[cig-commits] [commit] rajesh-petsc-schur: Eliminated the 5th argument of ggrd_vtop_helper_decide_on_internal_nodes, which was set to the caps_per_proc loop variable (b9e1354)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Wed Nov 5 19:10:00 PST 2014


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

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

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

commit b9e1354e37bfcb3156e017aafcd5599a2ed15a81
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Thu Sep 18 12:55:01 2014 -0700

    Eliminated the 5th argument of ggrd_vtop_helper_decide_on_internal_nodes, which was set to the caps_per_proc loop variable


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

b9e1354e37bfcb3156e017aafcd5599a2ed15a81
 lib/Ggrd_handling.c | 8 ++++----
 lib/prototypes.h    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/Ggrd_handling.c b/lib/Ggrd_handling.c
index 764a406..db98b79 100644
--- a/lib/Ggrd_handling.c
+++ b/lib/Ggrd_handling.c
@@ -71,7 +71,7 @@ void construct_mat_group(struct All_variables *);
 void temperatures_conform_bcs(struct All_variables *);
 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 *);
+					       int ,int ,int, int ,int *, int *,int *);
 void convert_pvec_to_cvec_d(double ,double , double , double *,double *);
 void calc_cbase_at_tp_d(double , double , double *);
 void xyz2rtpd(float ,float ,float ,double *);
@@ -1100,7 +1100,7 @@ void ggrd_read_vtop_from_file(struct All_variables *E, int is_geographic)
 	    /* 
 	       determine vertical nodes and set the assign flag, if needed
 	    */
-	    ggrd_vtop_helper_decide_on_internal_nodes(E,allow_internal,nozl,level,CPPR,verbose,
+	    ggrd_vtop_helper_decide_on_internal_nodes(E,allow_internal,nozl,level,verbose,
 						      &assign,&botnode,&topnode);
 	    /* 
 	       loop through all horizontal nodes and assign boundary
@@ -1213,7 +1213,7 @@ void ggrd_read_vtop_from_file(struct All_variables *E, int is_geographic)
       }
 
 	/* top level only */
-	ggrd_vtop_helper_decide_on_internal_nodes(E,allow_internal,E->lmesh.NOZ[E->mesh.gridmax],E->mesh.gridmax,CPPR,verbose,
+	ggrd_vtop_helper_decide_on_internal_nodes(E,allow_internal,E->lmesh.NOZ[E->mesh.gridmax],E->mesh.gridmax,verbose,
 						  &assign,&botnode,&topnode);
 	if(assign){	
 	  for(i=1;i <= noy;i++)	{/* loop through surface nodes */
@@ -1385,7 +1385,7 @@ void ggrd_read_vtop_from_file(struct All_variables *E, int is_geographic)
 
 void ggrd_vtop_helper_decide_on_internal_nodes(struct All_variables *E,	/* input */
 					       int allow_internal,
-					       int nozl,int level,int m,int verbose,
+					       int nozl,int level,int verbose,
 					       int *assign, /* output */
 					       int *botnode,int *topnode)
 {
diff --git a/lib/prototypes.h b/lib/prototypes.h
index e0ace1a..551ce79 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -183,7 +183,7 @@ void ggrd_temp_init_general(struct All_variables *, int);
 void ggrd_read_mat_from_file(struct All_variables *, int);
 void ggrd_read_ray_from_file(struct All_variables *, int);
 void ggrd_read_vtop_from_file(struct All_variables *, int);
-void ggrd_vtop_helper_decide_on_internal_nodes(struct All_variables *, int, int, int, int, int, int *, int *, int *);
+void ggrd_vtop_helper_decide_on_internal_nodes(struct All_variables *, int, int, int, int, int *, int *, int *);
 void ggrd_read_age_from_file(struct All_variables *, int);
 void ggrd_adjust_tbl_rayleigh(struct All_variables *, double **);
 void ggrd_solve_eigen3x3(double [3][3], double [3], double [3][3], struct All_variables *);



More information about the CIG-COMMITS mailing list