[cig-commits] [commit] rajesh-petsc-schur: Corrected the signature of fill_in_gaps (2f74fb1)

[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 2f74fb1af1ad244e5d81587099ca2b2b4bfc28aa
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Fri Sep 19 10:41:56 2014 -0700

    Corrected the signature of fill_in_gaps


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

2f74fb1af1ad244e5d81587099ca2b2b4bfc28aa
 lib/Solver_multigrid.c | 20 ++++++++++----------
 lib/prototypes.h       |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/Solver_multigrid.c b/lib/Solver_multigrid.c
index e97269a..d7e0bca 100644
--- a/lib/Solver_multigrid.c
+++ b/lib/Solver_multigrid.c
@@ -566,7 +566,7 @@ void project_vector(E,start_lev,AU,AD,ic)
  void fill_in_gaps(E,temp,level)
     struct All_variables *E;
     int level;
-    double **temp;
+    double *temp;
   {
 
     int i,j,k,m;
@@ -597,17 +597,17 @@ void project_vector(E,start_lev,AU,AD,ic)
 	      eqn0=E->ID[level][CPPR][node0].doff[1];
 	      eqn1=E->ID[level][CPPR][node1].doff[1];
 	      eqn2=E->ID[level][CPPR][node2].doff[1];
-	      temp[CPPR][eqn0] = n1*temp[CPPR][eqn1]+n2*temp[CPPR][eqn2];
+	      temp[eqn0] = n1*temp[eqn1]+n2*temp[eqn2];
 
 	      eqn0=E->ID[level][CPPR][node0].doff[2];
 	      eqn1=E->ID[level][CPPR][node1].doff[2];
 	      eqn2=E->ID[level][CPPR][node2].doff[2];
-	      temp[CPPR][eqn0] = n1*temp[CPPR][eqn1]+n2*temp[CPPR][eqn2];
+	      temp[eqn0] = n1*temp[eqn1]+n2*temp[eqn2];
 
 	      eqn0=E->ID[level][CPPR][node0].doff[3];
 	      eqn1=E->ID[level][CPPR][node1].doff[3];
 	      eqn2=E->ID[level][CPPR][node2].doff[3];
-	      temp[CPPR][eqn0] = n1*temp[CPPR][eqn1]+n2*temp[CPPR][eqn2];
+	      temp[eqn0] = n1*temp[eqn1]+n2*temp[eqn2];
 	      }
 
     n1 = n2 =0.5;
@@ -621,17 +621,17 @@ void project_vector(E,start_lev,AU,AD,ic)
 	        eqn0=E->ID[level][CPPR][node0].doff[1];
 	        eqn1=E->ID[level][CPPR][node1].doff[1];
 	        eqn2=E->ID[level][CPPR][node2].doff[1];
-	        temp[CPPR][eqn0] = n1*temp[CPPR][eqn1]+n2*temp[CPPR][eqn2];
+	        temp[eqn0] = n1*temp[eqn1]+n2*temp[eqn2];
 
 	        eqn0=E->ID[level][CPPR][node0].doff[2];
 	        eqn1=E->ID[level][CPPR][node1].doff[2];
 	        eqn2=E->ID[level][CPPR][node2].doff[2];
-	        temp[CPPR][eqn0] = n1*temp[CPPR][eqn1]+n2*temp[CPPR][eqn2];
+	        temp[eqn0] = n1*temp[eqn1]+n2*temp[eqn2];
 
 	        eqn0=E->ID[level][CPPR][node0].doff[3];
 	        eqn1=E->ID[level][CPPR][node1].doff[3];
 	        eqn2=E->ID[level][CPPR][node2].doff[3];
-	        temp[CPPR][eqn0] = n1*temp[CPPR][eqn1]+n2*temp[CPPR][eqn2];
+	        temp[eqn0] = n1*temp[eqn1]+n2*temp[eqn2];
 	       }
 
 
@@ -649,17 +649,17 @@ void project_vector(E,start_lev,AU,AD,ic)
 	        eqn0=E->ID[level][CPPR][node0].doff[1];
 	        eqn1=E->ID[level][CPPR][node1].doff[1];
 	        eqn2=E->ID[level][CPPR][node2].doff[1];
-	        temp[CPPR][eqn0] = n1*temp[CPPR][eqn1]+n2*temp[CPPR][eqn2];
+	        temp[eqn0] = n1*temp[eqn1]+n2*temp[eqn2];
 
 	        eqn0=E->ID[level][CPPR][node0].doff[2];
 	        eqn1=E->ID[level][CPPR][node1].doff[2];
 	        eqn2=E->ID[level][CPPR][node2].doff[2];
-	        temp[CPPR][eqn0] = n1*temp[CPPR][eqn1]+n2*temp[CPPR][eqn2];
+	        temp[eqn0] = n1*temp[eqn1]+n2*temp[eqn2];
 
 	        eqn0=E->ID[level][CPPR][node0].doff[3];
 	        eqn1=E->ID[level][CPPR][node1].doff[3];
 	        eqn2=E->ID[level][CPPR][node2].doff[3];
-	        temp[CPPR][eqn0] = n1*temp[CPPR][eqn1]+n2*temp[CPPR][eqn2];
+	        temp[eqn0] = n1*temp[eqn1]+n2*temp[eqn2];
 	        }
        }
 }
diff --git a/lib/prototypes.h b/lib/prototypes.h
index 5962ef3..9fe1aa3 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -475,7 +475,7 @@ void project_scalar(struct All_variables *, int, float **, float **);
 void project_vector(struct All_variables *, int, double *, double *, int);
 void from_xyz_to_rtf(struct All_variables *, int, double *, double *);
 void from_rtf_to_xyz(struct All_variables *, int, double *, double *);
-void fill_in_gaps(struct All_variables *, double **, int);
+void fill_in_gaps(struct All_variables *, double *, int);
 /* Sphere_harmonics.c */
 void set_sphere_harmonics(struct All_variables *);
 double modified_plgndr_a(int, int, double);