[cig-commits] [commit] rajesh-petsc-schur: Eliminated the 2nd argument of layers, which was set to the caps_per_proc loop variable (8318c8e)

[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 8318c8e4ac2772eb0e4f5cea95e1d1957beaac04
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Thu Sep 18 12:22:22 2014 -0700

    Eliminated the 2nd argument of layers, which was set to the caps_per_proc loop variable


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

8318c8e4ac2772eb0e4f5cea95e1d1957beaac04
 lib/BC_util.c                        | 4 ++--
 lib/Construct_arrays.c               | 6 +++---
 lib/Full_read_input_from_files.c     | 2 +-
 lib/Ggrd_handling.c                  | 4 ++--
 lib/Regional_read_input_from_files.c | 2 +-
 lib/prototypes.h                     | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/BC_util.c b/lib/BC_util.c
index 7f1126e..126ca84 100644
--- a/lib/BC_util.c
+++ b/lib/BC_util.c
@@ -30,7 +30,7 @@
 void horizontal_bc(struct All_variables *,float *[],int,int,float,unsigned int,char,int,int);
 void internal_horizontal_bc(struct All_variables *,float *[],int,int,float,unsigned int,char,int,int);
 void myerror(struct All_variables *,char *);
-int layers(struct All_variables *,int,int);
+int layers(struct All_variables *,int);
 
 
 #ifdef USE_GGRD
@@ -214,7 +214,7 @@ void assign_internal_bc(struct All_variables *E)
 	  onbottom = ((k==1) && (E->parallel.me_loc[3]==0))?(1):(0);
 	  /* node number is k, assuming no dependence on x and y  */
 	  if(E->SX[lv][CPPR][3][k] >= E->mesh.toplayerbc_r){
-	    lay = layers(E,CPPR,k);
+	    lay = layers(E,k);
 	    if((!ontop)&&(!onbottom)&&(lv==E->mesh.gridmax))
 	      ncount++;		/* not in top or bottom */
 	    if(E->mesh.topvbc != 1) {	/* free slip */
diff --git a/lib/Construct_arrays.c b/lib/Construct_arrays.c
index 3bc2fda..4ed7ce4 100644
--- a/lib/Construct_arrays.c
+++ b/lib/Construct_arrays.c
@@ -31,7 +31,7 @@
 #include "global_defs.h"
 
 int layers_r(struct All_variables *,float );
-int layers(struct All_variables *,int ,int );
+int layers(struct All_variables *,int);
 
 
 /*========================================================
@@ -743,7 +743,7 @@ int layers_r(struct All_variables *E,float r)
 }
 
 /* determine layer number of node "node" of cap "m" */
-int layers(struct All_variables *E,int m,int node)
+int layers(struct All_variables *E,int node)
 {
   return(layers_r(E,E->sx[CPPR][3][node]));
 }
@@ -778,7 +778,7 @@ void construct_mat_group(E)
           for(el=1;el<=E->lmesh.nel;el++) {
               E->mat[CPPR][el] = 1;
               nodea = E->ien[CPPR][el].node[2];
-              llayer = layers(E,CPPR,nodea);
+              llayer = layers(E,nodea);
               if (llayer)  {
                   E->mat[CPPR][el] = llayer;
               }
diff --git a/lib/Full_read_input_from_files.c b/lib/Full_read_input_from_files.c
index a4eac8a..b4427f4 100644
--- a/lib/Full_read_input_from_files.c
+++ b/lib/Full_read_input_from_files.c
@@ -320,7 +320,7 @@ void full_read_input_files_for_timesteps(E,action,output)
 
           for (el=1; el<=elx*ely*elz; el++)  {
             nodea = E->ien[CPPR][el].node[2];
-            llayer = layers(E,CPPR,nodea);
+            llayer = layers(E,nodea);
             if (llayer)  { /* for layers:1-lithosphere,2-upper, 3-trans, and 4-lower mantle */
               E->mat[CPPR][el] = llayer;
               fprintf(stderr,"\nINSIDE llayer=%d",llayer);
diff --git a/lib/Ggrd_handling.c b/lib/Ggrd_handling.c
index f0730c3..764a406 100644
--- a/lib/Ggrd_handling.c
+++ b/lib/Ggrd_handling.c
@@ -69,7 +69,7 @@ void report(struct All_variables *,char *);
 int layers_r(struct All_variables *,float );
 void construct_mat_group(struct All_variables *);
 void temperatures_conform_bcs(struct All_variables *);
-int layers(struct All_variables *,int ,int );
+int layers(struct All_variables *,int);
 void ggrd_vtop_helper_decide_on_internal_nodes(struct All_variables *,	/* input */
 					       int ,int ,int, int,int ,int *, int *,int *);
 void convert_pvec_to_cvec_d(double ,double , double , double *,double *);
@@ -1452,7 +1452,7 @@ void ggrd_adjust_tbl_rayleigh(struct All_variables *E,
       if(fabs(E->control.surface_rayleigh[snode]-1.0)>1e-6){
 	for(i=1;i <= E->lmesh.noz;i++){ /* go through depth layers */
 	  node = (snode-1)*E->lmesh.noz + i; /* global node number */
-	  if(layers(E,CPPR,node) <= E->control.ggrd.ray_control){ 
+	  if(layers(E,node) <= E->control.ggrd.ray_control){ 
 	    /* 
 	       node is in top layers 
 	    */
diff --git a/lib/Regional_read_input_from_files.c b/lib/Regional_read_input_from_files.c
index 117c7e5..b6fd0b0 100644
--- a/lib/Regional_read_input_from_files.c
+++ b/lib/Regional_read_input_from_files.c
@@ -326,7 +326,7 @@ void regional_read_input_files_for_timesteps(E,action,output)
 
           for (el=1; el<=elx*ely*elz; el++)  {
             nodea = E->ien[CPPR][el].node[2];
-            llayer = layers(E,1,nodea);
+            llayer = layers(E,nodea);
             if (llayer)  { /* for layers:1-lithosphere,2-upper, 3-trans, and 4-lower mantle */
               E->mat[CPPR][el] = llayer;
             }
diff --git a/lib/prototypes.h b/lib/prototypes.h
index afcfef5..e0ace1a 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -80,7 +80,7 @@ void construct_elt_gs(struct All_variables *);
 void construct_elt_cs(struct All_variables *);
 void construct_stiffness_B_matrix(struct All_variables *);
 int layers_r(struct All_variables *, float);
-int layers(struct All_variables *, int, int);
+int layers(struct All_variables *, int);
 void construct_mat_group(struct All_variables *);
 /* Convection.c */
 void set_convection_defaults(struct All_variables *);