Fixing warnings

git-svn-id: http://svn.cactuscode.org/arrangements/CactusElliptic/EllSOR/trunk@68 fa3da13c-9f13-4301-a575-cf5b8c5e1907

4 files changed, 38 insertions, 17 deletions

diff --git a/src/Startup.c b/src/Startup.c
index 37c7fa7..80449f3 100644
--- a/src/Startup.c
+++ b/src/Startup.c
@@ -10,19 +10,20 @@
 #include "CactusElliptic/EllBase/src/EllBase.h"
 #include "CactusElliptic/EllBase/src/Ell_DBstructure.h"
 
-  void sor_confmetric(cGH *GH, 
-		      int *MetricPsiI, 
-		      int FieldI, 
-		      int MI,
-                      int NI, 
-		      CCTK_REAL *AbsTol, 
-		      CCTK_REAL *RelTol);
-  void sor_flat(cGH *GH, 
-		int FieldI,
-		int MI, 
-		int NI, 
-		CCTK_REAL *AbsTol, 
-		CCTK_REAL *RelTol);
+void EllSOR_Register(CCTK_ARGUMENTS);
+void sor_confmetric(cGH *GH, 
+	            int *MetricPsiI, 
+	            int FieldI, 
+	            int MI,
+                    int NI, 
+	            CCTK_REAL *AbsTol, 
+	            CCTK_REAL *RelTol);
+void sor_flat(cGH *GH, 
+	      int FieldI,
+	      int MI, 
+	      int NI, 
+	      CCTK_REAL *AbsTol, 
+	      CCTK_REAL *RelTol);
 
 /* routine registers the SOR solver "sor_confmetric" under the name "sor" 
    with the Elliptic Class "LinConfMetric".
diff --git a/src/sor_confmetric.c b/src/sor_confmetric.c
index b258c91..4f5a2e4 100644
--- a/src/sor_confmetric.c
+++ b/src/sor_confmetric.c
@@ -20,9 +20,12 @@
 #include "CactusBase/CartGrid3D/src/Symmetry.h"
 #include "CactusElliptic/EllBase/src/Ell_DBstructure.h"
 
-
 #define SQR(a) ((a)*(a))
 
+void sor_confmetric_3d(cGH *GH, int *MetricPsiI, int conformal,
+		       int FieldIndex, int MIndex, int NIndex,
+		       CCTK_REAL *AbsTol, CCTK_REAL *RelTol);
+
  /*@@
    @routine    sor_confmetric
    @date       Tue Sep 26 11:28:08 2000
@@ -95,7 +98,7 @@ void sor_confmetric_3d(cGH *GH, int *MetricPsiI, int conformal,
   CCTK_REAL ac;
   CCTK_REAL ae,aw,an,as,at,ab;
   CCTK_REAL ane, anw, ase, asw, ate, atw, abe, abw;
-  CCTK_REAL atn, ats, abn, abs;
+  CCTK_REAL atn, ats, abn, absol;
 
   /* Miscellaneous */
   int sum_handle=-1;
@@ -338,7 +341,7 @@ void sor_confmetric_3d(cGH *GH, int *MetricPsiI, int conformal,
 	    atn = uyz[ijpk]+uyz[ijkp];               
 	    ats =-uyz[ijkp]-uyz[ijmk];
 	    abn =-uyz[ijkm]-uyz[ijpk];
-	    abs = uyz[ijkm]+uyz[ijmk];
+	    absol = uyz[ijkm]+uyz[ijmk];
 
 	    residual = ac * var[ijk]
 	      + ae *var[ipjk]  +  aw*var[imjk]
@@ -355,7 +358,7 @@ void sor_confmetric_3d(cGH *GH, int *MetricPsiI, int conformal,
 	      + ate*var[ipjkp] + atw*var[imjkp] 
 	      + abe*var[ipjkm] + abw*var[imjkm]
 	      + atn*var[ijpkp] + ats*var[ijmkp]
-	      + abn*var[ijpkm] + abs*var[ijmkm];
+	      + abn*var[ijpkm] + absol*var[ijmkm];
 	    
 	    if (Nstorage)
 	      residual +=Nlin[ijk];
diff --git a/src/sor_flat.c b/src/sor_flat.c
index 4771a44..67f0463 100644
--- a/src/sor_flat.c
+++ b/src/sor_flat.c
@@ -10,6 +10,8 @@
 #include "CactusBase/CartGrid3D/src/Symmetry.h"
 #include "CactusElliptic/EllBase/src/Ell_DBstructure.h"
  
+void sor_flat_3d(cGH *GH, int FieldIndex, int MIndex, int NIndex,
+		 CCTK_REAL *AbsTol, CCTK_REAL *RelTol);
 
 void sor_flat_3d(cGH *GH, int FieldIndex, int MIndex, int NIndex,
 		 CCTK_REAL *AbsTol, CCTK_REAL *RelTol)
diff --git a/src/sor_wrapper.c b/src/sor_wrapper.c
index 0bd976c..4f2a8b0 100644
--- a/src/sor_wrapper.c
+++ b/src/sor_wrapper.c
@@ -22,9 +22,24 @@
 #include "cctk_Parameters.h"
 #include "cctk_FortranString.h"
 
+void sor_flat_3d(cGH *GH, int FieldIndex, int MIndex, int NIndex,
+		 CCTK_REAL *AbsTol, CCTK_REAL *RelTol);
 void sor_confmetric_3d(cGH *GH, int *MetricPsiI, int conformal,
 		       int FieldIndex, int MIndex, int NIndex,
 		       CCTK_REAL *AbsTol, CCTK_REAL *RelTol);
+void sor_confmetric(cGH *GH, 
+		    int *MetricPsiI, 
+		    int FieldIndex, 
+		    int MIndex, 
+		    int NIndex, 
+		    CCTK_REAL *AbsTol,
+		    CCTK_REAL *RelTol);
+void sor_flat(cGH *GH, 
+	     int FieldIndex, 
+	     int MIndex, 
+	     int NIndex, 
+	     CCTK_REAL *AbsTol, 
+	     CCTK_REAL *RelTol);
 
 /*@@
    @routine    sor_confmetric