[cig-commits] [commit] python-removal: Got rid of come nested comment warnings from clang (c23d985)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Apr 9 03:01:00 PDT 2014
Repository : ssh://geoshell/citcoms
On branch : python-removal
Link : https://github.com/geodynamics/citcoms/compare/3ebabdc12f5b4e8d7db6edbc2cc578201d4477bf...fb1839e7e93bc56eb542afd64b3db70f2df6a5d8
>---------------------------------------------------------------
commit c23d985366bf195db41f383b779bc3aabb71808f
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Tue Apr 8 15:13:24 2014 -0700
Got rid of come nested comment warnings from clang
>---------------------------------------------------------------
c23d985366bf195db41f383b779bc3aabb71808f
lib/Composition_related.c | 4 ++--
lib/Full_tracer_advection.c | 20 ++++++++++----------
lib/Material_properties.c | 2 +-
lib/Mineral_physics_models.c | 8 ++++----
lib/Pan_problem_misc_functions.c | 2 +-
lib/Regional_tracer_advection.c | 19 +++++++++----------
lib/Tracer_setup.c | 11 ++++++-----
lib/Viscosity_structures.c | 4 ++--
8 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/lib/Composition_related.c b/lib/Composition_related.c
index 930840a..fed9857 100644
--- a/lib/Composition_related.c
+++ b/lib/Composition_related.c
@@ -466,7 +466,7 @@ void map_composition_to_nodes(struct All_variables *E)
E->composition.comp_node[j][i][kk] *= E->MASS[E->mesh.levmax][j][kk];
/* testing */
- /**
+ /*
for(i=0;i<E->composition.ncomp;i++)
for (kk=1;kk<=E->lmesh.nel;kk++) {
fprintf(E->trace.fpt,"%d %f\n",kk,E->composition.comp_el[j][i][kk]);
@@ -477,7 +477,7 @@ void map_composition_to_nodes(struct All_variables *E)
fprintf(E->trace.fpt,"%d %f %f\n",kk,E->sx[j][3][kk],E->composition.comp_node[j][i][kk]);
}
fflush(E->trace.fpt);
- /**/
+ */
} /* end j */
diff --git a/lib/Full_tracer_advection.c b/lib/Full_tracer_advection.c
index 4da1394..d51e6ed 100644
--- a/lib/Full_tracer_advection.c
+++ b/lib/Full_tracer_advection.c
@@ -321,7 +321,7 @@ void full_lost_souls(struct All_variables *E)
E->trace.rlater[j][2][kk]);
}
fflush(E->trace.fpt);
- /**/
+ */
@@ -353,7 +353,7 @@ void full_lost_souls(struct All_variables *E)
}
fflush(E->trace.fpt);
- /**/
+ */
/* Pre communication */
@@ -402,7 +402,7 @@ void full_lost_souls(struct All_variables *E)
fprintf(E->trace.fpt,"%d recv %d from proc %d\n",
E->parallel.me,ireceive[j][kk],isource_proc);
}
- /**/
+ */
/* Allocate memory in receive arrays */
@@ -619,7 +619,7 @@ void full_lost_souls(struct All_variables *E)
isend_z[j][kk],ireceive_z[j][kk]);
}
fflush(E->trace.fpt);
- /**/
+ */
/* Allocate memory to receive_z arrays */
@@ -983,7 +983,7 @@ void full_get_shape_functions(struct All_variables *E,
/** debug **
fprintf(E->trace.fpt, "shp: %e %e %e %e %e %e\n",
shp[1], shp[2], shp[3], shp[4], shp[5], shp[6]);
- /**/
+ */
return;
}
@@ -1150,7 +1150,7 @@ static void get_2dshape(struct All_variables *E,
/** debug **
fprintf(E->trace.fpt, "el=%d els=%d iwedge=%d shape=(%e %e %e)\n",
nelem, n, iwedge, shape2d[1], shape2d[2], shape2d[3]);
- /**/
+ */
return;
}
@@ -1252,7 +1252,7 @@ static void spherical_to_uv(struct All_variables *E, int j,
/** debug **
fprintf(E->trace.fpt, "(%e %e) -> (%e %e)\n",
theta, phi, *u, *v);
- /**/
+ */
return;
}
@@ -2892,7 +2892,7 @@ static void define_uv_space(struct All_variables *E)
}
fprintf(E->trace.fpt, "%d %d %d ref=(%e %e)\n",
E->lmesh.noz, E->lmesh.nsf, refnode, theta_f, phi_f);
- /**/
+ */
/* store cos(theta_f) and sin(theta_f) */
E->gnomonic[0].u = cost[refnode];
@@ -2915,7 +2915,7 @@ static void define_uv_space(struct All_variables *E)
/** debug **
fprintf(E->trace.fpt, "n=%d ns=%d cosc=%e (%e %e) -> (%e %e)\n",
n, i, cosc, E->sx[j][1][n], E->sx[j][2][n], u, v);
- /**/
+ */
}
return;
@@ -3035,7 +3035,7 @@ static void determine_shape_coefficients(struct All_variables *E)
E->trace.shape_coefs[j][iwedge][7][i],
E->trace.shape_coefs[j][iwedge][8][i],
E->trace.shape_coefs[j][iwedge][9][i]);
- /**/
+ */
} /* end wedge */
} /* end elem */
diff --git a/lib/Material_properties.c b/lib/Material_properties.c
index 9e83f50..db6582b 100644
--- a/lib/Material_properties.c
+++ b/lib/Material_properties.c
@@ -153,7 +153,7 @@ static void read_refstate(struct All_variables *E)
E->refstate.gravity[i],
E->refstate.thermal_expansivity[i],
E->refstate.heat_capacity[i]);
- /* end of debug */
+ end of debug */
}
fclose(fp);
diff --git a/lib/Mineral_physics_models.c b/lib/Mineral_physics_models.c
index 57ec2fa..a884717 100644
--- a/lib/Mineral_physics_models.c
+++ b/lib/Mineral_physics_models.c
@@ -142,9 +142,9 @@ void get_prem(double r, double *vp, double *vs, double *rho)
+ prem_rho[j][2] * r2
+ prem_rho[j][3] * r3;
- /** debug **
+ /* debug **
fprintf(stderr, "%e %d %f %f %f\n", r, j, *rho, *vp, *vs);
- /**/
+ */
#undef NUM_PREM_LAYERS
#undef SUPPRESS_CRUSTAL_MESH
@@ -215,10 +215,10 @@ static void modified_Trampert_Vacher_Vlaar_PEPI2001(struct All_variables *E,
vp[i] = vpr[nz] * (1 + dvp);
vs[i] = vsr[nz] * (1 + dvs);
- /** debug **
+ /* debug **
fprintf(stderr, "node=%d dT=%f K, dC=%f, %e %e %e\n",
i, dT, dC, drho, dvp, dvs);
- /**/
+ */
}
diff --git a/lib/Pan_problem_misc_functions.c b/lib/Pan_problem_misc_functions.c
index 7e501f8..e6c9830 100644
--- a/lib/Pan_problem_misc_functions.c
+++ b/lib/Pan_problem_misc_functions.c
@@ -263,7 +263,7 @@ static int scan_double_vector(const char *str, int len, double *values)
/** debug **
for (i = 0; i < len; ++i) fprintf(stderr, "%e, ", values[i]);
fprintf(stderr, "\n");
- /**/
+ */
return len;
}
diff --git a/lib/Regional_tracer_advection.c b/lib/Regional_tracer_advection.c
index d4ccb0c..b5f071f 100644
--- a/lib/Regional_tracer_advection.c
+++ b/lib/Regional_tracer_advection.c
@@ -269,7 +269,6 @@ static void make_mesh_ijk(struct All_variables *E)
for(k=0;k<noz;k++)
fprintf(E->trace.fpt, "k=%d z=%e\n", k, E->trace.z_space[k]);
- /**
fprintf(stderr, "%d\n", isearch_neighbors(E->trace.z_space, noz, 0.7, 0));
fprintf(stderr, "%d\n", isearch_neighbors(E->trace.z_space, noz, 0.7, 1));
fprintf(stderr, "%d\n", isearch_neighbors(E->trace.z_space, noz, 0.7, 2));
@@ -295,7 +294,7 @@ static void make_mesh_ijk(struct All_variables *E)
fprintf(stderr, "%d\n", isearch_all(E->trace.z_space, noz, 0.775));
fprintf(stderr, "%d\n", isearch_all(E->trace.z_space, noz, 0.7750001));
parallel_process_termination();
- /**/
+ */
return;
}
@@ -500,7 +499,7 @@ void regional_get_shape_functions(struct All_variables *E,
fprintf(E->trace.fpt, "sum(shp): %e\n",
shp[1]+ shp[2]+ shp[3]+ shp[4]+ shp[5]+ shp[6]+ shp[7]+ shp[8]);
fflush(E->trace.fpt);
- /**/
+ */
return;
}
@@ -568,7 +567,7 @@ void regional_get_velocity(struct All_variables *E,
fprintf(E->trace.fpt, "THETA: %e -> %e\n", theta, tmp);
fflush(E->trace.fpt);
- /**/
+ */
return;
}
@@ -685,7 +684,7 @@ void regional_lost_souls(struct All_variables *E)
}
fflush(E->trace.fpt);
parallel_process_sync(E);
- /**/
+ */
/* Allocate Maximum Memory to Send Arrays */
@@ -782,7 +781,7 @@ void regional_lost_souls(struct All_variables *E)
}
}
fflush(E->trace.fpt);
- /**/
+ */
/* Send info to other processors regarding number of send tracers */
@@ -823,7 +822,7 @@ void regional_lost_souls(struct All_variables *E)
}
}
parallel_process_sync(E);
- /**/
+ */
/* Allocate memory in receive arrays */
for (i=0; i<2; i++) {
@@ -874,7 +873,7 @@ void regional_lost_souls(struct All_variables *E)
}
fflush(E->trace.fpt);
parallel_process_sync(E);
- /**/
+ */
/* put the received tracers */
for (i=0; i<2; i++) {
@@ -974,7 +973,7 @@ static void put_found_tracers(struct All_variables *E,
kk, inside, theta, phi, rad);
fprintf(E->trace.fpt, "before: %d %d\n",
E->trace.ilater[j], E->trace.ntracers[j]);
- /**/
+ */
if (inside) {
@@ -1035,7 +1034,7 @@ static void put_found_tracers(struct All_variables *E,
fprintf(E->trace.fpt, "after: %d %d\n",
E->trace.ilater[j], E->trace.ntracers[j]);
fflush(E->trace.fpt);
- /**/
+ */
} /* end of for kk */
diff --git a/lib/Tracer_setup.c b/lib/Tracer_setup.c
index 387bbfe..61f3240 100644
--- a/lib/Tracer_setup.c
+++ b/lib/Tracer_setup.c
@@ -40,6 +40,7 @@
*/
#include <math.h>
+#include <string.h>
#include "global_defs.h"
#include "parsing.h"
#include "parallel_related.h"
@@ -601,7 +602,7 @@ static void find_tracers(struct All_variables *E)
/* debug *
fprintf(E->trace.fpt,"BB. kk %d %d %d %d %f %f %f %f %f %f\n",kk,j,iprevious_element,iel,x,y,z,theta,phi,rad);
fflush(E->trace.fpt);
- /**/
+ */
E->trace.ielement[j][it]=iel;
@@ -701,7 +702,7 @@ void count_tracers_of_flavors(struct All_variables *E)
}
}
fflush(E->trace.fpt);
- /**/
+ */
return;
}
@@ -1015,7 +1016,7 @@ static void read_tracer_file(struct All_variables *E)
fprintf(E->trace.fpt, "\n");
}
fflush(E->trace.fpt);
- /**/
+ */
} /* end j */
@@ -1159,7 +1160,7 @@ static void read_old_tracer_file(struct All_variables *E)
fprintf(E->trace.fpt, "\n");
}
fflush(E->trace.fpt);
- /**/
+ */
fprintf(E->trace.fpt,"Read %d tracers from file %s\n",numtracers,output_file);
fflush(E->trace.fpt);
@@ -1437,7 +1438,7 @@ void get_neighboring_caps(struct All_variables *E)
}
}
fflush(E->trace.fpt);
- /**/
+ */
}
return;
diff --git a/lib/Viscosity_structures.c b/lib/Viscosity_structures.c
index f2696af..d4e903d 100644
--- a/lib/Viscosity_structures.c
+++ b/lib/Viscosity_structures.c
@@ -1412,7 +1412,7 @@ static void low_viscosity_channel_factor(struct All_variables *E, float *F)
for(m=1; m<=E->sphere.caps_per_proc; m++)
for(e=1; e<=E->lmesh.nel; e++)
fprintf(stderr, "lv_reduction: %d %e\n", e, F[e]);
- /**/
+ */
return;
}
@@ -1472,7 +1472,7 @@ static void low_viscosity_wedge_factor(struct All_variables *E, float *F)
for(m=1; m<=E->sphere.caps_per_proc; m++)
for(e=1; e<=E->lmesh.nel; e++)
fprintf(stderr, "lv_reduction: %d %e\n", e, F[e]);
- /**/
+ */
return;
}
More information about the CIG-COMMITS
mailing list