[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->composition.comp_node as part of caps_per_proc removal (ed45c6d)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:11:17 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit ed45c6dc85b42a907b0003239c47b8cb632e2a4b
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Tue Sep 23 07:19:11 2014 -0700
Changed the shape of E->composition.comp_node as part of caps_per_proc removal
>---------------------------------------------------------------
ed45c6dc85b42a907b0003239c47b8cb632e2a4b
lib/Composition_related.c | 16 ++++++++--------
lib/Mineral_physics_models.c | 2 +-
lib/Output.c | 2 +-
lib/Output_gzdir.c | 4 ++--
lib/Output_vtk.c | 2 +-
lib/Pan_problem_misc_functions.c | 2 +-
lib/Process_buoyancy.c | 2 +-
lib/Viscosity_structures.c | 2 +-
lib/global_defs.h | 2 +-
9 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/lib/Composition_related.c b/lib/Composition_related.c
index 50b9565..8f6652b 100644
--- a/lib/Composition_related.c
+++ b/lib/Composition_related.c
@@ -223,7 +223,7 @@ static void allocate_composition_memory(struct All_variables *E)
fflush(E->trace.fpt);
exit(10);
}
- if ((E->composition.comp_node[CPPR]=(double **)malloc((E->composition.ncomp)*sizeof(double*)))==NULL) {
+ if ((E->composition.comp_node=(double **)malloc((E->composition.ncomp)*sizeof(double*)))==NULL) {
fprintf(E->trace.fpt,"AKM(allocate_composition_memory)-no memory 8988y\n");
fflush(E->trace.fpt);
exit(10);
@@ -236,7 +236,7 @@ static void allocate_composition_memory(struct All_variables *E)
exit(10);
}
- if ((E->composition.comp_node[CPPR][i]=(double *)malloc((E->lmesh.nno+1)*sizeof(double)))==NULL) {
+ if ((E->composition.comp_node[i]=(double *)malloc((E->lmesh.nno+1)*sizeof(double)))==NULL) {
fprintf(E->trace.fpt,"AKM(allocate_composition_memory)-no memory 983rk\n");
fflush(E->trace.fpt);
exit(10);
@@ -414,7 +414,7 @@ void map_composition_to_nodes(struct All_variables *E)
/* first, initialize node array */
for(i=0;i<E->composition.ncomp;i++) {
for (kk=1;kk<=E->lmesh.nno;kk++)
- E->composition.comp_node[CPPR][i][kk]=0.0;
+ E->composition.comp_node[i][kk]=0.0;
}
/* Loop through all elements */
@@ -428,7 +428,7 @@ void map_composition_to_nodes(struct All_variables *E)
n = E->ien[nelem].node[nodenum];
for(i=0;i<E->composition.ncomp;i++) {
- E->composition.comp_node[CPPR][i][n] +=
+ E->composition.comp_node[i][n] +=
E->composition.comp_el[i][nelem]*
E->TWW[E->mesh.levmax][CPPR][nelem].node[nodenum];
}
@@ -437,14 +437,14 @@ void map_composition_to_nodes(struct All_variables *E)
} /* end nelem */
for(i=0;i<E->composition.ncomp;i++) {
- tmp = E->composition.comp_node[CPPR][i];
+ tmp = E->composition.comp_node[i];
(E->exchange_node_d)(E,tmp,E->mesh.levmax);
}
/* Divide by nodal volume */
for(i=0;i<E->composition.ncomp;i++)
for (kk=1;kk<=E->lmesh.nno;kk++)
- E->composition.comp_node[CPPR][i][kk] *= E->MASS[E->mesh.levmax][kk];
+ E->composition.comp_node[i][kk] *= E->MASS[E->mesh.levmax][kk];
/* testing */
/**
@@ -545,7 +545,7 @@ static void init_bulk_composition(struct All_variables *E)
for (i=0; i<E->composition.ncomp; i++) {
- tmp[CPPR] = E->composition.comp_node[CPPR][i];
+ tmp[CPPR] = E->composition.comp_node[i];
/* ival=0 returns integral not average */
volume = return_bulk_value_d(E,tmp,ival);
@@ -567,7 +567,7 @@ void get_bulk_composition(struct All_variables *E)
for (i=0; i<E->composition.ncomp; i++) {
- tmp[CPPR] = E->composition.comp_node[CPPR][i];
+ tmp[CPPR] = E->composition.comp_node[i];
/* ival=0 returns integral not average */
volume = return_bulk_value_d(E,tmp,ival);
diff --git a/lib/Mineral_physics_models.c b/lib/Mineral_physics_models.c
index a3260b9..b40b145 100644
--- a/lib/Mineral_physics_models.c
+++ b/lib/Mineral_physics_models.c
@@ -201,7 +201,7 @@ static void modified_Trampert_Vacher_Vlaar_PEPI2001(struct All_variables *E,
if(E->control.tracer && E->composition.on && E->composition.ichemical_buoyancy)
for(j=0; j<E->composition.ncomp; j++) {
- dC = E->composition.comp_node[CPPR][j][i+1] - E->Have.C[j][nz];
+ dC = E->composition.comp_node[j][i+1] - E->Have.C[j][nz];
drho += dC * E->composition.buoyancy_ratio[j]
* E->data.ref_temperature * E->data.therm_exp / E->refstate.rho[nz];
diff --git a/lib/Output.c b/lib/Output.c
index 414764a..1eb7690 100644
--- a/lib/Output.c
+++ b/lib/Output.c
@@ -678,7 +678,7 @@ void output_comp_nd(struct All_variables *E, int cycles)
for(i=1;i<=E->lmesh.nno;i++) {
for(k=0;k<E->composition.ncomp;k++) {
- fprintf(fp1,"%.6e ",E->composition.comp_node[CPPR][k][i]);
+ fprintf(fp1,"%.6e ",E->composition.comp_node[k][i]);
}
fprintf(fp1,"\n");
}
diff --git a/lib/Output_gzdir.c b/lib/Output_gzdir.c
index 65590c2..fcf7274 100644
--- a/lib/Output_gzdir.c
+++ b/lib/Output_gzdir.c
@@ -1086,7 +1086,7 @@ void gzdir_output_comp_nd(struct All_variables *E, int cycles)
E->composition.bulk_composition);
for(i=1;i<=E->lmesh.nno;i++) {
for(k=0;k < E->composition.ncomp;k++)
- gzprintf(gz1,"%.6e ",E->composition.comp_node[CPPR][k][i]);
+ gzprintf(gz1,"%.6e ",E->composition.comp_node[k][i]);
gzprintf(gz1,"\n");
}
gzclose(gz1);
@@ -1107,7 +1107,7 @@ void gzdir_output_comp_nd(struct All_variables *E, int cycles)
}
for(i=1;i<=E->lmesh.nno;i++){
for(k=0;k<E->composition.ncomp;k++){
- ftmp = E->composition.comp_node[CPPR][k][i];
+ ftmp = E->composition.comp_node[k][i];
if(be_write_float_to_file(&ftmp,1,fp1)!=1)BE_WERROR;
}
}
diff --git a/lib/Output_vtk.c b/lib/Output_vtk.c
index c249dac..4eab1ab 100644
--- a/lib/Output_vtk.c
+++ b/lib/Output_vtk.c
@@ -239,7 +239,7 @@ static void vtk_output_comp_nd(struct All_variables *E, FILE *fp)
fprintf(fp, " <DataArray type=\"Float32\" Name=\"composition%d\" format=\"%s\">\n", k+1, E->output.vtk_format);
for(i=1; i<=E->lmesh.nno; i++) {
- floatcompo[(CPPR-1)*E->lmesh.nno+i-1] = (float) (E->composition.comp_node[CPPR][k][i]);
+ floatcompo[(CPPR-1)*E->lmesh.nno+i-1] = (float) (E->composition.comp_node[k][i]);
}
if (strcmp(E->output.vtk_format, "binary") == 0)
diff --git a/lib/Pan_problem_misc_functions.c b/lib/Pan_problem_misc_functions.c
index 403f83d..34b8f9d 100644
--- a/lib/Pan_problem_misc_functions.c
+++ b/lib/Pan_problem_misc_functions.c
@@ -175,7 +175,7 @@ void get_buoyancy(struct All_variables *E, double **buoy)
/* TODO: how to scale chemical buoyancy wrt reference density? */
temp2 = E->composition.buoyancy_ratio[j] * temp;
for(i=1;i<=E->lmesh.nno;i++)
- buoy[CPPR][i] -= temp2 * E->composition.comp_node[CPPR][j][i];
+ buoy[CPPR][i] -= temp2 * E->composition.comp_node[j][i];
}
}
#ifdef USE_GGRD
diff --git a/lib/Process_buoyancy.c b/lib/Process_buoyancy.c
index eed76f1..87a2bd7 100644
--- a/lib/Process_buoyancy.c
+++ b/lib/Process_buoyancy.c
@@ -216,7 +216,7 @@ void compute_horiz_avg(struct All_variables *E)
if (E->composition.on) {
for(n=0; n<E->composition.ncomp; n++) {
for(i=1;i<=E->lmesh.nno;i++)
- S1[CPPR][i] = E->composition.comp_node[CPPR][n][i];
+ S1[CPPR][i] = E->composition.comp_node[n][i];
return_horiz_ave_f(E,S1,E->Have.C[n]);
}
}
diff --git a/lib/Viscosity_structures.c b/lib/Viscosity_structures.c
index 88f6478..d7d201e 100644
--- a/lib/Viscosity_structures.c
+++ b/lib/Viscosity_structures.c
@@ -1072,7 +1072,7 @@ void visc_from_C( E, EEta)
element */
for(p=0; p<E->composition.ncomp; p++) {
for(kk = 1; kk <= ends; kk++){
- CC[p][kk] = E->composition.comp_node[CPPR][p][E->ien[i].node[kk]];
+ CC[p][kk] = E->composition.comp_node[p][E->ien[i].node[kk]];
if(CC[p][kk] < 0)CC[p][kk]=0.0;
if(CC[p][kk] > 1)CC[p][kk]=1.0;
}
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 308467b..c2bd59a 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -693,7 +693,7 @@ struct COMPOSITION {
double *buoyancy_ratio;
double **comp_el;
- double **comp_node[13];
+ double **comp_node;
double *initial_bulk_composition;
double *bulk_composition;
More information about the CIG-COMMITS
mailing list