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

[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 8654746f82b3435d2fb608d0f75e14b0b5a38029
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Tue Sep 16 10:25:57 2014 -0700

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


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

8654746f82b3435d2fb608d0f75e14b0b5a38029
 lib/Regional_read_input_from_files.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/Regional_read_input_from_files.c b/lib/Regional_read_input_from_files.c
index 5eb314a..117c7e5 100644
--- a/lib/Regional_read_input_from_files.c
+++ b/lib/Regional_read_input_from_files.c
@@ -259,14 +259,14 @@ void regional_read_input_files_for_timesteps(E,action,output)
                 nodeg = E->lmesh.nxs+i-1 + (E->lmesh.nys+k-2)*nox;
                 nodel = (k-1)*nox1*noz1 + (i-1)*noz1+noz1;
 		if (pos_age) { /* positive ages - we must interpolate */
-                    E->sphere.cap[1].VB[1][nodel] = (VB1[1][nodeg] + (VB2[1][nodeg]-VB1[1][nodeg])/(newage2-newage1)*(age-newage1))*E->data.scalev;
-                    E->sphere.cap[1].VB[2][nodel] = (VB1[2][nodeg] + (VB2[2][nodeg]-VB1[2][nodeg])/(newage2-newage1)*(age-newage1))*E->data.scalev;
-                    E->sphere.cap[1].VB[3][nodel] = 0.0;
+                    E->sphere.cap[CPPR].VB[1][nodel] = (VB1[1][nodeg] + (VB2[1][nodeg]-VB1[1][nodeg])/(newage2-newage1)*(age-newage1))*E->data.scalev;
+                    E->sphere.cap[CPPR].VB[2][nodel] = (VB1[2][nodeg] + (VB2[2][nodeg]-VB1[2][nodeg])/(newage2-newage1)*(age-newage1))*E->data.scalev;
+                    E->sphere.cap[CPPR].VB[3][nodel] = 0.0;
 		}
 		else { /* negative ages - don't do the interpolation */
-                    E->sphere.cap[1].VB[1][nodel] = VB1[1][nodeg]*E->data.scalev;
-                    E->sphere.cap[1].VB[2][nodel] = VB1[2][nodeg]*E->data.scalev;
-                    E->sphere.cap[1].VB[3][nodel] = 0.0;
+                    E->sphere.cap[CPPR].VB[1][nodel] = VB1[1][nodeg]*E->data.scalev;
+                    E->sphere.cap[CPPR].VB[2][nodel] = VB1[2][nodeg]*E->data.scalev;
+                    E->sphere.cap[CPPR].VB[3][nodel] = 0.0;
 		}
              }
       }   /* end of E->parallel.me_loc[3]==E->parallel.nprocz-1   */
@@ -325,10 +325,10 @@ void regional_read_input_files_for_timesteps(E,action,output)
         LL2 = (int*) malloc ((emax+1)*sizeof(int));
 
           for (el=1; el<=elx*ely*elz; el++)  {
-            nodea = E->ien[1][el].node[2];
+            nodea = E->ien[CPPR][el].node[2];
             llayer = layers(E,1,nodea);
             if (llayer)  { /* for layers:1-lithosphere,2-upper, 3-trans, and 4-lower mantle */
-              E->mat[1][el] = llayer;
+              E->mat[CPPR][el] = llayer;
             }
           }
           for(i=1;i<=emax;i++)  {
@@ -353,10 +353,10 @@ void regional_read_input_files_for_timesteps(E,action,output)
                 el = j + (i-1)*E->lmesh.elz + (k-1)*E->lmesh.elz*E->lmesh.elx;
                 elg = E->lmesh.ezs+j + (E->lmesh.exs+i-1)*E->mesh.elz + (E->lmesh.eys+k-1)*E->mesh.elz*E->mesh.elx;
                 if (pos_age) { /* positive ages - we must interpolate */
-                    E->VIP[1][el] = VIP1[elg]+(VIP2[elg]-VIP1[elg])/(newage2-newage1)*(age-newage1);
+                    E->VIP[CPPR][el] = VIP1[elg]+(VIP2[elg]-VIP1[elg])/(newage2-newage1)*(age-newage1);
                 }
                 else { /* negative ages - don't do the interpolation */
-                    E->VIP[1][el] = VIP1[elg];
+                    E->VIP[CPPR][el] = VIP1[elg];
                 }
 
                 /* E->mat[1][el] = LL1[elg]; */ /*use the mat numbers base on radius*/
@@ -410,14 +410,14 @@ void regional_read_input_files_for_timesteps(E,action,output)
                 nodeg = E->lmesh.nxs+i-1 + (E->lmesh.nys+k-2)*nox;
                 nodel = (k-1)*nox1*noz1 + (i-1)*noz1+noz1;
 		if (pos_age) { /* positive ages - we must interpolate */
-                    E->sphere.cap[1].TB[1][nodel] = (TB1[nodeg] + (TB2[nodeg]-TB1[nodeg])/(newage2-newage1)*(age-newage1));
-                    E->sphere.cap[1].TB[2][nodel] = (TB1[nodeg] + (TB2[nodeg]-TB1[nodeg])/(newage2-newage1)*(age-newage1));
-                    E->sphere.cap[1].TB[3][nodel] = (TB1[nodeg] + (TB2[nodeg]-TB1[nodeg])/(newage2-newage1)*(age-newage1));
+                    E->sphere.cap[CPPR].TB[1][nodel] = (TB1[nodeg] + (TB2[nodeg]-TB1[nodeg])/(newage2-newage1)*(age-newage1));
+                    E->sphere.cap[CPPR].TB[2][nodel] = (TB1[nodeg] + (TB2[nodeg]-TB1[nodeg])/(newage2-newage1)*(age-newage1));
+                    E->sphere.cap[CPPR].TB[3][nodel] = (TB1[nodeg] + (TB2[nodeg]-TB1[nodeg])/(newage2-newage1)*(age-newage1));
 		}
 		else { /* negative ages - don't do the interpolation */
-                    E->sphere.cap[1].TB[1][nodel] = TB1[nodeg];
-                    E->sphere.cap[1].TB[2][nodel] = TB1[nodeg];
-                    E->sphere.cap[1].TB[3][nodel] = TB1[nodeg];
+                    E->sphere.cap[CPPR].TB[1][nodel] = TB1[nodeg];
+                    E->sphere.cap[CPPR].TB[2][nodel] = TB1[nodeg];
+                    E->sphere.cap[CPPR].TB[3][nodel] = TB1[nodeg];
 		}
              }
       }   /* end of E->parallel.me_loc[3]==E->parallel.nprocz-1   */