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

[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 2969e6f18550f51ae02100526520f0f26beaee71
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Thu Sep 18 11:00:41 2014 -0700

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


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

2969e6f18550f51ae02100526520f0f26beaee71
 lib/Advection_diffusion.c  |  2 +-
 lib/Viscosity_structures.c | 10 +++++-----
 lib/prototypes.h           |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/Advection_diffusion.c b/lib/Advection_diffusion.c
index cd43fa2..3419142 100644
--- a/lib/Advection_diffusion.c
+++ b/lib/Advection_diffusion.c
@@ -733,7 +733,7 @@ static void process_visc_heating(struct All_variables *E, int m, double *heating
        reversal */
     temp = E->control.disptn_number / E->control.Atemp / vpts;
 
-    strain_rate_2_inv(E, CPPR, strain_sqr, 0);
+    strain_rate_2_inv(E, strain_sqr, 0);
 
     for(e=1; e<=E->lmesh.nel; e++) {
         visc = 0.0;
diff --git a/lib/Viscosity_structures.c b/lib/Viscosity_structures.c
index 8e16d35..e2fc503 100644
--- a/lib/Viscosity_structures.c
+++ b/lib/Viscosity_structures.c
@@ -887,7 +887,7 @@ void visc_from_S(E,EEta,propogate)
       if(E->viscosity.sdepv_visited){
 	
         /* get second invariant for all elements */
-        strain_rate_2_inv(E,CPPR,eedot,1);
+        strain_rate_2_inv(E,eedot,1);
       }else{
 	for(e=1;e<=nel;e++)	/* initialize with unity if no velocities around */
 	  eedot[e] = 1.0;
@@ -971,9 +971,9 @@ void visc_from_P(E,EEta) /* "plasticity" implementation
   
     if(E->viscosity.pdepv_visited){
       if(E->viscosity.psrw)
-	strain_rate_2_inv(E,CPPR,eedot,0);	/* get second invariant for all elements, don't take sqrt */
+	strain_rate_2_inv(E,eedot,0);	/* get second invariant for all elements, don't take sqrt */
       else
-	strain_rate_2_inv(E,CPPR,eedot,1);	/* get second invariant for all elements */
+	strain_rate_2_inv(E,eedot,1);	/* get second invariant for all elements */
     }else{
       for(e=1;e<=nel;e++)	/* initialize with unity if no velocities around */
 	eedot[e] = 1.0;
@@ -1103,10 +1103,10 @@ void visc_from_C( E, EEta)
     } /* end el loop */
 }
 
-void strain_rate_2_inv(E,m,EEDOT,SQRT)
+void strain_rate_2_inv(E,EEDOT,SQRT)
      struct All_variables *E;
      float *EEDOT;
-     int m,SQRT;
+     int SQRT;
 {
     void get_rtf_at_ppts();
     void velo_from_element();
diff --git a/lib/prototypes.h b/lib/prototypes.h
index f6d6eb8..6c0d339 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -527,7 +527,7 @@ void visc_from_T(struct All_variables *, float **, int);
 void visc_from_S(struct All_variables *, float **, int);
 void visc_from_P(struct All_variables *, float **);
 void visc_from_C(struct All_variables *, float **);
-void strain_rate_2_inv(struct All_variables *, int, float *, int);
+void strain_rate_2_inv(struct All_variables *, float *, int);
 double second_invariant_from_3x3(double [3][3]);
 void calc_strain_from_vgm(double [3][3], double [3][3]);
 void calc_strain_from_vgm9(double *, double [3][3]);