From 541f6deed1627739c7ea586a2ade945305517e2e Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Mon, 11 Mar 2024 08:03:02 -0600 Subject: [PATCH] clang-format new version --- .../libraries/exoIIv2for32/src/exo_jack_32.c | 8 +++---- .../libraries/exodus/src/ex_get_cmap_params.c | 18 +++++++-------- .../exodus/src/ex_put_all_var_param_ext.c | 6 ++--- .../libraries/exodus/src/ex_put_truth_table.c | 6 ++--- .../seacas/libraries/exodus/test/rd_wt_mesh.c | 14 ++++++------ .../seacas/libraries/nemesis/ne_ctest_wrap.c | 22 +++++++++---------- packages/seacas/libraries/suplib_c/XGetopt.c | 2 +- .../seacas/libraries/suplib_cpp/GetLongOpt.C | 4 ++-- 8 files changed, 40 insertions(+), 40 deletions(-) diff --git a/packages/seacas/libraries/exoIIv2for32/src/exo_jack_32.c b/packages/seacas/libraries/exoIIv2for32/src/exo_jack_32.c index b091bcc3b1..1c762e221d 100644 --- a/packages/seacas/libraries/exoIIv2for32/src/exo_jack_32.c +++ b/packages/seacas/libraries/exoIIv2for32/src/exo_jack_32.c @@ -504,8 +504,8 @@ void F2C(exginf, EXGINF)(int *idexo, char *info, int *ierr, int infolen) for (i = 0; i < num_info; i++) { /* Put pointers to the info records in ptr * array */ *(aptr + i) = sptr + i * (slen + 1); - } /* put ptr in string ptr - * array */ + } /* put ptr in string ptr + * array */ *(aptr + i) = NULL; /* null out last pointer */ /* Do exodus call to get info records */ @@ -1273,8 +1273,8 @@ void F2C(exgpn, EXGPN)(int *idexo, int *obj_type, char *prop_names, int *ierr, i int i; for (i = 0; i < num_props; i++) { *(aptr + i) = sptr + i * (slen + 1); - } /* put ptrs to staging space - * into ptr array */ + } /* put ptrs to staging space + * into ptr array */ *(aptr + i) = NULL; /* set last pointer to null */ /* do Exodus C call to get property name records */ diff --git a/packages/seacas/libraries/exodus/src/ex_get_cmap_params.c b/packages/seacas/libraries/exodus/src/ex_get_cmap_params.c index 83299094ee..2e4bdefd14 100644 --- a/packages/seacas/libraries/exodus/src/ex_get_cmap_params.c +++ b/packages/seacas/libraries/exodus/src/ex_get_cmap_params.c @@ -207,10 +207,10 @@ int ex_get_cmap_params(int exoid, void_int *node_cmap_ids, void_int *node_cmap_n ((int *)node_cmap_node_cnts)[cnt] = 0; } } /* "for(cnt=0; cnt < num_n_comm_maps; cnt++)" */ - } /* "if (node_cmap_node_cnts != NULL)" */ - } /* "if (node_cmap_ids != NULL)" */ - } /* "if (num_n_comm_maps > 0)" */ - } /* End "if ((dimid = nc_inq_dimid(exoid, DIM_NUM_N_CMAPS)) != -1)" */ + } /* "if (node_cmap_node_cnts != NULL)" */ + } /* "if (node_cmap_ids != NULL)" */ + } /* "if (num_n_comm_maps > 0)" */ + } /* End "if ((dimid = nc_inq_dimid(exoid, DIM_NUM_N_CMAPS)) != -1)" */ /*****************************************************************************/ /*****************************************************************************/ @@ -368,10 +368,10 @@ int ex_get_cmap_params(int exoid, void_int *node_cmap_ids, void_int *node_cmap_n ((int *)elem_cmap_elem_cnts)[cnt] = 0; } } /* "for(cnt=0; cnt < num_e_comm_maps; cnt++)" */ - } /* "if (elem_cmap_elem_cnts != NULL)" */ - } /* "if (elem_cmap_ids != NULL)" */ - } /* "if (num_e_comm_maps > 0)" */ - } /* End "if ((dimid = nc_inq_dimid(exoid, DIM_NUM_E_CMAPS(processor))) != - -1)" */ + } /* "if (elem_cmap_elem_cnts != NULL)" */ + } /* "if (elem_cmap_ids != NULL)" */ + } /* "if (num_e_comm_maps > 0)" */ + } /* End "if ((dimid = nc_inq_dimid(exoid, DIM_NUM_E_CMAPS(processor))) != + -1)" */ EX_FUNC_LEAVE(EX_NOERR); } diff --git a/packages/seacas/libraries/exodus/src/ex_put_all_var_param_ext.c b/packages/seacas/libraries/exodus/src/ex_put_all_var_param_ext.c index 0821d8b08f..7f2a238f7b 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_all_var_param_ext.c +++ b/packages/seacas/libraries/exodus/src/ex_put_all_var_param_ext.c @@ -510,10 +510,10 @@ static int define_truth_table(ex_entity_type obj_type, int exoid, int num_ent, i } exi_compress_variable(exoid, varid, 2); } - } /* if */ + } /* if */ k++; /* increment truth table pointer */ - } /* for j */ - } /* for i */ + } /* for j */ + } /* for i */ return NC_NOERR; } diff --git a/packages/seacas/libraries/exodus/src/ex_put_truth_table.c b/packages/seacas/libraries/exodus/src/ex_put_truth_table.c index 5daa134e8b..ccc89a1b21 100644 --- a/packages/seacas/libraries/exodus/src/ex_put_truth_table.c +++ b/packages/seacas/libraries/exodus/src/ex_put_truth_table.c @@ -301,10 +301,10 @@ int ex_put_truth_table(int exoid, ex_entity_type obj_type, int num_blk, int num_ exi_compress_variable(exoid, varid, 2); } } - } /* if */ + } /* if */ k++; /* increment element truth table pointer */ - } /* for j */ - } /* for i */ + } /* for j */ + } /* for i */ free(stat_vals); diff --git a/packages/seacas/libraries/exodus/test/rd_wt_mesh.c b/packages/seacas/libraries/exodus/test/rd_wt_mesh.c index 90ca0fc8da..c7dcf632dd 100644 --- a/packages/seacas/libraries/exodus/test/rd_wt_mesh.c +++ b/packages/seacas/libraries/exodus/test/rd_wt_mesh.c @@ -71,8 +71,8 @@ double my_timer(void) #ifdef PARALLEL_AWARE_EXODUS double t1 = MPI_Wtime(); #else - clock_t ctime = clock(); - double t1 = ctime / (double)CLOCKS_PER_SEC; + clock_t ctime = clock(); + double t1 = ctime / (double)CLOCKS_PER_SEC; #endif return t1; } @@ -136,8 +136,8 @@ int main(int argc, char **argv) MPI_Comm_rank(MPI_COMM_WORLD, &rank); MPI_Comm_size(MPI_COMM_WORLD, &num_domains); #else - rank = 0; - num_domains = 1; + rank = 0; + num_domains = 1; #endif /* * Processor 0: parse the command line arguments. @@ -654,7 +654,7 @@ int read_exo_mesh(char *file_name, int rank, int *num_dim, int num_domains, int #ifdef PARALLEL_AWARE_EXODUS MPI_Allreduce(&file_size, &glob_file_size, 1, MPI_LONG, MPI_SUM, MPI_COMM_WORLD); #else - glob_file_size = file_size; + glob_file_size = file_size; #endif if (rank == 0) { @@ -808,7 +808,7 @@ int write_exo_mesh(char *file_name, int rank, int num_dim, int num_domains, int } #else err = ex_put_block(exoid[npd], EX_ELEM_BLOCK, EBLK_ID, "hex", num_elems, NUM_NODES_PER_ELEM, - 0, 0, 0); + 0, 0, 0); #endif if (err) { printf("after ex_put_elem_block, error = %d\n", err); @@ -1153,7 +1153,7 @@ int write_exo_mesh(char *file_name, int rank, int num_dim, int num_domains, int #ifdef PARALLEL_AWARE_EXODUS MPI_Allreduce(&file_size, &glob_file_size, 1, MPI_LONG, MPI_SUM, MPI_COMM_WORLD); #else - glob_file_size = file_size; + glob_file_size = file_size; #endif if (rank == 0) { diff --git a/packages/seacas/libraries/nemesis/ne_ctest_wrap.c b/packages/seacas/libraries/nemesis/ne_ctest_wrap.c index 00c97382b2..50873c9f18 100644 --- a/packages/seacas/libraries/nemesis/ne_ctest_wrap.c +++ b/packages/seacas/libraries/nemesis/ne_ctest_wrap.c @@ -28,21 +28,21 @@ #include "ne_nemesisI.h" /* Constants for init_global functions */ -#define NNG 100 -#define NEG 50 -#define NEBG 5 +#define NNG 100 +#define NEG 50 +#define NEBG 5 #define NEBCG 10 -#define NNSG 2 -#define NSSG 3 +#define NNSG 2 +#define NSSG 3 /* Constants for load-balance functions */ -#define NPROC 10 +#define NPROC 10 #define NPROCF NPROC -#define NINTN 200 -#define NBORN 10 -#define NEXTN 5 -#define NINTE 100 -#define NBORE 20 +#define NINTN 200 +#define NBORN 10 +#define NEXTN 5 +#define NINTE 100 +#define NBORE 20 #define NNCMAP 4 #define NECMAP 2 diff --git a/packages/seacas/libraries/suplib_c/XGetopt.c b/packages/seacas/libraries/suplib_c/XGetopt.c index 1447dfa5a7..12029e58c6 100644 --- a/packages/seacas/libraries/suplib_c/XGetopt.c +++ b/packages/seacas/libraries/suplib_c/XGetopt.c @@ -24,7 +24,7 @@ /////////////////////////////////////////////////////////////////////////////// // if you are using precompiled headers then include this line: -//#include "stdafx.h" +// #include "stdafx.h" /////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// diff --git a/packages/seacas/libraries/suplib_cpp/GetLongOpt.C b/packages/seacas/libraries/suplib_cpp/GetLongOpt.C index ec5e5862c1..efbfb44285 100644 --- a/packages/seacas/libraries/suplib_cpp/GetLongOpt.C +++ b/packages/seacas/libraries/suplib_cpp/GetLongOpt.C @@ -197,7 +197,7 @@ int GetLongOption::parse(int argc, char *const *argv) } } } /* end if */ - } /* end for */ + } /* end for */ if (matchStatus == PartialMatch) { int stat = setcell(pc, tmptoken, *(argv + 1), pname); @@ -277,7 +277,7 @@ int GetLongOption::parse(char *const str, char *const p) pc = t; } } /* end if */ - } /* end for */ + } /* end for */ if (matchStatus == PartialMatch) { ladtoken = strtok(nullptr, " \t");