[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->Mass as part of caps_per_proc removal (572a9b8)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue Sep 23 13:59:22 PDT 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/9be20efa6e277e8341746bf0e8d505e81a8a8d74...c9d2a60c8943614964ddb17fcf2b487d6502cc61
>---------------------------------------------------------------
commit 572a9b89e4b9c95cac3733b8c2e66cf0d19ee3d2
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Tue Sep 23 12:32:08 2014 -0700
Changed the shape of E->Mass as part of caps_per_proc removal
>---------------------------------------------------------------
572a9b89e4b9c95cac3733b8c2e66cf0d19ee3d2
lib/Instructions.c | 2 +-
lib/Topo_gravity.c | 4 ++--
lib/global_defs.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/Instructions.c b/lib/Instructions.c
index 3dc1847..6b3598d 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -1359,7 +1359,7 @@ void set_up_nonmg_aliases(struct All_variables *E)
E->node[CPPR] = E->NODE[E->mesh.levmax][CPPR];
E->cc = E->CC[E->mesh.levmax][CPPR];
E->ccx = E->CCX[E->mesh.levmax][CPPR];
- E->Mass[CPPR] = E->MASS[E->mesh.levmax];
+ E->Mass = E->MASS[E->mesh.levmax];
E->gDA[CPPR] = E->GDA[E->mesh.levmax][CPPR];
E->gNX[CPPR] = E->GNX[E->mesh.levmax][CPPR];
diff --git a/lib/Topo_gravity.c b/lib/Topo_gravity.c
index c42c69b..6ac69ca 100644
--- a/lib/Topo_gravity.c
+++ b/lib/Topo_gravity.c
@@ -403,7 +403,7 @@ void compute_nodal_stress(struct All_variables *E,
stress_scaling = velo_scaling = 1.0;
for(node=1;node<=E->lmesh.nno;node++) {
- mass_fac = E->Mass[CPPR][node]*stress_scaling;
+ mass_fac = E->Mass[node]*stress_scaling;
SZZ[node] *= mass_fac;
SXX[node] *= mass_fac;
SYY[node] *= mass_fac;
@@ -411,7 +411,7 @@ void compute_nodal_stress(struct All_variables *E,
SXZ[node] *= mass_fac;
SZY[node] *= mass_fac;
- mass_fac = E->Mass[CPPR][node]*velo_scaling;
+ mass_fac = E->Mass[node]*velo_scaling;
vorv[node] *= mass_fac;
divv[node] *= mass_fac;
}
diff --git a/lib/global_defs.h b/lib/global_defs.h
index c2bd59a..55b79a9 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -833,7 +833,7 @@ struct All_variables {
double *T,*Tdot,*buoyancy[NCS];
double *u1;
double *temp,*temp1;
- double *Mass[NCS], *MASS[MAX_LEVELS];
+ double *Mass, *MASS[MAX_LEVELS];
double *TMass, *NMass[NCS];
double *SX[MAX_LEVELS][NCS][4],*X[MAX_LEVELS][NCS][4];
double *sx[NCS][4],*x[NCS][4];
More information about the CIG-COMMITS
mailing list