[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->gstress as part of caps_per_proc removal (3dd3531)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:12:03 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit 3dd353175e1585eede6efdf2fa8a1f395160e481
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Tue Sep 23 16:05:49 2014 -0700
Changed the shape of E->gstress as part of caps_per_proc removal
>---------------------------------------------------------------
3dd353175e1585eede6efdf2fa8a1f395160e481
lib/Instructions.c | 2 +-
lib/Output.c | 12 ++++++------
lib/Output_gzdir.c | 12 ++++++------
lib/Output_h5.c | 12 ++++++------
lib/Output_vtk.c | 4 ++--
lib/Topo_gravity.c | 32 ++++++++++++++++----------------
lib/global_defs.h | 2 +-
7 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/lib/Instructions.c b/lib/Instructions.c
index f8b23af..2311305 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -956,7 +956,7 @@ void allocate_common_vars(E)
E->NP = (float *) malloc((nno+1)*sizeof(float));
E->buoyancy[CPPR] = (double *) malloc((nno+1)*sizeof(double));
- E->gstress[CPPR] = (float *) malloc((6*nno+1)*sizeof(float));
+ E->gstress = (float *) malloc((6*nno+1)*sizeof(float));
// TWB do we need this anymore XXX
//E->stress[j] = (float *) malloc((12*nsf+1)*sizeof(float));
diff --git a/lib/Output.c b/lib/Output.c
index 344e816..c3aca65 100644
--- a/lib/Output.c
+++ b/lib/Output.c
@@ -481,12 +481,12 @@ void output_stress(struct All_variables *E, int cycles)
/* those are sorted like stt spp srr stp str srp */
for (node=1;node<=E->lmesh.nno;node++)
fprintf(fp1, "%.4e %.4e %.4e %.4e %.4e %.4e\n",
- E->gstress[CPPR][(node-1)*6+1],
- E->gstress[CPPR][(node-1)*6+2],
- E->gstress[CPPR][(node-1)*6+3],
- E->gstress[CPPR][(node-1)*6+4],
- E->gstress[CPPR][(node-1)*6+5],
- E->gstress[CPPR][(node-1)*6+6]);
+ E->gstress[(node-1)*6+1],
+ E->gstress[(node-1)*6+2],
+ E->gstress[(node-1)*6+3],
+ E->gstress[(node-1)*6+4],
+ E->gstress[(node-1)*6+5],
+ E->gstress[(node-1)*6+6]);
fclose(fp1);
}
diff --git a/lib/Output_gzdir.c b/lib/Output_gzdir.c
index 60d9e39..eb5256a 100644
--- a/lib/Output_gzdir.c
+++ b/lib/Output_gzdir.c
@@ -919,12 +919,12 @@ void gzdir_output_stress(struct All_variables *E, int cycles)
gzprintf(fp1,"%3d %7d\n",CPPR,E->lmesh.nno);
for (node=1;node<=E->lmesh.nno;node++)
gzprintf(fp1, "%.4e %.4e %.4e %.4e %.4e %.4e\n",
- E->gstress[CPPR][(node-1)*6+1], /* stt */
- E->gstress[CPPR][(node-1)*6+2], /* spp */
- E->gstress[CPPR][(node-1)*6+3], /* srr */
- E->gstress[CPPR][(node-1)*6+4], /* stp */
- E->gstress[CPPR][(node-1)*6+5], /* str */
- E->gstress[CPPR][(node-1)*6+6]); /* srp */
+ E->gstress[(node-1)*6+1], /* stt */
+ E->gstress[(node-1)*6+2], /* spp */
+ E->gstress[(node-1)*6+3], /* srr */
+ E->gstress[(node-1)*6+4], /* stp */
+ E->gstress[(node-1)*6+5], /* str */
+ E->gstress[(node-1)*6+6]); /* srp */
gzclose(fp1);
}
diff --git a/lib/Output_h5.c b/lib/Output_h5.c
index a973b99..7ec0ce7 100644
--- a/lib/Output_h5.c
+++ b/lib/Output_h5.c
@@ -690,12 +690,12 @@ void h5output_stress(struct All_variables *E, int cycles)
{
n = k + i*nz + j*nz*nx;
m = k + j*mz + i*mz*my;
- field->data[6*m+0] = E->gstress[CPPR][6*n+1];
- field->data[6*m+1] = E->gstress[CPPR][6*n+2];
- field->data[6*m+2] = E->gstress[CPPR][6*n+3];
- field->data[6*m+3] = E->gstress[CPPR][6*n+4];
- field->data[6*m+4] = E->gstress[CPPR][6*n+5];
- field->data[6*m+5] = E->gstress[CPPR][6*n+6];
+ field->data[6*m+0] = E->gstress[6*n+1];
+ field->data[6*m+1] = E->gstress[6*n+2];
+ field->data[6*m+2] = E->gstress[6*n+3];
+ field->data[6*m+3] = E->gstress[6*n+4];
+ field->data[6*m+4] = E->gstress[6*n+5];
+ field->data[6*m+5] = E->gstress[6*n+6];
}
}
}
diff --git a/lib/Output_vtk.c b/lib/Output_vtk.c
index 190f7a7..18b09a5 100644
--- a/lib/Output_vtk.c
+++ b/lib/Output_vtk.c
@@ -220,9 +220,9 @@ static void vtk_output_stress(struct All_variables *E, FILE *fp)
fprintf(fp, " <DataArray type=\"Float32\" Name=\"stress\" NumberOfComponents=\"6\" format=\"%s\">\n", E->output.vtk_format);
if (strcmp(E->output.vtk_format, "binary") == 0) {
- write_binary_array(nodes*6,&E->gstress[CPPR][1],fp);
+ write_binary_array(nodes*6,&E->gstress[1],fp);
} else {
- write_ascii_array(nodes*6,6,&E->gstress[CPPR][1],fp);
+ write_ascii_array(nodes*6,6,&E->gstress[1],fp);
}
fputs(" </DataArray>\n", fp);
diff --git a/lib/Topo_gravity.c b/lib/Topo_gravity.c
index ab89f4f..4053e3a 100644
--- a/lib/Topo_gravity.c
+++ b/lib/Topo_gravity.c
@@ -418,12 +418,12 @@ void compute_nodal_stress(struct All_variables *E,
/* assign stress to all the nodes */
for (node=1;node<=E->lmesh.nno;node++) {
- E->gstress[CPPR][(node-1)*6+1] = SXX[node];
- E->gstress[CPPR][(node-1)*6+2] = SYY[node];
- E->gstress[CPPR][(node-1)*6+3] = SZZ[node];
- E->gstress[CPPR][(node-1)*6+4] = SXY[node];
- E->gstress[CPPR][(node-1)*6+5] = SXZ[node];
- E->gstress[CPPR][(node-1)*6+6] = SZY[node];
+ E->gstress[(node-1)*6+1] = SXX[node];
+ E->gstress[(node-1)*6+2] = SYY[node];
+ E->gstress[(node-1)*6+3] = SZZ[node];
+ E->gstress[(node-1)*6+4] = SXY[node];
+ E->gstress[(node-1)*6+5] = SXZ[node];
+ E->gstress[(node-1)*6+6] = SZY[node];
}
/* replace boundary stresses with boundary conditions (if specified) */
@@ -462,17 +462,17 @@ void stress_conform_bcs(struct All_variables *E)
if(E->node[n] & sbc_flag[d]) {
if(i==1)
- E->gstress[CPPR][(n-1)*6+stress_index[d][2]] = E->sbc.SB[CPPR][SIDE_WEST][d][ E->sbc.node[CPPR][n] ];
+ E->gstress[(n-1)*6+stress_index[d][2]] = E->sbc.SB[CPPR][SIDE_WEST][d][ E->sbc.node[CPPR][n] ];
if(i==E->lmesh.noy)
- E->gstress[CPPR][(n-1)*6+stress_index[d][2]] = E->sbc.SB[CPPR][SIDE_EAST][d][ E->sbc.node[CPPR][n] ];
+ E->gstress[(n-1)*6+stress_index[d][2]] = E->sbc.SB[CPPR][SIDE_EAST][d][ E->sbc.node[CPPR][n] ];
if(j==1)
- E->gstress[CPPR][(n-1)*6+stress_index[d][1]] = E->sbc.SB[CPPR][SIDE_NORTH][d][ E->sbc.node[CPPR][n] ];
+ E->gstress[(n-1)*6+stress_index[d][1]] = E->sbc.SB[CPPR][SIDE_NORTH][d][ E->sbc.node[CPPR][n] ];
if(j==E->lmesh.nox)
- E->gstress[CPPR][(n-1)*6+stress_index[d][1]] = E->sbc.SB[CPPR][SIDE_SOUTH][d][ E->sbc.node[CPPR][n] ];
+ E->gstress[(n-1)*6+stress_index[d][1]] = E->sbc.SB[CPPR][SIDE_SOUTH][d][ E->sbc.node[CPPR][n] ];
if(k==1)
- E->gstress[CPPR][(n-1)*6+stress_index[d][3]] = E->sbc.SB[CPPR][SIDE_BOTTOM][d][ E->sbc.node[CPPR][n] ];
+ E->gstress[(n-1)*6+stress_index[d][3]] = E->sbc.SB[CPPR][SIDE_BOTTOM][d][ E->sbc.node[CPPR][n] ];
if(k==E->lmesh.noz)
- E->gstress[CPPR][(n-1)*6+stress_index[d][3]] = E->sbc.SB[CPPR][SIDE_TOP][d][ E->sbc.node[CPPR][n] ];
+ E->gstress[(n-1)*6+stress_index[d][3]] = E->sbc.SB[CPPR][SIDE_TOP][d][ E->sbc.node[CPPR][n] ];
}
}
@@ -490,7 +490,7 @@ void stress_conform_bcs(struct All_variables *E)
for(d=1; d<=E->mesh.nsd; d++)
if(E->node[n] & sbc_flag[d]) {
/* apply internal traction vector on horizontal surface */
- E->gstress[CPPR][(n-1)*6+stress_index[d][3]] = E->sphere.cap[CPPR].VB[d][n];
+ E->gstress[(n-1)*6+stress_index[d][3]] = E->sphere.cap[CPPR].VB[d][n];
}
}
}else{
@@ -502,11 +502,11 @@ void stress_conform_bcs(struct All_variables *E)
for(d=1; d<=E->mesh.nsd; d++)
if(E->node[n] & sbc_flag[d]) {
if(i==1 || i==E->lmesh.noy)
- E->gstress[CPPR][(n-1)*6+stress_index[d][2]] = E->sphere.cap[CPPR].VB[d][n];
+ E->gstress[(n-1)*6+stress_index[d][2]] = E->sphere.cap[CPPR].VB[d][n];
if(j==1 || j==E->lmesh.nox)
- E->gstress[CPPR][(n-1)*6+stress_index[d][1]] = E->sphere.cap[CPPR].VB[d][n];
+ E->gstress[(n-1)*6+stress_index[d][1]] = E->sphere.cap[CPPR].VB[d][n];
if(k==1 || k==E->lmesh.noz)
- E->gstress[CPPR][(n-1)*6+stress_index[d][3]] = E->sphere.cap[CPPR].VB[d][n];
+ E->gstress[(n-1)*6+stress_index[d][3]] = E->sphere.cap[CPPR].VB[d][n];
}
}
}
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 0c75e0f..464101e 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -842,7 +842,7 @@ struct All_variables {
float *NP;
//float *stress[NCS];
- float *gstress[NCS];
+ float *gstress;
float *Fas670[NCS],*Fas410[NCS],*Fas670_b[NCS],*Fas410_b[NCS];
float *Fascmb[NCS],*Fascmb_b[NCS];
More information about the CIG-COMMITS
mailing list