Apply pre-commmit fixes

Author: wperkins

src/opflow/interface/opflow.cpp

@@ -1797,15 +1797,14 @@ PetscErrorCode OPFLOWSetUp(OPFLOW opflow) {
 
   ierr = MatCreate(opflow->comm->type, &opflow->Hes);
   CHKERRQ(ierr);
-  ierr = MatSetSizes(opflow->Hes, opflow->nx, opflow->nx,
-                     opflow->Nx, opflow->Nx);
+  ierr =
+      MatSetSizes(opflow->Hes, opflow->nx, opflow->nx, opflow->Nx, opflow->Nx);
   CHKERRQ(ierr);
   ierr = MatSetFromOptions(opflow->Hes);
   CHKERRQ(ierr);
   ierr = MatSeqAIJSetPreallocation(opflow->Hes, 6, NULL);
   CHKERRQ(ierr);
-  ierr = MatSetOption(opflow->Hes, MAT_NEW_NONZERO_ALLOCATION_ERR,
-                      PETSC_FALSE);
+  ierr = MatSetOption(opflow->Hes, MAT_NEW_NONZERO_ALLOCATION_ERR, PETSC_FALSE);
   CHKERRQ(ierr);
 
   /* Create natural to sparse dense ordering mapping (needed for some models)

src/opflow/model/power_bal_hiop/paramsrajahiop.h

@@ -196,12 +196,12 @@ struct LINEParamsRajaHiop {
                       constraint bound */
   int *linelimidx; /* Indices for subset of lines that have finite limits */
 
-  int *busf_idx;   /* From bus index */
-  int *bust_idx;   /* To bus index */
-  int *jacf_idx;   /* Location number in the sparse Jacobian (from) */
-  int *jact_idx;   /* Location number in the sparse Jacobian (to) */
-  int *jac_ieq_idx;/* Location number in sparse inequality Jacobian */
-  int *hesssp_idx; /* Location number in sparse Hessian */
+  int *busf_idx;    /* From bus index */
+  int *bust_idx;    /* To bus index */
+  int *jacf_idx;    /* Location number in the sparse Jacobian (from) */
+  int *jact_idx;    /* Location number in the sparse Jacobian (to) */
+  int *jac_ieq_idx; /* Location number in sparse inequality Jacobian */
+  int *hesssp_idx;  /* Location number in sparse Hessian */
 
   // Device data
   double *Gff_dev_;    /* From side self conductance */
@@ -226,12 +226,12 @@ struct LINEParamsRajaHiop {
   int *
       linelimidx_dev_; /* Indices for subset of lines that have finite limits */
 
-  int *busf_idx_dev_;   /* From bus index */
-  int *bust_idx_dev_;   /* To bus index */
-  int *jacf_idx_dev_;   /* Location number in the sparse Jacobian (from) */
-  int *jact_idx_dev_;   /* Location number in the sparse Jacobian (to) */
-  int *jac_ieq_idx_dev_;/* Location number in sparse inequality Jacobian */
-  int *hesssp_idx_dev_; /* Location number in sparse Hessian */
+  int *busf_idx_dev_;    /* From bus index */
+  int *bust_idx_dev_;    /* To bus index */
+  int *jacf_idx_dev_;    /* Location number in the sparse Jacobian (from) */
+  int *jact_idx_dev_;    /* Location number in the sparse Jacobian (to) */
+  int *jac_ieq_idx_dev_; /* Location number in sparse inequality Jacobian */
+  int *hesssp_idx_dev_;  /* Location number in sparse Hessian */
 
   int allocate(OPFLOW);
   int destroy(OPFLOW);
@@ -267,12 +267,14 @@ struct PbpolModelRajaHiop : public _p_FormPBPOLRAJAHIOP {
   // GPU sparse model)
   int *i_jaceq,
       *j_jaceq; // Row and column indices for equality constrained Jacobian
-  int *idx_jaceq_dev_; // Permuted triplet indexes for equality constrained Jacobian (on-device)
+  int *idx_jaceq_dev_; // Permuted triplet indexes for equality constrained
+                       // Jacobian (on-device)
   int *i_jacineq,
       *j_jacineq; // Row and column indices for inequality constrained Jacobain
-  int *idx_jacineq_dev_; // Permuted triplet indexes for inequality constrained Jacobian (on-device)
-  int *i_hess, *j_hess; // Row and column indices for hessian
+  int *idx_jacineq_dev_; // Permuted triplet indexes for inequality constrained
+                         // Jacobian (on-device)
+  int *i_hess, *j_hess;  // Row and column indices for hessian
   double *val_jaceq, *val_jacineq,
-      *val_hess; // values for equality, inequality jacobians and hessian
+      *val_hess;      // values for equality, inequality jacobians and hessian
   int *idx_hess_dev_; // Permuted triplet indexes for Hessian (on-device)
 };

src/opflow/model/power_bal_hiop/pbpolrajahiopsparse.cpp

@@ -234,7 +234,7 @@ PetscErrorCode OPFLOWModelSetUp_PBPOLRAJAHIOPSPARSE(OPFLOW opflow) {
 
     PSBUS bus = &(ps->bus[ibus]);
 
-    // Nonzero entries used by each *bus* starts here 
+    // Nonzero entries used by each *bus* starts here
 
     // no matter what, each bus uses 2 rows and 2 columns
     // row 1 = real, row2 = reactive
@@ -243,11 +243,11 @@ PetscErrorCode OPFLOWModelSetUp_PBPOLRAJAHIOPSPARSE(OPFLOW opflow) {
     nnz_eqjac += 2;
     busparams->jacsq_idx[ibus] = nnz_eqjac;
     nnz_eqjac += 2;
-    
+
     if (bus->ide == ISOLATED_BUS) {
       continue;
     }
-      
+
     if (opflow->include_powerimbalance_variables) {
       // 2 more entries on both real and reactive
       nnz_eqjac += 4;
@@ -264,7 +264,7 @@ PetscErrorCode OPFLOWModelSetUp_PBPOLRAJAHIOPSPARSE(OPFLOW opflow) {
       genparams->eqjacsqbus_idx[igen1] = nnz_eqjac++;
       igen1++;
     }
-      
+
     if (opflow->include_loadloss_variables) {
       // each load adds one real and reactive entry on each bus row
       // NOTE: iload is a system load counter
@@ -275,13 +275,12 @@ PetscErrorCode OPFLOWModelSetUp_PBPOLRAJAHIOPSPARSE(OPFLOW opflow) {
       }
     }
 
-      
     if (opflow->has_gensetpoint) {
       for (int bgen = 0; bgen < bus->ngen; ++bgen) {
         PSGEN gen;
         ierr = PSBUSGetGen(bus, bgen, &gen);
         CHKERRQ(ierr);
-        
+
         if (!gen->status || gen->isrenewable)
           continue;
 
@@ -297,10 +296,10 @@ PetscErrorCode OPFLOWModelSetUp_PBPOLRAJAHIOPSPARSE(OPFLOW opflow) {
 
   for (int iline = 0; iline <= ps->nline; ++iline) {
     PSLINE line = &(ps->line[iline]);
-    
+
     if (!line->status)
       continue;
-    
+
     // each line adds 4 (off-diagonal) entries for the to bus and 4
     // entries for the from bus.  Each line also modifies 4 existing
     // to and from bus entries.
@@ -338,11 +337,11 @@ PetscErrorCode OPFLOWModelSetUp_PBPOLRAJAHIOPSPARSE(OPFLOW opflow) {
       PSBUS bus = &(ps->bus[ibus]);
       if (bus->ide == PV_BUS || bus->ide == REF_BUS) {
         for (int bgen = 0; bgen < bus->ngen; ++bgen) {
-        PSGEN gen;
-        ierr = PSBUSGetGen(bus, bgen, &gen);
-        CHKERRQ(ierr);
-        if (!gen->status)
-          continue;
+          PSGEN gen;
+          ierr = PSBUSGetGen(bus, bgen, &gen);
+          CHKERRQ(ierr);
+          if (!gen->status)
+            continue;
         }
         nnz_ineqjac += 2;
       }
@@ -357,8 +356,8 @@ PetscErrorCode OPFLOWModelSetUp_PBPOLRAJAHIOPSPARSE(OPFLOW opflow) {
     }
   }
 
-  std::cout << "Inequality Jacobian nonzero count: " << nnz_ineqjac << std::endl;
-
+  std::cout << "Inequality Jacobian nonzero count: " << nnz_ineqjac
+            << std::endl;
 
   // Count non-zeros in *upper triangular* Hessian
 
@@ -375,7 +374,6 @@ PetscErrorCode OPFLOWModelSetUp_PBPOLRAJAHIOPSPARSE(OPFLOW opflow) {
     if (opflow->include_powerimbalance_variables) {
       nnz_hesssp += 2;
     }
-
   }
 
   for (int i = 0, igen = 0; i < ps->ngen; ++i) {
@@ -402,19 +400,18 @@ PetscErrorCode OPFLOWModelSetUp_PBPOLRAJAHIOPSPARSE(OPFLOW opflow) {
     igen++;
   }
 
-  for (int iline=0; iline < ps->nline; ++iline) {
+  for (int iline = 0; iline < ps->nline; ++iline) {
     PSLINE line = &(ps->line[iline]);
 
     if (!line->status)
       continue;
-    
+
     lineparams->hesssp_idx[iline] = nnz_hesssp;
 
     // 3 diagonal entries for on the from-bus rows (already defined)
     // 3 diagonal entries for on the to-bus rows (already defined)
     // 4 off-diagonal entries in upper part
     nnz_hesssp += 4;
-
   }
 
   if (opflow->include_loadloss_variables) {
@@ -426,7 +423,6 @@ PetscErrorCode OPFLOWModelSetUp_PBPOLRAJAHIOPSPARSE(OPFLOW opflow) {
 
   std::cout << "Hessian nonzero count: " << nnz_hesssp << std::endl;
 
-
   ierr = busparams->copy(opflow);
   ierr = genparams->copy(opflow);
   ierr = lineparams->copy(opflow);