Small pointer and declaration fixes

git-svn-id: http://svn.cactuscode.org/arrangements/CactusElliptic/EllBase/trunk@11 57bc7290-fb3d-4efd-a9b1-28e84cce6043

2 files changed, 25 insertions, 21 deletions

diff --git a/src/Ell_Interface.c b/src/Ell_Interface.c
index f302920..7d086a6 100644
--- a/src/Ell_Interface.c
+++ b/src/Ell_Interface.c
@@ -5,7 +5,7 @@
 
 #include "cctk.h"
 #include "cctk_parameters.h"
-
+#include "cctk_WarnLevel.h"
 #include "cctk_FortranString.h"     
 #include "StoreNamedData.h" 
 
@@ -34,14 +34,16 @@ void Ell_LinConfMetricRegistry(void (*function), const char *sname) {
    grid hierarchy, integer array of the metric+conf.factor indeces, 
    field index, Mindex, Nindex, real array for absolute tolerances 
    and relative tolerances, the registration name of the solver */
-int Ell_LinConfMetricSolver(cGH *GH, int *MetricPsi, int *FieldIndex, 
-			     int *MIndex, int *NIndex, 
+
+int Ell_LinConfMetricSolver(cGH *GH, int *MetricPsi, int FieldIndex, 
+			     int MIndex, int NIndex, 
+
 			     CCTK_REAL *AbsTol, CCTK_REAL *RelTol, 
 			     const char *sname) {
   /* prototype for the equation class wrapper */
-  void (*fn)(cGH *GH,int *MetricPsi, int *FieldIndex, 
-	     int *MIndex, int *NIndex, 
-	     int *AbsTol, int *RelTol);
+  void (*fn)(cGH *GH,int *MetricPsi, int FieldIndex, 
+	     int MIndex, int NIndex,  
+	     CCTK_REAL *AbsTol, CCTK_REAL *RelTol);
  
   /* derive the fucntion name from the requested name and hope it is there */
   fn = (void(*))GetNamedData(LinConfMetricSolverDB,sname);
@@ -59,10 +61,11 @@ int Ell_LinConfMetricSolver(cGH *GH, int *MetricPsi, int *FieldIndex,
 /* Fortran wrappr for the routine Ell_LinConfMetricSolver */
 void FMODIFIER FORTRAN_NAME(Ell_LinConfMetricSolver)
      (int *ierr, cGH *GH, int *MetricPsi, int *FieldIndex, 
-      int *MIndex, int *NIndex, int *AbsTol, int *RelTol, ONE_FORTSTRING_ARG) {
+      int *MIndex, int *NIndex, CCTK_REAL *AbsTol, CCTK_REAL *RelTol, ONE_FORTSTRING_ARG) {
+
   ONE_FORTSTRING_CREATE(sname); 
-  *ierr = Ell_LinConfMetricSolver(GH, MetricPsi, FieldIndex, MIndex, NIndex, 
-				  AbsTol, RelTol, sname);
+  *ierr = Ell_LinConfMetricSolver(GH, MetricPsi, *FieldIndex, *MIndex, *NIndex, 
+			  AbsTol, RelTol, sname);
   free(sname);
 }
 
@@ -73,11 +76,11 @@ void Ell_LinMetricRegistry(void (*function), const char *sname) {
   StoreNamedData(&LinMetricSolverDB,sname,(void*)function);
 }
 
-int Ell_LinMetricSolver(cGH *GH, int *Metric, int *FieldIndex, 
-	int *MIndex, int *NIndex, int *AbsTol, int *RelTol, const char *sname) {
+int Ell_LinMetricSolver(cGH *GH, int *Metric, int FieldIndex, 
+		int MIndex, int NIndex, CCTK_REAL *AbsTol, CCTK_REAL *RelTol, const char *sname) {
 
-  void (*fn)(cGH *GH,int *Metric, int *FieldIndex, 
-               int *MIndex, int *NIndex, int *AbsTol, int *RelTol);
+  void (*fn)(cGH *GH,int *Metric, int FieldIndex, 
+               int MIndex, int NIndex, CCTK_REAL *AbsTol, CCTK_REAL *RelTol);
   
   fn = (void(*))GetNamedData(LinMetricSolverDB,sname);
   if (!fn) {
@@ -91,9 +94,9 @@ int Ell_LinMetricSolver(cGH *GH, int *Metric, int *FieldIndex,
   
 void FMODIFIER FORTRAN_NAME(Ell_LinMetricSolver)
      (int *ierr, cGH *GH, int *Metric, int *FieldIndex, 
-      int *MIndex, int *NIndex, int *AbsTol, int *RelTol, ONE_FORTSTRING_ARG) {
+      int *MIndex, int *NIndex, CCTK_REAL *AbsTol, CCTK_REAL *RelTol, ONE_FORTSTRING_ARG) {
   ONE_FORTSTRING_CREATE(sname); 
-  *ierr = Ell_LinMetricSolver(GH, Metric, FieldIndex, MIndex, NIndex, AbsTol, RelTol, sname);
+  *ierr = Ell_LinMetricSolver(GH, Metric, *FieldIndex, *MIndex, *NIndex, AbsTol, RelTol, sname);
   free(sname);
 }
   
@@ -104,11 +107,11 @@ void Ell_LinFlatRegistry(void (*function), const char *sname) {
   StoreNamedData(&LinFlatSolverDB,sname,(void*)function);
 }
 
-int Ell_LinFlatSolver(cGH *GH, int *FieldIndex, int *MIndex, int *NIndex, 
-		       int *AbsTol, int *RelTol, const char *sname) {
+int Ell_LinFlatSolver(cGH *GH, int FieldIndex, int MIndex, int NIndex, 
+		       CCTK_REAL *AbsTol, CCTK_REAL *RelTol, const char *sname) {
 
-  void (*fn)(cGH *GH, int *FieldIndex, int *MIndex, int *NIndex, 
-	     int *AbsTol, int *RelTol);
+  void (*fn)(cGH *GH, int FieldIndex, int MIndex, int NIndex, 
+	     CCTK_REAL *AbsTol, CCTK_REAL *RelTol);
   
   fn = (void(*))GetNamedData(LinFlatSolverDB,sname);
   if (!fn) { 
@@ -122,8 +125,8 @@ int Ell_LinFlatSolver(cGH *GH, int *FieldIndex, int *MIndex, int *NIndex,
   
 void FMODIFIER FORTRAN_NAME(Ell_LinFlatSolver)
      (int *ierr, cGH *GH, int *FieldIndex, 
-      int *MIndex, int *NIndex, int *AbsTol, int *RelTol, ONE_FORTSTRING_ARG) {
+      int *MIndex, int *NIndex, CCTK_REAL *AbsTol, CCTK_REAL *RelTol, ONE_FORTSTRING_ARG) {
   ONE_FORTSTRING_CREATE(sname); 
-  *ierr = Ell_LinFlatSolver(GH, FieldIndex, MIndex, NIndex, AbsTol, RelTol, sname);
+  *ierr = Ell_LinFlatSolver(GH, *FieldIndex, *MIndex, *NIndex, AbsTol, RelTol, sname);
   free(sname);
 }
diff --git a/src/Ell_Register.c b/src/Ell_Register.c
index ae1d061..931daf0 100644
--- a/src/Ell_Register.c
+++ b/src/Ell_Register.c
@@ -5,6 +5,7 @@
 
 #include "cctk.h"
 #include "cctk_parameters.h"
+#include "cctk_WarnLevel.h"
 
 #include "StoreNamedData.h"