[cig-commits] [commit] rajesh-petsc-schur: replaced all occurences of the caps_per_proc iteration variable by CPPR in Regional_sphere_related.c (b62c536)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:06:06 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit b62c536cf29d20ca039936a66be726ba41314980
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Tue Sep 16 10:34:35 2014 -0700
replaced all occurences of the caps_per_proc iteration variable by CPPR in Regional_sphere_related.c
>---------------------------------------------------------------
b62c536cf29d20ca039936a66be726ba41314980
lib/Regional_sphere_related.c | 64 +++++++++++++++++++++----------------------
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/lib/Regional_sphere_related.c b/lib/Regional_sphere_related.c
index 00c884a..a72f631 100644
--- a/lib/Regional_sphere_related.c
+++ b/lib/Regional_sphere_related.c
@@ -72,14 +72,14 @@ void regional_coord_of_cap(E,m,icap)
temp = max(E->mesh.NOY[E->mesh.levmax],E->mesh.NOX[E->mesh.levmax]);
/* define the cap corners */
- E->sphere.cap[1].theta[1] = E->control.theta_min;
- E->sphere.cap[1].theta[2] = E->control.theta_max;
- E->sphere.cap[1].theta[3] = E->control.theta_max;
- E->sphere.cap[1].theta[4] = E->control.theta_min;
- E->sphere.cap[1].fi[1] = E->control.fi_min;
- E->sphere.cap[1].fi[2] = E->control.fi_min;
- E->sphere.cap[1].fi[3] = E->control.fi_max;
- E->sphere.cap[1].fi[4] = E->control.fi_max;
+ E->sphere.cap[CPPR].theta[1] = E->control.theta_min;
+ E->sphere.cap[CPPR].theta[2] = E->control.theta_max;
+ E->sphere.cap[CPPR].theta[3] = E->control.theta_max;
+ E->sphere.cap[CPPR].theta[4] = E->control.theta_min;
+ E->sphere.cap[CPPR].fi[1] = E->control.fi_min;
+ E->sphere.cap[CPPR].fi[2] = E->control.fi_min;
+ E->sphere.cap[CPPR].fi[3] = E->control.fi_max;
+ E->sphere.cap[CPPR].fi[4] = E->control.fi_max;
if(E->control.coor==1) {
@@ -122,14 +122,14 @@ void regional_coord_of_cap(E,m,icap)
fclose(fp);
/* redefine the cap corners */
- E->sphere.cap[1].theta[1] = E->control.theta_min;
- E->sphere.cap[1].theta[2] = E->control.theta_max;
- E->sphere.cap[1].theta[3] = E->control.theta_max;
- E->sphere.cap[1].theta[4] = E->control.theta_min;
- E->sphere.cap[1].fi[1] = E->control.fi_min;
- E->sphere.cap[1].fi[2] = E->control.fi_min;
- E->sphere.cap[1].fi[3] = E->control.fi_max;
- E->sphere.cap[1].fi[4] = E->control.fi_max;
+ E->sphere.cap[CPPR].theta[1] = E->control.theta_min;
+ E->sphere.cap[CPPR].theta[2] = E->control.theta_max;
+ E->sphere.cap[CPPR].theta[3] = E->control.theta_max;
+ E->sphere.cap[CPPR].theta[4] = E->control.theta_min;
+ E->sphere.cap[CPPR].fi[1] = E->control.fi_min;
+ E->sphere.cap[CPPR].fi[2] = E->control.fi_min;
+ E->sphere.cap[CPPR].fi[3] = E->control.fi_max;
+ E->sphere.cap[CPPR].fi[4] = E->control.fi_max;
for (lev=E->mesh.gridmin;lev<=E->mesh.gridmax;lev++) {
@@ -166,16 +166,16 @@ void regional_coord_of_cap(E,m,icap)
node = i + (j-1)*noz + (k-1)*nox*noz;
/* theta,fi,and r coordinates */
- E->SX[lev][m][1][node] = theta1[lev][nodesx];
- E->SX[lev][m][2][node] = fi1[lev][nodesy];
- E->SX[lev][m][3][node] = E->sphere.R[lev][i];
+ E->SX[lev][CPPR][1][node] = theta1[lev][nodesx];
+ E->SX[lev][CPPR][2][node] = fi1[lev][nodesy];
+ E->SX[lev][CPPR][3][node] = E->sphere.R[lev][i];
/* x,y,and z oordinates */
- E->X[lev][m][1][node] =
+ E->X[lev][CPPR][1][node] =
E->sphere.R[lev][i]*sin(theta1[lev][nodesx])*cos(fi1[lev][nodesy]);
- E->X[lev][m][2][node] =
+ E->X[lev][CPPR][2][node] =
E->sphere.R[lev][i]*sin(theta1[lev][nodesx])*sin(fi1[lev][nodesy]);
- E->X[lev][m][3][node] =
+ E->X[lev][CPPR][3][node] =
E->sphere.R[lev][i]*cos(theta1[lev][nodesx]);
}
}
@@ -209,13 +209,13 @@ void regional_coord_of_cap(E,m,icap)
SX[1] = (double *)malloc((temp+1)*sizeof(double));
- tt[1] = E->sphere.cap[m].theta[1]+(E->sphere.cap[m].theta[2] -E->sphere.cap[m].theta[1])/nprocxl*(E->parallel.me_loc[1]);
- tt[2] = E->sphere.cap[m].theta[1]+(E->sphere.cap[m].theta[2] -E->sphere.cap[m].theta[1])/nprocxl*(E->parallel.me_loc[1]+1);
+ tt[1] = E->sphere.cap[CPPR].theta[1]+(E->sphere.cap[CPPR].theta[2] -E->sphere.cap[CPPR].theta[1])/nprocxl*(E->parallel.me_loc[1]);
+ tt[2] = E->sphere.cap[CPPR].theta[1]+(E->sphere.cap[CPPR].theta[2] -E->sphere.cap[CPPR].theta[1])/nprocxl*(E->parallel.me_loc[1]+1);
tt[3] = tt[2];
tt[4] = tt[1];
- ff[1] = E->sphere.cap[m].fi[1]+(E->sphere.cap[m].fi[4] -E->sphere.cap[1].fi[1])/nprocyl*(E->parallel.me_loc[2]);
+ ff[1] = E->sphere.cap[CPPR].fi[1]+(E->sphere.cap[CPPR].fi[4] -E->sphere.cap[CPPR].fi[1])/nprocyl*(E->parallel.me_loc[2]);
ff[2] = ff[1];
- ff[3] = E->sphere.cap[m].fi[1]+(E->sphere.cap[m].fi[4] -E->sphere.cap[1].fi[1])/nprocyl*(E->parallel.me_loc[2]+1);
+ ff[3] = E->sphere.cap[CPPR].fi[1]+(E->sphere.cap[CPPR].fi[4] -E->sphere.cap[CPPR].fi[1])/nprocyl*(E->parallel.me_loc[2]+1);
ff[4] = ff[3];
@@ -249,16 +249,16 @@ void regional_coord_of_cap(E,m,icap)
node = i + (j-1)*noz + (k-1)*nox*noz;
/* theta,fi,and r coordinates */
- E->SX[lev][m][1][node] = SX[0][nodes];
- E->SX[lev][m][2][node] = SX[1][nodes];
- E->SX[lev][m][3][node] = E->sphere.R[lev][i];
+ E->SX[lev][CPPR][1][node] = SX[0][nodes];
+ E->SX[lev][CPPR][2][node] = SX[1][nodes];
+ E->SX[lev][CPPR][3][node] = E->sphere.R[lev][i];
/* x,y,and z oordinates */
- E->X[lev][m][1][node] =
+ E->X[lev][CPPR][1][node] =
E->sphere.R[lev][i]*sin(SX[0][nodes])*cos(SX[1][nodes]);
- E->X[lev][m][2][node] =
+ E->X[lev][CPPR][2][node] =
E->sphere.R[lev][i]*sin(SX[0][nodes])*sin(SX[1][nodes]);
- E->X[lev][m][3][node] =
+ E->X[lev][CPPR][3][node] =
E->sphere.R[lev][i]*cos(SX[0][nodes]);
}
}
More information about the CIG-COMMITS
mailing list