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

[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 0003b3609a8b10562274e557075016bf937f9341
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Thu Sep 18 10:37:03 2014 -0700

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


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

0003b3609a8b10562274e557075016bf937f9341
 lib/Element_calculations.c | 8 ++++----
 lib/Topo_gravity.c         | 4 ++--
 lib/prototypes.h           | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/Element_calculations.c b/lib/Element_calculations.c
index 94bf264..ad90d93 100644
--- a/lib/Element_calculations.c
+++ b/lib/Element_calculations.c
@@ -98,7 +98,7 @@ void assemble_forces(E,penalty)
       E->F[CPPR][a] = 0.0;
 
     for (e=1;e<=nel;e++)  {
-      get_elt_f(E,e,elt_f,1,CPPR);
+      get_elt_f(E,e,elt_f,1);
       add_force(E, e, elt_f);
     }
 
@@ -963,9 +963,9 @@ void get_elt_g(E,el,elt_del,lev,m)
   Function to create the element force vector (allowing for velocity b.c.'s)
   ================================================================= */
 
-void get_elt_f(E,el,elt_f,bcs,m)
+void get_elt_f(E,el,elt_f,bcs)
      struct All_variables *E;
-     int el,m;
+     int el;
      double elt_f[24];
      int bcs;
 
@@ -1020,7 +1020,7 @@ void get_elt_f(E,el,elt_f,bcs,m)
             nodeb=E->ien[CPPR][el].node[b];
             if ((E->node[CPPR][nodeb]&type)&&(E->sphere.cap[CPPR].VB[j][nodeb]!=0.0)){
               if(!got_elt_k) {
-                get_elt_k(E,el,elt_k,E->mesh.levmax,m,1);
+                get_elt_k(E,el,elt_k,E->mesh.levmax,1);
                 got_elt_k = 1;
                 }
               q = dims*(b-1)+j-1;
diff --git a/lib/Topo_gravity.c b/lib/Topo_gravity.c
index 64af62c..d12d211 100644
--- a/lib/Topo_gravity.c
+++ b/lib/Topo_gravity.c
@@ -988,8 +988,8 @@ void get_CBF_topo(E,H,HB)       /* call this only for top and bottom processors*
       /* The statement order is important:
          elb must be executed before el when calling get_elt_f().
          Otherwise, construct_c3x3matrix_el() would be skipped incorrectly. */
-      get_elt_f(E,elb,eltfb,1,CPPR);
-      get_elt_f(E,el,eltf,1,CPPR);
+      get_elt_f(E,elb,eltfb,1);
+      get_elt_f(E,el,eltf,1);
 
       get_elt_k(E,elb,eltkb,lev,CPPR,1);
       get_elt_k(E,el,eltk,lev,CPPR,1);
diff --git a/lib/prototypes.h b/lib/prototypes.h
index c5d8ea7..8f6f3f3 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -121,7 +121,7 @@ void assemble_grad_p(struct All_variables *, double **, double **, int);
 double assemble_dAhatp_entry(struct All_variables *, int, int);
 void get_elt_c(struct All_variables *, int, higher_precision [24][1], int);
 void get_elt_g(struct All_variables *, int, higher_precision [24][1], int, int);
-void get_elt_f(struct All_variables *, int, double [24], int, int);
+void get_elt_f(struct All_variables *, int, double [24], int);
 void get_aug_k(struct All_variables *, int, double [24*24], int);
 /* Full_boundary_conditions.c */
 void full_velocity_boundary_conditions(struct All_variables *);