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

[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 1e8d47799b52d0f5cf8191957170d2c103b6c97d
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Thu Sep 18 10:20:48 2014 -0700

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


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

1e8d47799b52d0f5cf8191957170d2c103b6c97d
 lib/Construct_arrays.c     |  4 ++--
 lib/Element_calculations.c | 10 ++--------
 lib/Topo_gravity.c         |  4 ++--
 lib/prototypes.h           |  2 +-
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/lib/Construct_arrays.c b/lib/Construct_arrays.c
index 06dd3bb..972dfd5 100644
--- a/lib/Construct_arrays.c
+++ b/lib/Construct_arrays.c
@@ -348,7 +348,7 @@ void construct_node_ks(E)
 	    get_elt_k(E,element,elt_K,level,CPPR,0);
 
 	    if (E->control.augmented_Lagr)
-	         get_aug_k(E,element,elt_K,level,CPPR);
+	         get_aug_k(E,element,elt_K,level);
 
             build_diagonal_of_K(E,element,elt_K,level);
 
@@ -618,7 +618,7 @@ void construct_elt_ks(E)
 	    get_elt_k(E,el,E->elt_k[lev][CPPR][el].k,lev,CPPR,0);
 
 	    if (E->control.augmented_Lagr)
-	        get_aug_k(E,el,E->elt_k[lev][CPPR][el].k,lev,CPPR);
+	        get_aug_k(E,el,E->elt_k[lev][CPPR][el].k,lev);
 
             build_diagonal_of_K(E,el,E->elt_k[lev][CPPR][el].k,lev);
 
diff --git a/lib/Element_calculations.c b/lib/Element_calculations.c
index 2fbb66c..d78e267 100644
--- a/lib/Element_calculations.c
+++ b/lib/Element_calculations.c
@@ -1231,9 +1231,9 @@ static void get_elt_tr_pseudo_surf(struct All_variables *E, int bel, int side, d
  subroutine to get augmented lagrange part of stiffness matrix
 ================================================================== */
 
-void get_aug_k(E,el,elt_k,level,m)
+void get_aug_k(E,el,elt_k,level)
      struct All_variables *E;
-     int el,m;
+     int el;
      double elt_k[24*24];
      int level;
 {
@@ -1290,9 +1290,3 @@ void get_aug_k(E,el,elt_k,level,m)
            }
        }
 }
-
-
-/* version */
-/* $Id$ */
-
-/* End of file  */
diff --git a/lib/Topo_gravity.c b/lib/Topo_gravity.c
index 99b9a71..64af62c 100644
--- a/lib/Topo_gravity.c
+++ b/lib/Topo_gravity.c
@@ -995,8 +995,8 @@ void get_CBF_topo(E,H,HB)       /* call this only for top and bottom processors*
       get_elt_k(E,el,eltk,lev,CPPR,1);
 
       if (E->control.augmented_Lagr) {
-          get_aug_k(E,elb,eltkb,lev,CPPR);
-          get_aug_k(E,el,eltk,lev,CPPR);
+          get_aug_k(E,elb,eltkb,lev);
+          get_aug_k(E,el,eltk,lev);
       }
 
       for(m=0;m<dims*ends;m++) {
diff --git a/lib/prototypes.h b/lib/prototypes.h
index 54ff94a..8356720 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -122,7 +122,7 @@ double assemble_dAhatp_entry(struct All_variables *, int, int);
 void get_elt_c(struct All_variables *, int, higher_precision [24][1], int, 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_aug_k(struct All_variables *, int, double [24*24], int, 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 *);
 void full_temperature_boundary_conditions(struct All_variables *);