[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->mat as part of caps_per_proc removal (21efe00)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:11:41 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit 21efe003ef41ba9e2c7688bee0814526915a9d7d
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Tue Sep 23 14:16:32 2014 -0700
Changed the shape of E->mat as part of caps_per_proc removal
>---------------------------------------------------------------
21efe003ef41ba9e2c7688bee0814526915a9d7d
lib/Construct_arrays.c | 6 +++---
lib/Full_read_input_from_files.c | 2 +-
lib/Instructions.c | 4 ++--
lib/Output.c | 2 +-
lib/Output_gzdir.c | 2 +-
lib/Regional_read_input_from_files.c | 2 +-
lib/Viscosity_structures.c | 32 ++++++++++++++++----------------
lib/global_defs.h | 2 +-
8 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/lib/Construct_arrays.c b/lib/Construct_arrays.c
index 02333c6..b760531 100644
--- a/lib/Construct_arrays.c
+++ b/lib/Construct_arrays.c
@@ -773,15 +773,15 @@ void construct_mat_group(E)
for(el=1;el<=E->lmesh.nel;el++) {
int nz;
nz = ((el-1) % E->lmesh.elz) + 1;
- E->mat[CPPR][el] = E->mesh.elz - (nz + E->lmesh.ezs) + 1;
+ E->mat[el] = E->mesh.elz - (nz + E->lmesh.ezs) + 1;
}
} else {
for(el=1;el<=E->lmesh.nel;el++) {
- E->mat[CPPR][el] = 1;
+ E->mat[el] = 1;
nodea = E->ien[el].node[2];
llayer = layers(E,nodea);
if (llayer) {
- E->mat[CPPR][el] = llayer;
+ E->mat[el] = llayer;
}
}
}
diff --git a/lib/Full_read_input_from_files.c b/lib/Full_read_input_from_files.c
index 91dfb00..aaf4d97 100644
--- a/lib/Full_read_input_from_files.c
+++ b/lib/Full_read_input_from_files.c
@@ -322,7 +322,7 @@ void full_read_input_files_for_timesteps(E,action,output)
nodea = E->ien[el].node[2];
llayer = layers(E,nodea);
if (llayer) { /* for layers:1-lithosphere,2-upper, 3-trans, and 4-lower mantle */
- E->mat[CPPR][el] = llayer;
+ E->mat[el] = llayer;
fprintf(stderr,"\nINSIDE llayer=%d",llayer);
}
}
diff --git a/lib/Instructions.c b/lib/Instructions.c
index 72a28a3..d94a64e 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -972,7 +972,7 @@ void allocate_common_vars(E)
/* if(E->mesh.topvbc==2 && E->control.pseudo_free_surf) */
E->slice.freesurf = (float *)malloc((nsf+2)*sizeof(float));
- E->mat[CPPR] = (int *) malloc((nel+2)*sizeof(int));
+ E->mat = (int *) malloc((nel+2)*sizeof(int));
E->VIP[CPPR] = (float *) malloc((nel+2)*sizeof(float));
E->heating_adi = (double *) malloc((nel+1)*sizeof(double));
@@ -1133,7 +1133,7 @@ void allocate_common_vars(E)
E->T[i] = 0.0;
for(i=1;i<=E->lmesh.nel;i++) {
- E->mat[CPPR][i]=1;
+ E->mat[i]=1;
E->VIP[CPPR][i]=1.0;
E->heating_adi[i] = 0;
diff --git a/lib/Output.c b/lib/Output.c
index 08ff6c8..d9dd8cf 100644
--- a/lib/Output.c
+++ b/lib/Output.c
@@ -595,7 +595,7 @@ void output_mat(struct All_variables *E)
fp = output_open(output_file, "w");
for(el=1;el<=E->lmesh.nel;el++)
- fprintf(fp,"%d %d %f\n", el,E->mat[CPPR][el],E->VIP[CPPR][el]);
+ fprintf(fp,"%d %d %f\n", el,E->mat[el],E->VIP[CPPR][el]);
fclose(fp);
}
diff --git a/lib/Output_gzdir.c b/lib/Output_gzdir.c
index cf5dbd6..617250f 100644
--- a/lib/Output_gzdir.c
+++ b/lib/Output_gzdir.c
@@ -974,7 +974,7 @@ void gzdir_output_mat(struct All_variables *E)
fp = gzdir_output_open(output_file,"w");
for(el=1;el<=E->lmesh.nel;el++)
- gzprintf(fp,"%d %d %f\n", el,E->mat[CPPR][el],E->VIP[CPPR][el]);
+ gzprintf(fp,"%d %d %f\n", el,E->mat[el],E->VIP[CPPR][el]);
gzclose(fp);
diff --git a/lib/Regional_read_input_from_files.c b/lib/Regional_read_input_from_files.c
index eca3891..e90ef45 100644
--- a/lib/Regional_read_input_from_files.c
+++ b/lib/Regional_read_input_from_files.c
@@ -328,7 +328,7 @@ void regional_read_input_files_for_timesteps(E,action,output)
nodea = E->ien[el].node[2];
llayer = layers(E,nodea);
if (llayer) { /* for layers:1-lithosphere,2-upper, 3-trans, and 4-lower mantle */
- E->mat[CPPR][el] = llayer;
+ E->mat[el] = llayer;
}
}
for(i=1;i<=emax;i++) {
diff --git a/lib/Viscosity_structures.c b/lib/Viscosity_structures.c
index 2340ec1..6d454d7 100644
--- a/lib/Viscosity_structures.c
+++ b/lib/Viscosity_structures.c
@@ -352,7 +352,7 @@ void get_system_viscosity(E,propogate,evisc,visc)
fprintf(E->fp_out,"output_evisc \n");
fprintf(E->fp_out,"output_evisc for cap %d\n",E->sphere.capid[CPPR]);
for(i=1;i<=E->lmesh.nel;i++)
- fprintf(E->fp_out,"%d %d %f %f\n",i,E->mat[CPPR][i],evisc[(i-1)*vpts+1],evisc[(i-1)*vpts+7]);
+ fprintf(E->fp_out,"%d %d %f %f\n",i,E->mat[i],evisc[(i-1)*vpts+1],evisc[(i-1)*vpts+7]);
fflush(E->fp_out);
}
/* interpolate from gauss quadrature points to node points for output */
@@ -406,11 +406,11 @@ void visc_from_mat(E,EEta)
if(E->control.mat_control){ /* use pre-factor even without temperature dependent viscosity */
for(i=1;i<=E->lmesh.nel;i++)
for(jj=1;jj<=vpoints[E->mesh.nsd];jj++)
- EEta[ (i-1)*vpoints[E->mesh.nsd]+jj ] = E->viscosity.N0[E->mat[CPPR][i]-1]*E->VIP[CPPR][i];
+ EEta[ (i-1)*vpoints[E->mesh.nsd]+jj ] = E->viscosity.N0[E->mat[i]-1]*E->VIP[CPPR][i];
}else{
for(i=1;i<=E->lmesh.nel;i++)
for(jj=1;jj<=vpoints[E->mesh.nsd];jj++)
- EEta[ (i-1)*vpoints[E->mesh.nsd]+jj ] = E->viscosity.N0[E->mat[CPPR][i]-1];
+ EEta[ (i-1)*vpoints[E->mesh.nsd]+jj ] = E->viscosity.N0[E->mat[i]-1];
}
}
@@ -481,7 +481,7 @@ void visc_from_T(E,EEta,propogate)
case 1:
/* eta = N_0 exp( E * (T_0 - T)) */
for(i=1;i<=nel;i++) {
- l = E->mat[CPPR][i] - 1;
+ l = E->mat[i] - 1;
if(E->control.mat_control==0)
tempa = E->viscosity.N0[l];
@@ -508,7 +508,7 @@ void visc_from_T(E,EEta,propogate)
case 2:
/* eta = N_0 exp(-T/T_0) */
for(i=1;i<=nel;i++) {
- l = E->mat[CPPR][i] - 1;
+ l = E->mat[i] - 1;
if(E->control.mat_control==0)
tempa = E->viscosity.N0[l];
@@ -539,7 +539,7 @@ void visc_from_T(E,EEta,propogate)
*/
for(i=1;i<=nel;i++) {
- l = E->mat[CPPR][i] - 1;
+ l = E->mat[i] - 1;
if(E->control.mat_control) /* switch moved up here TWB */
tempa = E->viscosity.N0[l] * E->VIP[CPPR][i];
else
@@ -568,7 +568,7 @@ void visc_from_T(E,EEta,propogate)
case 4:
/* eta = N_0 exp( (E + (1-z)Z_0) / (T+T_0) ) */
for(i=1;i<=nel;i++) {
- l = E->mat[CPPR][i] - 1;
+ l = E->mat[i] - 1;
if(E->control.mat_control) /* moved this up here TWB */
tempa = E->viscosity.N0[l] * E->VIP[CPPR][i];
else
@@ -603,7 +603,7 @@ void visc_from_T(E,EEta,propogate)
/* when mat_control=0, same as rheol 3,
when mat_control=1, applying viscosity cut-off before mat_control */
for(i=1;i<=nel;i++) {
- l = E->mat[CPPR][i] - 1;
+ l = E->mat[i] - 1;
tempa = E->viscosity.N0[l];
/* fprintf(stderr,"\nINSIDE visc_from_T, l=%d, tempa=%g",l+1,tempa);*/
for(kk=1;kk<=ends;kk++) {
@@ -648,7 +648,7 @@ void visc_from_T(E,EEta,propogate)
for(i=1;i <= nel;i++) {
- l = E->mat[CPPR][i] - 1;
+ l = E->mat[i] - 1;
if(E->control.mat_control)
tempa = E->viscosity.N0[l] * E->VIP[CPPR][i];
@@ -703,7 +703,7 @@ void visc_from_T(E,EEta,propogate)
*/
for(i=1;i<=nel;i++) {
- l = E->mat[CPPR][i] - 1;
+ l = E->mat[i] - 1;
if(E->control.mat_control)
tempa = E->viscosity.N0[l] * E->VIP[CPPR][i];
@@ -752,7 +752,7 @@ void visc_from_T(E,EEta,propogate)
dr = E->sphere.ro - E->sphere.ri;
for(i=1;i<=nel;i++) {
- l = E->mat[CPPR][i] - 1;
+ l = E->mat[i] - 1;
if(E->control.mat_control)
tempa = E->viscosity.N0[l] * E->VIP[CPPR][i];
else
@@ -789,7 +789,7 @@ void visc_from_T(E,EEta,propogate)
*/
for(i=1;i<=nel;i++) {
- l = E->mat[CPPR][i] - 1;
+ l = E->mat[i] - 1;
if(E->control.mat_control) /* switch moved up here TWB */
tempa = E->viscosity.N0[l] * E->VIP[CPPR][i];
else
@@ -820,7 +820,7 @@ void visc_from_T(E,EEta,propogate)
dr = E->sphere.ro - E->sphere.ri;
for(i=1;i<=nel;i++) {
- l = E->mat[CPPR][i] - 1;
+ l = E->mat[i] - 1;
if(E->control.mat_control)
tempa = E->viscosity.N0[l] * E->VIP[CPPR][i];
else
@@ -900,7 +900,7 @@ void visc_from_S(E,EEta,propogate)
}
for(e=1;e<=nel;e++) {
- exponent1= one/E->viscosity.sdepv_expt[E->mat[CPPR][e]-1];
+ exponent1= one/E->viscosity.sdepv_expt[E->mat[e]-1];
scale=pow(eedot[e],exponent1-one);
for(jj=1;jj<=vpts;jj++)
EEta[(e-1)*vpts + jj] = scale*pow(EEta[(e-1)*vpts+jj],exponent1);
@@ -990,7 +990,7 @@ void visc_from_P(E,EEta) /* "plasticity" implementation
*/
for(e=1;e <= nel;e++) { /* loop through all elements */
- l = E->mat[CPPR][e] -1 ; /* material of this element */
+ l = E->mat[e] -1 ; /* material of this element */
for(kk=1;kk <= ends;kk++) /* nodal depths */
zz[kk] = (1.0 - E->sx[3][E->ien[e].node[kk]]); /* for depth, zz = 1 - r */
@@ -1023,7 +1023,7 @@ void visc_from_P(E,EEta) /* "plasticity" implementation
/* strain-rate weakening, steady state solution */
for(e=1;e <= nel;e++) { /* loop through all elements */
- l = E->mat[CPPR][e] -1 ;
+ l = E->mat[e] -1 ;
for(kk=1;kk <= ends;kk++)
zz[kk] = (1.0 - E->sx[3][E->ien[e].node[kk]]);
for(jj=1;jj <= vpts;jj++){
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 748696c..1a8a662 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -861,7 +861,7 @@ struct All_variables {
int num_zero_resid[MAX_LEVELS][NCS];
int *zero_resid[MAX_LEVELS][NCS];
int *surf_element,*surf_node;
- int *mat[NCS];
+ int *mat;
float *VIP[NCS];
unsigned int *NODE[MAX_LEVELS][NCS];
unsigned int *node;
More information about the CIG-COMMITS
mailing list