[cig-commits] [commit] rajesh-petsc-schur: replaced all occurences of the caps_per_proc iteration variable by CPPR in Determine_net_rotation.c (c25dd31)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/citcoms

On branch  : rajesh-petsc-schur
Link       : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd

>---------------------------------------------------------------

commit c25dd311d1ff64a946fee9e4433907758814acee
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Mon Sep 15 09:56:56 2014 -0700

    replaced all occurences of the caps_per_proc iteration variable by CPPR in Determine_net_rotation.c


>---------------------------------------------------------------

c25dd311d1ff64a946fee9e4433907758814acee
 lib/Determine_net_rotation.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/Determine_net_rotation.c b/lib/Determine_net_rotation.c
index df6fffe..5ba74df 100644
--- a/lib/Determine_net_rotation.c
+++ b/lib/Determine_net_rotation.c
@@ -97,44 +97,44 @@ double determine_model_net_rotation(struct All_variables *E,double *omega)
       for (k=1;k <= ely;k++)
         for (j=1;j <= elx;j++)     {
           el = i + (j-1)*elz + (k-1)*elx*elz;
-          get_global_1d_shape_fn(E,el,&M,&dGamma,top,m);
+          get_global_1d_shape_fn(E,el,&M,&dGamma,top,CPPR);
 
 	  /* find mean element location and horizontal velocity */
 
 	  x[0] = x[1] = x[2] = v[0] = v[1] = vw = 0.0;
 
-          lnode[1] = E->ien[m][el].node[1];
-          lnode[2] = E->ien[m][el].node[2];
-          lnode[3] = E->ien[m][el].node[3];
-          lnode[4] = E->ien[m][el].node[4];
+          lnode[1] = E->ien[CPPR][el].node[1];
+          lnode[2] = E->ien[CPPR][el].node[2];
+          lnode[3] = E->ien[CPPR][el].node[3];
+          lnode[4] = E->ien[CPPR][el].node[4];
 
           for(nint=1;nint <= onedvpoints[E->mesh.nsd];nint++)   {
             for(d=1;d <= onedvpoints[E->mesh.nsd];d++){
 	      vtmp = E->M.vpt[GMVINDEX(d,nint)] * dGamma.vpt[GMVGAMMA(0,nint)];
-	      x[0] += E->x[m][1][lnode[d]] * vtmp; /* coords */
-	      x[1] += E->x[m][2][lnode[d]] * vtmp;
-	      x[2] += E->x[m][3][lnode[d]] * vtmp;
+	      x[0] += E->x[CPPR][1][lnode[d]] * vtmp; /* coords */
+	      x[1] += E->x[CPPR][2][lnode[d]] * vtmp;
+	      x[2] += E->x[CPPR][3][lnode[d]] * vtmp;
 	      
-              v[0] += E->sphere.cap[m].V[1][lnode[d]] * vtmp; /* theta */
-              v[1] += E->sphere.cap[m].V[2][lnode[d]] * vtmp; /* phi */
+              v[0] += E->sphere.cap[CPPR].V[1][lnode[d]] * vtmp; /* theta */
+              v[1] += E->sphere.cap[CPPR].V[2][lnode[d]] * vtmp; /* phi */
 	      vw += dGamma.vpt[GMVGAMMA(0,nint)];
 	    }
 	  }
           if (i==elz)  {
-            lnode[1] = E->ien[m][el].node[5];
-            lnode[2] = E->ien[m][el].node[6];
-            lnode[3] = E->ien[m][el].node[7];
-            lnode[4] = E->ien[m][el].node[8];
+            lnode[1] = E->ien[CPPR][el].node[5];
+            lnode[2] = E->ien[CPPR][el].node[6];
+            lnode[3] = E->ien[CPPR][el].node[7];
+            lnode[4] = E->ien[CPPR][el].node[8];
 
             for(nint=1;nint<=onedvpoints[E->mesh.nsd];nint++)   {
               for(d=1;d<=onedvpoints[E->mesh.nsd];d++){
 		vtmp = E->M.vpt[GMVINDEX(d,nint)] * dGamma.vpt[GMVGAMMA(1,nint)];
-		x[0] += E->x[m][1][lnode[d]] * vtmp; /* coords */
-		x[1] += E->x[m][2][lnode[d]] * vtmp;
-		x[2] += E->x[m][3][lnode[d]] * vtmp;
+		x[0] += E->x[CPPR][1][lnode[d]] * vtmp; /* coords */
+		x[1] += E->x[CPPR][2][lnode[d]] * vtmp;
+		x[2] += E->x[CPPR][3][lnode[d]] * vtmp;
 		/*  */
-		v[0] += E->sphere.cap[m].V[1][lnode[d]] * vtmp;
-		v[1] += E->sphere.cap[m].V[2][lnode[d]] * vtmp;
+		v[0] += E->sphere.cap[CPPR].V[1][lnode[d]] * vtmp;
+		v[1] += E->sphere.cap[CPPR].V[2][lnode[d]] * vtmp;
 		vw += dGamma.vpt[GMVGAMMA(1,nint)];
 	      }
 	    }