Tidying things up, removing deprecated routines.

New macros for fortran names


git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/CartGrid3D/trunk@109 c78560ca-4b45-4335-b268-5f3340f3cb52

6 files changed, 232 insertions, 303 deletions

diff --git a/src/ParamCheck.c b/src/ParamCheck.c
index c054431..9bb68e1 100644
--- a/src/ParamCheck.c
+++ b/src/ParamCheck.c
@@ -82,7 +82,8 @@ void ParamCheck_CartGrid3D(CCTK_ARGUMENTS)
   { 
     iflag++;
 
-    if (!CCTK_Equals(domain,"full")) CCTK_PARAMWARN("No symmetries can be used with box grid");
+    if (!CCTK_Equals(domain,"full")) 
+      CCTK_PARAMWARN("No symmetries can be used with box grid");
   }
 
   /* No grid was set up */
@@ -94,8 +95,5 @@ void ParamCheck_CartGrid3D(CCTK_ARGUMENTS)
 
   return;
 
-  
-  
-
 }
 
diff --git a/src/SetSymmetry.c b/src/SetSymmetry.c
index b87282d..f610221 100644
--- a/src/SetSymmetry.c
+++ b/src/SetSymmetry.c
@@ -1,3 +1,4 @@
+
 /*@@
    @file      Symmetry.c
    @date      Mon Mar 15 15:09:00 1999
@@ -8,14 +9,12 @@
    @enddesc 
  @@*/
 
-#include <assert.h>
 #include <stdlib.h>
-#include <stdio.h>
 
 #include "cctk.h"
 #include "cctk_Parameters.h"
-#include "Symmetry.h" 
 #include "cctk_FortranString.h"
+#include "Symmetry.h" 
 
 
  /*@@
@@ -37,13 +36,13 @@
 
 @@*/
 
-int SetCartSymVI(cGH *GH, int *sym, int vi) {
+int SetCartSymVI(cGH *GH, int *sym, int vi) 
+{
   
   DECLARE_CCTK_PARAMETERS
 
   SymmetryGHex *sGHex; 
   
-
   /* Pointer to the SymmetryGHextension */
   sGHex  = (SymmetryGHex *)GH->extensions[CCTK_GHExtensionHandle("Symmetry")];
 
@@ -103,7 +102,7 @@ int SetCartSymVI(cGH *GH, int *sym, int vi) {
   return(0);
 }
 
-void FMODIFIER FORTRAN_NAME(SetCartSymVI)
+void CCTK_FCALL CCTK_FNAME(SetCartSymVI)
      (int *ierr, cGH *GH, int *sym, int *vi)
 {
   *ierr = SetCartSymVI(GH, sym, *vi);
@@ -111,61 +110,63 @@ void FMODIFIER FORTRAN_NAME(SetCartSymVI)
 
 int SetCartSymVN(cGH *GH, int *sym, const char *vn) {
   int vi;
-  char mess[128];
   vi = CCTK_VarIndex(vn);
   
   if (vi>-1)
+  {
     return(SetCartSymVI(GH, sym, vi));
+  }
   else
   {
-    sprintf(mess,"Cannot find variable %s in SetCartSymVN",vn);
-    CCTK_WARN(1,mess);
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,
+	       "Cannot find variable %s in SetCartSymVN",vn);
     return(-1);
   }
 }
 
-void FMODIFIER FORTRAN_NAME(SetCartSymVN)
+void CCTK_FCALL CCTK_FNAME(SetCartSymVN)
      (int *ierr, cGH *GH, int *sym, ONE_FORTSTRING_ARG)
 {
   ONE_FORTSTRING_CREATE(vn)
-  int vi;
-  char mess[128];
- 
-  vi   = CCTK_GroupIndex(vn);
-  
-  if (vi>-1)
-    *ierr = SetCartSymVI(GH, sym, vi);
-  else 
-  {
-    sprintf(mess,"Cannot find variable %s in SetCartSymVN",vn);
-    CCTK_WARN(1,mess);
-    *ierr = -1;   
-  }
+  *ierr = SetCartSymVN(GH, sym, vn);
   free(vn);
 }
 
 
 
-int SetCartSymGI(cGH *GH, int *sym, int gi) {
+ /*@@
+   @routine    
+   @date       
+   @author     
+   @desc 
+
+   @enddesc 
+   @calls     
+   @calledby   
+   @history 
+ 
+   @endhistory 
+
+@@*/
+
+int SetCartSymGI(cGH *GH, int *sym, int gi) 
+{
   
   DECLARE_CCTK_PARAMETERS
 
   SymmetryGHex *sGHex; 
-  int first_vi,numvars,vi;
+  int first_vari,numvars,vi;
     
-
-  /* Pointer to the SymmetryGHextension */
   sGHex  = (SymmetryGHex *)GH->extensions[CCTK_GHExtensionHandle("Symmetry")];
 
-  /* first index/number of variables in group */
-  first_vi = CCTK_FirstVarIndexI(gi);
-  numvars  = CCTK_NumVarsInGroupI(gi);
-  if (first_vi<0)
+  first_vari = CCTK_FirstVarIndexI(gi);
+  numvars    = CCTK_NumVarsInGroupI(gi);
+
+  if (first_vari<0)
   {
-    char mess[256];
-    sprintf(mess,"Cannot find group %s (grp.index: %d) in SetCartSymGI",
-	    CCTK_GroupName(gi),first_vi);
-    CCTK_WARN(1,mess);
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,
+	       "Cannot find group %s (grp.index: %d) in SetCartSymGI",
+	       CCTK_GroupName(gi),first_vari);
     return(-1);
   }
 
@@ -175,11 +176,12 @@ int SetCartSymGI(cGH *GH, int *sym, int gi) {
      If there is no symmetry necessary,set ESYM_NOSYM
      When we apply a symmetry and find ESYM_UNSET, something went wrong! 
    */
-  for (vi=first_vi; vi<first_vi+numvars; vi++) 
+  for (vi=first_vari; vi<first_vari+numvars; vi++) 
   {
 
 #ifdef SYM_DEBUG
-    printf("SetSymmetry: %s   [%d,%d,%d]\n",CCTK_VarName(vi), sym[0],sym[1],sym[2]);
+    printf("SetSymmetry: %s   [%d,%d,%d]\n",CCTK_VarName(vi), 
+	   sym[0],sym[1],sym[2]);
 #endif
 
     if (CCTK_Equals(domain,"full")) 
@@ -222,168 +224,54 @@ int SetCartSymGI(cGH *GH, int *sym, int gi) {
 	   sGHex->GFSym[vi][4]);
 #endif
   }
-    return(0);
+  return(0);
 }
 
-void FMODIFIER FORTRAN_NAME(SetCartSymGI)
+void CCTK_FCALL CCTK_FNAME(SetCartSymGI)
      (int *ierr, cGH *GH, int *sym, int *gi)
 {
   *ierr = SetCartSymGI(GH, sym, *gi);
 }
 
-int SetCartSymGN(cGH *GH, int *sym, const char *gn) {
-  int gi;
-  char mess[128];
-  gi = CCTK_GroupIndex(gn);
+
+
+ /*@@
+   @routine    
+   @date       
+   @author     
+   @desc 
+
+   @enddesc 
+   @calls     
+   @calledby   
+   @history 
+ 
+   @endhistory 
+
+@@*/
+
+int SetCartSymGN(cGH *GH, int *sym, const char *gn) 
+{
+  int gi = CCTK_GroupIndex(gn);
   
   if (gi>-1)
+  {
     return(SetCartSymGI(GH, sym, gi));
+  }
   else
   {
-    sprintf(mess,"Cannot find group %s in SetCartSymGN",gn);
-    CCTK_WARN(1,mess);
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,
+	       "Cannot find group %s in SetCartSymGN",gn);
     return(-1);
   }
 }
 
-void FMODIFIER FORTRAN_NAME(SetCartSymGN)
+void CCTK_FCALL CCTK_FNAME(SetCartSymGN)
      (int *ierr, cGH *GH, int *sym, ONE_FORTSTRING_ARG)
 {
   ONE_FORTSTRING_CREATE(gn)
-  int gi;
-  char mess[128];
- 
-  gi   = CCTK_GroupIndex(gn);
-  
-  if (gi>-1)
-    *ierr = SetCartSymGI(GH, sym, gi);
-  else 
-  {
-    sprintf(mess,"Cannot find variable %s in SetCartSymGN",gn);
-    CCTK_WARN(1,mess);
-    *ierr = -1;   
-  }
+  *ierr = SetCartSymGN(GH, sym, gn);
   free(gn);
 }
 
 
-
-
-
-
-
-
-
-
-
-
-/* Function going to be deprecated */
-void SetCartSymmetry(cGH *GH, int *sym, const char *imp_gf) 
-{
-  SetCartSymVN(GH, sym, imp_gf);
-}   
-
-
-/* Function going to be deprecated */
-void FMODIFIER FORTRAN_NAME(SetCartSymmetry)(cGH *GH,  int *sym, ONE_FORTSTRING_ARG) {
-
-  ONE_FORTSTRING_CREATE(imp_gf) 
-  SetCartSymVN(GH, sym, imp_gf);
-  free(imp_gf);
-} 
-
-
-/* Function going to be deprecated */
-int CartSymBCGroupI(cGH *GH, int groupnum) 
-{
-  return(CartSymGI(GH, groupnum));
-}
-
-
-/* Function going to be deprecated */
-int CartSymBCVarI(cGH *GH, int varnum) 
-{
-  return(CartSymGI(GH, varnum));
-}
-
-
-/* Function is going to be deprecated */
-int CartSymBCVar(cGH *GH, char *name) 
-{
-
-  int index;
-  index = CCTK_VarIndex(name);
-  CartSymBCVarI(GH,index);
-  return 0;
-
-}
-
-/* Function is going to be deprecated */
-int CartSymBCGroup(cGH *GH, char *name) 
-{
-
-  int index;
-  int retval;
-  index = CCTK_GroupIndex(name);
-  /*retval = CartSymBCGroupI(GH,index);*/
-  retval = CartSymGI(GH,index);
-  return retval;
-
-}
-
-/* Function is going to be deprecated */
-void FMODIFIER FORTRAN_NAME(CartSymBCVar)
-     (int *ierr, cGH *GH, ONE_FORTSTRING_ARG) 
-{ 
-
-  ONE_FORTSTRING_CREATE(name)  
-  /* *ierr = CartSymBCVar(GH,name);*/
-  *ierr = CartSymVN(GH,name);
-  free(name);
-}
-
-/* Function is going to be deprecated */
-void FMODIFIER FORTRAN_NAME(CartSymBCGroup)
-     (int *ierr, cGH *GH, ONE_FORTSTRING_ARG) 
-{ 
-  ONE_FORTSTRING_CREATE(name)  
-  /*  *ierr = CartSymBCGroup(GH,name); */
-  *ierr = CartSymGN(GH,name);  
-  free(name);
-}
-
-/* Function is going to be deprecated */
-void FMODIFIER FORTRAN_NAME(ApplySymmetry)(cGH *GH, ONE_FORTSTRING_ARG) 
-{ 
-
-  ONE_FORTSTRING_CREATE(name)  
-  /*$CartSymBCGroup(GH,name);$*/
-  CartSymGN(GH,name);
-  free(name);
-}
-
-/* Function is going to be deprecated */
-void FMODIFIER FORTRAN_NAME(CartSymBCVarI)
-     (int *ierr, cGH *GH, int *index) 
-{ 
-  /* *ierr = CartSymBCVarI(GH,*index);*/
-  *ierr = CartSymVI(GH,*index);
-}
-
-/* Function is going to be deprecated */
-void FMODIFIER FORTRAN_NAME(CartSymBCGroupI)
-     (int *ierr, cGH *GH, int *index) 
-{ 
-  /*$ *ierr = CartSymBCGroupI(GH,*index);$*/
-  *ierr = CartSymGI(GH,*index);
-}
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Startup.c b/src/Startup.c
index 70d1638..cbf1194 100644
--- a/src/Startup.c
+++ b/src/Startup.c
@@ -35,12 +35,14 @@ int   Symmetry_InitGHex(cGH *GH);
 int Symmetry_handle;
 
 
-int SymmetryStartup(void) {
+int SymmetryStartup(void) 
+{
   Symmetry_handle = CCTK_RegisterGHExtension("Symmetry");
   
   /* Register the allocation and init routine */
   CCTK_RegisterGHExtensionSetupGH(Symmetry_handle,Symmetry_AllocGHex);
   CCTK_RegisterGHExtensionInitGH(Symmetry_handle,Symmetry_InitGHex);
+
   return 0;
 }
 
@@ -64,29 +66,34 @@ int RegisterCartGrid3DCoords(void)
 {
 
   int handle;
+  int nerrors=0;
 
   handle=CCTK_CoordRegister(1,"grid::x","x");
   if (handle<0)
   {
     CCTK_WARN(1,"Problem with registering coordinate x");
+    nerrors--;
   }
   handle=CCTK_CoordRegister(2,"grid::y","y");
   if (handle<0)
   {
     CCTK_WARN(1,"Problem with registering coordinate y");
+    nerrors--;
   }
   handle=CCTK_CoordRegister(3,"grid::z","z");
   if (handle<0)
   {
     CCTK_WARN(1,"Problem with registering coordinate z");
+    nerrors--;
   }
   handle=CCTK_CoordRegister(0,"grid::r","r");
   if (handle<0)
   {
     CCTK_WARN(1,"Problem with registering coordinate r");
+    nerrors--;
   }
 
-  return 0;
+  return nerrors;
 }
 
 
diff --git a/src/Symmetry.h b/src/Symmetry.h
index 907c826..502ae1a 100644
--- a/src/Symmetry.h
+++ b/src/Symmetry.h
@@ -40,7 +40,6 @@ extern "C"
 {
 #endif
 
-
 int SetCartSymVI(cGH *GH, int *sym, int vi);
 int SetCartSymGI(cGH *GH, int *sym, int vi);
 int SetCartSymVN(cGH *GH, int *sym, const char *vn); 
@@ -51,14 +50,6 @@ int CartSymGI(cGH *GH, int gi);
 int CartSymVN(cGH *GH, const char *vn);
 int CartSymGN(cGH *GH, const char *gn);
 
-/* Functions below are going to be deprecated */
-void SetCartSymmetry(cGH *GH, int *sym, const char *imp_gf);
-
-int CartSymBCGroupI(cGH *GH, int groupnum);
-int CartSymBCVarI(cGH *GH, int varnum);
-int CartSymBCVar(cGH *GH, char *name);
-int CartSymBCGroup(cGH *GH, char *name); 
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/SymmetryCondition.c b/src/SymmetryCondition.c
index faa86bf..e0a3cb4 100644
--- a/src/SymmetryCondition.c
+++ b/src/SymmetryCondition.c
@@ -97,7 +97,7 @@ void SymmetryCondition(int nxyz[],CCTK_REAL var[], int nghostzones,int sym[], in
   return;
 }
 
-void FORTRAN_NAME(SymmetryCondition)(int nxyz[],CCTK_REAL var[], int *nghostzones,int sym[], int doSym[])
+void CCTK_FNAME(SymmetryCondition)(int nxyz[],CCTK_REAL var[], int *nghostzones,int sym[], int doSym[])
 {
   SymmetryCondition(nxyz, var, *nghostzones, sym, doSym);
 }
diff --git a/src/SymmetryWrappers.c b/src/SymmetryWrappers.c
index 8641938..eed3455 100644
--- a/src/SymmetryWrappers.c
+++ b/src/SymmetryWrappers.c
@@ -1,9 +1,13 @@
-#include <stdio.h>
-#include <assert.h>
+ /*@@
+   @file      SymmetryWrappers.c
+   @date      April 2000
+   @author    Gerd Lanfermann
+   @desc 
+   Apply symmetry boundary conditions
+   @enddesc 
+ @@*/
+
 #include <stdlib.h>
-#include <ctype.h>
-#include <stdarg.h>
-#include <string.h>
 
 #include "cctk.h"
 #include "cctk_Parameters.h"
@@ -11,41 +15,61 @@
 #include "Symmetry.h"
 
 int CartApplySym3Di(cGH *GH, 
-		   int gdim, 
-		   int *doSym, 
-		   int *cntstag,
-		   int *lssh, 
-		   int *ghostz, 
-		   int *sym,
-		   CCTK_REAL *var);
+		    int gdim, 
+		    int *doSym, 
+		    int *cntstag,
+		    int *lssh, 
+		    int *ghostz, 
+		    int *sym,
+		    CCTK_REAL *var);
 
 int CartApplySym2Di(cGH *GH, 
-		   int gdim, 
-		   int *doSym, 
-		   int *cntstag,
-		   int *lssh, 
-		   int *ghostz, 
-		   int *sym,
-		   CCTK_REAL *var);
+		    int gdim, 
+		    int *doSym, 
+		    int *cntstag,
+		    int *lssh, 
+		    int *ghostz, 
+		    int *sym,
+		    CCTK_REAL *var);
 
 int CartApplySym1Di(cGH *GH, 
-		   int gdim, 
-		   int *doSym, 
-		   int *cntstag,
-		   int *lssh, 
-		   int *ghostz, 
-		   int *sym,
-		   CCTK_REAL *var);
+		    int gdim, 
+		    int *doSym, 
+		    int *cntstag,
+		    int *lssh, 
+		    int *ghostz, 
+		    int *sym,
+		    CCTK_REAL *var);
+
 
+static char *rcsid = "$Header$";
+
+CCTK_FILEVERSION(CactusBase_CartGrid3D_SymmetryWrappers_c)
 
 /*$#define SYM_DEBUG$*/
 
+
+ /*@@
+   @routine    
+   @date       
+   @author     
+   @desc 
+
+   @enddesc 
+   @calls     
+   @calledby   
+   @history 
+ 
+   @endhistory 
+
+@@*/
+
 int CartSymGI(cGH *GH, int gi) 
 { 
   DECLARE_CCTK_PARAMETERS
 
   int numvars, vi, first_vi;
-  int idim, gdim;
+  int idim, gdim; 
   int berr=-1,ierr=-1;
   int time;
   int *doSym, *dstag, *lssh, *cntstag;
@@ -56,17 +80,16 @@ int CartSymGI(cGH *GH, int gi)
   /*$if (CCTK_Equals(domain,"full")) return 0;$*/
 
   first_vi = CCTK_FirstVarIndexI(gi);
-  numvars  = CCTK_NumVarsInGroupI(gi);
-  gdim     = CCTK_GroupDimI(gi);
   if (first_vi<0)
   {
-    char mess[256];
-    sprintf(mess,"Cannot find group %s (grp.index: %d) in CartSymGN",
-	    CCTK_GroupName(gi),first_vi);
-    CCTK_WARN(1,mess);
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,
+	       "Cannot find group %d (%s) in CartSymGI",gi,CCTK_GroupName(gi));
     return(-1);
   }
 
+  numvars  = CCTK_NumVarsInGroupI(gi);
+  gdim     = CCTK_GroupDimI(gi);
+
   sGHex  = (SymmetryGHex*)GH->extensions[CCTK_GHExtensionHandle("Symmetry")];
   doSym  = (int *)malloc((2*gdim)*sizeof(int)); 
   dstag  = (int *)malloc(gdim*sizeof(int));
@@ -105,25 +128,22 @@ int CartSymGI(cGH *GH, int gi)
 
   for (vi=first_vi; vi<first_vi+numvars; vi++) 
   {
-    /* Apply Symmetries to lower sides [0,2,4] if:
-       + if the Symmetrie is activated (== NOT NOSYM)
-       + if the Symmetrie is set (== NOT UNSET)
-       + if the lenght in the direction is more than 1 grid point
+    /* Apply Symmetries to lower sides [0,2,4,...] if:
+       + if the Symmetry is activated (== NOT NOSYM)
+       + if the Symmetry is set (== NOT UNSET)
+       + if the length in the direction is more than 1 grid point
        + if the processor has a lower physical boundary.
        Whether a grid allows a symmetry along a direction (e.g. octant=all)
-       is part if the Symmetrie Setup process.
+       is part if the Symmetry Setup process.
 
-       No Symmetries for "upper" sides : [1,3,5]
+       No Symmetries for "upper" sides : [1,3,5,...]
     */
     for (idim=0; idim<gdim; idim++) 
     {
-      if ((sGHex->GFSym[vi][idim*2]  ==GFSYM_UNSET))
-	 
+      if ((sGHex->GFSym[vi][idim*2] == GFSYM_UNSET))
       {
-	char mess[128];
-	sprintf(mess,
-		"You apply a symmetry to a grid functions but have not specified the symmetries.\nVariable name: %s", CCTK_FullName(vi));
-	CCTK_WARN(0,mess);
+	CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
+		  "Symmetries unspecified for %s",CCTK_FullName(vi));
       }
 
       lssh[idim]      = GH->cctk_lssh[CCTK_LSSH_IDX(dstag[idim],idim)];
@@ -179,54 +199,76 @@ int CartSymGI(cGH *GH, int gi)
   
   free(dstag);
   free(doSym);
+  free(lssh);
   free(cntstag);
 
   return(ierr);
 }
 
-void FMODIFIER FORTRAN_NAME(CartSymGI)
-     (int *ierr, cGH *GH, int *gi)
+void CCTK_FCALL CCTK_FNAME(CartSymGI)(int *ierr, cGH *GH, int *gi)
 {
-  *ierr = CartSymGI(GH, *gi);
+  *ierr = CartSymGI(GH,*gi);
+  return;
 }
 
+
+
+ /*@@
+   @routine    
+   @date       
+   @author     
+   @desc 
+
+   @enddesc 
+   @calls     
+   @calledby   
+   @history 
+ 
+   @endhistory 
+
+@@*/
+
 int CartSymGN(cGH *GH, const char *gn)
 {
-  int gi;
-  char mess[128];
-  gi = CCTK_GroupIndex(gn);
-  
+  int gi=CCTK_GroupIndex(gn);
+  int retval=-1;
   if (gi>-1)
-    return(CartSymGI(GH,gi));
+  {
+    retval = CartSymGI(GH,gi);
+  }
   else
   {
-    sprintf(mess,"Cannot find implementation::group >%s< in CartSymGN",gn);
-    CCTK_WARN(1,mess);
-    return(-1);
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,
+	       "Cannot find group %s in CartSymGN",gn);
   }
+  return retval;
 }
 
-void FMODIFIER FORTRAN_NAME(CartSymGN)
+void CCTK_FCALL CCTK_FNAME(CartSymGN)
      (int *ierr, cGH *GH, ONE_FORTSTRING_ARG)
 {
   ONE_FORTSTRING_CREATE(gn)
-  int gi;
-  char mess[128];
- 
-  gi   = CCTK_GroupIndex(gn);
-  
-  if (gi>-1)
-    *ierr = CartSymGI(GH, gi);
-  else 
-  {
-    sprintf(mess,"Cannot find group implementation::group >%s< in CartSymGN",gn);
-    CCTK_WARN(1,mess);
-    *ierr = -1;   
-  }
-  free(gn);
+  *ierr = CartSymGN(GH,gn);
+  free(gn);  
+  return;
 }
 
 
+ /*@@
+   @routine    
+   @date       
+   @author     
+   @desc 
+
+   @enddesc 
+   @calls     
+   @calledby   
+   @history 
+ 
+   @endhistory 
+
+@@*/
+
 int CartSymVI(cGH *GH, int vi) 
 {
   DECLARE_CCTK_PARAMETERS
@@ -247,9 +289,9 @@ int CartSymVI(cGH *GH, int vi)
   gi     = CCTK_GroupIndexFromVarI(vi);
   if (gi<0)
   {
-    char mess[256];
-    sprintf(mess,"Cannot find implementation::variable >%s< (var.index: %d) in CartSymGN",CCTK_FullName(vi),vi);
-    CCTK_WARN(1,mess);
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,
+	       "Cannot find variable index %d (%s) in CartSymVI",
+	       vi,CCTK_FullName(vi));
     return(-1);
   }
 
@@ -291,12 +333,12 @@ int CartSymVI(cGH *GH, int vi)
 
 
   /* Apply Symmetries to lower sides [0,2,4] if:
-     + if the Symmetrie is activated (== NOT NOSYM)
-     + if the Symmetrie is set (== NOT UNSET)
-     + if the lenght in the direction is more than 1 grid point
+     + if the Symmetry is activated (== NOT NOSYM)
+     + if the Symmetry is set (== NOT UNSET)
+     + if the length in the direction is more than 1 grid point
      + if the processor has a lower physical boundary.
      Whether a grid allows a symmetry along a direction (e.g. octant=all)
-     is part if the Symmetrie Setup process.
+     is part if the Symmetry Setup process.
 
      No Symmetries for "upper" sides : [1,3,5]
   */
@@ -304,10 +346,8 @@ int CartSymVI(cGH *GH, int vi)
   { 
     if (sGHex->GFSym[vi][idim*2]==GFSYM_UNSET) 
       {
-	char mess[128];
-	sprintf(mess,
-		"You apply a symmetry to a grid functions but have not specified the symmetries.\nVariable name: %s", CCTK_FullName(vi));
-	CCTK_WARN(0,mess);
+	CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
+		   "Symmetries unspecified for %s", CCTK_FullName(vi));
       }
 
     lssh[idim]      = GH->cctk_lssh[CCTK_LSSH_IDX(dstag[idim],idim)];
@@ -360,6 +400,7 @@ int CartSymVI(cGH *GH, int vi)
   default: berr = -1; CCTK_WARN(1, "No Symmetries for GF dim>3");
   }
 
+  free(lssh);
   free(dstag);
   free(doSym);
   free(cntstag);
@@ -367,48 +408,52 @@ int CartSymVI(cGH *GH, int vi)
   return(berr);
 }
 
-void FMODIFIER FORTRAN_NAME(CartSymVI)
-     (int *ierr, cGH *GH, int *vi)
+void CCTK_FCALL CCTK_FNAME(CartSymVI)(int *ierr, cGH *GH, int *vi)
 {
   *ierr = CartSymVI(GH, *vi);
+  return;
 }
 
+
+
+ /*@@
+   @routine    
+   @date       
+   @author     
+   @desc 
+
+   @enddesc 
+   @calls     
+   @calledby   
+   @history 
+ 
+   @endhistory 
+
+@@*/
+
 int CartSymVN(cGH *GH, const char *vn)
 {
-  int vi;
-  char mess[128];
+  int retval=-1;
+  int vi=CCTK_VarIndex(vn);
 
-  vi   = CCTK_VarIndex(vn);
-  
   if (vi>-1)
-    return(CartSymVI(GH, vi));
+  {
+    retval = CartSymVI(GH, vi);
+  }
   else
   {
-    sprintf(mess,"Cannot find implementation::variable >%s< in BndFlatVN",vn);
-    CCTK_WARN(1,mess);
-    return(-1);
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,
+	       "Cannot find variable %s in CartSymVN",vn);
   } 
+  return retval;
 }
 
-void FMODIFIER FORTRAN_NAME(CartSymVN)
+void CCTK_FCALL CCTK_FNAME(CartSymVN)
      (int *ierr, cGH *GH, ONE_FORTSTRING_ARG)
 {
   ONE_FORTSTRING_CREATE(vn)
-  int  vi;
-  char mess[128];
-
-  vi   = CCTK_VarIndex(vn);
-
-  if (vi>-1)
-  {
-    *ierr = CartSymVI(GH, vi);
-  }
-  else
-  {
-    sprintf(mess,"Cannot find implementation::variable >%s< in FlatBndVN",vn);
-    CCTK_WARN(1,mess);
-    *ierr=-1;
-  }
+  *ierr = CartSymVN(GH,vn);
   free(vn);
+  return;
 }