[cig-commits] [commit] rajesh-petsc-schur: replaced all occurences of the caps_per_proc iteration variable by CPPR in Pan_problem_misc_functions.c (69fc952)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue Sep 16 16:13:56 PDT 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/400e8500968f38074f2de7627682299fce9f86bb...1bfd8478d42e61b89bc8cfc1679ae9dcc94936f5
>---------------------------------------------------------------
commit 69fc9525e1a84759e0b6c164e9cc51a211725bfa
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Tue Sep 16 08:54:45 2014 -0700
replaced all occurences of the caps_per_proc iteration variable by CPPR in Pan_problem_misc_functions.c
>---------------------------------------------------------------
69fc9525e1a84759e0b6c164e9cc51a211725bfa
lib/Global_operations.c | 2 +-
lib/Pan_problem_misc_functions.c | 38 +++++++++++++++++++-------------------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/lib/Global_operations.c b/lib/Global_operations.c
index 1597289..d07227b 100644
--- a/lib/Global_operations.c
+++ b/lib/Global_operations.c
@@ -999,7 +999,7 @@ void remove_rigid_rot(struct All_variables *E)
vx[1] = fxyz[3]* E->x[CPPR][1][node] - fxyz[1]*E->x[CPPR][3][node];
vx[2] = fxyz[1]* E->x[CPPR][2][node] - fxyz[2]*E->x[m][1][node];
/* project into theta, phi */
- calc_cbase_at_node(m,node,cart_base,E);
+ calc_cbase_at_node(CPPR,node,cart_base,E);
v_theta = vx[0]*cart_base[3] + vx[1]*cart_base[4] + vx[2]*cart_base[5] ;
v_phi = vx[0]*cart_base[6] + vx[1]*cart_base[7];
E->sphere.cap[m].V[1][node] -= v_theta;
diff --git a/lib/Pan_problem_misc_functions.c b/lib/Pan_problem_misc_functions.c
index 7e501f8..b6af39d 100644
--- a/lib/Pan_problem_misc_functions.c
+++ b/lib/Pan_problem_misc_functions.c
@@ -116,33 +116,33 @@ void apply_side_sbc(struct All_variables *E)
}
for(m=1; m<=E->sphere.caps_per_proc; m++) {
- E->sbc.node[m] = (int* ) malloc((E->lmesh.nno+1)*sizeof(int));
+ E->sbc.node[CPPR] = (int* ) malloc((E->lmesh.nno+1)*sizeof(int));
n = 1;
for(i=1; i<=E->lmesh.nno; i++) {
- if(E->node[m][i] & sbc_flags) {
- E->sbc.node[m][i] = n;
+ if(E->node[CPPR][i] & sbc_flags) {
+ E->sbc.node[CPPR][i] = n;
n++;
}
else
- E->sbc.node[m][i] = 0;
+ E->sbc.node[CPPR][i] = 0;
}
for(side=SIDE_BEGIN; side<=SIDE_END; side++)
for(d=1; d<=E->mesh.nsd; d++) {
- E->sbc.SB[m][side][d] = (double *) malloc(n*sizeof(double));
+ E->sbc.SB[CPPR][side][d] = (double *) malloc(n*sizeof(double));
for(i=0; i<n; i++)
- E->sbc.SB[m][side][d][i] = 0;
+ E->sbc.SB[CPPR][side][d][i] = 0;
}
for(d=1; d<=E->mesh.nsd; d++)
for(i=1; i<=E->lmesh.nno; i++)
- if(E->node[m][i] & sbc_flag[d] && E->sphere.cap[m].VB[d][i] != 0) {
- j = E->sbc.node[m][i];
+ if(E->node[CPPR][i] & sbc_flag[d] && E->sphere.cap[CPPR].VB[d][i] != 0) {
+ j = E->sbc.node[CPPR][i];
for(side=SIDE_BOTTOM; side<=SIDE_TOP; side++)
- E->sbc.SB[m][side][d][j] = E->sphere.cap[m].VB[d][i];
+ E->sbc.SB[CPPR][side][d][j] = E->sphere.cap[CPPR].VB[d][i];
}
}
}
@@ -167,8 +167,8 @@ void get_buoyancy(struct All_variables *E, double **buoy)
/* We don't need to substract adiabatic T profile from T here,
* since the horizontal average of buoy will be removed.
*/
- buoy[m][i] = temp * E->refstate.rho[nz]
- * E->refstate.thermal_expansivity[nz] * E->T[m][i];
+ buoy[CPPR][i] = temp * E->refstate.rho[nz]
+ * E->refstate.thermal_expansivity[nz] * E->T[CPPR][i];
}
/* chemical buoyancy */
@@ -179,7 +179,7 @@ void get_buoyancy(struct All_variables *E, double **buoy)
temp2 = E->composition.buoyancy_ratio[j] * temp;
for(m=1;m<=E->sphere.caps_per_proc;m++)
for(i=1;i<=E->lmesh.nno;i++)
- buoy[m][i] -= temp2 * E->composition.comp_node[m][j][i];
+ buoy[CPPR][i] -= temp2 * E->composition.comp_node[CPPR][j][i];
}
}
#ifdef USE_GGRD
@@ -212,9 +212,9 @@ void get_buoyancy(struct All_variables *E, double **buoy)
n = j*E->lmesh.noz + i; /* this could be improved by only
computing the cos as a function
of lat, but leave for now */
- cost2 = cos(E->sx[m][1][n]);cost2 = cost2*cost2; /* cos^2(theta) */
+ cost2 = cos(E->sx[CPPR][1][n]);cost2 = cost2*cost2; /* cos^2(theta) */
/* correct gravity for rotation */
- buoy[m][n] *= E->refstate.gravity[i] * (E->data.ge+rfac*cost2);
+ buoy[CPPR][n] *= E->refstate.gravity[i] * (E->data.ge+rfac*cost2);
}
}else{
#endif
@@ -224,7 +224,7 @@ void get_buoyancy(struct All_variables *E, double **buoy)
for(j=0;j < nxny;j++) {
for(i=1;i<=E->lmesh.noz;i++){
n = j*E->lmesh.noz + i;
- buoy[m][n] *= E->refstate.gravity[i];
+ buoy[CPPR][n] *= E->refstate.gravity[i];
}
}
#ifdef ALLOW_ELLIPTICAL
@@ -456,10 +456,10 @@ void calc_cbase_at_node(int cap, int node, float *base,struct All_variables *E)
int lev ;
double ct,cp,st,sp;
lev = E->mesh.levmax;
- st = E->SinCos[lev][cap][0][node]; /* for elliptical, sincos would be corrected */
- sp = E->SinCos[lev][cap][1][node];
- ct = E->SinCos[lev][cap][2][node];
- cp = E->SinCos[lev][cap][3][node];
+ st = E->SinCos[lev][CPPR][0][node]; /* for elliptical, sincos would be corrected */
+ sp = E->SinCos[lev][CPPR][1][node];
+ ct = E->SinCos[lev][CPPR][2][node];
+ cp = E->SinCos[lev][CPPR][3][node];
/* r */
base[0]= st * cp;
More information about the CIG-COMMITS
mailing list