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

[cig_noreply at geodynamics.org]

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

On branch  : rajesh-petsc-schur
Link       : https://github.com/geodynamics/citcoms/compare/b8ceede151860da20e44adbb561266c5d0878b18...0aff4ed493594ce0d58153a5e0b72afdba61d6fd

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

commit 785857abed160785e6d32c26a672296cba883ba8
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Thu Sep 18 10:44:07 2014 -0700

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


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

785857abed160785e6d32c26a672296cba883ba8
 lib/Construct_arrays.c     | 4 ++--
 lib/Element_calculations.c | 4 ++--
 lib/Topo_gravity.c         | 4 ++--
 lib/prototypes.h           | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/Construct_arrays.c b/lib/Construct_arrays.c
index 43f63e4..2240815 100644
--- a/lib/Construct_arrays.c
+++ b/lib/Construct_arrays.c
@@ -345,7 +345,7 @@ void construct_node_ks(E)
 
         for(element=1;element<=nel;element++) {
 
-	    get_elt_k(E,element,elt_K,level,CPPR,0);
+	    get_elt_k(E,element,elt_K,level,0);
 
 	    if (E->control.augmented_Lagr)
 	         get_aug_k(E,element,elt_K,level);
@@ -615,7 +615,7 @@ void construct_elt_ks(E)
 
 	for(el=1;el<=E->lmesh.NEL[lev];el++)    {
 
-	    get_elt_k(E,el,E->elt_k[lev][CPPR][el].k,lev,CPPR,0);
+	    get_elt_k(E,el,E->elt_k[lev][CPPR][el].k,lev,0);
 
 	    if (E->control.augmented_Lagr)
 	        get_aug_k(E,el,E->elt_k[lev][CPPR][el].k,lev);
diff --git a/lib/Element_calculations.c b/lib/Element_calculations.c
index ad90d93..66b8ed2 100644
--- a/lib/Element_calculations.c
+++ b/lib/Element_calculations.c
@@ -268,9 +268,9 @@ void get_ba_p(struct Shape_function *N, struct Shape_function_dx *GNx,
   Function to supply the element k matrix for a given element e.
   ==============================================================  */
 
-void get_elt_k(E,el,elt_k,lev,m,iconv)
+void get_elt_k(E,el,elt_k,lev,iconv)
      struct All_variables *E;
-     int el,m;
+     int el;
      double elt_k[24*24];
      int lev, iconv;
 {
diff --git a/lib/Topo_gravity.c b/lib/Topo_gravity.c
index d12d211..dadc048 100644
--- a/lib/Topo_gravity.c
+++ b/lib/Topo_gravity.c
@@ -991,8 +991,8 @@ void get_CBF_topo(E,H,HB)       /* call this only for top and bottom processors*
       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);
+      get_elt_k(E,elb,eltkb,lev,1);
+      get_elt_k(E,el,eltk,lev,1);
 
       if (E->control.augmented_Lagr) {
           get_aug_k(E,elb,eltkb,lev);
diff --git a/lib/prototypes.h b/lib/prototypes.h
index 8f6f3f3..c9e1181 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -108,7 +108,7 @@ void general_stokes_solver_pseudo_surf(struct All_variables *);
 void assemble_forces(struct All_variables *, int);
 void get_ba(struct Shape_function *, struct Shape_function_dx *, struct CC *, struct CCX *, double [4][9], int, double [9][9][4][7]);
 void get_ba_p(struct Shape_function *, struct Shape_function_dx *, struct CC *, struct CCX *, double [4][9], int, double [9][9][4][7]);
-void get_elt_k(struct All_variables *, int, double [24*24], int, int, int);
+void get_elt_k(struct All_variables *, int, double [24*24], int, int);
 void assemble_del2_u(struct All_variables *, double **, double **, int, int);
 void e_assemble_del2_u(struct All_variables *, double **, double **, int, int);
 void n_assemble_del2_u(struct All_variables *, double **, double **, int, int);