[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->composition.comp_el as part of caps_per_proc removal (e47162d)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:11:15 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit e47162dfde3cc1072e742bc2758f829cfd9104b8
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Tue Sep 23 07:14:20 2014 -0700
Changed the shape of E->composition.comp_el as part of caps_per_proc removal
>---------------------------------------------------------------
e47162dfde3cc1072e742bc2758f829cfd9104b8
lib/Advection_diffusion.c | 4 ++--
lib/Checkpoints.c | 4 ++--
lib/Composition_related.c | 16 ++++++++--------
lib/Output.c | 2 +-
lib/Output_gzdir.c | 2 +-
lib/global_defs.h | 2 +-
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/lib/Advection_diffusion.c b/lib/Advection_diffusion.c
index 3a5b7c4..6c53adc 100644
--- a/lib/Advection_diffusion.c
+++ b/lib/Advection_diffusion.c
@@ -558,8 +558,8 @@ static void element_residual(struct All_variables *E, int el,
/* Q = Q0 for C = 0, Q = Q0ER for C = 1, and linearly in
between */
- Q *= (1.0 - E->composition.comp_el[CPPR][0][el]);
- Q += E->composition.comp_el[CPPR][0][el] * E->control.Q0ER;
+ Q *= (1.0 - E->composition.comp_el[0][el]);
+ Q += E->composition.comp_el[0][el] * E->control.Q0ER;
}
nz = ((el-1) % E->lmesh.elz) + 1;
diff --git a/lib/Checkpoints.c b/lib/Checkpoints.c
index 8d0371d..08774e3 100644
--- a/lib/Checkpoints.c
+++ b/lib/Checkpoints.c
@@ -350,7 +350,7 @@ static void composition_checkpoint(struct All_variables *E, FILE *fp)
/* the 0-th element of comp_el is not init'd
* and won't be used when read it. */
for(i=0; i<E->composition.ncomp; i++)
- fwrite(E->composition.comp_el[CPPR][i], sizeof(double),
+ fwrite(E->composition.comp_el[i], sizeof(double),
E->lmesh.nel+1, fp);
}
@@ -377,7 +377,7 @@ static void read_composition_checkpoint(struct All_variables *E, FILE *fp)
E->composition.ncomp, fp);
for(i=0; i<E->composition.ncomp; i++)
- fread(E->composition.comp_el[CPPR][i], sizeof(double),
+ fread(E->composition.comp_el[i], sizeof(double),
E->lmesh.nel+1, fp);
/* init E->composition.comp_node */
diff --git a/lib/Composition_related.c b/lib/Composition_related.c
index b1dfdfb..50b9565 100644
--- a/lib/Composition_related.c
+++ b/lib/Composition_related.c
@@ -218,7 +218,7 @@ static void allocate_composition_memory(struct All_variables *E)
/* allocat memory for composition fields at the nodes and elements */
- if ((E->composition.comp_el[CPPR]=(double **)malloc((E->composition.ncomp)*sizeof(double*)))==NULL) {
+ if ((E->composition.comp_el=(double **)malloc((E->composition.ncomp)*sizeof(double*)))==NULL) {
fprintf(E->trace.fpt,"AKM(allocate_composition_memory)-no memory 8987y\n");
fflush(E->trace.fpt);
exit(10);
@@ -230,7 +230,7 @@ static void allocate_composition_memory(struct All_variables *E)
}
for (i=0; i<E->composition.ncomp; i++) {
- if ((E->composition.comp_el[CPPR][i]=(double *)malloc((E->lmesh.nel+1)*sizeof(double)))==NULL) {
+ if ((E->composition.comp_el[i]=(double *)malloc((E->lmesh.nel+1)*sizeof(double)))==NULL) {
fprintf(E->trace.fpt,"AKM(allocate_composition_memory)-no memory 8989y\n");
fflush(E->trace.fpt);
exit(10);
@@ -320,7 +320,7 @@ static void compute_elemental_composition_ratio_method(struct All_variables *E)
for(i=0;i<E->composition.ncomp;i++) {
flavor = i + 1;
- E->composition.comp_el[CPPR][i][e] =
+ E->composition.comp_el[i][e] =
E->trace.ntracer_flavor[CPPR][flavor][e] / (double)numtracers;
}
}
@@ -376,7 +376,7 @@ static void compute_elemental_composition_absolute_method(struct All_variables *
/* If no tracers are in an element, comp = 0.0 (i.e. is ambient) */
if (numtracers == 0) {
for(i=0;i<E->composition.ncomp;i++) {
- E->composition.comp_el[CPPR][i][e] = 0.0;
+ E->composition.comp_el[i][e] = 0.0;
}
continue;
}
@@ -391,7 +391,7 @@ static void compute_elemental_composition_absolute_method(struct All_variables *
/* truncate composition at 1.0 */
/* This violates mass conservation but prevents unphysical C */
/* XXX: make truncation a switch for the user to specify */
- E->composition.comp_el[CPPR][i][e] = min(comp,one);
+ E->composition.comp_el[i][e] = min(comp,one);
}
}
@@ -429,7 +429,7 @@ void map_composition_to_nodes(struct All_variables *E)
for(i=0;i<E->composition.ncomp;i++) {
E->composition.comp_node[CPPR][i][n] +=
- E->composition.comp_el[CPPR][i][nelem]*
+ E->composition.comp_el[i][nelem]*
E->TWW[E->mesh.levmax][CPPR][nelem].node[nodenum];
}
}
@@ -508,7 +508,7 @@ static void fill_composition_from_neighbors(struct All_variables *E)
if((ee>0) && (ee<=E->lmesh.nel) && (!is_empty[ee])) {
count++;
for (i=0; i<E->composition.ncomp; i++)
- sum[i] += E->composition.comp_el[CPPR][i][ee];
+ sum[i] += E->composition.comp_el[i][ee];
}
}
@@ -519,7 +519,7 @@ static void fill_composition_from_neighbors(struct All_variables *E)
}
for (i=0; i<E->composition.ncomp; i++)
- E->composition.comp_el[CPPR][i][e] = sum[i] / count;
+ E->composition.comp_el[i][e] = sum[i] / count;
}
}
diff --git a/lib/Output.c b/lib/Output.c
index aa0eae1..414764a 100644
--- a/lib/Output.c
+++ b/lib/Output.c
@@ -711,7 +711,7 @@ void output_comp_el(struct All_variables *E, int cycles)
for(i=1;i<=E->lmesh.nel;i++) {
for(k=0;k<E->composition.ncomp;k++) {
fprintf(fp1,"%.6e ",
- E->composition.comp_el[CPPR][k][i]);
+ E->composition.comp_el[k][i]);
}
fprintf(fp1,"\n");
}
diff --git a/lib/Output_gzdir.c b/lib/Output_gzdir.c
index 6d37629..65590c2 100644
--- a/lib/Output_gzdir.c
+++ b/lib/Output_gzdir.c
@@ -1138,7 +1138,7 @@ void gzdir_output_comp_el(struct All_variables *E, int cycles)
for(i=1;i<=E->lmesh.nel;i++) {
for(k=0;k<E->composition.ncomp;k++)
- gzprintf(fp1,"%.6e ",E->composition.comp_el[CPPR][k][i]);
+ gzprintf(fp1,"%.6e ",E->composition.comp_el[k][i]);
gzprintf(fp1,"\n");
}
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 292456e..308467b 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -692,7 +692,7 @@ struct COMPOSITION {
int ncomp;
double *buoyancy_ratio;
- double **comp_el[13];
+ double **comp_el;
double **comp_node[13];
double *initial_bulk_composition;
More information about the CIG-COMMITS
mailing list