Code cleanup to pass pfformat check

danrosen25 · danrosen25 · commit 05215ed914e5 · 2024-11-21T19:40:51.000-05:00
diff --git a/pfnuopc/include/pf_nuopc_macros.h b/pfnuopc/include/pf_nuopc_macros.h
@@ -1,13 +1,9 @@
-!-------------------------------------------------------------------------------
-! Define Defaults
-!-------------------------------------------------------------------------------
-#define CONTEXT  line=__LINE__,file=__FILE__
-#define PASSTHRU msg=ESMF_LOGERR_PASSTHRU,CONTEXT
-#define ESMF_STDERRORCHECK(rc) ESMF_LogFoundError(rcToCheck=rc,msg=ESMF_LOGERR_PASSTHRU,line=__LINE__,file=__FILE__)
+!Define Defaults
+#define CONTEXT  line = __LINE__, file = __FILE__
+#define PASSTHRU msg = ESMF_LOGERR_PASSTHRU, CONTEXT
+#define ESMF_STDERRORCHECK(rc) ESMF_LogFoundError(rcToCheck = rc, msg = ESMF_LOGERR_PASSTHRU, line = __LINE__, file = __FILE__)
 
-!-------------------------------------------------------------------------------
-! Define ESMF real kind to match Appplications single/double precision
-!-------------------------------------------------------------------------------
+!Define ESMF real kind to match Appplications single / double precision
 #if defined(REAL4)
 #define ESMF_KIND_FIELD ESMF_KIND_R4
 #define ESMF_KIND_COORD ESMF_KIND_R4
diff --git a/pfsimulator/amps/cuda/amps_init.c b/pfsimulator/amps/cuda/amps_init.c
@@ -269,6 +269,7 @@ int amps_EmbeddedInit(void)
 int amps_EmbeddedInitFComm(MPI_Fint *f_handle)
 {
   MPI_Comm comm;
+
   comm = MPI_Comm_f2c(*f_handle);
   return amps_EmbeddedInitComm(comm);
 }
diff --git a/pfsimulator/amps/mpi1/amps_init.c b/pfsimulator/amps/mpi1/amps_init.c
@@ -265,6 +265,7 @@ int amps_EmbeddedInit(void)
 int amps_EmbeddedInitFComm(MPI_Fint *f_handle)
 {
   MPI_Comm comm;
+
   comm = MPI_Comm_f2c(*f_handle);
   return amps_EmbeddedInitComm(comm);
 }
diff --git a/pfsimulator/amps/oas3/amps_init.c b/pfsimulator/amps/oas3/amps_init.c
@@ -278,6 +278,7 @@ int amps_EmbeddedInit(void)
 int amps_EmbeddedInitFComm(MPI_Fint *f_handle)
 {
   MPI_Comm comm;
+
   comm = MPI_Comm_f2c(*f_handle);
   return amps_EmbeddedInitComm(comm);
 }
@@ -309,7 +310,8 @@ int amps_EmbeddedInitFComm(MPI_Fint *f_handle)
 int amps_EmbeddedInitComm(MPI_Comm comm)
 {
   int result;
-  MPI_Comm_compare(oas3Comm, comm, &result );
+
+  MPI_Comm_compare(oas3Comm, comm, &result);
   if (result != MPI_CONGRUENT)
   {
     printf("AMPS Error: oas3Comm is not congruent with embedded usage\n");
diff --git a/pfsimulator/amps/smpi/amps_init.c b/pfsimulator/amps/smpi/amps_init.c
@@ -268,6 +268,7 @@ int amps_EmbeddedInit(void)
 int amps_EmbeddedInitFComm(MPI_Fint *f_handle)
 {
   MPI_Comm comm;
+
   comm = MPI_Comm_f2c(*f_handle);
   return amps_EmbeddedInitComm(comm);
 }
diff --git a/pfsimulator/parflow_lib/cpl_parflow.c b/pfsimulator/parflow_lib/cpl_parflow.c
@@ -40,12 +40,12 @@ amps_ThreadLocalDcl(PFModule *, Solver_module);
 amps_ThreadLocalDcl(PFModule *, solver);
 amps_ThreadLocalDcl(Vector   *, evap_trans);
 
-void cplparflowinit_(int  *fcom,
-                     char *input_file,
-                     int  *numprocs,
-                     int  *subgridcount,
-                     int  *nz,
-                     int  *ierror)
+void cplparflowinit_(int *  fcom,
+                     char * input_file,
+                     int *  numprocs,
+                     int *  subgridcount,
+                     int *  nz,
+                     int *  ierror)
 {
   Grid         *grid;
   char *seperators = " \n";
@@ -129,22 +129,21 @@ void cplparflowinit_(int  *fcom,
   *ierror = 0;
 }
 
-void cplparflowadvance_(double *current_time,
-                        double *dt,
-                        float  *imp_flux,
-                        float  *exp_pressure,
-                        float  *exp_porosity,
-                        float  *exp_saturation,
-                        float  *exp_specific,
-                        float  *exp_zmult,
-                        int    *num_soil_layers,
-                        int    *num_cpl_layers,
-                        int    *ghost_size_i_lower,
-                        int    *ghost_size_j_lower,
-                        int    *ghost_size_i_upper,
-                        int    *ghost_size_j_upper,
-                        int    *ierror)
-
+void cplparflowadvance_(double * current_time,
+                        double * dt,
+                        float *  imp_flux,
+                        float *  exp_pressure,
+                        float *  exp_porosity,
+                        float *  exp_saturation,
+                        float *  exp_specific,
+                        float *  exp_zmult,
+                        int *    num_soil_layers,
+                        int *    num_cpl_layers,
+                        int *    ghost_size_i_lower,
+                        int *    ghost_size_j_lower,
+                        int *    ghost_size_i_upper,
+                        int *    ghost_size_j_upper,
+                        int *    ierror)
 {
   ProblemData *problem_data = GetProblemDataRichards(amps_ThreadLocal(solver));
   Vector *solver_mask = GetMaskRichards(amps_ThreadLocal(solver));
@@ -262,19 +261,18 @@ void cplparflowadvance_(double *current_time,
   *ierror = 0;
 }
 
-void cplparflowexport_(float  *exp_pressure,
-                       float  *exp_porosity,
-                       float  *exp_saturation,
-                       float  *exp_specific,
-                       float  *exp_zmult,
-                       int    *num_soil_layers,
-                       int    *num_cpl_layers,
-                       int    *ghost_size_i_lower,
-                       int    *ghost_size_j_lower,
-                       int    *ghost_size_i_upper,
-                       int    *ghost_size_j_upper,
-                       int    *ierror)
-
+void cplparflowexport_(float * exp_pressure,
+                       float * exp_porosity,
+                       float * exp_saturation,
+                       float * exp_specific,
+                       float * exp_zmult,
+                       int *   num_soil_layers,
+                       int *   num_cpl_layers,
+                       int *   ghost_size_i_lower,
+                       int *   ghost_size_j_lower,
+                       int *   ghost_size_i_upper,
+                       int *   ghost_size_j_upper,
+                       int *   ierror)
 {
   ProblemData *problem_data = GetProblemDataRichards(amps_ThreadLocal(solver));
   Vector *solver_mask = GetMaskRichards(amps_ThreadLocal(solver));
@@ -348,18 +346,18 @@ void cplparflowexport_(float  *exp_pressure,
  * k-index data for the top of the domain.
  */
 void CPL2PF(
-            float * imp_array,          /* import array */
-            int     imp_nz,             /* layers of import array, X, Y are
-                                         * assumed to be the same as PF vector
-                                         * subgrid */ 
-            int     cpy_layers,         /* number of layers to copy */
-            int     ghost_size_i_lower, /* Number of ghost cells */
-            int     ghost_size_j_lower,
-            int     ghost_size_i_upper,
-            int     ghost_size_j_upper,
-            Vector *pf_vector,
-            Vector *top,
-            Vector *mask)
+            float *  imp_array,          /* import array */
+            int      imp_nz,             /* layers of import array, X, Y are
+                                          * assumed to be the same as PF vector
+                                          * subgrid */
+            int      cpy_layers,         /* number of layers to copy */
+            int      ghost_size_i_lower, /* Number of ghost cells */
+            int      ghost_size_j_lower,
+            int      ghost_size_i_upper,
+            int      ghost_size_j_upper,
+            Vector * pf_vector,
+            Vector * top,
+            Vector * mask)
 {
   Grid       *grid = VectorGrid(pf_vector);
   int sg;
@@ -419,17 +417,17 @@ void CPL2PF(
  * Copy data from a PF vector to an export array
  */
 void PF2CPL(
-            Vector *pf_vector,
-            float * exp_array, /* export array */
-            int     exp_nz,             /* layers of export array, X, Y are
-                                         * assumed to be the same as PF vector
-                                         * subgrid */
-            int     ghost_size_i_lower, /* Number of ghost cells */
-            int     ghost_size_j_lower,
-            int     ghost_size_i_upper,
-            int     ghost_size_j_upper,
-            Vector *top,
-            Vector *mask)
+            Vector * pf_vector,
+            float *  exp_array, /* export array */
+            int      exp_nz,             /* layers of export array, X, Y are
+                                          * assumed to be the same as PF vector
+                                          * subgrid */
+            int      ghost_size_i_lower, /* Number of ghost cells */
+            int      ghost_size_j_lower,
+            int      ghost_size_i_upper,
+            int      ghost_size_j_upper,
+            Vector * top,
+            Vector * mask)
 {
   Grid       *grid = VectorGrid(pf_vector);
   int sg;
@@ -480,7 +478,9 @@ void PF2CPL(
                             ((j - iy + ghost_size_j_lower) * (exp_nx * exp_nz));
             exp_array[exp_index] = (float)(subvector_data[pf_index]);
           }
-        }else{
+        }
+        else
+        {
           // fill missing export
           for (k = 0; k < exp_nz; k++)
           {
@@ -500,23 +500,26 @@ void PF2CPL(
  * Local Decomposition
  *--------------------------------------------------------------------------*/
 
-void cplparflowlcldecomp_(int *sg,
-                          int *lowerx,
-                          int *upperx,
-                          int *lowery,
-                          int *uppery,
-                          int *ierror)
+void cplparflowlcldecomp_(int * sg,
+                          int * lowerx,
+                          int * upperx,
+                          int * lowery,
+                          int * uppery,
+                          int * ierror)
 {
   Grid *grid = GetGrid2DRichards(amps_ThreadLocal(solver));
   int subgridcount = SubgridArraySize(GridSubgrids(grid));
-  if (*sg < 0 || *sg > (subgridcount-1))
+
+  if (*sg < 0 || *sg > (subgridcount - 1))
   {
     *lowerx = 0;
     *upperx = 0;
     *lowery = 0;
     *uppery = 0;
     *ierror = 22;
-  }else{
+  }
+  else
+  {
     Subgrid *subgrid = GridSubgrid(grid, *sg);
     *lowerx = SubgridIX(subgrid);
     *upperx = *lowerx + SubgridNX(subgrid) - 1;
@@ -530,17 +533,20 @@ void cplparflowlcldecomp_(int *sg,
  * Local Watershed Mask
  *--------------------------------------------------------------------------*/
 
-void cplparflowlclmask_(int *sg,
-                        int *localmask,
-                        int *ierror)
+void cplparflowlclmask_(int * sg,
+                        int * localmask,
+                        int * ierror)
 {
   Grid *grid = GetGrid2DRichards(amps_ThreadLocal(solver));
   int subgridcount = SubgridArraySize(GridSubgrids(grid));
   Vector *mask = GetMaskRichards(amps_ThreadLocal(solver));
-  if (*sg < 0 || *sg > (subgridcount-1))
+
+  if (*sg < 0 || *sg > (subgridcount - 1))
   {
     *ierror = 22;
-  }else{
+  }
+  else
+  {
     Subgrid *subgrid = GridSubgrid(grid, *sg);
     int ix = SubgridIX(subgrid);
     int iy = SubgridIY(subgrid);
@@ -561,7 +567,9 @@ void cplparflowlclmask_(int *sg,
         if (mask_data[mask_index] > 0)
         {
           localmask[localmask_index] = 1;
-        }else{
+        }
+        else
+        {
           localmask[localmask_index] = 0;
         }
       }
@@ -574,20 +582,23 @@ void cplparflowlclmask_(int *sg,
  * Local Cartesian Coordinates Center
  *--------------------------------------------------------------------------*/
 
-void cplparflowlclxyctr_(int   *sg,
-                         float *localx,
-                         float *localy,
-                         int   *ierror)
+void cplparflowlclxyctr_(int *   sg,
+                         float * localx,
+                         float * localy,
+                         int *   ierror)
 {
   Grid *grid = GetGrid2DRichards(amps_ThreadLocal(solver));
   int subgridcount = SubgridArraySize(GridSubgrids(grid));
-  if (*sg < 0 || *sg > (subgridcount-1))
+
+  if (*sg < 0 || *sg > (subgridcount - 1))
   {
     *ierror = 22;
-  }else{
+  }
+  else
+  {
     Subgrid *subgrid = GridSubgrid(grid, *sg);
-    int nx   = SubgridNX(subgrid);
-    int ny   = SubgridNY(subgrid);
+    int nx = SubgridNX(subgrid);
+    int ny = SubgridNY(subgrid);
     float lx = SubgridX(subgrid);
     float ly = SubgridY(subgrid);
     float dx = SubgridDX(subgrid);
@@ -612,20 +623,23 @@ void cplparflowlclxyctr_(int   *sg,
  * Local Cartesian Coordinates Edge
  *--------------------------------------------------------------------------*/
 
-void cplparflowlclxyedg_(int   *sg,
-                         float *localx,
-                         float *localy,
-                         int   *ierror)
+void cplparflowlclxyedg_(int *   sg,
+                         float * localx,
+                         float * localy,
+                         int *   ierror)
 {
   Grid *grid = GetGrid2DRichards(amps_ThreadLocal(solver));
   int subgridcount = SubgridArraySize(GridSubgrids(grid));
-  if (*sg < 0 || *sg > (subgridcount-1))
+
+  if (*sg < 0 || *sg > (subgridcount - 1))
   {
     *ierror = 22;
-  }else{
+  }
+  else
+  {
     Subgrid *subgrid = GridSubgrid(grid, *sg);
-    int nx   = SubgridNX(subgrid);
-    int ny   = SubgridNY(subgrid);
+    int nx = SubgridNX(subgrid);
+    int ny = SubgridNY(subgrid);
     float lx = SubgridX(subgrid);
     float ly = SubgridY(subgrid);
     float dx = SubgridDX(subgrid);
diff --git a/pfsimulator/parflow_lib/parflow_proto.h b/pfsimulator/parflow_lib/parflow_proto.h
diff --git a/pfsimulator/parflow_lib/solver_richards.c b/pfsimulator/parflow_lib/solver_richards.c

Original file line number	Diff line number	Diff line change
`@@ -269,6 +269,7 @@ int amps_EmbeddedInit(void)`
`269`	`269`	`int amps_EmbeddedInitFComm(MPI_Fint *f_handle)`
`270`	`270`	`{`
`271`	`271`	`MPI_Comm comm;`
	`272`	`+`
`272`	`273`	`comm = MPI_Comm_f2c(*f_handle);`
`273`	`274`	`return amps_EmbeddedInitComm(comm);`
`274`	`275`	`}`
Original file line number	Diff line number	Diff line change
`@@ -265,6 +265,7 @@ int amps_EmbeddedInit(void)`
`265`	`265`	`int amps_EmbeddedInitFComm(MPI_Fint *f_handle)`
`266`	`266`	`{`
`267`	`267`	`MPI_Comm comm;`
	`268`	`+`
`268`	`269`	`comm = MPI_Comm_f2c(*f_handle);`
`269`	`270`	`return amps_EmbeddedInitComm(comm);`
`270`	`271`	`}`
Original file line number	Diff line number	Diff line change
`@@ -278,6 +278,7 @@ int amps_EmbeddedInit(void)`
`278`	`278`	`int amps_EmbeddedInitFComm(MPI_Fint *f_handle)`
`279`	`279`	`{`
`280`	`280`	`MPI_Comm comm;`
	`281`	`+`
`281`	`282`	`comm = MPI_Comm_f2c(*f_handle);`
`282`	`283`	`return amps_EmbeddedInitComm(comm);`
`283`	`284`	`}`
`@@ -309,7 +310,8 @@ int amps_EmbeddedInitFComm(MPI_Fint *f_handle)`
`309`	`310`	`int amps_EmbeddedInitComm(MPI_Comm comm)`
`310`	`311`	`{`
`311`	`312`	`int result;`
`312`		`- MPI_Comm_compare(oas3Comm, comm, &result );`
	`313`	`+`
	`314`	`+ MPI_Comm_compare(oas3Comm, comm, &result);`
`313`	`315`	`if (result != MPI_CONGRUENT)`
`314`	`316`	`{`
`315`	`317`	`printf("AMPS Error: oas3Comm is not congruent with embedded usage\n");`
Original file line number	Diff line number	Diff line change
`@@ -268,6 +268,7 @@ int amps_EmbeddedInit(void)`
`268`	`268`	`int amps_EmbeddedInitFComm(MPI_Fint *f_handle)`
`269`	`269`	`{`
`270`	`270`	`MPI_Comm comm;`
	`271`	`+`
`271`	`272`	`comm = MPI_Comm_f2c(*f_handle);`
`272`	`273`	`return amps_EmbeddedInitComm(comm);`
`273`	`274`	`}`