From 0ce824e590c70460875a99e5d7c063d8769ed35c Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 10 Apr 2024 08:40:36 -0600 Subject: [PATCH] Clang format run over all files --- .../libraries/chaco/assign/assign_out.c | 10 +- packages/seacas/libraries/chaco/assign/y2x.c | 4 +- .../libraries/chaco/bpmatch/genvals2d.c | 2 +- .../libraries/chaco/bpmatch/genvals3d.c | 2 +- .../seacas/libraries/chaco/bpmatch/inits2d.c | 14 +-- .../seacas/libraries/chaco/bpmatch/sorts2d.c | 2 +- .../seacas/libraries/chaco/bpmatch/sorts3d.c | 2 +- .../libraries/chaco/coarsen/countcedges.c | 10 +- .../libraries/chaco/coarsen/interpolate.c | 10 +- .../libraries/chaco/coarsen/makeccoords.c | 8 +- .../libraries/chaco/connect/add_edges.c | 12 +-- .../seacas/libraries/chaco/connect/heap.c | 14 +-- .../seacas/libraries/chaco/graph/graph_out.c | 4 +- .../seacas/libraries/chaco/graph/mm_out.c | 4 +- .../seacas/libraries/chaco/graph/reformat.c | 24 ++--- .../seacas/libraries/chaco/graph/subgraph.c | 22 ++--- .../libraries/chaco/inertial/make_subgeom.c | 2 +- .../libraries/chaco/input/read_params.c | 97 +++++++++---------- .../libraries/chaco/internal/check_internal.c | 10 +- .../chaco/internal/improve_internal.c | 16 +-- .../libraries/chaco/klspiff/bilistops.c | 6 +- .../libraries/chaco/klspiff/compress_ewgts.c | 8 +- .../libraries/chaco/klspiff/count_weights.c | 4 +- .../libraries/chaco/klspiff/make_bndy_list.c | 12 +-- .../libraries/chaco/klvspiff/clear_dvals.c | 6 +- .../chaco/klvspiff/countup_vtx_sep.c | 2 +- .../libraries/chaco/klvspiff/find_bndy.c | 8 +- .../libraries/chaco/klvspiff/klv_init.c | 8 +- .../libraries/chaco/klvspiff/make_bpgraph.c | 16 +-- .../seacas/libraries/chaco/main/user_params.c | 4 +- packages/seacas/libraries/chaco/misc/count.c | 2 +- .../libraries/chaco/misc/countup_cube.c | 6 +- .../libraries/chaco/misc/countup_mesh.c | 12 +-- .../libraries/chaco/misc/define_submeshes.c | 8 +- .../seacas/libraries/chaco/misc/find_maxdeg.c | 2 +- .../seacas/libraries/chaco/misc/merge_goals.c | 6 +- packages/seacas/libraries/chaco/misc/timing.c | 2 +- .../chaco/refine_map/compute_cube_vdata.c | 4 +- .../chaco/refine_map/compute_mesh_vdata.c | 4 +- .../chaco/refine_map/find_edge_mesh.c | 4 +- .../chaco/refine_part/make_maps_ref.c | 8 +- .../chaco/refine_part/make_terms_ref.c | 4 +- .../libraries/chaco/util/array_alloc_2D.c | 4 +- .../libraries/chaco/util/machine_params.c | 2 +- .../seacas/libraries/chaco/util/smalloc.c | 18 ++-- .../libraries/exodus_for/src/exo_jack.c | 58 ++++++----- .../libraries/ioss/src/Ioss_CodeTypes.h | 2 +- .../libraries/ioss/src/Ioss_DatabaseIO.h | 57 ++++++----- .../libraries/ioss/src/Ioss_GroupingEntity.h | 40 ++++---- .../libraries/ioss/src/Ioss_IOFactory.h | 16 +-- .../seacas/libraries/ioss/src/Ioss_Property.h | 14 +-- .../seacas/libraries/ioss/src/Ioss_Utils.h | 32 +++--- .../libraries/ioss/src/adios/Ioad_Helper.h | 8 +- .../libraries/ioss/src/cgns/Iocgns_Utils.h | 30 +++--- .../ioss/src/exodus/Ioex_DatabaseIO.h | 7 +- .../ioss/src/exodus/Ioex_DecompositionData.C | 6 +- .../libraries/ioss/src/exodus/Ioex_Utils.h | 8 +- .../ioss/src/exonull/Ioexnl_DatabaseIO.C | 2 +- .../libraries/ioss/src/hopscotch_hash.h | 4 +- .../ioss/src/utest/Utst_IofxDatabaseIO.C | 2 +- .../libraries/ioss/src/utest/Utst_heartbeat.C | 2 +- .../seacas/libraries/supes/ext_lib/exread.c | 2 +- packages/seacas/libraries/svdi/cgi/mdcgi.c | 14 +-- .../seacas/libraries/svdi/cgi/met_metxlate.c | 84 ++++++++-------- .../seacas/libraries/svdi/cgi/pst_pstxlate.c | 84 ++++++++-------- packages/seacas/libraries/svdi/cgi/sdcgi.c | 84 ++++++++-------- .../seacas/libraries/svdi/cgi/x11_vdix11.c | 4 +- .../seacas/libraries/svdi/cgi/x11_x11xlate.c | 82 ++++++++-------- 68 files changed, 545 insertions(+), 526 deletions(-) diff --git a/packages/seacas/libraries/chaco/assign/assign_out.c b/packages/seacas/libraries/chaco/assign/assign_out.c index 81a8f8d264..d29554136c 100644 --- a/packages/seacas/libraries/chaco/assign/assign_out.c +++ b/packages/seacas/libraries/chaco/assign/assign_out.c @@ -10,7 +10,7 @@ #include static void assign_out_normal(int nvtxs, /* number of vertices to output */ - int * sets, /* values to be printed */ + int *sets, /* values to be printed */ char *outname /* name of output file */ ) { @@ -36,14 +36,14 @@ static void assign_out_normal(int nvtxs, /* number of vertices to output */ } static void assign_out_inv(int nvtxs, /* number of vertices to output */ - int * sets, /* values to be printed */ + int *sets, /* values to be printed */ int nsets, /* number of sets */ char *outname /* name of output file */ ) { FILE *fout; /* output file */ - int * size; /* # vtxs in sets / index into inorder */ - int * inorder; /* list of vtxs in each set */ + int *size; /* # vtxs in sets / index into inorder */ + int *inorder; /* list of vtxs in each set */ int i, j; /* loop counter */ /* Print assignment in inverted format. */ @@ -105,7 +105,7 @@ static void assign_out_inv(int nvtxs, /* number of vertices to output */ } void assign_out(int nvtxs, /* number of vertices to output */ - int * sets, /* values to be printed */ + int *sets, /* values to be printed */ int nsets, /* number of sets */ char *outname /* name of output file */ ) diff --git a/packages/seacas/libraries/chaco/assign/y2x.c b/packages/seacas/libraries/chaco/assign/y2x.c index 39096861a1..90ee1b8c5b 100644 --- a/packages/seacas/libraries/chaco/assign/y2x.c +++ b/packages/seacas/libraries/chaco/assign/y2x.c @@ -11,7 +11,7 @@ void y2x(double **xvecs, /* pointer to list of x-vectors */ int ndims, /* number of divisions to make (# xvecs) */ int nmyvtxs, /* number of vertices I own (length xvecs) */ - double * wsqrt /* sqrt of vertex weights */ + double *wsqrt /* sqrt of vertex weights */ ) /* Convert from y to x by dividing by wsqrt. */ @@ -36,7 +36,7 @@ void y2x(double **xvecs, /* pointer to list of x-vectors */ void x2y(double **yvecs, /* pointer to list of y-vectors */ int ndims, /* number of divisions to make (# yvecs) */ int nmyvtxs, /* number of vertices I own (length yvecs) */ - double * wsqrt /* sqrt of vertex weights */ + double *wsqrt /* sqrt of vertex weights */ ) /* Convert from x to y by multiplying by wsqrt. */ diff --git a/packages/seacas/libraries/chaco/bpmatch/genvals2d.c b/packages/seacas/libraries/chaco/bpmatch/genvals2d.c index 9305dd1ff7..722fd3dca9 100644 --- a/packages/seacas/libraries/chaco/bpmatch/genvals2d.c +++ b/packages/seacas/libraries/chaco/bpmatch/genvals2d.c @@ -12,7 +12,7 @@ void genvals2d( /* Create lists of sets of values to be sorted. */ double **xvecs, /* vectors to partition */ - double * vals[4][MAXSETS], /* ptrs to lists of values */ + double *vals[4][MAXSETS], /* ptrs to lists of values */ int nvtxs /* number of values */ ) { diff --git a/packages/seacas/libraries/chaco/bpmatch/genvals3d.c b/packages/seacas/libraries/chaco/bpmatch/genvals3d.c index aedc450b2f..b7a5cecbaa 100644 --- a/packages/seacas/libraries/chaco/bpmatch/genvals3d.c +++ b/packages/seacas/libraries/chaco/bpmatch/genvals3d.c @@ -12,7 +12,7 @@ void genvals3d( /* Create lists of sets of values to be sorted. */ double **xvecs, /* vectors to partition */ - double * vals[8][MAXSETS], /* ptrs to lists of values */ + double *vals[8][MAXSETS], /* ptrs to lists of values */ int nvtxs /* number of values */ ) { diff --git a/packages/seacas/libraries/chaco/bpmatch/inits2d.c b/packages/seacas/libraries/chaco/bpmatch/inits2d.c index 6611fc441a..bedf35bf6b 100644 --- a/packages/seacas/libraries/chaco/bpmatch/inits2d.c +++ b/packages/seacas/libraries/chaco/bpmatch/inits2d.c @@ -9,7 +9,7 @@ #include "params.h" // for MAXSETS #include "structs.h" // for vtx_data -int findindex(int * indices, /* indices sorting values */ +int findindex(int *indices, /* indices sorting values */ double *vals, /* values sorted by indices */ double target, /* target value */ int nvals /* number of values */ @@ -62,14 +62,14 @@ int findindex(int * indices, /* indices sorting values */ } void inits2d(struct vtx_data **graph, /* graph data structure for vertex weights */ - double ** xvecs, /* values to partition with */ - double * vals[4][MAXSETS], /* values in sorted lists */ - int * indices[4][MAXSETS], /* indices sorting lists */ + double **xvecs, /* values to partition with */ + double *vals[4][MAXSETS], /* values in sorted lists */ + int *indices[4][MAXSETS], /* indices sorting lists */ int nvtxs, /* number of vertices */ - double * dist, /* trial separation point */ + double *dist, /* trial separation point */ int startvtx[4][MAXSETS], /* indices defining separation */ - double * size, /* size of each set being modified */ - int * sets /* set each vertex gets assigned to */ + double *size, /* size of each set being modified */ + int *sets /* set each vertex gets assigned to */ ) { double xmid, ymid; /* median x and y values */ diff --git a/packages/seacas/libraries/chaco/bpmatch/sorts2d.c b/packages/seacas/libraries/chaco/bpmatch/sorts2d.c index 3f2b24cef7..77f39a802d 100644 --- a/packages/seacas/libraries/chaco/bpmatch/sorts2d.c +++ b/packages/seacas/libraries/chaco/bpmatch/sorts2d.c @@ -12,7 +12,7 @@ void sorts2d( /* Sort the lists needed to find the splitter. */ double *vals[4][MAXSETS], /* lists of values to sort */ - int * indices[4][MAXSETS], /* indices of sorted lists */ + int *indices[4][MAXSETS], /* indices of sorted lists */ int nvtxs /* number of vertices */ ) { diff --git a/packages/seacas/libraries/chaco/bpmatch/sorts3d.c b/packages/seacas/libraries/chaco/bpmatch/sorts3d.c index 6a098cea61..fa6baa147c 100644 --- a/packages/seacas/libraries/chaco/bpmatch/sorts3d.c +++ b/packages/seacas/libraries/chaco/bpmatch/sorts3d.c @@ -12,7 +12,7 @@ void sorts3d( /* Sort the lists needed to find the splitter. */ double *vals[8][MAXSETS], /* lists of values to sort */ - int * indices[8][MAXSETS], /* indices of sorted lists */ + int *indices[8][MAXSETS], /* indices of sorted lists */ int nvtxs /* number of vertices */ ) { diff --git a/packages/seacas/libraries/chaco/coarsen/countcedges.c b/packages/seacas/libraries/chaco/coarsen/countcedges.c index 232aa0a6e6..374cd9eb4b 100644 --- a/packages/seacas/libraries/chaco/coarsen/countcedges.c +++ b/packages/seacas/libraries/chaco/coarsen/countcedges.c @@ -12,11 +12,11 @@ void countcedges( /* Count edges in coarsened graph and construct start array. */ struct vtx_data **graph, /* array of vtx data for graph */ int nvtxs, /* number of vertices in graph */ - int * start, /* start of edgevals list for each vertex */ - int * seenflag, /* flags indicating vtxs already counted */ - int * mflag, /* flag indicating vtx matched or not */ - int * v2cv, /* mapping from fine to coarse vertices */ - int * pcnedges /* number of edges in coarsened graph */ + int *start, /* start of edgevals list for each vertex */ + int *seenflag, /* flags indicating vtxs already counted */ + int *mflag, /* flag indicating vtx matched or not */ + int *v2cv, /* mapping from fine to coarse vertices */ + int *pcnedges /* number of edges in coarsened graph */ ) { int *jptr; /* loops through edge list */ diff --git a/packages/seacas/libraries/chaco/coarsen/interpolate.c b/packages/seacas/libraries/chaco/coarsen/interpolate.c index 23f2900243..104bfcaa5a 100644 --- a/packages/seacas/libraries/chaco/coarsen/interpolate.c +++ b/packages/seacas/libraries/chaco/coarsen/interpolate.c @@ -15,18 +15,18 @@ which they were collapsed. */ -void ch_interpolate(double ** vecs, /* approximate eigenvectors for graph */ - double ** cvecs, /* exact eigenvectors for coarse graph */ +void ch_interpolate(double **vecs, /* approximate eigenvectors for graph */ + double **cvecs, /* exact eigenvectors for coarse graph */ int ndims, /* number of vectors to interpolate */ struct vtx_data **graph, /* array of vtx data for graph */ int nvtxs, /* number of vertices in graph */ - int * v2cv, /* mapping from vtxs to cvtxs */ + int *v2cv, /* mapping from vtxs to cvtxs */ int using_ewgts /* are edge weights being used in fine graph? */ ) { double *vec, *cvec; /* pointers into vecs and vecs */ - int * eptr; /* loops through edge lists */ - float * ewptr; /* loops through edge weights */ + int *eptr; /* loops through edge lists */ + float *ewptr; /* loops through edge weights */ float ewgt; /* value for edge weight */ double ewsum; /* sum of incident edge weights */ double sum; /* sum of values of neighbors */ diff --git a/packages/seacas/libraries/chaco/coarsen/makeccoords.c b/packages/seacas/libraries/chaco/coarsen/makeccoords.c index ace71e657c..d3a147bc54 100644 --- a/packages/seacas/libraries/chaco/coarsen/makeccoords.c +++ b/packages/seacas/libraries/chaco/coarsen/makeccoords.c @@ -14,11 +14,11 @@ void makeccoords(struct vtx_data **graph, /* array of vtx data for graph */ int cnvtxs, /* number of vertices in coarse graph */ - int * cv2v_ptrs, /* vtxs corresponding to each cvtx */ - int * cv2v_vals, /* indices into cv2v_vals */ + int *cv2v_ptrs, /* vtxs corresponding to each cvtx */ + int *cv2v_vals, /* indices into cv2v_vals */ int igeom, /* dimensions of geometric data */ - float ** coords, /* coordinates for vertices */ - float ** ccoords /* coordinates for coarsened vertices */ + float **coords, /* coordinates for vertices */ + float **ccoords /* coordinates for coarsened vertices */ ) { double mass; /* total mass of merged vertices */ diff --git a/packages/seacas/libraries/chaco/connect/add_edges.c b/packages/seacas/libraries/chaco/connect/add_edges.c index 2bcf91ed17..c7c932b2dd 100644 --- a/packages/seacas/libraries/chaco/connect/add_edges.c +++ b/packages/seacas/libraries/chaco/connect/add_edges.c @@ -12,16 +12,16 @@ void add_edges(struct vtx_data **graph, /* graph data structure */ struct edgeslist *new_edges, /* list of edges connecting graph */ - struct ilists ** old_edges, /* edges data overwritten for connecting */ - struct flists ** old_ewgts, /* weights of edges overwritten */ + struct ilists **old_edges, /* edges data overwritten for connecting */ + struct flists **old_ewgts, /* weights of edges overwritten */ int using_ewgts /* are edge weights being used? */ ) { - struct ilists * save_list; /* space to save old edge list */ - struct flists * save_ewgts; /* space to save old edge weights */ + struct ilists *save_list; /* space to save old edge list */ + struct flists *save_ewgts; /* space to save old edge weights */ struct edgeslist *edges; /* loops through new edges */ - float * new_ewgts; /* new edge weights */ - int * new_list; /* new edge list */ + float *new_ewgts; /* new edge weights */ + int *new_list; /* new edge list */ int nedges; /* number of edges a vertex has */ int vtx, vtx2; /* two vertices in edge to be added */ int i, j; /* loop counter */ diff --git a/packages/seacas/libraries/chaco/connect/heap.c b/packages/seacas/libraries/chaco/connect/heap.c index ad530cbc9b..6a71b646b6 100644 --- a/packages/seacas/libraries/chaco/connect/heap.c +++ b/packages/seacas/libraries/chaco/connect/heap.c @@ -9,8 +9,8 @@ #include #include -#define left(i) (2 * (i)) -#define right(i) (2 * (i) + 1) +#define left(i) (2 * (i)) +#define right(i) (2 * (i) + 1) #define parent(i) ((int)((i) / 2)) /* NOTE: heap assumes indices are 1-based. */ @@ -22,7 +22,7 @@ void heapify(struct heap *heap, /* array of vals/tag to make into heap */ int index, /* root of subtree to heapify */ int nvals, /* number of values in array */ - int * map /* maps from tag values to heap indices */ + int *map /* maps from tag values to heap indices */ ) { double swap_val; /* temporary storage for swapping values */ @@ -66,7 +66,7 @@ void heapify(struct heap *heap, /* array of vals/tag to make into heap */ /* Construct a heap from an unordered set of values. */ void heap_build(struct heap *heap, /* array of vals/tag to make into heap */ int nvals, /* number of values in array */ - int * map /* maps from tag values to heap indices */ + int *map /* maps from tag values to heap indices */ ) { int i; /* loop counter */ @@ -84,8 +84,8 @@ void heap_build(struct heap *heap, /* array of vals/tag to make into heap */ double heap_extract_max(struct heap *heap, /* array of vals/tag in a heap */ int nvals, /* number of values in array */ - int * ptag, /* tag associated with return value */ - int * map /* maps from tag values to heap indices */ + int *ptag, /* tag associated with return value */ + int *map /* maps from tag values to heap indices */ ) { double maxval; /* return value */ @@ -117,7 +117,7 @@ double heap_extract_max(struct heap *heap, /* array of vals/tag in a heap */ void heap_update_val(struct heap *heap, /* array of vals/tag in a heap */ int index, /* index of value to update */ double newval, /* new value to insert */ - int * map /* maps from tag values to heap indices */ + int *map /* maps from tag values to heap indices */ ) { int tag; /* tag value associated with updated val */ diff --git a/packages/seacas/libraries/chaco/graph/graph_out.c b/packages/seacas/libraries/chaco/graph/graph_out.c index 0059bf2f7f..da2fc554d2 100644 --- a/packages/seacas/libraries/chaco/graph/graph_out.c +++ b/packages/seacas/libraries/chaco/graph/graph_out.c @@ -14,8 +14,8 @@ void graph_out(struct vtx_data **graph, /* graph data structure */ int nvtxs, /* number of vtxs in graph */ int using_ewgts, /* Are edges weighted? */ - char * tag, /* message to include */ - char * file_name /* output file name if not null */ + char *tag, /* message to include */ + char *file_name /* output file name if not null */ ) { FILE *file; /* output file */ diff --git a/packages/seacas/libraries/chaco/graph/mm_out.c b/packages/seacas/libraries/chaco/graph/mm_out.c index bc27a4c1bd..8d1f87d50b 100644 --- a/packages/seacas/libraries/chaco/graph/mm_out.c +++ b/packages/seacas/libraries/chaco/graph/mm_out.c @@ -14,8 +14,8 @@ void mm_out(struct vtx_data **graph, /* graph data structure */ int nvtxs, /* number of vtxs in graph */ int using_ewgts, /* Are edges weighted? */ - char * tag, /* message to include */ - char * file_name /* output file name if not null */ + char *tag, /* message to include */ + char *file_name /* output file name if not null */ ) { FILE *file; /* output file */ diff --git a/packages/seacas/libraries/chaco/graph/reformat.c b/packages/seacas/libraries/chaco/graph/reformat.c index 399d1bf23d..332fafec67 100644 --- a/packages/seacas/libraries/chaco/graph/reformat.c +++ b/packages/seacas/libraries/chaco/graph/reformat.c @@ -12,23 +12,23 @@ /* Change from a FORTRAN graph style to our graph data structure. */ -int reformat(int * start, /* start of edge list for each vertex */ - int * adjacency, /* edge list data */ +int reformat(int *start, /* start of edge list for each vertex */ + int *adjacency, /* edge list data */ int nvtxs, /* number of vertices in graph */ - int * pnedges, /* ptr to number of edges in graph */ - int * vwgts, /* weights for all vertices */ - float * ewgts, /* weights for all edges */ + int *pnedges, /* ptr to number of edges in graph */ + int *vwgts, /* weights for all vertices */ + float *ewgts, /* weights for all edges */ struct vtx_data ***pgraph /* ptr to array of vtx data for graph */ ) { - extern FILE * Output_File; /* output file or null */ + extern FILE *Output_File; /* output file or null */ struct vtx_data **graph = NULL; /* array of vtx data for graph */ - struct vtx_data * links = NULL; /* space for data for all vtxs */ - int * edges = NULL; /* space for all adjacency lists */ - float * eweights = NULL; /* space for all edge weights */ - int * eptr = NULL; /* steps through adjacency list */ - int * eptr_save = NULL; /* saved index into adjacency list */ - float * wptr = NULL; /* steps through edge weights list */ + struct vtx_data *links = NULL; /* space for data for all vtxs */ + int *edges = NULL; /* space for all adjacency lists */ + float *eweights = NULL; /* space for all edge weights */ + int *eptr = NULL; /* steps through adjacency list */ + int *eptr_save = NULL; /* saved index into adjacency list */ + float *wptr = NULL; /* steps through edge weights list */ int self_edge; /* number of self loops detected */ int size; /* length of all edge lists */ double sum; /* sum of edge weights for a vtx */ diff --git a/packages/seacas/libraries/chaco/graph/subgraph.c b/packages/seacas/libraries/chaco/graph/subgraph.c index ba49b1325b..4acf54f5c1 100644 --- a/packages/seacas/libraries/chaco/graph/subgraph.c +++ b/packages/seacas/libraries/chaco/graph/subgraph.c @@ -15,18 +15,18 @@ void make_subgraph(struct vtx_data **graph, /* graph data structure */ struct vtx_data **subgraph, /* subgraph data structure */ int subnvtxs, /* number of vtxs in subgraph */ - int * psubnedges, /* ptr to number of edges in subgraph */ - int * assignment, /* values designating subgraph inclusion */ + int *psubnedges, /* ptr to number of edges in subgraph */ + int *assignment, /* values designating subgraph inclusion */ int set, /* assignment value indicating inclusion */ - int * glob2loc, /* mapping from graph to subgraph numbering */ - int * loc2glob, /* mapping from subgraph to graph numbering */ - int * degree, /* degrees of vertices in graph */ + int *glob2loc, /* mapping from graph to subgraph numbering */ + int *loc2glob, /* mapping from subgraph to graph numbering */ + int *degree, /* degrees of vertices in graph */ int using_ewgts /* are edge weights being used? */ ) { struct vtx_data *subgptr = NULL; /* loops through subgraph */ - float * fptr = NULL; /* loops through edge weights */ - int * iptr = NULL; /* loops through edge list */ + float *fptr = NULL; /* loops through edge weights */ + int *iptr = NULL; /* loops through edge list */ float tempwgt; /* weight of vertex being swapped */ double ewgtsum; /* sum of weights of subgraph edges */ int subnedges; /* number of edges in subgraph */ @@ -83,14 +83,14 @@ void make_subgraph(struct vtx_data **graph, /* graph data structure */ /* Undo the construction of the subgraph. */ void remake_graph(struct vtx_data **subgraph, /* subgraph data structure */ int subnvtxs, /* number of vtxs in subgraph */ - int * loc2glob, /* mapping from subgraph to graph numbering */ - int * degree, /* degrees of vertices in graph */ + int *loc2glob, /* mapping from subgraph to graph numbering */ + int *degree, /* degrees of vertices in graph */ int using_ewgts /* are edge weights being used? */ ) { struct vtx_data *subgptr; /* loops through subgraph */ - float * fptr; /* loops through edge weights */ - int * iptr; /* loops through adjacency list */ + float *fptr; /* loops through edge weights */ + int *iptr; /* loops through adjacency list */ double ewgtsum; /* sum of weights of subgraph edges */ int nedges; /* vertex degree in subgraph */ int i, j; /* loop counter */ diff --git a/packages/seacas/libraries/chaco/inertial/make_subgeom.c b/packages/seacas/libraries/chaco/inertial/make_subgeom.c index dc4c8673be..cee7fe5f77 100644 --- a/packages/seacas/libraries/chaco/inertial/make_subgeom.c +++ b/packages/seacas/libraries/chaco/inertial/make_subgeom.c @@ -10,7 +10,7 @@ void make_subgeom(int igeom, /* 1, 2 or 3 dimensional geometry? */ float **coords, /* x, y and z coordinates of vertices */ float **subcoords, /* x, y and z coordinates in subgraph */ int subnvtxs, /* number of vertices in subgraph */ - int * loc2glob /* maps from subgraph to graph numbering */ + int *loc2glob /* maps from subgraph to graph numbering */ ) { int i; /* loop counter */ diff --git a/packages/seacas/libraries/chaco/input/read_params.c b/packages/seacas/libraries/chaco/input/read_params.c index a4b4150efc..d11322bfbe 100644 --- a/packages/seacas/libraries/chaco/input/read_params.c +++ b/packages/seacas/libraries/chaco/input/read_params.c @@ -191,58 +191,57 @@ void read_params(FILE *pfile /* file with new user parameters */ &LANCZOS_TIME, &TIME_KERNELS, &HEAVY_MATCH, &EXPERT, &OUT_ASSIGN_INV, &IN_ASSIGN_INV, &VERTEX_SEPARATOR, &VERTEX_COVER, &FLATTEN, &CONNECTED_DOMAINS}; - static char *ipnames[] = { /* names of integer parameters */ - "ECHO", - "NSQRTS", - "ARCHITECTURE", - "LANCZOS_SO_INTERVAL", - "LANCZOS_MAXITNS", - "MAPPING_TYPE", - "COARSE_NLEVEL_RQI", - "KL_METRIC", - "KL_NTRIES_BAD", - "KL_BAD_MOVES", - "COARSE_NLEVEL_KL", - "NPERTURB", - "OPT3D_NTRIES", - "DEBUG_CONNECTED", - "DEBUG_PERTURB", - "DEBUG_ASSIGN", - "DEBUG_INERTIAL", - "DEBUG_OPTIMIZE", - "DEBUG_BPMATCH", - "DEBUG_COARSEN", - "DEBUG_EVECS", - "DEBUG_KL", - "DEBUG_MEMORY", - "DEBUG_INPUT", - "DEBUG_PARAMS", - "DEBUG_TRACE", - "WARNING_EVECS", - "OUTPUT_TIME", - "OUTPUT_METRICS", - "SIMULATION_ITNS", - "DEBUG_SIMULATOR", - "LANCZOS_CONVERGENCE_MODE", - "RQI_CONVERGENCE_MODE", - "REFINE_PARTITION", - "INTERNAL_VERTICES", - "LANCZOS_TYPE", - "MATCH_TYPE", - "DEBUG_INTERNAL", - "DEBUG_REFINE_PART", - "DEBUG_REFINE_MAP", - "DEBUG_MACH_PARAMS", - "DEBUG_COVER", - "LANCZOS_SO_PRECISION", - "COARSE_KLV", - "COARSE_BPM", - "KL_MAX_PASS", + static char *ipnames[] = {/* names of integer parameters */ + "ECHO", + "NSQRTS", + "ARCHITECTURE", + "LANCZOS_SO_INTERVAL", + "LANCZOS_MAXITNS", + "MAPPING_TYPE", + "COARSE_NLEVEL_RQI", + "KL_METRIC", + "KL_NTRIES_BAD", + "KL_BAD_MOVES", + "COARSE_NLEVEL_KL", + "NPERTURB", + "OPT3D_NTRIES", + "DEBUG_CONNECTED", + "DEBUG_PERTURB", + "DEBUG_ASSIGN", + "DEBUG_INERTIAL", + "DEBUG_OPTIMIZE", + "DEBUG_BPMATCH", + "DEBUG_COARSEN", + "DEBUG_EVECS", + "DEBUG_KL", + "DEBUG_MEMORY", + "DEBUG_INPUT", + "DEBUG_PARAMS", + "DEBUG_TRACE", + "WARNING_EVECS", + "OUTPUT_TIME", + "OUTPUT_METRICS", + "SIMULATION_ITNS", + "DEBUG_SIMULATOR", + "LANCZOS_CONVERGENCE_MODE", + "RQI_CONVERGENCE_MODE", + "REFINE_PARTITION", + "INTERNAL_VERTICES", + "LANCZOS_TYPE", + "MATCH_TYPE", + "DEBUG_INTERNAL", + "DEBUG_REFINE_PART", + "DEBUG_REFINE_MAP", + "DEBUG_MACH_PARAMS", + "DEBUG_COVER", + "LANCZOS_SO_PRECISION", + "COARSE_KLV", + "COARSE_BPM", + "KL_MAX_PASS", #if 0 , "PROJECTION_AXIS", #endif - NULL - }; + NULL}; static int *iparams[] = {/* pointers to integer parameters */ &ECHO, diff --git a/packages/seacas/libraries/chaco/internal/check_internal.c b/packages/seacas/libraries/chaco/internal/check_internal.c index d71ee9cd33..edf9d6feae 100644 --- a/packages/seacas/libraries/chaco/internal/check_internal.c +++ b/packages/seacas/libraries/chaco/internal/check_internal.c @@ -13,11 +13,11 @@ void check_internal(struct vtx_data **graph, /* graph data structure */ int nvtxs, /* number of vertices in graph */ - struct bidint * int_list, /* sorted list of internal weights per set */ - struct bidint * set_list, /* head of vtx_elems lists */ - struct bidint * vtx_elems, /* start of vertex data */ - int * total_vwgt, /* total weight in each set */ - int * assign, /* current assignment */ + struct bidint *int_list, /* sorted list of internal weights per set */ + struct bidint *set_list, /* head of vtx_elems lists */ + struct bidint *vtx_elems, /* start of vertex data */ + int *total_vwgt, /* total weight in each set */ + int *assign, /* current assignment */ int nsets_tot /* total number of sets */ ) { diff --git a/packages/seacas/libraries/chaco/internal/improve_internal.c b/packages/seacas/libraries/chaco/internal/improve_internal.c index 5c9f724a9d..21d51b7784 100644 --- a/packages/seacas/libraries/chaco/internal/improve_internal.c +++ b/packages/seacas/libraries/chaco/internal/improve_internal.c @@ -13,17 +13,17 @@ int improve_internal(struct vtx_data **graph, /* graph data structure */ int nvtxs, /* number of vertices in graph */ - int * assign, /* current assignment */ - double * goal, /* desired set sizes */ - struct bidint * int_list, /* sorted list of internal vtx values */ - struct bidint * set_list, /* headers of vtx_elems lists */ - struct bidint * vtx_elems, /* lists of vtxs in each set */ + int *assign, /* current assignment */ + double *goal, /* desired set sizes */ + struct bidint *int_list, /* sorted list of internal vtx values */ + struct bidint *set_list, /* headers of vtx_elems lists */ + struct bidint *vtx_elems, /* lists of vtxs in each set */ int set1, /* set to try to improve */ - int * locked, /* indicates vertices not allowed to move */ - int * nlocked, /* number of vertices that can't move */ + int *locked, /* indicates vertices not allowed to move */ + int *nlocked, /* number of vertices that can't move */ int using_ewgts, /* are edge weights being used? */ int vwgt_max, /* largest vertex weight */ - int * total_vwgt /* total vertex weight in each set */ + int *total_vwgt /* total vertex weight in each set */ ) { struct bidint *move_list; /* list of vertices changing sets */ diff --git a/packages/seacas/libraries/chaco/klspiff/bilistops.c b/packages/seacas/libraries/chaco/klspiff/bilistops.c index 74a498aa33..1118260c5f 100644 --- a/packages/seacas/libraries/chaco/klspiff/bilistops.c +++ b/packages/seacas/libraries/chaco/klspiff/bilistops.c @@ -12,7 +12,7 @@ /* Note: bi-directional lists aren't assumed to be sorted. */ void add2bilist( /* add val to unsorted list */ - struct bilist * lptr, /* element to add */ + struct bilist *lptr, /* element to add */ struct bilist **list /* list added to */ ) { @@ -24,7 +24,7 @@ void add2bilist( /* add val to unsorted list */ *list = lptr; } -void removebilist(struct bilist * lptr, /* ptr to element to remove */ +void removebilist(struct bilist *lptr, /* ptr to element to remove */ struct bilist **list /* head of list to remove it from */ ) @@ -41,7 +41,7 @@ void removebilist(struct bilist * lptr, /* ptr to element to remove */ } } -void movebilist(struct bilist * lptr, /* ptr to element to move */ +void movebilist(struct bilist *lptr, /* ptr to element to move */ struct bilist **oldlist, /* head of list to remove it from */ struct bilist **newlist /* head of list to add it to */ ) diff --git a/packages/seacas/libraries/chaco/klspiff/compress_ewgts.c b/packages/seacas/libraries/chaco/klspiff/compress_ewgts.c index 6867c41782..64e286728b 100644 --- a/packages/seacas/libraries/chaco/klspiff/compress_ewgts.c +++ b/packages/seacas/libraries/chaco/klspiff/compress_ewgts.c @@ -20,10 +20,10 @@ void compress_ewgts(struct vtx_data **graph, /* list of graph info for each ) { extern double EWGT_RATIO_MAX; /* max allowed ewgt/nvtxs */ - float * old_ewptr; /* loops through old edge weights */ - float * new_ewptr; /* loops through old edge weights */ - float * self_ptr; /* points to self edge in new_ewgts */ - float * new_ewgts; /* space for new edge weights */ + float *old_ewptr; /* loops through old edge weights */ + float *new_ewptr; /* loops through old edge weights */ + float *self_ptr; /* points to self edge in new_ewgts */ + float *new_ewgts; /* space for new edge weights */ int ewgt; /* new edge weight value */ double sum; /* sum of all the new edge weights */ double ratio; /* amount to reduce edge weights */ diff --git a/packages/seacas/libraries/chaco/klspiff/count_weights.c b/packages/seacas/libraries/chaco/klspiff/count_weights.c index 1ee5052e2c..166680951e 100644 --- a/packages/seacas/libraries/chaco/klspiff/count_weights.c +++ b/packages/seacas/libraries/chaco/klspiff/count_weights.c @@ -10,9 +10,9 @@ void count_weights(struct vtx_data **graph, /* data structure for graph */ int nvtxs, /* number of vtxs in graph */ - int * sets, /* set each vertex is assigned to */ + int *sets, /* set each vertex is assigned to */ int nsets, /* number of sets in this division */ - double * weights, /* vertex weights in each set */ + double *weights, /* vertex weights in each set */ int using_vwgts /* are vertex weights being used? */ ) diff --git a/packages/seacas/libraries/chaco/klspiff/make_bndy_list.c b/packages/seacas/libraries/chaco/klspiff/make_bndy_list.c index a45e7d8ec5..4bdbfe024e 100644 --- a/packages/seacas/libraries/chaco/klspiff/make_bndy_list.c +++ b/packages/seacas/libraries/chaco/klspiff/make_bndy_list.c @@ -11,14 +11,14 @@ #include // for NULL void make_bndy_list(struct vtx_data **graph, /* data structure for graph */ - struct bilist * movelist, /* list of vtxs to be moved */ + struct bilist *movelist, /* list of vtxs to be moved */ struct bilist ****buckets, /* array of lists for bucket sort */ - struct bilist ** listspace, /* list data structure for each vertex */ - int * sets, /* processor each vertex is assigned to */ + struct bilist **listspace, /* list data structure for each vertex */ + int *sets, /* processor each vertex is assigned to */ int nsets, /* number of sets divided into */ - int * bspace, /* list of active vertices for bucketsort */ - int ** tops, /* top of each set of buckets */ - int ** bndy_list /* list of boundary vertices returned */ + int *bspace, /* list of active vertices for bucketsort */ + int **tops, /* top of each set of buckets */ + int **bndy_list /* list of boundary vertices returned */ ) { struct bilist *bptr; /* loops through bspace */ diff --git a/packages/seacas/libraries/chaco/klvspiff/clear_dvals.c b/packages/seacas/libraries/chaco/klvspiff/clear_dvals.c index e7e53727f0..4d37260c04 100644 --- a/packages/seacas/libraries/chaco/klvspiff/clear_dvals.c +++ b/packages/seacas/libraries/chaco/klvspiff/clear_dvals.c @@ -10,9 +10,9 @@ void clear_dvals(struct vtx_data **graph, /* data structure for graph */ int nvtxs, /* number of vtxs in graph */ - int * ldvals, /* d-values for each transition */ - int * rdvals, /* d-values for each transition */ - int * bspace, /* list of activated vertices */ + int *ldvals, /* d-values for each transition */ + int *rdvals, /* d-values for each transition */ + int *bspace, /* list of activated vertices */ int list_length /* number of activated vertices */ ) { diff --git a/packages/seacas/libraries/chaco/klvspiff/countup_vtx_sep.c b/packages/seacas/libraries/chaco/klvspiff/countup_vtx_sep.c index 8683509bb8..b2b011c992 100644 --- a/packages/seacas/libraries/chaco/klvspiff/countup_vtx_sep.c +++ b/packages/seacas/libraries/chaco/klvspiff/countup_vtx_sep.c @@ -11,7 +11,7 @@ void countup_vtx_sep(struct vtx_data **graph, /* list of graph info for each vertex */ int nvtxs, /* number of vertices in graph */ - int * sets /* local partitioning of vtxs */ + int *sets /* local partitioning of vtxs */ ) { int vtx, set; /* vertex and set in graph */ diff --git a/packages/seacas/libraries/chaco/klvspiff/find_bndy.c b/packages/seacas/libraries/chaco/klvspiff/find_bndy.c index 97744b3f39..205b21018b 100644 --- a/packages/seacas/libraries/chaco/klvspiff/find_bndy.c +++ b/packages/seacas/libraries/chaco/klvspiff/find_bndy.c @@ -14,9 +14,9 @@ int find_bndy(struct vtx_data **graph, /* array of vtx data for graph */ int nvtxs, /* number of vertices in graph */ - int * assignment, /* processor each vertex gets assigned to */ + int *assignment, /* processor each vertex gets assigned to */ int new_val, /* assignment value for boundary vtxs */ - int ** pbndy_list /* returned list, end with zero */ + int **pbndy_list /* returned list, end with zero */ ) { int *bndy_list; /* returned list, end with zero */ @@ -55,10 +55,10 @@ int find_bndy(struct vtx_data **graph, /* array of vtx data for graph */ int find_side_bndy(struct vtx_data **graph, /* array of vtx data for graph */ int nvtxs, /* number of vertices in graph */ - int * assignment, /* processor each vertex gets assigned to */ + int *assignment, /* processor each vertex gets assigned to */ int side, /* side to take vertices from */ int new_val, /* assignment value for boundary vtxs */ - int ** pbndy_list /* returned list, end with zero */ + int **pbndy_list /* returned list, end with zero */ ) { diff --git a/packages/seacas/libraries/chaco/klvspiff/klv_init.c b/packages/seacas/libraries/chaco/klvspiff/klv_init.c index 9eff7e29f3..e1daf03f1e 100644 --- a/packages/seacas/libraries/chaco/klvspiff/klv_init.c +++ b/packages/seacas/libraries/chaco/klvspiff/klv_init.c @@ -12,10 +12,10 @@ int klv_init(struct bilist ***lbucket_ptr, /* space for left bucket sorts */ struct bilist ***rbucket_ptr, /* space for right bucket sorts */ - struct bilist ** llistspace, /* space for elements of linked lists */ - struct bilist ** rlistspace, /* space for elements of linked lists */ - int ** ldvals, /* change in separator for left moves */ - int ** rdvals, /* change in separator for right moves */ + struct bilist **llistspace, /* space for elements of linked lists */ + struct bilist **rlistspace, /* space for elements of linked lists */ + int **ldvals, /* change in separator for left moves */ + int **rdvals, /* change in separator for right moves */ int nvtxs, /* number of vertices in the graph */ int maxchange /* maximum change by moving a vertex */ ) diff --git a/packages/seacas/libraries/chaco/klvspiff/make_bpgraph.c b/packages/seacas/libraries/chaco/klvspiff/make_bpgraph.c index 5cb15791c8..8ed67e1970 100644 --- a/packages/seacas/libraries/chaco/klvspiff/make_bpgraph.c +++ b/packages/seacas/libraries/chaco/klvspiff/make_bpgraph.c @@ -13,16 +13,16 @@ /* Make a bipartite graph from vertex separator and neighbors. */ void make_bpgraph(struct vtx_data **graph, /* list of graph info for each vertex */ - int * sets, /* local partitioning of vtxs */ - int * bndy_list, /* list of vertices on boundary (0 ends) */ + int *sets, /* local partitioning of vtxs */ + int *bndy_list, /* list of vertices on boundary (0 ends) */ int sep_size, /* length of bndy_list */ int set_match, /* side to match against */ - int ** ppointers, /* start/stop of adjacency lists */ - int ** pindices, /* adjacency list for each vertex */ - int ** pvweight, /* weight of each vertex */ - int ** ploc2glob, /* maps bp number to full graph */ - int * pnleft, /* number of nodes in left half */ - int * pnright, /* number of nodes in right half */ + int **ppointers, /* start/stop of adjacency lists */ + int **pindices, /* adjacency list for each vertex */ + int **pvweight, /* weight of each vertex */ + int **ploc2glob, /* maps bp number to full graph */ + int *pnleft, /* number of nodes in left half */ + int *pnright, /* number of nodes in right half */ int using_vwgts /* are vertices weighted? */ ) { diff --git a/packages/seacas/libraries/chaco/main/user_params.c b/packages/seacas/libraries/chaco/main/user_params.c index c46f222937..977b23345e 100644 --- a/packages/seacas/libraries/chaco/main/user_params.c +++ b/packages/seacas/libraries/chaco/main/user_params.c @@ -8,7 +8,7 @@ #include "params.h" // for NAME_LENGTH -#define TRUE 1 +#define TRUE 1 #define FALSE 0 /* Input and output control parameters */ @@ -96,7 +96,7 @@ long RANDOM_SEED = 7654321L; /* Seed for random number gen int NSQRTS = 1000; /* # square roots to precompute if coarsening */ int MAKE_VWGTS = FALSE; /* Make vtx weights degrees+1? (TRUE/FALSE) */ int FREE_GRAPH = TRUE; /* Free input graph data? (TRUE/FALSE) */ -char * PARAMS_FILENAME = "User_Params"; /* File of parameter changes */ +char *PARAMS_FILENAME = "User_Params"; /* File of parameter changes */ /* Parameters that control debugging output */ diff --git a/packages/seacas/libraries/chaco/misc/count.c b/packages/seacas/libraries/chaco/misc/count.c index 686e96593e..2d1fbdee9d 100644 --- a/packages/seacas/libraries/chaco/misc/count.c +++ b/packages/seacas/libraries/chaco/misc/count.c @@ -13,7 +13,7 @@ void count(struct vtx_data **graph, /* graph data structure */ int nvtxs, /* number of vtxs in graph */ - int * sets, /* processor each vertex is assigned to */ + int *sets, /* processor each vertex is assigned to */ int nsets, /* number of sets partitioned into */ int (*hops)[MAXSETS], /* hops metric between sets */ int dump, /* flag for extended output */ diff --git a/packages/seacas/libraries/chaco/misc/countup_cube.c b/packages/seacas/libraries/chaco/misc/countup_cube.c index cfc4f6ae67..8e51be149e 100644 --- a/packages/seacas/libraries/chaco/misc/countup_cube.c +++ b/packages/seacas/libraries/chaco/misc/countup_cube.c @@ -15,11 +15,11 @@ void countup_cube(struct vtx_data **graph, /* graph data structure */ int nvtxs, /* number of vtxs in graph */ - int * assignment, /* set number of each vtx (length nvtxs+1) */ + int *assignment, /* set number of each vtx (length nvtxs+1) */ int ndims, /* number of cuts at each level */ int ndims_tot, /* total number of divisions of graph */ int print_lev, /* level of output */ - FILE * outfile, /* output file if not NULL */ + FILE *outfile, /* output file if not NULL */ int using_ewgts /* are edge weights being used? */ ) { @@ -28,7 +28,7 @@ void countup_cube(struct vtx_data **graph, /* graph data structure */ int nsets = (1 << ndims_tot); double *cutsize = smalloc(nsets * sizeof(double)); double *hopsize = smalloc(nsets * sizeof(double)); - int * setsize = smalloc(nsets * sizeof(int)); + int *setsize = smalloc(nsets * sizeof(int)); int *setseen = smalloc(nsets * sizeof(int)); int *startptr = smalloc((nsets + 1) * sizeof(int)); diff --git a/packages/seacas/libraries/chaco/misc/countup_mesh.c b/packages/seacas/libraries/chaco/misc/countup_mesh.c index 065273fe26..5bd1fe1128 100644 --- a/packages/seacas/libraries/chaco/misc/countup_mesh.c +++ b/packages/seacas/libraries/chaco/misc/countup_mesh.c @@ -15,19 +15,19 @@ void countup_mesh(struct vtx_data **graph, /* graph data structure */ int nvtxs, /* number of vtxs in graph */ - int * assignment, /* set number of each vtx (length nvtxs+1) */ + int *assignment, /* set number of each vtx (length nvtxs+1) */ int mesh_dims[3], /* extent of mesh in each dimension */ int print_lev, /* level of output */ - FILE * outfile, /* output file if not NULL */ + FILE *outfile, /* output file if not NULL */ int using_ewgts /* are edge weights being used? */ ) { double *hopsize; /* number of hops for each set */ double *cutsize; /* number of cuts for each set */ - int * setsize; /* number or weight of vtxs in each set */ - int * setseen; /* flags for sets adjacent to a particular set */ - int * inorder; /* list of vtxs in each set */ - int * startptr; /* indices into inorder array */ + int *setsize; /* number or weight of vtxs in each set */ + int *setseen; /* flags for sets adjacent to a particular set */ + int *inorder; /* list of vtxs in each set */ + int *startptr; /* indices into inorder array */ double ncuts; /* total number of edges connecting sets */ double nhops; /* total cuts weighted by mesh hops */ double ewgt; /* edge weight */ diff --git a/packages/seacas/libraries/chaco/misc/define_submeshes.c b/packages/seacas/libraries/chaco/misc/define_submeshes.c index 4d532fb0b8..8643091db7 100644 --- a/packages/seacas/libraries/chaco/misc/define_submeshes.c +++ b/packages/seacas/libraries/chaco/misc/define_submeshes.c @@ -14,13 +14,13 @@ /* Figure out how to divide mesh into pieces. Return true if nonstandard. */ int define_submeshes(int nsets, /* number of subsets in this partition */ int cube_or_mesh, /* 0=> hypercube, d=> d-dimensional mesh */ - int * mesh_dims, /* shape of mesh */ + int *mesh_dims, /* shape of mesh */ struct set_info *set, /* set data for set I'm partitioning */ struct set_info *set_info, /* set data for all sets */ - int * subsets, /* subsets being created by partition */ + int *subsets, /* subsets being created by partition */ int inert, /* using inertial method? */ - int * striping, /* should I partition with parallel cuts? */ - int * dir, /* directions of each cut */ + int *striping, /* should I partition with parallel cuts? */ + int *dir, /* directions of each cut */ int hop_mtx_special[MAXSETS][MAXSETS] /* hops values if unusual */ ) { diff --git a/packages/seacas/libraries/chaco/misc/find_maxdeg.c b/packages/seacas/libraries/chaco/misc/find_maxdeg.c index 328fc693f8..06558891c0 100644 --- a/packages/seacas/libraries/chaco/misc/find_maxdeg.c +++ b/packages/seacas/libraries/chaco/misc/find_maxdeg.c @@ -13,7 +13,7 @@ double find_maxdeg(struct vtx_data **graph, /* graph data structure */ int nvtxs, /* number of vertices */ int using_ewgts, /* are edge weights being used? */ - float * pmax_ewgt /* returns largest edge weight if not NULL */ + float *pmax_ewgt /* returns largest edge weight if not NULL */ ) { double maxdeg; /* maximum degree of a vertex */ diff --git a/packages/seacas/libraries/chaco/misc/merge_goals.c b/packages/seacas/libraries/chaco/misc/merge_goals.c index b4cc80414e..34510d8c80 100644 --- a/packages/seacas/libraries/chaco/misc/merge_goals.c +++ b/packages/seacas/libraries/chaco/misc/merge_goals.c @@ -9,10 +9,10 @@ #include "structs.h" /* Combine goals of collections of processors for next division. */ -void merge_goals(double * goal, /* desired set sizes */ - double * merged_goal, /* sizes of sets at this partition level */ +void merge_goals(double *goal, /* desired set sizes */ + double *merged_goal, /* sizes of sets at this partition level */ struct set_info *set_info, /* information about all sets */ - int * subsets, /* set numbers of processors to merge */ + int *subsets, /* set numbers of processors to merge */ int nsets, /* number of sets created by this division */ int ndims_tot, /* total number of dimensions in the hypercube */ int cube_or_mesh, /* 0=> hypercube, d=> d-dimensional mesh */ diff --git a/packages/seacas/libraries/chaco/misc/timing.c b/packages/seacas/libraries/chaco/misc/timing.c index 5e881967c6..a4b063da11 100644 --- a/packages/seacas/libraries/chaco/misc/timing.c +++ b/packages/seacas/libraries/chaco/misc/timing.c @@ -55,7 +55,7 @@ double sim_time = 0; void time_out(FILE *outfile /* file to print output to */ ) { - FILE * tempfile; /* file name for two passes */ + FILE *tempfile; /* file name for two passes */ extern int ECHO; /* parameter for different output styles */ extern int OUTPUT_TIME; /* how much timing output should I print? */ double time_tol; /* tolerance for ignoring time */ diff --git a/packages/seacas/libraries/chaco/refine_map/compute_cube_vdata.c b/packages/seacas/libraries/chaco/refine_map/compute_cube_vdata.c index acc2c0366d..d38ae94e40 100644 --- a/packages/seacas/libraries/chaco/refine_map/compute_cube_vdata.c +++ b/packages/seacas/libraries/chaco/refine_map/compute_cube_vdata.c @@ -10,10 +10,10 @@ #include "structs.h" // for vtx_data void compute_cube_vdata(struct refine_vdata *vdata, /* preference data for a vertex */ - struct vtx_data ** comm_graph, /* communication graph data structure */ + struct vtx_data **comm_graph, /* communication graph data structure */ int vtx, /* current vertex */ int mask, /* bit set in current hypercube dimension */ - int * vtx2node /* maps graph vtxs to mesh nodes */ + int *vtx2node /* maps graph vtxs to mesh nodes */ ) { float same; /* my preference to stay where I am */ diff --git a/packages/seacas/libraries/chaco/refine_map/compute_mesh_vdata.c b/packages/seacas/libraries/chaco/refine_map/compute_mesh_vdata.c index ba89c92d1c..20d54f1d83 100644 --- a/packages/seacas/libraries/chaco/refine_map/compute_mesh_vdata.c +++ b/packages/seacas/libraries/chaco/refine_map/compute_mesh_vdata.c @@ -10,9 +10,9 @@ #include "structs.h" // for vtx_data void compute_mesh_vdata(struct refine_vdata *vdata, /* preference data for a vertex */ - struct vtx_data ** comm_graph, /* communication graph data structure */ + struct vtx_data **comm_graph, /* communication graph data structure */ int vtx, /* current vertex */ - int * vtx2node, /* maps graph vtxs to mesh nodes */ + int *vtx2node, /* maps graph vtxs to mesh nodes */ int mesh_dims[3], /* size of mesh */ int dim /* dimension we are currently working in */ ) diff --git a/packages/seacas/libraries/chaco/refine_map/find_edge_mesh.c b/packages/seacas/libraries/chaco/refine_map/find_edge_mesh.c index ef9d70e2d3..f1d71c77c4 100644 --- a/packages/seacas/libraries/chaco/refine_map/find_edge_mesh.c +++ b/packages/seacas/libraries/chaco/refine_map/find_edge_mesh.c @@ -13,8 +13,8 @@ struct refine_edata * find_edge_mesh(int vertex, /* vertex in comm_graph */ int dim, /* direction of edge from node */ struct refine_edata *edata, /* data structure for edge preferences */ - int * mesh_dims, /* dimensions of mesh */ - int * vtx2node /* maps comm_graph vtxs to processors */ + int *mesh_dims, /* dimensions of mesh */ + int *vtx2node /* maps comm_graph vtxs to processors */ ) { struct refine_edata *eguy; /* returned pointer to edge info */ diff --git a/packages/seacas/libraries/chaco/refine_part/make_maps_ref.c b/packages/seacas/libraries/chaco/refine_part/make_maps_ref.c index f4c06dad40..6084c11ed6 100644 --- a/packages/seacas/libraries/chaco/refine_part/make_maps_ref.c +++ b/packages/seacas/libraries/chaco/refine_part/make_maps_ref.c @@ -11,10 +11,10 @@ /* Set up data structures for refine_part. */ void make_maps_ref(struct vtx_data **graph, /* graph data structure */ - struct bilist * set_list, /* lists of vertices in each set */ - struct bilist * vtx_elems, /* start of storage for vertices */ - int * assignment, /* set assignments for graph */ - int * sub_assign, /* assignment file for subgraph */ + struct bilist *set_list, /* lists of vertices in each set */ + struct bilist *vtx_elems, /* start of storage for vertices */ + int *assignment, /* set assignments for graph */ + int *sub_assign, /* assignment file for subgraph */ int set1, int set2, /* set value denoting subgraph */ int *glob2loc, /* graph -> subgraph numbering map */ int *loc2glob, /* subgraph -> graph numbering map */ diff --git a/packages/seacas/libraries/chaco/refine_part/make_terms_ref.c b/packages/seacas/libraries/chaco/refine_part/make_terms_ref.c index 2f1c8cc49f..9b26a54cf0 100644 --- a/packages/seacas/libraries/chaco/refine_part/make_terms_ref.c +++ b/packages/seacas/libraries/chaco/refine_part/make_terms_ref.c @@ -13,9 +13,9 @@ void make_terms_ref(struct vtx_data **graph, /* data structure for graph */ int using_ewgts, /* are edge weights being used? */ int subnvtxs, /* number of vtxs in subgraph */ - int * loc2glob, /* mapping from subgraph to graph */ + int *loc2glob, /* mapping from subgraph to graph */ int set0, int set1, /* two processors I'm choosing between */ - int * assignment, /* set for each vertex */ + int *assignment, /* set for each vertex */ int architecture, /* 0 => hypercube, 1 => mesh */ int mesh_dims[3], /* if mesh, size of mesh */ float *term_wgts[] /* terminal weights for each vertex */ diff --git a/packages/seacas/libraries/chaco/util/array_alloc_2D.c b/packages/seacas/libraries/chaco/util/array_alloc_2D.c index 38243e62ff..c3052ab26b 100644 --- a/packages/seacas/libraries/chaco/util/array_alloc_2D.c +++ b/packages/seacas/libraries/chaco/util/array_alloc_2D.c @@ -21,9 +21,9 @@ void *array_alloc_2D_ret(size_t dim1, size_t dim2, size_t size) size_t total; /* Total size of the array */ size_t aligned_dim; /* dim1 or dim1+1 to ensure data alignment */ size_t offset; /* offset of array elements */ - char * field; /* The multi-dimensional array */ + char *field; /* The multi-dimensional array */ char **ptr; /* Pointer offset */ - char * data; /* Data offset */ + char *data; /* Data offset */ size_t j; /* loop counter */ aligned_dim = (dim1 % 2) ? dim1 + 1 : dim1; diff --git a/packages/seacas/libraries/chaco/util/machine_params.c b/packages/seacas/libraries/chaco/util/machine_params.c index 1b1cb4eb6d..feb1da2538 100644 --- a/packages/seacas/libraries/chaco/util/machine_params.c +++ b/packages/seacas/libraries/chaco/util/machine_params.c @@ -74,6 +74,6 @@ void machine_params(double *double_epsilon, double *double_max) */ *double_max = max; #else - *double_max = DBL_MAX; + *double_max = DBL_MAX; #endif } diff --git a/packages/seacas/libraries/chaco/util/smalloc.c b/packages/seacas/libraries/chaco/util/smalloc.c index 1fa112c2a0..9a4cca9274 100644 --- a/packages/seacas/libraries/chaco/util/smalloc.c +++ b/packages/seacas/libraries/chaco/util/smalloc.c @@ -19,7 +19,7 @@ static struct smalloc_debug_data { int order; /* which smalloc call is it? */ size_t size; /* size of malloc invocation */ - double * ptr; /* memory location returned */ + double *ptr; /* memory location returned */ struct smalloc_debug_data *next; /* pointer to next element */ } *top = NULL; @@ -38,7 +38,7 @@ void *smalloc(size_t n) { extern FILE *Output_File; /* output file or null */ extern int DEBUG_MEMORY; /* use debug memory allocator? */ - void * ptr; /* return value */ + void *ptr; /* return value */ struct smalloc_debug_data *new; /* data structure for malloc data */ void bail(char *msg, int status); @@ -87,7 +87,7 @@ void *smalloc_ret(size_t n) { extern FILE *Output_File; /* output file or null */ extern int DEBUG_MEMORY; /* use debug memory allocator? */ - void * ptr; /* return value */ + void *ptr; /* return value */ struct smalloc_debug_data *new; /* data structure for malloc data */ void bail(char *msg, int status); @@ -138,8 +138,8 @@ void *smalloc_ret(size_t n) /* Safe version of realloc */ void *srealloc(void *ptr, size_t n) { - extern FILE * Output_File; /* output file or null */ - void * p; /* returned pointer */ + extern FILE *Output_File; /* output file or null */ + void *p; /* returned pointer */ extern int DEBUG_MEMORY; /* use debug memory allocator? */ struct smalloc_debug_data *dbptr; /* loops through debug list */ void bail(char *msg, int status); @@ -187,8 +187,8 @@ void *srealloc(void *ptr, size_t n) /* Returns instead of dying if it fails. */ void *srealloc_ret(void *ptr, size_t n) { - extern FILE * Output_File; /* output file or null */ - void * p; /* returned pointer */ + extern FILE *Output_File; /* output file or null */ + void *p; /* returned pointer */ extern int DEBUG_MEMORY; /* use debug memory allocator? */ struct smalloc_debug_data *dbptr; /* loops through debug list */ @@ -234,9 +234,9 @@ void *srealloc_ret(void *ptr, size_t n) /* Safe version of free. */ void sfree(void *ptr) { - extern FILE * Output_File; /* output file or null */ + extern FILE *Output_File; /* output file or null */ extern int DEBUG_MEMORY; /* use debug memory allocator? */ - struct smalloc_debug_data * dbptr; /* loops through debug list */ + struct smalloc_debug_data *dbptr; /* loops through debug list */ struct smalloc_debug_data **prev; /* holds previous pointer */ if (DEBUG_MEMORY > 1) { diff --git a/packages/seacas/libraries/exodus_for/src/exo_jack.c b/packages/seacas/libraries/exodus_for/src/exo_jack.c index ce4c2ce4a2..af02b4700e 100644 --- a/packages/seacas/libraries/exodus_for/src/exo_jack.c +++ b/packages/seacas/libraries/exodus_for/src/exo_jack.c @@ -76,7 +76,7 @@ #endif /* 64 vs 32 bit build */ #if defined(Build64) -static int *i8i4(int64_t size, const int64_t *i8) +static int *i8i4(int64_t size, const int64_t *i8) { int *i4 = malloc(size * sizeof(int)); for (int64_t i = 0; i < size; i++) { @@ -85,7 +85,7 @@ static int *i8i4(int64_t size, const int64_t *i8) return i4; } -static void i4i8(int64_t size, const int *i4, int64_t *i8) +static void i4i8(int64_t size, const int *i4, int64_t *i8) { for (int64_t i = 0; i < size; i++) { i8[i] = i4[i]; @@ -522,8 +522,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 */ @@ -859,7 +859,7 @@ void F2C(expecpp, EXPECPP)(int *idexo, int *obj_type, entity_id *elem_blk_id, in int *ierr) { ex_block block; - block.id = *elem_blk_id; + block.id = *elem_blk_id; block.type = *obj_type; if (ex_get_block_param(*idexo, &block) == EX_FATAL) { *ierr = EX_FATAL; @@ -888,14 +888,14 @@ void F2C(exgecpp, EXGECPP)(int *idexo, int *obj_type, entity_id *elem_blk_id, in int *ierr) { ex_block block; - block.id = *elem_blk_id; + block.id = *elem_blk_id; block.type = *obj_type; if (ex_get_block_param(*idexo, &block) == EX_FATAL) { *ierr = EX_FATAL; return; } int64_t num_elem_this_blk = block.num_entry; - int *counts4 = malloc(num_elem_this_blk * sizeof(int)); + int *counts4 = malloc(num_elem_this_blk * sizeof(int)); *ierr = ex_get_entity_count_per_polyhedra(*idexo, (ex_entity_type)*obj_type, *elem_blk_id, counts4); i4i8(num_elem_this_blk, counts4, counts); @@ -1329,8 +1329,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 */ @@ -2037,16 +2037,14 @@ void F2C(exgvan, EXGVAN)(int *idexo, char *var_type, int *num_vars, char *var_na * \sa ex_put_truth_table() */ #if Build64 -void F2C(expvtt, EXPVTT)(int *idexo, int *num_entity, int *num_var, int64_t *var_tab, - int *ierr) +void F2C(expvtt, EXPVTT)(int *idexo, int *num_entity, int *num_var, int64_t *var_tab, int *ierr) { int *var_tab4 = i8i4(*num_entity * *num_var, var_tab); - *ierr = ex_put_truth_table(*idexo, EX_ELEM_BLOCK, *num_entity, *num_var, var_tab4); + *ierr = ex_put_truth_table(*idexo, EX_ELEM_BLOCK, *num_entity, *num_var, var_tab4); free(var_tab4); } #else -void F2C(expvtt, EXPVTT)(int *idexo, int *num_entity, int *num_var, int *var_tab, - int *ierr) +void F2C(expvtt, EXPVTT)(int *idexo, int *num_entity, int *num_var, int *var_tab, int *ierr) { *ierr = ex_put_truth_table(*idexo, EX_ELEM_BLOCK, *num_entity, *num_var, var_tab); } @@ -2060,7 +2058,7 @@ void F2C(expvtt, EXPVTT)(int *idexo, int *num_entity, int *num_var, int *var_tab void F2C(expnstt, EXPNSTT)(int *idexo, int *num_entity, int *num_var, int64_t *var_tab, int *ierr) { int *var_tab4 = i8i4(*num_entity * *num_var, var_tab); - *ierr = ex_put_truth_table(*idexo, EX_NODE_SET, *num_entity, *num_var, var_tab4); + *ierr = ex_put_truth_table(*idexo, EX_NODE_SET, *num_entity, *num_var, var_tab4); free(var_tab4); } #else @@ -2078,7 +2076,7 @@ void F2C(expnstt, EXPNSTT)(int *idexo, int *num_entity, int *num_var, int *var_t void F2C(expsstt, EXPSSTT)(int *idexo, int *num_entity, int *num_var, int64_t *var_tab, int *ierr) { int *var_tab4 = i8i4(*num_entity * *num_var, var_tab); - *ierr = ex_put_truth_table(*idexo, EX_SIDE_SET, *num_entity, *num_var, var_tab4); + *ierr = ex_put_truth_table(*idexo, EX_SIDE_SET, *num_entity, *num_var, var_tab4); free(var_tab4); } #else @@ -2093,16 +2091,14 @@ void F2C(expsstt, EXPSSTT)(int *idexo, int *num_entity, int *num_var, int *var_t * \sa ex_get_truth_table() */ #if Build64 -void F2C(exgvtt, EXGVTT)(int *idexo, int *num_entity, int *num_var, int64_t *var_tab, - int *ierr) +void F2C(exgvtt, EXGVTT)(int *idexo, int *num_entity, int *num_var, int64_t *var_tab, int *ierr) { int *var_tab4 = malloc(*num_entity * *num_var * sizeof(int)); - *ierr = ex_get_truth_table(*idexo, EX_ELEM_BLOCK, *num_entity, *num_var, var_tab4); + *ierr = ex_get_truth_table(*idexo, EX_ELEM_BLOCK, *num_entity, *num_var, var_tab4); i4i8(*num_entity * *num_var, var_tab4, var_tab); free(var_tab4); #else -void F2C(exgvtt, EXGVTT)(int *idexo, int *num_entity, int *num_var, int *var_tab, - int *ierr) +void F2C(exgvtt, EXGVTT)(int *idexo, int *num_entity, int *num_var, int *var_tab, int *ierr) { *ierr = ex_get_truth_table(*idexo, EX_ELEM_BLOCK, *num_entity, *num_var, var_tab); #endif @@ -2116,17 +2112,17 @@ void F2C(exgvtt, EXGVTT)(int *idexo, int *num_entity, int *num_var, int *var_tab void F2C(exgnstt, EXGNSTT)(int *idexo, int *num_entity, int *num_var, int64_t *var_tab, int *ierr) { int *var_tab4 = malloc(*num_entity * *num_var * sizeof(int)); - *ierr = ex_get_truth_table(*idexo, EX_NODE_SET, *num_entity, *num_var, var_tab4); + *ierr = ex_get_truth_table(*idexo, EX_NODE_SET, *num_entity, *num_var, var_tab4); i4i8(*num_entity * *num_var, var_tab4, var_tab); free(var_tab4); } #else - void F2C(exgnstt, EXGNSTT)(int *idexo, int *num_entity, int *num_var, int *var_tab, int *ierr) +void F2C(exgnstt, EXGNSTT)(int *idexo, int *num_entity, int *num_var, int *var_tab, int *ierr) { *ierr = ex_get_truth_table(*idexo, EX_NODE_SET, *num_entity, *num_var, var_tab); } #endif - + /*! * read sideset variable truth table * \sa ex_get_truth_table() @@ -2135,17 +2131,17 @@ void F2C(exgnstt, EXGNSTT)(int *idexo, int *num_entity, int *num_var, int64_t *v void F2C(exgsstt, EXGSSTT)(int *idexo, int *num_entity, int *num_var, int64_t *var_tab, int *ierr) { int *var_tab4 = malloc(*num_entity * *num_var * sizeof(int)); - *ierr = ex_get_truth_table(*idexo, EX_SIDE_SET, *num_entity, *num_var, var_tab4); + *ierr = ex_get_truth_table(*idexo, EX_SIDE_SET, *num_entity, *num_var, var_tab4); i4i8(*num_entity * *num_var, var_tab4, var_tab); free(var_tab4); } #else - void F2C(exgsstt, EXGSSTT)(int *idexo, int *num_entity, int *num_var, int *var_tab, int *ierr) +void F2C(exgsstt, EXGSSTT)(int *idexo, int *num_entity, int *num_var, int *var_tab, int *ierr) { *ierr = ex_get_truth_table(*idexo, EX_SIDE_SET, *num_entity, *num_var, var_tab); } #endif - + /*! * write global variable values at time step * \sa ex_put_var() @@ -2440,10 +2436,11 @@ void F2C(exgssn, EXGSSN)(int *idexo, entity_id *side_set_id, void_int *side_set_ * \sa ex_get_side_set_node_count() */ #if Build64 -void F2C(exgssc, EXGSSC)(int *idexo, entity_id *side_set_id, int64_t *side_set_node_cnt_list, int *ierr) +void F2C(exgssc, EXGSSC)(int *idexo, entity_id *side_set_id, int64_t *side_set_node_cnt_list, + int *ierr) { int64_t num_sides_in_set = 0; - int64_t num_df_in_set = 0; + int64_t num_df_in_set = 0; ex_get_set_param(*idexo, EX_SIDE_SET, *side_set_id, &num_sides_in_set, &num_df_in_set); int *cnt_list = malloc(num_sides_in_set * sizeof(int)); @@ -2466,7 +2463,7 @@ void F2C(exgssc, EXGSSC)(int *idexo, entity_id *side_set_id, int *side_set_node_ #if Build64 void F2C(exgcssc, EXGCSSC)(int *idexo, int64_t *side_set_node_cnt_list, int *ierr) { - int count = ex_inquire_int(*idexo, EX_INQ_SS_ELEM_LEN); + int count = ex_inquire_int(*idexo, EX_INQ_SS_ELEM_LEN); int *cnt_list = malloc(count * sizeof(int)); *ierr = ex_get_concat_side_set_node_count(*idexo, cnt_list); @@ -4031,4 +4028,3 @@ void F2C(exppcc, EXPPCC)(int *exoid, void_int *start_node_num, void_int *num_nod ex_err_fn(*exoid, __func__, errmsg, EX_MSG); } } - diff --git a/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h b/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h index ea7e67385f..f799bad41f 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h +++ b/packages/seacas/libraries/ioss/src/Ioss_CodeTypes.h @@ -48,7 +48,7 @@ inline std::string IOSS_SYM_TENSOR() { return {"sym_tensor_33"}; } #if (__cplusplus >= 201703L) #define IOSS_MAYBE_UNUSED [[maybe_unused]] -#define IOSS_NODISCARD [[nodiscard]] +#define IOSS_NODISCARD [[nodiscard]] #else #define IOSS_MAYBE_UNUSED #define IOSS_NODISCARD diff --git a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h index 1b97760a41..90a83ffe2b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h @@ -82,7 +82,7 @@ namespace Ioss { * \returns True if database state is OK. False if not. */ IOSS_NODISCARD bool ok(bool write_message = false, std::string *error_message = nullptr, - int *bad_count = nullptr) const + int *bad_count = nullptr) const { IOSS_FUNC_ENTER(m_); return ok_nl(write_message, error_message, bad_count); @@ -172,7 +172,7 @@ namespace Ioss { * \returns The database file name. */ IOSS_NODISCARD std::string get_filename() const { return DBFilename; } - + /** For the database types that support it, return an integer `handle` * through which a client can directly access the underlying file. * Please use sparingly and with discretion. Basically, a kluge @@ -344,9 +344,12 @@ namespace Ioss { * * \returns The informative strings. */ - IOSS_NODISCARD const std::vector &get_information_records() const { return informationRecords; } - void add_information_records(const std::vector &info); - void add_information_record(const std::string &info); + IOSS_NODISCARD const std::vector &get_information_records() const + { + return informationRecords; + } + void add_information_records(const std::vector &info); + void add_information_record(const std::string &info); // QA Records: @@ -370,9 +373,9 @@ namespace Ioss { const std::string &time); IOSS_NODISCARD bool get_logging() const { return doLogging && !singleProcOnly; } - void set_logging(bool on_off) { doLogging = on_off; } + void set_logging(bool on_off) { doLogging = on_off; } IOSS_NODISCARD bool get_nan_detection() const { return doNanDetection; } - void set_nan_detection(bool on_off) { doNanDetection = on_off; } + void set_nan_detection(bool on_off) { doNanDetection = on_off; } // The get_field and put_field functions are just a wrapper around the // pure virtual get_field_internal and put_field_internal functions, @@ -428,35 +431,41 @@ namespace Ioss { * */ IOSS_NODISCARD bool is_parallel_consistent() const { return isParallelConsistent; } - void set_parallel_consistency(bool on_off) { isParallelConsistent = on_off; } + void set_parallel_consistency(bool on_off) { isParallelConsistent = on_off; } IOSS_NODISCARD bool get_use_generic_canonical_name() const { return useGenericCanonicalName; } void set_use_generic_canonical_name(bool yes_no) { useGenericCanonicalName = yes_no; } IOSS_NODISCARD bool ignore_database_names() const { return ignoreDatabaseNames; } - void ignore_database_names(bool yes_no) { ignoreDatabaseNames = yes_no; } + void ignore_database_names(bool yes_no) { ignoreDatabaseNames = yes_no; } IOSS_NODISCARD bool get_ignore_realn_fields() const { return m_ignoreRealnFields; } - void set_ignore_realn_fields(bool yes_no) { m_ignoreRealnFields = yes_no; } + void set_ignore_realn_fields(bool yes_no) { m_ignoreRealnFields = yes_no; } /** \brief Get the length of the longest name in the database file. * * \returns The length, or 0 for unlimited. */ - IOSS_NODISCARD virtual int maximum_symbol_length() const { return 0; } // Default is unlimited... + IOSS_NODISCARD virtual int maximum_symbol_length() const + { + return 0; + } // Default is unlimited... virtual void set_maximum_symbol_length(int /* requested_symbol_size */) { } // Default does nothing... - IOSS_NODISCARD std::string get_component_name(const Ioss::Field &field, Ioss::Field::InOut in_out, - int component) const; + IOSS_NODISCARD std::string get_component_name(const Ioss::Field &field, + Ioss::Field::InOut in_out, int component) const; IOSS_NODISCARD char get_field_separator() const { return fieldSeparator; } IOSS_NODISCARD bool get_field_recognition() const { return enableFieldRecognition; } IOSS_NODISCARD bool get_field_strip_trailing_() const { return fieldStripTrailing_; } - void set_field_separator(char separator); - void set_field_recognition(bool yes_no) { enableFieldRecognition = yes_no; } - void set_field_strip_trailing_(bool yes_no) { fieldStripTrailing_ = yes_no; } + void set_field_separator(char separator); + void set_field_recognition(bool yes_no) { enableFieldRecognition = yes_no; } + void set_field_strip_trailing_(bool yes_no) { fieldStripTrailing_ = yes_no; } - IOSS_NODISCARD DuplicateFieldBehavior get_duplicate_field_behavior() const { return duplicateFieldBehavior; } + IOSS_NODISCARD DuplicateFieldBehavior get_duplicate_field_behavior() const + { + return duplicateFieldBehavior; + } void set_lower_case_variable_names(bool true_false) const { @@ -492,9 +501,9 @@ namespace Ioss { IOSS_NODISCARD AxisAlignedBoundingBox get_bounding_box(const Ioss::ElementBlock *eb) const; IOSS_NODISCARD AxisAlignedBoundingBox get_bounding_box(const Ioss::StructuredBlock *sb) const; - IOSS_NODISCARD virtual int int_byte_size_db() const = 0; //! Returns 4 or 8 - IOSS_NODISCARD int int_byte_size_api() const; //! Returns 4 or 8 - virtual void set_int_byte_size_api(Ioss::DataSize size) const; + IOSS_NODISCARD virtual int int_byte_size_db() const = 0; //! Returns 4 or 8 + IOSS_NODISCARD int int_byte_size_api() const; //! Returns 4 or 8 + virtual void set_int_byte_size_api(Ioss::DataSize size) const; /*! * The owning region of this database. @@ -544,16 +553,16 @@ namespace Ioss { * If you only want the last step available on the database, * use set_cycle_count(1) */ - void set_cycle_count(int count) const { cycleCount = count; } + void set_cycle_count(int count) const { cycleCount = count; } IOSS_NODISCARD int get_cycle_count() const { return cycleCount; } - void set_overlay_count(int count) const { overlayCount = count; } + void set_overlay_count(int count) const { overlayCount = count; } IOSS_NODISCARD int get_overlay_count() const { return overlayCount; } - void set_file_per_state(bool yes_no) const { filePerState = yes_no; } + void set_file_per_state(bool yes_no) const { filePerState = yes_no; } IOSS_NODISCARD bool get_file_per_state() const { return filePerState; } void set_time_scale_factor(double factor) { timeScaleFactor = factor; } - IOSS_NODISCARD const Ioss::ParallelUtils &util() const { return util_; } + IOSS_NODISCARD const Ioss::ParallelUtils &util() const { return util_; } IOSS_NODISCARD const Ioss::PropertyManager &get_property_manager() const { return properties; } /** \brief Get the processor that this mesh database is on. * diff --git a/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.h b/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.h index d3037bb02b..6c7faec5b1 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.h +++ b/packages/seacas/libraries/ioss/src/Ioss_GroupingEntity.h @@ -77,10 +77,10 @@ namespace Ioss { IOSS_NODISCARD State get_state() const; - IOSS_NODISCARD DatabaseIO *get_database() const; - void set_database(DatabaseIO *io_database); - void reset_database(DatabaseIO *io_database); - virtual void delete_database(); + IOSS_NODISCARD DatabaseIO *get_database() const; + void set_database(DatabaseIO *io_database); + void reset_database(DatabaseIO *io_database); + virtual void delete_database(); /** Return the GroupingEntity pointer of the "object" that this * entity is contained in. For example, a SideBlock would @@ -161,18 +161,20 @@ namespace Ioss { // ======================================================================== // Property-related information.... // Just forward it through to the property manager... - inline void property_add(const Property &new_prop); - inline void property_erase(const std::string &property_name); + inline void property_add(const Property &new_prop); + inline void property_erase(const std::string &property_name); IOSS_NODISCARD inline bool property_exists(const std::string &property_name) const; IOSS_NODISCARD inline Property get_property(const std::string &property_name) const; - IOSS_NODISCARD inline int64_t get_optional_property(const std::string &property, int64_t optional_value) const; - IOSS_NODISCARD inline std::string get_optional_property(const std::string &property_name, - const std::string &optional_value) const; - IOSS_NODISCARD inline NameList property_describe() const; - inline int property_describe(NameList *names) const; - IOSS_NODISCARD inline NameList property_describe(Ioss::Property::Origin origin) const; - inline int property_describe(Ioss::Property::Origin origin, NameList *names) const; - IOSS_NODISCARD inline size_t property_count() const; + IOSS_NODISCARD inline int64_t get_optional_property(const std::string &property, + int64_t optional_value) const; + IOSS_NODISCARD inline std::string + get_optional_property(const std::string &property_name, + const std::string &optional_value) const; + IOSS_NODISCARD inline NameList property_describe() const; + inline int property_describe(NameList *names) const; + IOSS_NODISCARD inline NameList property_describe(Ioss::Property::Origin origin) const; + inline int property_describe(Ioss::Property::Origin origin, NameList *names) const; + IOSS_NODISCARD inline size_t property_count() const; /** Add a property, or change its value if it already exists with a different value */ void property_update(const std::string &property, int64_t value) const; @@ -182,15 +184,15 @@ namespace Ioss { // FIELDS // ======================================================================== // Just forward these through to the field manager... - void field_add(Field new_field); - inline void field_erase(const std::string &field_name); - inline void field_erase(Field::RoleType role); + void field_add(Field new_field); + inline void field_erase(const std::string &field_name); + inline void field_erase(Field::RoleType role); IOSS_NODISCARD inline bool field_exists(const std::string &field_name) const; IOSS_NODISCARD inline Field get_field(const std::string &field_name) const; IOSS_NODISCARD inline const Field &get_fieldref(const std::string &field_name) const; - inline int field_describe(NameList *names) const; + inline int field_describe(NameList *names) const; IOSS_NODISCARD inline NameList field_describe() const; - inline int field_describe(Field::RoleType role, NameList *names) const; + inline int field_describe(Field::RoleType role, NameList *names) const; IOSS_NODISCARD inline NameList field_describe(Field::RoleType role) const; IOSS_NODISCARD inline size_t field_count() const; IOSS_NODISCARD size_t field_count(Field::RoleType role) const; diff --git a/packages/seacas/libraries/ioss/src/Ioss_IOFactory.h b/packages/seacas/libraries/ioss/src/Ioss_IOFactory.h index af8c783b1c..2467a21b7b 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_IOFactory.h +++ b/packages/seacas/libraries/ioss/src/Ioss_IOFactory.h @@ -35,22 +35,22 @@ namespace Ioss { { public: virtual ~IOFactory() = default; - IOSS_NODISCARD static DatabaseIO *create(const std::string &type, const std::string &filename, - DatabaseUsage db_usage, - Ioss_MPI_Comm communicator = Ioss::ParallelUtils::comm_world(), - const Ioss::PropertyManager &properties = Ioss::PropertyManager()); + IOSS_NODISCARD static DatabaseIO * + create(const std::string &type, const std::string &filename, DatabaseUsage db_usage, + Ioss_MPI_Comm communicator = Ioss::ParallelUtils::comm_world(), + const Ioss::PropertyManager &properties = Ioss::PropertyManager()); - static int describe(NameList *names); + static int describe(NameList *names); IOSS_NODISCARD static NameList describe(); - static void clean(); + static void clean(); IOSS_NODISCARD static std::string show_configuration(); protected: explicit IOFactory(const std::string &type); IOSS_NODISCARD virtual DatabaseIO *make_IO(const std::string &filename, DatabaseUsage db_usage, - Ioss_MPI_Comm communicator, - const Ioss::PropertyManager &properties) const = 0; + Ioss_MPI_Comm communicator, + const Ioss::PropertyManager &properties) const = 0; IOSS_NODISCARD virtual std::string show_config() const { return {""}; } diff --git a/packages/seacas/libraries/ioss/src/Ioss_Property.h b/packages/seacas/libraries/ioss/src/Ioss_Property.h index ac269a28c9..290405405c 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Property.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Property.h @@ -6,8 +6,8 @@ #pragma once -#include "ioss_export.h" #include "Ioss_CodeTypes.h" +#include "ioss_export.h" #include // for int64_t #include // for string @@ -47,14 +47,14 @@ namespace Ioss { // To set implicit property Property(const GroupingEntity *ge, std::string name, BasicType type); - IOSS_NODISCARD std::string get_string() const; - IOSS_NODISCARD int64_t get_int() const; - IOSS_NODISCARD double get_real() const; - IOSS_NODISCARD void *get_pointer() const; + IOSS_NODISCARD std::string get_string() const; + IOSS_NODISCARD int64_t get_int() const; + IOSS_NODISCARD double get_real() const; + IOSS_NODISCARD void *get_pointer() const; IOSS_NODISCARD std::vector get_vec_double() const; - IOSS_NODISCARD std::vector get_vec_int() const; + IOSS_NODISCARD std::vector get_vec_int() const; - void set_origin(Origin origin) { origin_ = origin; } + void set_origin(Origin origin) { origin_ = origin; } IOSS_NODISCARD Origin get_origin() const { return origin_; } /** \brief Tells whether the property is calculated, rather than stored. diff --git a/packages/seacas/libraries/ioss/src/Ioss_Utils.h b/packages/seacas/libraries/ioss/src/Ioss_Utils.h index c714127f91..670eed3af7 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Utils.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Utils.h @@ -188,7 +188,8 @@ namespace Ioss { index.back() = sum; } - template IOSS_NODISCARD static T find_index_location(T node, const std::vector &index) + template + IOSS_NODISCARD static T find_index_location(T node, const std::vector &index) { // 0-based node numbering // index[p] = first node (0-based) on processor p @@ -312,7 +313,7 @@ namespace Ioss { IOSS_NODISCARD static int log_power_2(uint64_t value); IOSS_NODISCARD static char **get_name_array(size_t count, int size); - static void delete_name_array(char **names, int count); + static void delete_name_array(char **names, int count); /** \brief Get formatted time and date strings. * @@ -327,10 +328,11 @@ namespace Ioss { static void time_and_date(char *time_string, char *date_string, size_t length); IOSS_NODISCARD static std::string decode_filename(const std::string &filename, int processor, - int num_processors); + int num_processors); IOSS_NODISCARD static int get_number(const std::string &suffix); IOSS_NODISCARD static int extract_id(const std::string &name_id); - IOSS_NODISCARD static std::string encode_entity_name(const std::string &entity_type, int64_t id); + IOSS_NODISCARD static std::string encode_entity_name(const std::string &entity_type, + int64_t id); /** Return the trailing digits (if any) from `name` * `hex20` would return the string `20` @@ -347,8 +349,8 @@ namespace Ioss { * string `1..3, 5..8` */ IOSS_NODISCARD static std::string format_id_list(const std::vector &ids, - const std::string &rng_sep = " to ", - const std::string &seq_sep = ", "); + const std::string &rng_sep = " to ", + const std::string &seq_sep = ", "); /** \brief Convert a string to lower case, and convert spaces to `_`. * @@ -403,7 +405,8 @@ namespace Ioss { * \param[in] spatial The spatial dimension of the element. * \returns The Ioss-formatted element name. */ - IOSS_NODISCARD static std::string fixup_type(const std::string &base, int nodes_per_element, int spatial); + IOSS_NODISCARD static std::string fixup_type(const std::string &base, int nodes_per_element, + int spatial); /** \brief Uppercase the first letter of the string * @@ -472,8 +475,9 @@ namespace Ioss { * \param[in] working_directory the path to which the relative_filename path is appended. * \returns The full path (working_directory + relative_filename) */ - IOSS_NODISCARD static std::string local_filename(const std::string &relative_filename, const std::string &type, - const std::string &working_directory); + IOSS_NODISCARD static std::string local_filename(const std::string &relative_filename, + const std::string &type, + const std::string &working_directory); static void get_fields(int64_t entity_count, char **names, int num_names, Ioss::Field::RoleType fld_role, const DatabaseIO *db, int *local_truth, @@ -521,7 +525,10 @@ namespace Ioss { static void input_file(const std::string &file_name, std::vector *lines, size_t max_line_length = 0); - template IOSS_NODISCARD static std::string to_string(const T &t) { return std::to_string(t); } + template IOSS_NODISCARD static std::string to_string(const T &t) + { + return std::to_string(t); + } //! \brief Tries to shorten long variable names to an acceptable //! length, and converts to lowercase and spaces to `_` @@ -541,8 +548,9 @@ namespace Ioss { //! characters and append a 2 character hash+separator. //! //! It also converts name to lowercase and converts spaces to `_` - IOSS_NODISCARD static std::string variable_name_kluge(const std::string &name, size_t component_count, - size_t copies, size_t max_var_len); + IOSS_NODISCARD static std::string variable_name_kluge(const std::string &name, + size_t component_count, size_t copies, + size_t max_var_len); IOSS_NODISCARD static std::string shape_to_string(const Ioss::ElementShape &shape); diff --git a/packages/seacas/libraries/ioss/src/adios/Ioad_Helper.h b/packages/seacas/libraries/ioss/src/adios/Ioad_Helper.h index c18be10120..f689aab681 100644 --- a/packages/seacas/libraries/ioss/src/adios/Ioad_Helper.h +++ b/packages/seacas/libraries/ioss/src/adios/Ioad_Helper.h @@ -37,16 +37,16 @@ namespace Ioad { // parameters. template auto NewEntity(Ioss::DatabaseIO *io_database, const std::string &my_name, - const std::string & /*entity_type*/, size_t entity_count) - -> IossHas3ParametersConstructor * + const std::string & /*entity_type*/, + size_t entity_count) -> IossHas3ParametersConstructor * { return new T(io_database, my_name, entity_count); } template auto NewEntity(Ioss::DatabaseIO *io_database, const std::string &my_name, - const std::string &entity_type, size_t entity_count) - -> IossHas4ParametersConstructor * + const std::string &entity_type, + size_t entity_count) -> IossHas4ParametersConstructor * { return new T(io_database, my_name, entity_type, entity_count); } diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.h b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.h index 40d4e77837..15c6f727e7 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.h +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_Utils.h @@ -77,7 +77,10 @@ namespace Ioss { IOSS_NODISCARD inline auto format_as(CGNS_ENUMT(BCType_t) t) { return BCTypeName[t]; } IOSS_NODISCARD inline auto format_as(CGNS_ENUMT(DataType_t) t) { return DataTypeName[t]; } IOSS_NODISCARD inline auto format_as(CGNS_ENUMT(ElementType_t) t) { return ElementTypeName[t]; } -IOSS_NODISCARD inline auto format_as(CGNS_ENUMT(GridConnectivityType_t) t) { return GridConnectivityTypeName[t]; } +IOSS_NODISCARD inline auto format_as(CGNS_ENUMT(GridConnectivityType_t) t) +{ + return GridConnectivityTypeName[t]; +} IOSS_NODISCARD inline auto format_as(CGNS_ENUMT(GridLocation_t) t) { return GridLocationName[t]; } IOSS_NODISCARD inline auto format_as(CGNS_ENUMT(PointSetType_t) t) { return PointSetTypeName[t]; } IOSS_NODISCARD inline auto format_as(CGNS_ENUMT(ZoneType_t) t) { return ZoneTypeName[t]; } @@ -100,7 +103,8 @@ namespace Iocgns { class IOCGNS_EXPORT Utils { public: - IOSS_NODISCARD static std::pair decompose_name(const std::string &name, bool is_parallel); + IOSS_NODISCARD static std::pair decompose_name(const std::string &name, + bool is_parallel); IOSS_NODISCARD static std::string decompose_sb_name(const std::string &name); IOSS_NODISCARD static size_t index(const Ioss::Field &field); @@ -108,11 +112,11 @@ namespace Iocgns { static void cgns_error(int cgnsid, const char *file, const char *function, int lineno, int processor); - static void update_db_zone_property(int cgns_file_ptr, const Ioss::Region *region, - int myProcessor, bool is_parallel, bool is_parallel_io); - IOSS_NODISCARD static int get_db_zone(const Ioss::GroupingEntity *entity); - static void set_field_index(const Ioss::Field &field, size_t index, - CGNS_ENUMT(GridLocation_t) location); + static void update_db_zone_property(int cgns_file_ptr, const Ioss::Region *region, + int myProcessor, bool is_parallel, bool is_parallel_io); + IOSS_NODISCARD static int get_db_zone(const Ioss::GroupingEntity *entity); + static void set_field_index(const Ioss::Field &field, size_t index, + CGNS_ENUMT(GridLocation_t) location); IOSS_NODISCARD static bool is_cell_field(const Ioss::Field &field); template @@ -274,8 +278,8 @@ namespace Iocgns { } } - IOSS_NODISCARD static std::vector parse_zonebc_sideblocks(int cgns_file_ptr, int base, int zone, - int myProcessor); + IOSS_NODISCARD static std::vector parse_zonebc_sideblocks(int cgns_file_ptr, int base, + int zone, int myProcessor); static void generate_boundary_faces(Ioss::Region *region, @@ -286,8 +290,8 @@ namespace Iocgns { int state, const int *vertex_solution_index, const int *cell_center_solution_index, bool is_parallel_io); - IOSS_NODISCARD static int find_solution_index(int cgns_file_ptr, int base, int zone, int step, - CGNS_ENUMT(GridLocation_t) location); + IOSS_NODISCARD static int find_solution_index(int cgns_file_ptr, int base, int zone, int step, + CGNS_ENUMT(GridLocation_t) location); IOSS_NODISCARD static Ioss::MeshType check_mesh_type(int cgns_file_ptr); static void output_assembly(int file_ptr, const Ioss::Assembly *assembly, bool is_parallel_io, @@ -304,8 +308,8 @@ namespace Iocgns { IOSS_NODISCARD static CGNS_ENUMT(ElementType_t) map_topology_to_cgns(const std::string &name); IOSS_NODISCARD static std::string map_cgns_to_topology_type(CGNS_ENUMT(ElementType_t) type); - static void add_sidesets(int cgns_file_ptr, Ioss::DatabaseIO *db); - static void add_assemblies(int cgns_file_ptr, Ioss::DatabaseIO *db); + static void add_sidesets(int cgns_file_ptr, Ioss::DatabaseIO *db); + static void add_assemblies(int cgns_file_ptr, Ioss::DatabaseIO *db); static void add_to_assembly(int cgns_file_ptr, Ioss::Region *region, Ioss::EntityBlock *block, int base, int zone); diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h index f7689e5a2f..66c87690ad 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DatabaseIO.h @@ -74,8 +74,8 @@ namespace Ioex { bool abort_if_error) const override; bool handle_output_file(bool write_message, std::string *error_msg, int *bad_count, bool overwrite, bool abort_if_error) const override; - IOSS_NODISCARD bool check_valid_file_ptr(bool write_message, std::string *error_msg, int *bad_count, - bool abort_if_error) const; + IOSS_NODISCARD bool check_valid_file_ptr(bool write_message, std::string *error_msg, + int *bad_count, bool abort_if_error) const; int64_t get_field_internal(const Ioss::Region *reg, const Ioss::Field &field, void *data, size_t data_size) const override; @@ -207,7 +207,8 @@ namespace Ioex { // ID Mapping functions. IOSS_NODISCARD const Ioss::Map &get_map(ex_entity_type type) const; IOSS_NODISCARD const Ioss::Map &get_map(Ioss::Map &entity_map, int64_t entity_count, - ex_entity_type entity_type, ex_inquiry inquiry_type) const; + ex_entity_type entity_type, + ex_inquiry inquiry_type) const; // Internal data handling int64_t handle_node_ids(void *ids, int64_t num_to_get) const; diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C index 9c4c15d45f..b3edaccb2e 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C @@ -2182,9 +2182,9 @@ namespace Ioex { load_field_data(filePtr, Data(fileData), blockSubsetIndex, step, blockFieldData, blockComponentCount, fileConnOffset); - (void)decompData->m_decomposition.communicate_entity_data(Data(fileData), data, - decompData->el_blocks, blockSubsetIndex, - fileConnOffset, blockComponentCount); + (void)decompData->m_decomposition.communicate_entity_data( + Data(fileData), data, decompData->el_blocks, blockSubsetIndex, fileConnOffset, + blockComponentCount); } } diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.h index 768ad244a3..a08f9d80f1 100644 --- a/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.h +++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.h @@ -82,8 +82,8 @@ namespace Ioex { #endif IOSS_NODISCARD IOEX_EXPORT const char *Version(); - IOEX_EXPORT bool check_processor_info(const std::string &filename, int exodusFilePtr, - int processor_count, int processor_id); + IOEX_EXPORT bool check_processor_info(const std::string &filename, int exodusFilePtr, + int processor_count, int processor_id); IOSS_NODISCARD IOEX_EXPORT Ioss::EntityType map_exodus_type(ex_entity_type type); IOSS_NODISCARD IOEX_EXPORT ex_entity_type map_exodus_type(Ioss::EntityType type); @@ -114,8 +114,8 @@ namespace Ioex { std::string *disp_name); IOSS_NODISCARD IOEX_EXPORT std::string get_entity_name(int exoid, ex_entity_type type, int64_t id, - const std::string &basename, int length, - bool &db_has_name); + const std::string &basename, int length, + bool &db_has_name); IOEX_EXPORT bool filter_node_list(Ioss::Int64Vector &nodes, const std::vector &node_connectivity_status); diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C index 801d0891c1..236a36b0a1 100644 --- a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_DatabaseIO.C @@ -53,7 +53,7 @@ // Static internal helper functions // ======================================================================== namespace { - const size_t max_line_length = MAX_LINE_LENGTH; + const size_t max_line_length = MAX_LINE_LENGTH; template void compute_internal_border_maps(T *entities, T *internal, size_t count, size_t entity_count) diff --git a/packages/seacas/libraries/ioss/src/hopscotch_hash.h b/packages/seacas/libraries/ioss/src/hopscotch_hash.h index 4fd92f1ab7..00f421125d 100644 --- a/packages/seacas/libraries/ioss/src/hopscotch_hash.h +++ b/packages/seacas/libraries/ioss/src/hopscotch_hash.h @@ -1798,7 +1798,7 @@ namespace tsl { */ template < class T = size_type, - typename std::enable_if::value>::type * = nullptr> + typename std::enable_if::value>::type * = nullptr> static bool USE_STORED_HASH_ON_REHASH(size_type /*bucket_count*/) { return StoreHash; @@ -1806,7 +1806,7 @@ namespace tsl { template < class T = size_type, - typename std::enable_if::value>::type * = nullptr> + typename std::enable_if::value>::type * = nullptr> static bool USE_STORED_HASH_ON_REHASH(size_type bucket_count) { (void)bucket_count; diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C b/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C index c1c148097f..b9aa175f1b 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_IofxDatabaseIO.C @@ -18,8 +18,8 @@ #include "Ioss_SideSet.h" #include "exodus/Ioex_DatabaseIO.h" -#include #include +#include #include #include #include diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_heartbeat.C b/packages/seacas/libraries/ioss/src/utest/Utst_heartbeat.C index 1045fb9b6c..cb16ca34ff 100644 --- a/packages/seacas/libraries/ioss/src/utest/Utst_heartbeat.C +++ b/packages/seacas/libraries/ioss/src/utest/Utst_heartbeat.C @@ -1,6 +1,6 @@ #include "Ionit_Initializer.h" -#include #include +#include #include #include #include diff --git a/packages/seacas/libraries/supes/ext_lib/exread.c b/packages/seacas/libraries/supes/ext_lib/exread.c index 91a3190081..99c47f603b 100644 --- a/packages/seacas/libraries/supes/ext_lib/exread.c +++ b/packages/seacas/libraries/supes/ext_lib/exread.c @@ -64,7 +64,7 @@ C IOSTAT INTEGER I/O Status ( -1 = EOF, 0 = normal ) } else { static char internal_prompt[128]; - char * p = NULL; + char *p = NULL; /* Fill line with blanks... */ int dlen = InputLength; diff --git a/packages/seacas/libraries/svdi/cgi/mdcgi.c b/packages/seacas/libraries/svdi/cgi/mdcgi.c index c365c09e7b..85542ba671 100644 --- a/packages/seacas/libraries/svdi/cgi/mdcgi.c +++ b/packages/seacas/libraries/svdi/cgi/mdcgi.c @@ -62,8 +62,8 @@ void xcoon(anything **surface_id) /* which surface to turn output on for*/ surf_found = surf; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ /* does surface_id point to a valid surface? */ if (dev_found < 0) { @@ -81,7 +81,7 @@ void xcoon(anything **surface_id) /* which surface to turn output on for*/ devices[dev_found].statelist[devices[dev_found].num_on_surfaces - 1]; devices[dev_found].statelist[devices[dev_found].num_on_surfaces - 1] = temp; } /* end if there is an off surface */ - } /* end if surface was off */ + } /* end if surface was off */ } /* end xcoon */ /******************************************************************************/ @@ -102,7 +102,7 @@ void xcact(void (*device_fn)(anything **, int, anything **), anything **p_surfac which_device = i; break; } /* end if */ - } /* end for */ + } /* end for */ if (which_device < 0) { /* if device not initialized */ if (num_devices >= MAX_DEVICES) { /* if no room */ @@ -110,7 +110,7 @@ void xcact(void (*device_fn)(anything **, int, anything **), anything **p_surfac *p_surface_id = NULL; return; } /* end if no room for device */ - } /* end if device not initialized */ + } /* end if device not initialized */ /* call the device driver with ACTIVATE, so it can allocate a state list */ short arg1 = ACTIVATE_FN; @@ -190,8 +190,8 @@ void xcsol(anything **surface_id) dev_found = dev; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ /* does surface_id point to a valid surface? */ if (dev_found < 0) { diff --git a/packages/seacas/libraries/svdi/cgi/met_metxlate.c b/packages/seacas/libraries/svdi/cgi/met_metxlate.c index 3f69a3d952..425435e65d 100644 --- a/packages/seacas/libraries/svdi/cgi/met_metxlate.c +++ b/packages/seacas/libraries/svdi/cgi/met_metxlate.c @@ -629,7 +629,7 @@ static void xci(anything **params, int num_surfaces, anything **surf_list) set_dev_descrip(); dev_descrip.set_flag = TRUE; } /* end if set_flag */ - } /* end if surface not initialized */ + } /* end if surface not initialized */ else { /* this surface has been initialized once already */ @@ -1129,7 +1129,7 @@ static void xcesc(anything **params, int num_surfaces, anything **surf_list) break; } /* end switch */ - } /* end for i */ + } /* end for i */ } /* end xcesc */ /* INQUIRE DEVICE IDENTIFICATION */ @@ -1521,7 +1521,7 @@ static void xcpl(anything **params, int num_surfaces, anything **surf_list) vdlina(&cur_x, &cur_y); } } /* end for j */ - } /* end no clipping on */ + } /* end no clipping on */ else { /* clipping is on */ @@ -1709,8 +1709,8 @@ static void xcpl(anything **params, int num_surfaces, anything **surf_list) default: done = TRUE; break; } /* end switch */ - } /* end while !done */ - } /* end while j*/ + } /* end while !done */ + } /* end while j*/ } /* end else clipping is on */ @@ -1765,7 +1765,7 @@ static void xcdjpl(anything **params, int num_surfaces, anything **surf_list) vdlina(&x2, &y2); } /* end for j */ - } /* end if clipping is off */ + } /* end if clipping is off */ else { /* clipping is on */ @@ -1926,9 +1926,9 @@ static void xcdjpl(anything **params, int num_surfaces, anything **surf_list) default: done = TRUE; break; } /* end switch */ - } /* end while !done */ - } /* end for j */ - } /* end else clipping is on */ + } /* end while !done */ + } /* end for j */ + } /* end else clipping is on */ /* flag that the page has been marked */ cur_state->pic_dirty = CDIRTY; @@ -2093,8 +2093,8 @@ static void xctx(anything **params, int num_surfaces, anything **surf_list) np = (int)((cur_state->clipmax.x - x) / char_width); } } /* end if ok in x */ - } /* end if ok in y */ - } /* end if clip_on */ + } /* end if ok in y */ + } /* end if clip_on */ ok = ok && np > 0; /* make sure there is still some text left */ @@ -2208,7 +2208,7 @@ static void xcpg(anything **params, int num_surfaces, anything **surf_list) vdi_ls = (int)temp_array[4]; vdstls(&vdi_ls); } - } /* end if hollow OR no poly support */ + } /* end if hollow OR no poly support */ else { /* solid polygon */ vdpoly(xnew, ynew, &npnew); } @@ -2364,7 +2364,7 @@ static void xcca(anything **params, int num_surfaces, anything **surf_list) } /* end clip at top edge */ } /* end if ok */ - } /* end if clip is on */ + } /* end if clip is on */ /* make sure there is still something left */ ok = ok && (nx1 > 0 && ny1 > 0); @@ -2433,9 +2433,9 @@ static void xcca(anything **params, int num_surfaces, anything **surf_list) vdpixi(&ix, &iy, &cells[index], &nx1); index = index + nx; /* compute next index */ iy = iy + yinc; /* compute next raster line */ - } /* end for k */ - } /* end else no special case */ - } /* end x increasing */ + } /* end for k */ + } /* end else no special case */ + } /* end x increasing */ else { /* x decreasing */ @@ -2474,8 +2474,8 @@ static void xcca(anything **params, int num_surfaces, anything **surf_list) index = index + index_inc; } /* end for k */ - } /* end x decreasing */ - } /* end if indexed color */ + } /* end x decreasing */ + } /* end if indexed color */ else { /* direct color */ @@ -2523,7 +2523,7 @@ static void xcca(anything **params, int num_surfaces, anything **surf_list) index = index + index_inc; } /* end for k */ - } /* end if x increasing */ + } /* end if x increasing */ else { /* x decreasing */ @@ -2560,14 +2560,14 @@ static void xcca(anything **params, int num_surfaces, anything **surf_list) index = index + index_inc; } /* end for k */ - } /* end else x decreasing */ - } /* end else direct color */ + } /* end else x decreasing */ + } /* end else direct color */ /* flag that the page has been marked */ cur_state->pic_dirty = CDIRTY; } /* end if ok */ - } /* end for each surface */ + } /* end for each surface */ } /* end xcca */ /* PIXEL ARRAY */ @@ -2746,7 +2746,7 @@ static void xcpxa(anything **params, int num_surfaces, anything **surf_list) } /* end clip top edge */ } /* end if ok */ - } /* end if clip_on */ + } /* end if clip_on */ /* make sure there is still something to draw */ ok = ok && (nx1 > 0 && ny1 > 0); @@ -2816,9 +2816,9 @@ static void xcpxa(anything **params, int num_surfaces, anything **surf_list) vdpixi(&ix, &iy, &pxclrs[index], &nx1); index = index + nx; /* compute next index */ iy = iy + yinc; /* compute next raster line */ - } /* end for k */ - } /* end else no special case */ - } /* end x increasing */ + } /* end for k */ + } /* end else no special case */ + } /* end x increasing */ else { /* x decreasing */ @@ -2857,8 +2857,8 @@ static void xcpxa(anything **params, int num_surfaces, anything **surf_list) index = index + index_inc; } /* end for k */ - } /* end x decreasing */ - } /* end if indexed color */ + } /* end x decreasing */ + } /* end if indexed color */ else { /* direct color */ @@ -2905,7 +2905,7 @@ static void xcpxa(anything **params, int num_surfaces, anything **surf_list) index = index + index_inc; } /* end for k */ - } /* end if x increasing */ + } /* end if x increasing */ else { /* x decreasing */ @@ -2942,14 +2942,14 @@ static void xcpxa(anything **params, int num_surfaces, anything **surf_list) index = index + index_inc; } /* end for k */ - } /* end else x decreasing */ - } /* end else direct color */ + } /* end else x decreasing */ + } /* end else direct color */ /* flag that the page has been marked */ cur_state->pic_dirty = CDIRTY; } /* end if ok */ - } /* end for each surface */ + } /* end for each surface */ } /* end xcpxa */ /* LINE TYPE */ @@ -3333,8 +3333,8 @@ static void xccsm(anything **params, int num_surfaces, anything **surf_list) functions with affected parameters ignored until reset */ report_error(cur_state, 3, 305, *(short *)params[0]); cur_state->csm = -1; /* flag error condition */ - } /* end else must be an error */ - } /* end else */ + } /* end else must be an error */ + } /* end else */ } /* end for each surface */ } /* end xccsm */ @@ -4893,7 +4893,7 @@ static void set_foreground_color(surf_statelist *surf_state, int *colors) cur_state->vdi_attrib.fg_rgb[1] = -1.0; cur_state->vdi_attrib.fg_rgb[2] = -1.0; } /* end does foreground... */ - } /* end indexed color */ + } /* end indexed color */ else /* direct color */ @@ -4974,7 +4974,7 @@ static void set_background_color(surf_statelist *surf_state, int *colors) index = i; } } /* end for i */ - } /* end vector SVDI */ + } /* end vector SVDI */ /* is it close enough? */ if (dmin <= epsilon) { @@ -4986,7 +4986,7 @@ static void set_background_color(surf_statelist *surf_state, int *colors) vdstco(&one, &dev_descrip.index_array[cur_state->bg_index], &cur_state->vdi_attrib.bg_rgb, &dev_descrip.col_mode); cur_state->color_set = TRUE; /* flag that CT has been set */ - } /* end else not close enough */ + } /* end else not close enough */ } /* end has never been set */ @@ -5054,7 +5054,7 @@ static void report_error(surf_statelist *surf_state, int e_class, int e_num, int surf_state->err_queue[err_slot - 1].err_num = 0; surf_state->err_queue[err_slot - 1].func_id = 2; } /* end else create */ - } /* end not enuff room in the queue */ + } /* end not enuff room in the queue */ } /* end if error reporting is on */ } /* end report_error */ @@ -5093,7 +5093,7 @@ static void gettoken(int *index_p, int *numrecs_p, char *data_p, int max_chars, /* c is not whitespace, is start of token */ workstate = 1; } /* end if c is whitespace */ - } /* end while skipping whitespace */ + } /* end while skipping whitespace */ while (workstate == 1) { /* while in token */ c = data_p[*index_p]; @@ -5110,7 +5110,7 @@ static void gettoken(int *index_p, int *numrecs_p, char *data_p, int max_chars, if (*index_p >= *numrecs_p * 80) { workstate = 2; } /* end if off end of data */ - } /* end if c is whitespace */ + } /* end if c is whitespace */ } /* end while putting chars into outtoken */ @@ -5201,7 +5201,7 @@ static int poly_clip(point *cmin, point *cmax, float *vx, float *vy, int vlen, f xtemp[*lenout] = t.x; ytemp[(*lenout)++] = t.y; } /* end intersect */ - } /* end else p outside, s inside */ + } /* end else p outside, s inside */ s.x = p.x; s.y = p.y; @@ -5472,6 +5472,6 @@ void nmtbuf(int *numwds, unsigned outary[]) cur_state->buff_ptr = 0; } /* end if > BUFFER_SIZE */ - } /* end for i=... */ + } /* end for i=... */ } } /* end nmtbuf */ diff --git a/packages/seacas/libraries/svdi/cgi/pst_pstxlate.c b/packages/seacas/libraries/svdi/cgi/pst_pstxlate.c index b4356383c8..de2ea964d8 100644 --- a/packages/seacas/libraries/svdi/cgi/pst_pstxlate.c +++ b/packages/seacas/libraries/svdi/cgi/pst_pstxlate.c @@ -635,7 +635,7 @@ static void xci(anything **params, int num_surfaces, anything **surf_list) set_dev_descrip(); dev_descrip.set_flag = TRUE; } /* end if set_flag */ - } /* end if surface not initialized */ + } /* end if surface not initialized */ else { /* this surface has been initialized once already */ @@ -1135,7 +1135,7 @@ static void xcesc(anything **params, int num_surfaces, anything **surf_list) break; } /* end switch */ - } /* end for i */ + } /* end for i */ } /* end xcesc */ /* INQUIRE DEVICE IDENTIFICATION */ @@ -1527,7 +1527,7 @@ static void xcpl(anything **params, int num_surfaces, anything **surf_list) vdlina(&cur_x, &cur_y); } } /* end for j */ - } /* end no clipping on */ + } /* end no clipping on */ else { /* clipping is on */ @@ -1715,8 +1715,8 @@ static void xcpl(anything **params, int num_surfaces, anything **surf_list) default: done = TRUE; break; } /* end switch */ - } /* end while !done */ - } /* end while j*/ + } /* end while !done */ + } /* end while j*/ } /* end else clipping is on */ @@ -1771,7 +1771,7 @@ static void xcdjpl(anything **params, int num_surfaces, anything **surf_list) vdlina(&x2, &y2); } /* end for j */ - } /* end if clipping is off */ + } /* end if clipping is off */ else { /* clipping is on */ @@ -1932,9 +1932,9 @@ static void xcdjpl(anything **params, int num_surfaces, anything **surf_list) default: done = TRUE; break; } /* end switch */ - } /* end while !done */ - } /* end for j */ - } /* end else clipping is on */ + } /* end while !done */ + } /* end for j */ + } /* end else clipping is on */ /* flag that the page has been marked */ cur_state->pic_dirty = CDIRTY; @@ -2099,8 +2099,8 @@ static void xctx(anything **params, int num_surfaces, anything **surf_list) np = (int)((cur_state->clipmax.x - x) / char_width); } } /* end if ok in x */ - } /* end if ok in y */ - } /* end if clip_on */ + } /* end if ok in y */ + } /* end if clip_on */ ok = ok && np > 0; /* make sure there is still some text left */ @@ -2214,7 +2214,7 @@ static void xcpg(anything **params, int num_surfaces, anything **surf_list) vdi_ls = (int)temp_array[4]; vdstls(&vdi_ls); } - } /* end if hollow OR no poly support */ + } /* end if hollow OR no poly support */ else { /* solid polygon */ vdpoly(xnew, ynew, &npnew); } @@ -2370,7 +2370,7 @@ static void xcca(anything **params, int num_surfaces, anything **surf_list) } /* end clip at top edge */ } /* end if ok */ - } /* end if clip is on */ + } /* end if clip is on */ /* make sure there is still something left */ ok = ok && (nx1 > 0 && ny1 > 0); @@ -2439,9 +2439,9 @@ static void xcca(anything **params, int num_surfaces, anything **surf_list) vdpixi(&ix, &iy, &cells[index], &nx1); index = index + nx; /* compute next index */ iy = iy + yinc; /* compute next raster line */ - } /* end for k */ - } /* end else no special case */ - } /* end x increasing */ + } /* end for k */ + } /* end else no special case */ + } /* end x increasing */ else { /* x decreasing */ @@ -2480,8 +2480,8 @@ static void xcca(anything **params, int num_surfaces, anything **surf_list) index = index + index_inc; } /* end for k */ - } /* end x decreasing */ - } /* end if indexed color */ + } /* end x decreasing */ + } /* end if indexed color */ else { /* direct color */ @@ -2529,7 +2529,7 @@ static void xcca(anything **params, int num_surfaces, anything **surf_list) index = index + index_inc; } /* end for k */ - } /* end if x increasing */ + } /* end if x increasing */ else { /* x decreasing */ @@ -2566,14 +2566,14 @@ static void xcca(anything **params, int num_surfaces, anything **surf_list) index = index + index_inc; } /* end for k */ - } /* end else x decreasing */ - } /* end else direct color */ + } /* end else x decreasing */ + } /* end else direct color */ /* flag that the page has been marked */ cur_state->pic_dirty = CDIRTY; } /* end if ok */ - } /* end for each surface */ + } /* end for each surface */ } /* end xcca */ /* PIXEL ARRAY */ @@ -2752,7 +2752,7 @@ static void xcpxa(anything **params, int num_surfaces, anything **surf_list) } /* end clip top edge */ } /* end if ok */ - } /* end if clip_on */ + } /* end if clip_on */ /* make sure there is still something to draw */ ok = ok && (nx1 > 0 && ny1 > 0); @@ -2822,9 +2822,9 @@ static void xcpxa(anything **params, int num_surfaces, anything **surf_list) vdpixi(&ix, &iy, &pxclrs[index], &nx1); index = index + nx; /* compute next index */ iy = iy + yinc; /* compute next raster line */ - } /* end for k */ - } /* end else no special case */ - } /* end x increasing */ + } /* end for k */ + } /* end else no special case */ + } /* end x increasing */ else { /* x decreasing */ @@ -2863,8 +2863,8 @@ static void xcpxa(anything **params, int num_surfaces, anything **surf_list) index = index + index_inc; } /* end for k */ - } /* end x decreasing */ - } /* end if indexed color */ + } /* end x decreasing */ + } /* end if indexed color */ else { /* direct color */ @@ -2911,7 +2911,7 @@ static void xcpxa(anything **params, int num_surfaces, anything **surf_list) index = index + index_inc; } /* end for k */ - } /* end if x increasing */ + } /* end if x increasing */ else { /* x decreasing */ @@ -2948,14 +2948,14 @@ static void xcpxa(anything **params, int num_surfaces, anything **surf_list) index = index + index_inc; } /* end for k */ - } /* end else x decreasing */ - } /* end else direct color */ + } /* end else x decreasing */ + } /* end else direct color */ /* flag that the page has been marked */ cur_state->pic_dirty = CDIRTY; } /* end if ok */ - } /* end for each surface */ + } /* end for each surface */ } /* end xcpxa */ /* LINE TYPE */ @@ -3339,8 +3339,8 @@ static void xccsm(anything **params, int num_surfaces, anything **surf_list) functions with affected parameters ignored until reset */ report_error(cur_state, 3, 305, *(short *)params[0]); cur_state->csm = -1; /* flag error condition */ - } /* end else must be an error */ - } /* end else */ + } /* end else must be an error */ + } /* end else */ } /* end for each surface */ } /* end xccsm */ @@ -4902,7 +4902,7 @@ static void set_foreground_color(surf_statelist *surf_state, int *colors) cur_state->vdi_attrib.fg_rgb[1] = -1.0; cur_state->vdi_attrib.fg_rgb[2] = -1.0; } /* end does foreground... */ - } /* end indexed color */ + } /* end indexed color */ else /* direct color */ @@ -4983,7 +4983,7 @@ static void set_background_color(surf_statelist *surf_state, int *colors) index = i; } } /* end for i */ - } /* end vector SVDI */ + } /* end vector SVDI */ /* is it close enough? */ if (dmin <= epsilon) { @@ -4995,7 +4995,7 @@ static void set_background_color(surf_statelist *surf_state, int *colors) vdstco(&one, &dev_descrip.index_array[cur_state->bg_index], &cur_state->vdi_attrib.bg_rgb, &dev_descrip.col_mode); cur_state->color_set = TRUE; /* flag that CT has been set */ - } /* end else not close enough */ + } /* end else not close enough */ } /* end has never been set */ @@ -5063,7 +5063,7 @@ static void report_error(surf_statelist *surf_state, int e_class, int e_num, int surf_state->err_queue[err_slot - 1].err_num = 0; surf_state->err_queue[err_slot - 1].func_id = 2; } /* end else create */ - } /* end not enuff room in the queue */ + } /* end not enuff room in the queue */ } /* end if error reporting is on */ } /* end report_error */ @@ -5102,7 +5102,7 @@ static void gettoken(int *index_p, int *numrecs_p, char *data_p, int max_chars, /* c is not whitespace, is start of token */ workstate = 1; } /* end if c is whitespace */ - } /* end while skipping whitespace */ + } /* end while skipping whitespace */ while (workstate == 1) { /* while in token */ c = data_p[*index_p]; @@ -5119,7 +5119,7 @@ static void gettoken(int *index_p, int *numrecs_p, char *data_p, int max_chars, if (*index_p >= *numrecs_p * 80) { workstate = 2; } /* end if off end of data */ - } /* end if c is whitespace */ + } /* end if c is whitespace */ } /* end while putting chars into outtoken */ @@ -5210,7 +5210,7 @@ static int poly_clip(point *cmin, point *cmax, float *vx, float *vy, int vlen, f xtemp[*lenout] = t.x; ytemp[(*lenout)++] = t.y; } /* end intersect */ - } /* end else p outside, s inside */ + } /* end else p outside, s inside */ s.x = p.x; s.y = p.y; @@ -5459,6 +5459,6 @@ void pstbuf(int *numwds, char *outary) cur_state->buff_ptr = 0; } /* end if > BUFFER_SIZE */ - } /* end for i=... */ + } /* end for i=... */ } } /* end pstbuf */ diff --git a/packages/seacas/libraries/svdi/cgi/sdcgi.c b/packages/seacas/libraries/svdi/cgi/sdcgi.c index ace531b598..1a38e2c815 100644 --- a/packages/seacas/libraries/svdi/cgi/sdcgi.c +++ b/packages/seacas/libraries/svdi/cgi/sdcgi.c @@ -435,8 +435,8 @@ void cdqerr_(f_integer *nreq, f_integer *vstat, f_integer *nrem, f_integer *nret surf_found = surf; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ if (dev_found != -1) { anything *temp_surface[] = {devices[dev_found].statelist[surf_found]}; @@ -538,8 +538,8 @@ void cqid_(f_integer *maxchr, f_integer *vstat, f_integer *dclass, char *devid) surf_found = surf; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ if (dev_found != -1) { anything *temp_surface[] = {devices[dev_found].statelist[surf_found]}; @@ -585,8 +585,8 @@ void cqd_(f_integer *vstat, f_integer *hscopy, f_integer *disp, f_integer *bcolo surf_found = surf; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ if (dev_found != -1) { anything *temp_surface[] = {devices[dev_found].statelist[surf_found]}; @@ -622,8 +622,8 @@ void clf_(f_integer *n, f_integer *funccl, f_integer *funcid, f_integer *vstat, surf_found = surf; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ if (dev_found != -1) { anything *temp_surface[] = {devices[dev_found].statelist[surf_found]}; @@ -659,8 +659,8 @@ void clpr_(f_integer *n, char *profid, f_integer *profid_size, f_integer *vstat, surf_found = surf; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ if (dev_found != -1) { anything *temp_surface[] = {devices[dev_found].statelist[surf_found]}; @@ -713,8 +713,8 @@ void cqsp_(f_integer *vstat, f_integer *nvip, f_integer *vip, f_integer *nvrp, f surf_found = surf; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ if (dev_found != -1) { anything *temp_surface[] = {devices[dev_found].statelist[surf_found]}; @@ -749,8 +749,8 @@ void clesc_(f_integer *n, f_integer *escid, f_integer *vstat, f_integer *supprt) surf_found = surf; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ if (dev_found != -1) { anything *temp_surface[] = {devices[dev_found].statelist[surf_found]}; @@ -796,8 +796,8 @@ void cqp_(f_integer *vstat, f_integer *vip, f_integer *vrfmt, f_integer *vrexp, surf_found = surf; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ if (dev_found != -1) { anything *temp_surface[] = {devices[dev_found].statelist[surf_found]}; @@ -834,8 +834,8 @@ void cqcl_(f_integer *vstat, f_integer *clip1, f_integer *clipr, f_integer *scli surf_found = surf; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ if (dev_found != -1) { anything *temp_surface[] = {devices[dev_found].statelist[surf_found]}; @@ -1259,8 +1259,8 @@ void cgtxx1_(f_real *x, f_real *y, char *string, f_integer *vstat, f_integer *vc surf_found = surf; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ if (dev_found != -1) { anything *temp_surface[] = {devices[dev_found].statelist[surf_found]}; @@ -1307,8 +1307,8 @@ void cqprl_(f_integer *vstat, f_integer *maxpl, f_integer *maxdpl, f_integer *ma surf_found = surf; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ if (dev_found != -1) { anything *temp_surface[] = {devices[dev_found].statelist[surf_found]}; @@ -1348,8 +1348,8 @@ void cqln_(f_integer *vstat, f_integer *npdefb, f_integer *nsetb, f_integer *max surf_found = surf; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ if (dev_found != -1) { anything *temp_surface[] = {devices[dev_found].statelist[surf_found]}; @@ -1387,8 +1387,8 @@ void cqlnt_(f_integer *nreq, f_integer *first, f_integer *vstat, f_integer *ntot surf_found = surf; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ if (dev_found != -1) { anything *temp_surface[] = {devices[dev_found].statelist[surf_found]}; @@ -1432,8 +1432,8 @@ void cqchh1_(char *font, f_integer *txp, f_integer *nreq, f_integer *first, f_in surf_found = surf; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ if (dev_found != -1) { anything *temp_surface[] = {devices[dev_found].statelist[surf_found]}; @@ -1481,8 +1481,8 @@ void cqfl_(f_integer *vstat, f_integer *npdefb, f_integer *nsetb, f_integer *max surf_found = surf; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ if (dev_found != -1) { anything *temp_surface[] = {devices[dev_found].statelist[surf_found]}; @@ -1522,8 +1522,8 @@ void cqc_(f_integer *vstat, f_integer *nsimul, f_integer *navail, f_integer *nin surf_found = surf; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ if (dev_found != -1) { anything *temp_surface[] = {devices[dev_found].statelist[surf_found]}; @@ -1563,8 +1563,8 @@ void cqlna_(f_integer *vstat, f_integer *lnbi, f_integer *lntyp, f_integer *lwmo surf_found = surf; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ if (dev_found != -1) { anything *temp_surface[] = {devices[dev_found].statelist[surf_found]}; @@ -1615,8 +1615,8 @@ void cqtxa_(f_integer *vstat, f_integer *txbi, f_integer *fonti, f_integer *font surf_found = surf; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ if (dev_found != -1) { anything *temp_surface[] = {devices[dev_found].statelist[surf_found]}; @@ -1654,8 +1654,8 @@ void cqcte_(f_integer *nreq, f_integer *first, f_integer *vstat, f_integer *ntot surf_found = surf; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ if (dev_found != -1) { anything *temp_surface[] = {devices[dev_found].statelist[surf_found]}; @@ -1688,8 +1688,8 @@ void cili_(f_integer *iclass, f_integer *idev) surf_found = surf; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ if (dev_found != -1) { anything *temp_surface[] = {devices[dev_found].statelist[surf_found]}; @@ -1729,8 +1729,8 @@ void crqlc_(f_integer *idev, f_real *timeout, f_integer *vstat, f_integer *rstat surf_found = surf; break; } /* end if found on list */ - } /* end for */ - } /* end for all devices */ + } /* end for */ + } /* end for all devices */ if (dev_found != -1) { anything *temp_surface[] = {devices[dev_found].statelist[surf_found]}; diff --git a/packages/seacas/libraries/svdi/cgi/x11_vdix11.c b/packages/seacas/libraries/svdi/cgi/x11_vdix11.c index 0c2398590d..d76acb023f 100644 --- a/packages/seacas/libraries/svdi/cgi/x11_vdix11.c +++ b/packages/seacas/libraries/svdi/cgi/x11_vdix11.c @@ -554,13 +554,13 @@ static int font_height, font_width; /* char size in device coord. */ #define map_y(yin) ((int)(x_height - (ypad + scale * (yin)))) /* macros which map X Windows coords. into ndc */ -#define ndc_map_x(xin) ((float)(((xin)-xpad) / scale)) +#define ndc_map_x(xin) ((float)(((xin) - xpad) / scale)) #define ndc_map_y(yin) ((float)(((x_height - (yin)) - ypad) / scale)) /* macro to convert measure in X window units into ndc units */ #define ndc_units(in) ((float)((in) / scale)) /* macro to convert measure in ndc into X window measure */ -#define x_units(in) ((int)((in)*scale)) +#define x_units(in) ((int)((in) * scale)) /* macro to convert ascii(integer) to char (note: machine dependent) */ #define a_to_c(ain) ((char)(ain)) /* for ascii machine */ diff --git a/packages/seacas/libraries/svdi/cgi/x11_x11xlate.c b/packages/seacas/libraries/svdi/cgi/x11_x11xlate.c index 6e7233fd07..7552f4b468 100644 --- a/packages/seacas/libraries/svdi/cgi/x11_x11xlate.c +++ b/packages/seacas/libraries/svdi/cgi/x11_x11xlate.c @@ -631,7 +631,7 @@ static void xci(anything **params, int num_surfaces, anything **surf_list) set_dev_descrip(); dev_descrip.set_flag = TRUE; } /* end if set_flag */ - } /* end if surface not initialized */ + } /* end if surface not initialized */ else { /* this surface has been initialized once already */ @@ -1131,7 +1131,7 @@ static void xcesc(anything **params, int num_surfaces, anything **surf_list) break; } /* end switch */ - } /* end for i */ + } /* end for i */ } /* end xcesc */ /* INQUIRE DEVICE IDENTIFICATION */ @@ -1524,7 +1524,7 @@ static void xcpl(anything **params, int num_surfaces, anything **surf_list) vdlina(&cur_x, &cur_y); } } /* end for j */ - } /* end no clipping on */ + } /* end no clipping on */ else { /* clipping is on */ @@ -1712,8 +1712,8 @@ static void xcpl(anything **params, int num_surfaces, anything **surf_list) default: done = TRUE; break; } /* end switch */ - } /* end while !done */ - } /* end while j*/ + } /* end while !done */ + } /* end while j*/ } /* end else clipping is on */ @@ -1768,7 +1768,7 @@ static void xcdjpl(anything **params, int num_surfaces, anything **surf_list) vdlina(&x2, &y2); } /* end for j */ - } /* end if clipping is off */ + } /* end if clipping is off */ else { /* clipping is on */ @@ -1929,9 +1929,9 @@ static void xcdjpl(anything **params, int num_surfaces, anything **surf_list) default: done = TRUE; break; } /* end switch */ - } /* end while !done */ - } /* end for j */ - } /* end else clipping is on */ + } /* end while !done */ + } /* end for j */ + } /* end else clipping is on */ /* flag that the page has been marked */ cur_state->pic_dirty = CDIRTY; @@ -2096,8 +2096,8 @@ static void xctx(anything **params, int num_surfaces, anything **surf_list) np = (int)((cur_state->clipmax.x - x) / char_width); } } /* end if ok in x */ - } /* end if ok in y */ - } /* end if clip_on */ + } /* end if ok in y */ + } /* end if clip_on */ ok = ok && np > 0; /* make sure there is still some text left */ @@ -2211,7 +2211,7 @@ static void xcpg(anything **params, int num_surfaces, anything **surf_list) vdi_ls = (int)temp_array[4]; vdstls(&vdi_ls); } - } /* end if hollow OR no poly support */ + } /* end if hollow OR no poly support */ else { /* solid polygon */ vdpoly(xnew, ynew, &npnew); } @@ -2367,7 +2367,7 @@ static void xcca(anything **params, int num_surfaces, anything **surf_list) } /* end clip at top edge */ } /* end if ok */ - } /* end if clip is on */ + } /* end if clip is on */ /* make sure there is still something left */ ok = ok && (nx1 > 0 && ny1 > 0); @@ -2436,9 +2436,9 @@ static void xcca(anything **params, int num_surfaces, anything **surf_list) vdpixi(&ix, &iy, &cells[index], &nx1); index = index + nx; /* compute next index */ iy = iy + yinc; /* compute next raster line */ - } /* end for k */ - } /* end else no special case */ - } /* end x increasing */ + } /* end for k */ + } /* end else no special case */ + } /* end x increasing */ else { /* x decreasing */ @@ -2477,8 +2477,8 @@ static void xcca(anything **params, int num_surfaces, anything **surf_list) index = index + index_inc; } /* end for k */ - } /* end x decreasing */ - } /* end if indexed color */ + } /* end x decreasing */ + } /* end if indexed color */ else { /* direct color */ @@ -2526,7 +2526,7 @@ static void xcca(anything **params, int num_surfaces, anything **surf_list) index = index + index_inc; } /* end for k */ - } /* end if x increasing */ + } /* end if x increasing */ else { /* x decreasing */ @@ -2563,14 +2563,14 @@ static void xcca(anything **params, int num_surfaces, anything **surf_list) index = index + index_inc; } /* end for k */ - } /* end else x decreasing */ - } /* end else direct color */ + } /* end else x decreasing */ + } /* end else direct color */ /* flag that the page has been marked */ cur_state->pic_dirty = CDIRTY; } /* end if ok */ - } /* end for each surface */ + } /* end for each surface */ } /* end xcca */ /* PIXEL ARRAY */ @@ -2749,7 +2749,7 @@ static void xcpxa(anything **params, int num_surfaces, anything **surf_list) } /* end clip top edge */ } /* end if ok */ - } /* end if clip_on */ + } /* end if clip_on */ /* make sure there is still something to draw */ ok = ok && (nx1 > 0 && ny1 > 0); @@ -2819,9 +2819,9 @@ static void xcpxa(anything **params, int num_surfaces, anything **surf_list) vdpixi(&ix, &iy, &pxclrs[index], &nx1); index = index + nx; /* compute next index */ iy = iy + yinc; /* compute next raster line */ - } /* end for k */ - } /* end else no special case */ - } /* end x increasing */ + } /* end for k */ + } /* end else no special case */ + } /* end x increasing */ else { /* x decreasing */ @@ -2860,8 +2860,8 @@ static void xcpxa(anything **params, int num_surfaces, anything **surf_list) index = index + index_inc; } /* end for k */ - } /* end x decreasing */ - } /* end if indexed color */ + } /* end x decreasing */ + } /* end if indexed color */ else { /* direct color */ @@ -2908,7 +2908,7 @@ static void xcpxa(anything **params, int num_surfaces, anything **surf_list) index = index + index_inc; } /* end for k */ - } /* end if x increasing */ + } /* end if x increasing */ else { /* x decreasing */ @@ -2945,14 +2945,14 @@ static void xcpxa(anything **params, int num_surfaces, anything **surf_list) index = index + index_inc; } /* end for k */ - } /* end else x decreasing */ - } /* end else direct color */ + } /* end else x decreasing */ + } /* end else direct color */ /* flag that the page has been marked */ cur_state->pic_dirty = CDIRTY; } /* end if ok */ - } /* end for each surface */ + } /* end for each surface */ } /* end xcpxa */ /* LINE TYPE */ @@ -3336,8 +3336,8 @@ static void xccsm(anything **params, int num_surfaces, anything **surf_list) functions with affected parameters ignored until reset */ report_error(cur_state, 3, 305, *(short *)params[0]); cur_state->csm = -1; /* flag error condition */ - } /* end else must be an error */ - } /* end else */ + } /* end else must be an error */ + } /* end else */ } /* end for each surface */ } /* end xccsm */ @@ -4895,7 +4895,7 @@ static void set_foreground_color(surf_statelist *surf_state, int *colors) cur_state->vdi_attrib.fg_rgb[1] = -1.0; cur_state->vdi_attrib.fg_rgb[2] = -1.0; } /* end does foreground... */ - } /* end indexed color */ + } /* end indexed color */ else /* direct color */ @@ -4976,7 +4976,7 @@ static void set_background_color(surf_statelist *surf_state, int *colors) index = i; } } /* end for i */ - } /* end vector SVDI */ + } /* end vector SVDI */ /* is it close enough? */ if (dmin <= epsilon) { @@ -4989,7 +4989,7 @@ static void set_background_color(surf_statelist *surf_state, int *colors) vdstco(&one, &dev_descrip.index_array[cur_state->bg_index], &cur_state->vdi_attrib.bg_rgb, &dev_descrip.col_mode); cur_state->color_set = TRUE; /* flag that CT has been set */ - } /* end else not close enough */ + } /* end else not close enough */ } /* end has never been set */ @@ -5057,7 +5057,7 @@ static void report_error(surf_statelist *surf_state, int e_class, int e_num, int surf_state->err_queue[err_slot - 1].err_num = 0; surf_state->err_queue[err_slot - 1].func_id = 2; } /* end else create */ - } /* end not enuff room in the queue */ + } /* end not enuff room in the queue */ } /* end if error reporting is on */ } /* end report_error */ @@ -5096,7 +5096,7 @@ static void gettoken(int *index_p, int *numrecs_p, char *data_p, int max_chars, /* c is not whitespace, is start of token */ workstate = 1; } /* end if c is whitespace */ - } /* end while skipping whitespace */ + } /* end while skipping whitespace */ while (workstate == 1) { /* while in token */ c = data_p[*index_p]; @@ -5113,7 +5113,7 @@ static void gettoken(int *index_p, int *numrecs_p, char *data_p, int max_chars, if (*index_p >= *numrecs_p * 80) { workstate = 2; } /* end if off end of data */ - } /* end if c is whitespace */ + } /* end if c is whitespace */ } /* end while putting chars into outtoken */ @@ -5204,7 +5204,7 @@ static int poly_clip(point *cmin, point *cmax, float *vx, float *vy, int vlen, f xtemp[*lenout] = t.x; ytemp[(*lenout)++] = t.y; } /* end intersect */ - } /* end else p outside, s inside */ + } /* end else p outside, s inside */ s.x = p.x; s.y = p.y;