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

[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 0aff4ed493594ce0d58153a5e0b72afdba61d6fd
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Thu Sep 18 13:16:33 2014 -0700

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


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

0aff4ed493594ce0d58153a5e0b72afdba61d6fd
 lib/Advection_diffusion.c  | 2 +-
 lib/Element_calculations.c | 4 ++--
 lib/Size_does_matter.c     | 3 +--
 lib/Topo_gravity.c         | 2 +-
 lib/prototypes.h           | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/Advection_diffusion.c b/lib/Advection_diffusion.c
index d71b9ff..d1804ca 100644
--- a/lib/Advection_diffusion.c
+++ b/lib/Advection_diffusion.c
@@ -377,7 +377,7 @@ static void pg_solver(struct All_variables *E,
 
       velo_from_element(E,VV,el,sphere_key);
 
-      get_rtf_at_vpts(E, CPPR, lev, el, rtf);
+      get_rtf_at_vpts(E, lev, el, rtf);
 
       /* XXX: replace diff with refstate.thermal_conductivity */
       pg_shape_fn(E, el, &PG, &(E->gNX[CPPR][el]), VV, rtf, diff);
diff --git a/lib/Element_calculations.c b/lib/Element_calculations.c
index 684114b..9b6f779 100644
--- a/lib/Element_calculations.c
+++ b/lib/Element_calculations.c
@@ -297,7 +297,7 @@ void get_elt_k(E,el,elt_k,lev,iconv)
     int l1,l2;
 #endif
 
-    get_rtf_at_vpts(E, CPPR, lev, el, rtf);
+    get_rtf_at_vpts(E, lev, el, rtf);
 
     if (iconv || (el-1)%E->lmesh.ELZ[lev]==0)
       construct_c3x3matrix_el(E,el,&E->element_Cc,&E->element_Ccx,lev,0);
@@ -899,7 +899,7 @@ void get_elt_g(E,el,elt_del,lev)
 #ifdef CITCOM_ALLOW_ANISOTROPIC_VISC
    if(E->viscosity.allow_anisotropic_viscosity && modify_g){
      /* find avg constitutive matrix from all vpts (change this later) */
-     get_rtf_at_vpts(E, m, lev, el, rtf2);
+     get_rtf_at_vpts(E, lev, el, rtf2);
      for(i=0;i<6;i++)
        for(j=0;j<6;j++)
 	 Duse[i][j]=0.0;
diff --git a/lib/Size_does_matter.c b/lib/Size_does_matter.c
index bfc3e73..b527a8d 100644
--- a/lib/Size_does_matter.c
+++ b/lib/Size_does_matter.c
@@ -187,8 +187,7 @@ void construct_shape_function_derivatives(struct All_variables *E)
 gets r,theta,phi coordinates at the integration points
 
  */
-void get_rtf_at_vpts(struct All_variables *E, int m, int lev, int el,
-                  double rtf[4][9])
+void get_rtf_at_vpts(struct All_variables *E, int lev, int el, double rtf[4][9])
 {
     int i, k, d;
     double x[4];
diff --git a/lib/Topo_gravity.c b/lib/Topo_gravity.c
index 2d88d38..01dd0bd 100644
--- a/lib/Topo_gravity.c
+++ b/lib/Topo_gravity.c
@@ -206,7 +206,7 @@ void compute_nodal_stress(struct All_variables *E,
       div = 0.0;
       vor = 0.0;
 
-      get_rtf_at_vpts(E, CPPR, lev, e, rtf);// gets r,theta,phi coordinates at the integration points
+      get_rtf_at_vpts(E, lev, e, rtf);// gets r,theta,phi coordinates at the integration points
       velo_from_element(E,VV,e,sphere_key); /* assign node-global
 						 velocities to nodes
 						 local to the
diff --git a/lib/prototypes.h b/lib/prototypes.h
index f95162c..e3f5eaf 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -445,7 +445,7 @@ double lpolydash(int, double);
 /* Size_does_matter.c */
 void twiddle_thumbs(struct All_variables *);
 void construct_shape_function_derivatives(struct All_variables *);
-void get_rtf_at_vpts(struct All_variables *, int, int, int, double [4][9]);
+void get_rtf_at_vpts(struct All_variables *, int, int, double [4][9]);
 void get_rtf_at_ppts(struct All_variables *, int, int, double [4][9]);
 void get_side_x_cart(struct All_variables *, double [4][5], int, int);
 void construct_surf_det(struct All_variables *);