Fortran wrappers for CCTK_OutputVar and CCTK_OutputVarAs

git-svn-id: http://svn.cactuscode.org/flesh/trunk@2838 17b73243-c579-4c4c-a9d2-2d5706c11dac

2 files changed, 24 insertions, 38 deletions

diff --git a/src/IO/FortranBindingsIO.c b/src/IO/FortranBindingsIO.c
index a70fa229..32790df6 100644
--- a/src/IO/FortranBindingsIO.c
+++ b/src/IO/FortranBindingsIO.c
@@ -28,8 +28,6 @@ CCTK_FILEVERSION(IO_FortranBindingsIO_c)
 
 void CCTK_FCALL CCTK_FNAME (CCTK_OutputGH)
                            (int *istat, const cGH *GH);
-void CCTK_FCALL CCTK_FNAME (CCTK_OutputVar)
-     (int *istat, const cGH *GH, ONE_FORTSTRING_ARG);
 void CCTK_FCALL CCTK_FNAME (CCTKi_RegisterIOMethod)
                            (int *handle, TWO_FORTSTRING_ARG);
 
@@ -71,42 +69,6 @@ void CCTK_FCALL CCTK_FNAME (CCTK_OutputGH)
 }
 
  /*@@
-   @routine    CCTK_OutputVar
-   @date       
-   @author     
-   @desc
-   Fortran binding for CCTK_OutputVar
-   @enddesc
-   @var        istat
-   @vdesc      error code
-   @vtype      int
-   @vio        out
-   @endva
-   @var        GH
-   @vdesc      grid hierachy
-   @vtype      const GH *
-   @vio        in
-   @endvar
-   @var        name
-   @vdesc      Name of variable to outut
-   @vtype      const char *
-   @vio        in
-   @endvar
-   @returntype int
-   @returndesc
-
-   @endreturndesc
-@@*/
-void CCTK_FCALL CCTK_FNAME (CCTK_OutputVar)
-                           (int *istat, const cGH *GH, ONE_FORTSTRING_ARG)
-{
-  ONE_FORTSTRING_CREATE (var);
-  *istat = CCTK_OutputVar (GH, var);
-  free (var);
-}
-
-
- /*@@
    @routine    CCTKi_RegisterIOMethod
    @date       
    @author     
diff --git a/src/IO/IOMethods.c b/src/IO/IOMethods.c
index 898b7483..05409287 100644
--- a/src/IO/IOMethods.c
+++ b/src/IO/IOMethods.c
@@ -52,6 +52,12 @@ void CCTK_FCALL CCTK_FNAME (CCTK_OutputVarAsByMethod)
                            (int *ierr, const cGH *GH, THREE_FORTSTRING_ARG);
 void CCTK_FCALL CCTK_FNAME (CCTK_OutputVarByMethod)
                            (int *ierr, const cGH *GH, TWO_FORTSTRING_ARG);
+void CCTK_FCALL CCTK_FNAME (CCTK_OutputVar)
+     (int *istat, const cGH *GH, ONE_FORTSTRING_ARG);
+void CCTK_FCALL CCTK_FNAME (CCTK_OutputVarAs)
+     (int *istat, const cGH *GH, TWO_FORTSTRING_ARG);
+
+
 int CCTKi_TriggerSaysGo (const cGH *GH, int variable);
 int CCTKi_TriggerAction (void *GH, int variable);
 
@@ -384,6 +390,15 @@ int CCTK_OutputVarAs (const cGH *GH, const char *var, const char *alias)
   return (retval);
 }
 
+void CCTK_FCALL CCTK_FNAME (CCTK_OutputVarAs)
+                           (int *istat, const cGH *GH, TWO_FORTSTRING_ARG)
+{
+  TWO_FORTSTRING_CREATE (var,as);
+  *istat = CCTK_OutputVarAs (GH, var,as);
+  free (var);
+  free (as);
+}
+
 
  /*@@
    @routine    CCTK_OutputVar
@@ -420,6 +435,15 @@ int CCTK_OutputVar (const cGH *GH, const char *var)
   return (retval);
 }
 
+void CCTK_FCALL CCTK_FNAME (CCTK_OutputVar)
+                           (int *istat, const cGH *GH, ONE_FORTSTRING_ARG)
+{
+  ONE_FORTSTRING_CREATE (var);
+  *istat = CCTK_OutputVar (GH, var);
+  free (var);
+}
+
+
 
  /*@@
    @routine    CCTK_OutputVarByMethod