Replace "MoL" by CCTK_THORNSTRING in calls to CCTK_VWarn.

Correct some typos in warnings.

Remove some commented out variable declarations.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusNumerical/MoL/trunk@102 578cdeb0-5ea1-4b81-8215-5a3b8777ee0b

5 files changed, 112 insertions, 114 deletions

diff --git a/src/GenericRK.c b/src/GenericRK.c
index 942866b..7d278b5 100644
--- a/src/GenericRK.c
+++ b/src/GenericRK.c
@@ -353,7 +353,7 @@ void MoL_GenericRKAdd(CCTK_ARGUMENTS)
                                  &arraydata);
     if (ierr)
     {
-      CCTK_VWarn(0, __LINE__, __FILE__, "MoL", 
+      CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING, 
                  "The driver does not return group information "
                  "for group '%s'.", 
                  CCTK_GroupName(groupindex));
@@ -439,7 +439,7 @@ void MoL_GenericRKAdd(CCTK_ARGUMENTS)
                                    &arraydata);
       if (ierr)
       {
-        CCTK_VWarn(0, __LINE__, __FILE__, "MoL", 
+        CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING, 
                    "The driver does not return group information "
                    "for group '%s'.", 
                    CCTK_GroupName(groupindex));
diff --git a/src/InitialCopy.c b/src/InitialCopy.c
index df09980..06a89da 100644
--- a/src/InitialCopy.c
+++ b/src/InitialCopy.c
@@ -82,8 +82,6 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
   CCTK_INT arraytotalsize, arraydim;
 
   CCTK_INT var;
-/*    CCTK_INT index; */
-/*    CCTK_INT i,j,k; */
   CCTK_INT totalsize;
 
   CCTK_REAL *CurrentVar;
@@ -115,7 +113,7 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
     
     if (StorageOn < 0)
     {
-      CCTK_VWarn(1,__LINE__,__FILE__,"MoL","Warning for index %i", 
+      CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,"Warning for index %i", 
                  EvolvedVariableIndex[var]);
       CCTK_WARN(0, "The index passed does not correspond to a GF.");
     }
@@ -125,7 +123,7 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
              MoLNumEvolvedVariables, var, EvolvedVariableIndex[var],  
                  CCTK_VarName(EvolvedVariableIndex[var]));
 #endif
-      CCTK_VWarn(1,__LINE__,__FILE__,"MoL","Warning for GF %s", 
+      CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,"Warning for GF %s", 
                  CCTK_VarName(EvolvedVariableIndex[var]));
       CCTK_WARN(0, "The grid function does not have storage assigned.");
     }
@@ -140,7 +138,7 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
     }
     else
     {
-      CCTK_VWarn(0,__LINE__,__FILE__,"MoL","Null pointer for variable %s", 
+      CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,"Null pointer for variable %s", 
                  CCTK_VarName(EvolvedVariableIndex[var]));
     }
 
@@ -158,7 +156,7 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
                                  &arraydata);
     if (ierr)
     {
-      CCTK_VWarn(0, __LINE__, __FILE__, "MoL", 
+      CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING, 
                  "The driver does not return group information "
                  "for group '%s'.", 
                  CCTK_GroupName(groupindex));
@@ -177,7 +175,7 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
     {
       printf("The pointers are %p (prev) and %p (curr)\n.",
              PreviousVar, CurrentVar);
-      CCTK_VWarn(0,__LINE__,__FILE__,"MoL","Null pointer for variable %s", 
+      CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,"Null pointer for variable %s", 
                  CCTK_VarName(EvolvedArrayVariableIndex[var]));
     }
 
@@ -195,12 +193,12 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
     
     if (StorageOn < 0)
     {
-      CCTK_VWarn(1,__LINE__,__FILE__,"MoL","Warning for index %i", 
+      CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,"Warning for index %i", 
                  EvolvedComplexVariableIndex[var]);
       CCTK_WARN(0, "The index passed does not correspond to a GF.");
     }
     else if (StorageOn == 0) {
-      CCTK_VWarn(1,__LINE__,__FILE__,"MoL","Warning for GF %s", 
+      CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,"Warning for GF %s", 
                  CCTK_VarName(EvolvedComplexVariableIndex[var]));
       CCTK_WARN(0, "The grid function does not have storage assigned.");
     }
@@ -215,7 +213,7 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
     }
     else
     {
-      CCTK_VWarn(0,__LINE__,__FILE__,"MoL","Null pointer for variable %s", 
+      CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,"Null pointer for variable %s", 
                  CCTK_VarName(EvolvedComplexVariableIndex[var]));
     }
 
@@ -236,12 +234,12 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
     
     if (StorageOn < 0)
     {
-      CCTK_VWarn(1,__LINE__,__FILE__,"MoL","Warning for index %i", 
+      CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,"Warning for index %i", 
                  SandRVariableIndex[var]);
       CCTK_WARN(0, "The index passed does not correspond to a GF.");
     }
     else if (StorageOn == 0) {
-      CCTK_VWarn(1,__LINE__,__FILE__,"MoL","Warning for GF %s", 
+      CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,"Warning for GF %s", 
                  CCTK_VarName(SandRVariableIndex[var]));
       CCTK_WARN(0, "The grid function does not have storage assigned.");
     }
@@ -271,7 +269,7 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
     }
     else
     {
-      CCTK_VWarn(0,__LINE__,__FILE__,"MoL","Null pointer for variable %s", 
+      CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,"Null pointer for variable %s", 
                  CCTK_VarName(SandRVariableIndex[var]));
     }
 #ifdef MOLDEBUG
@@ -293,12 +291,12 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
     
     if (StorageOn < 0)
     {
-      CCTK_VWarn(1,__LINE__,__FILE__,"MoL","Warning for index %i", 
+      CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,"Warning for index %i", 
                  SandRComplexVariableIndex[var]);
       CCTK_WARN(0, "The index passed does not correspond to a GF.");
     }
     else if (StorageOn == 0) {
-      CCTK_VWarn(1,__LINE__,__FILE__,"MoL","Warning for GF %s", 
+      CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,"Warning for GF %s", 
                  CCTK_VarName(SandRComplexVariableIndex[var]));
       CCTK_WARN(0, "The grid function does not have storage assigned.");
     }
@@ -321,7 +319,7 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
     }
     else
     {
-      CCTK_VWarn(0,__LINE__,__FILE__,"MoL","Null pointer for variable %s", 
+      CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,"Null pointer for variable %s", 
                  CCTK_VarName(SandRComplexVariableIndex[var]));
     }
   }
@@ -340,12 +338,12 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
     
     if (StorageOn < 0)
     {
-      CCTK_VWarn(1,__LINE__,__FILE__,"MoL","Warning for index %i", 
+      CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,"Warning for index %i", 
                  ConstrainedVariableIndex[var]);
       CCTK_WARN(0, "The index passed does not correspond to a GF.");
     }
     else if (StorageOn == 0) {
-      CCTK_VWarn(1,__LINE__,__FILE__,"MoL","Warning for GF %s", 
+      CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,"Warning for GF %s", 
                  CCTK_VarName(ConstrainedVariableIndex[var]));
       CCTK_WARN(0, "The grid function does not have storage assigned.");
     }
@@ -372,7 +370,7 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
       }
       else
       {
-        CCTK_VWarn(0,__LINE__,__FILE__,"MoL","Null pointer for variable %s", 
+        CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,"Null pointer for variable %s", 
                    CCTK_VarName(ConstrainedVariableIndex[var]));
       }
       
@@ -392,12 +390,12 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
     
     if (StorageOn < 0)
     {
-      CCTK_VWarn(1,__LINE__,__FILE__,"MoL","Warning for index %i", 
+      CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,"Warning for index %i", 
                  ConstrainedComplexVariableIndex[var]);
       CCTK_WARN(0, "The index passed does not correspond to a GF.");
     }
     else if (StorageOn == 0) {
-      CCTK_VWarn(1,__LINE__,__FILE__,"MoL","Warning for GF %s", 
+      CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,"Warning for GF %s", 
                  CCTK_VarName(ConstrainedComplexVariableIndex[var]));
       CCTK_WARN(0, "The grid function does not have storage assigned.");
     }
@@ -424,7 +422,7 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
       }
       else
       {
-        CCTK_VWarn(0,__LINE__,__FILE__,"MoL","Null pointer for variable %s", 
+        CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,"Null pointer for variable %s", 
                    CCTK_VarName(ConstrainedComplexVariableIndex[var]));
       }
       
@@ -492,7 +490,7 @@ void MoL_InitRHS(CCTK_ARGUMENTS)
     
     if (StorageOn < 0)
     {
-      CCTK_VWarn(1,__LINE__,__FILE__,"MoL","Warning for index %i", 
+      CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,"Warning for index %i", 
                  RHSVariableIndex[var]);
       CCTK_WARN(0, "The index passed does not correspond to a GF.");
     }
@@ -502,7 +500,7 @@ void MoL_InitRHS(CCTK_ARGUMENTS)
              MoLNumEvolvedVariables, var, RHSVariableIndex[var],  
                  CCTK_VarName(RHSVariableIndex[var]));
 #endif
-      CCTK_VWarn(1,__LINE__,__FILE__,"MoL","Warning for GF %s", 
+      CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,"Warning for GF %s", 
                  CCTK_VarName(RHSVariableIndex[var]));
       CCTK_WARN(0, "The grid function does not have storage assigned.");
     }
@@ -518,7 +516,7 @@ void MoL_InitRHS(CCTK_ARGUMENTS)
     }
     else
     {
-      CCTK_VWarn(0,__LINE__,__FILE__,"MoL","Null pointer for variable %s", 
+      CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,"Null pointer for variable %s", 
                  CCTK_VarName(RHSVariableIndex[var]));
     }
 
@@ -534,7 +532,7 @@ void MoL_InitRHS(CCTK_ARGUMENTS)
                                  &arraydata);
     if (ierr)
     {
-      CCTK_VWarn(0, __LINE__, __FILE__, "MoL", 
+      CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING, 
                  "The driver does not return group information "
                  "for group '%s'.", 
                  CCTK_GroupName(groupindex));
@@ -556,7 +554,7 @@ void MoL_InitRHS(CCTK_ARGUMENTS)
     {
       printf("The pointer is %p (rhs)\n.",
              RHSVar);
-      CCTK_VWarn(0,__LINE__,__FILE__,"MoL","Null pointer for variable %s", 
+      CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,"Null pointer for variable %s", 
                  CCTK_VarName(RHSArrayVariableIndex[var]));
     }
 
@@ -574,12 +572,12 @@ void MoL_InitRHS(CCTK_ARGUMENTS)
     
     if (StorageOn < 0)
     {
-      CCTK_VWarn(1,__LINE__,__FILE__,"MoL","Warning for index %i", 
+      CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,"Warning for index %i", 
                  RHSComplexVariableIndex[var]);
       CCTK_WARN(0, "The index passed does not correspond to a GF.");
     }
     else if (StorageOn == 0) {
-      CCTK_VWarn(1,__LINE__,__FILE__,"MoL","Warning for GF %s", 
+      CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,"Warning for GF %s", 
                  CCTK_VarName(RHSComplexVariableIndex[var]));
       CCTK_WARN(0, "The grid function does not have storage assigned.");
     }
@@ -595,7 +593,7 @@ void MoL_InitRHS(CCTK_ARGUMENTS)
     }
     else
     {
-      CCTK_VWarn(0,__LINE__,__FILE__,"MoL","Null pointer for variable %s", 
+      CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,"Null pointer for variable %s", 
                  CCTK_VarName(RHSComplexVariableIndex[var]));
     }
 
diff --git a/src/RK2.c b/src/RK2.c
index 6f96cbb..d722623 100644
--- a/src/RK2.c
+++ b/src/RK2.c
@@ -135,7 +135,7 @@ void MoL_RK2Add(CCTK_ARGUMENTS)
                                        &arraydata);
           if (ierr)
           {
-            CCTK_VWarn(0, __LINE__, __FILE__, "MoL", 
+            CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING, 
                        "The driver does not return group information "
                        "for group '%s'.", 
                        CCTK_GroupName(groupindex));
@@ -207,7 +207,7 @@ void MoL_RK2Add(CCTK_ARGUMENTS)
                                        &arraydata);
           if (ierr)
           {
-            CCTK_VWarn(0, __LINE__, __FILE__, "MoL", 
+            CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING, 
                        "The driver does not return group information "
                        "for group '%s'.", 
                        CCTK_GroupName(groupindex));
diff --git a/src/RK3.c b/src/RK3.c
index cf21414..b8a8b03 100644
--- a/src/RK3.c
+++ b/src/RK3.c
@@ -140,7 +140,7 @@ void MoL_RK3Add(CCTK_ARGUMENTS)
                                        &arraydata);
           if (ierr)
           {
-            CCTK_VWarn(0, __LINE__, __FILE__, "MoL", 
+            CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING, 
                        "The driver does not return group information "
                        "for group '%s'.", 
                        CCTK_GroupName(groupindex));
@@ -213,7 +213,7 @@ void MoL_RK3Add(CCTK_ARGUMENTS)
                                        &arraydata);
           if (ierr)
           {
-            CCTK_VWarn(0, __LINE__, __FILE__, "MoL", 
+            CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING, 
                        "The driver does not return group information "
                        "for group '%s'.", 
                        CCTK_GroupName(groupindex));
@@ -294,7 +294,7 @@ void MoL_RK3Add(CCTK_ARGUMENTS)
                                        &arraydata);
           if (ierr)
           {
-            CCTK_VWarn(0, __LINE__, __FILE__, "MoL", 
+            CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING, 
                        "The driver does not return group information "
                        "for group '%s'.", 
                        CCTK_GroupName(groupindex));
diff --git a/src/Registration.c b/src/Registration.c
index da553ec..b037202 100644
--- a/src/Registration.c
+++ b/src/Registration.c
@@ -212,7 +212,7 @@ CCTK_INT MoL_RegisterEvolved(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
               }
             default:
               {
-                CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+                CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                            "The variable '%s' is not a GF or an array", 
                            CCTK_VarName(EvolvedIndex));
                 retval++;
@@ -241,7 +241,7 @@ CCTK_INT MoL_RegisterEvolved(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
               }
             default:
               {
-                CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+                CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                            "The variable '%s' is not a GF or an array", 
                            CCTK_VarName(EvolvedIndex));
                 retval++;
@@ -252,7 +252,7 @@ CCTK_INT MoL_RegisterEvolved(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
         }
       default:
         {
-          CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+          CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                      "The variable '%s' is neither REAL nor COMPLEX.", 
                      CCTK_VarName(EvolvedIndex));
           retval++;
@@ -330,7 +330,7 @@ CCTK_INT MoL_RegisterConstrained(CCTK_INT ConstrainedIndex)
             }
           default:
             {
-              CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+              CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                          "The variable '%s' is not a GF or an array", 
                          CCTK_VarName(ConstrainedIndex));
               retval++;
@@ -357,7 +357,7 @@ CCTK_INT MoL_RegisterConstrained(CCTK_INT ConstrainedIndex)
             }
           default:
             {
-              CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+              CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                          "The variable '%s' is not a GF or an array", 
                          CCTK_VarName(ConstrainedIndex));
               retval++;
@@ -368,7 +368,7 @@ CCTK_INT MoL_RegisterConstrained(CCTK_INT ConstrainedIndex)
       }
     default:
       {
-        CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+        CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                    "The variable '%s' is neither REAL nor COMPLEX.", 
                    CCTK_VarName(ConstrainedIndex));
         retval++;
@@ -443,7 +443,7 @@ CCTK_INT MoL_RegisterSaveAndRestore(CCTK_INT SandRIndex)
             }
           default:
             {
-              CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+              CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                          "The variable '%s' is not a GF or an array", 
                          CCTK_VarName(SandRIndex));
               retval++;
@@ -470,7 +470,7 @@ CCTK_INT MoL_RegisterSaveAndRestore(CCTK_INT SandRIndex)
             }
           default:
             {
-              CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+              CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                          "The variable '%s' is not a GF or an array", 
                          CCTK_VarName(SandRIndex));
               retval++;
@@ -481,7 +481,7 @@ CCTK_INT MoL_RegisterSaveAndRestore(CCTK_INT SandRIndex)
       }
     default:
       {
-        CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+        CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                    "The variable '%s' is neither REAL nor COMPLEX.", 
                    CCTK_VarName(SandRIndex));
         retval++;
@@ -543,7 +543,7 @@ CCTK_INT MoL_RegisterEvolvedGroup(CCTK_INT EvolvedGroupIndex,
             }
           default:
             {
-              CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+              CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                          "The group '%s' is not a GF or an array", 
                          CCTK_GroupName(EvolvedGroupIndex));
               retval++;
@@ -572,7 +572,7 @@ CCTK_INT MoL_RegisterEvolvedGroup(CCTK_INT EvolvedGroupIndex,
             }
           default:
             {
-              CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+              CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                          "The group '%s' is not a GF or an array", 
                          CCTK_GroupName(EvolvedGroupIndex));
               retval++;
@@ -583,7 +583,7 @@ CCTK_INT MoL_RegisterEvolvedGroup(CCTK_INT EvolvedGroupIndex,
       }
     default:
       {
-        CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+        CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                    "The group '%s' is neither REAL nor COMPLEX.", 
                    CCTK_GroupName(EvolvedGroupIndex));
         retval++;
@@ -643,7 +643,7 @@ CCTK_INT MoL_RegisterConstrainedGroup(CCTK_INT ConstrainedGroupIndex)
             }
           default:
             {
-              CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+              CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                          "The group '%s' is not a GF or an array", 
                          CCTK_GroupName(ConstrainedGroupIndex));
               retval++;
@@ -670,7 +670,7 @@ CCTK_INT MoL_RegisterConstrainedGroup(CCTK_INT ConstrainedGroupIndex)
             }
           default:
             {
-              CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+              CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                          "The group '%s' is not a GF or an array", 
                          CCTK_GroupName(ConstrainedGroupIndex));
               retval++;
@@ -681,7 +681,7 @@ CCTK_INT MoL_RegisterConstrainedGroup(CCTK_INT ConstrainedGroupIndex)
       }
     default:
       {
-        CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+        CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                    "The group '%s' is neither REAL nor COMPLEX.", 
                    CCTK_GroupName(ConstrainedGroupIndex));
         retval++;
@@ -740,7 +740,7 @@ CCTK_INT MoL_RegisterSaveAndRestoreGroup(CCTK_INT SandRGroupIndex)
             }
           default:
             {
-              CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+              CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                          "The group '%s' is not a GF or an array", 
                          CCTK_GroupName(SandRGroupIndex));
               retval++;
@@ -767,7 +767,7 @@ CCTK_INT MoL_RegisterSaveAndRestoreGroup(CCTK_INT SandRGroupIndex)
             }
           default:
             {
-              CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+              CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                          "The group '%s' is not a GF or an array", 
                          CCTK_GroupName(SandRGroupIndex));
               retval++;
@@ -778,7 +778,7 @@ CCTK_INT MoL_RegisterSaveAndRestoreGroup(CCTK_INT SandRGroupIndex)
       }
     default:
       {
-        CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+        CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                    "The group '%s' is neither REAL nor COMPLEX.", 
                    CCTK_GroupName(SandRGroupIndex));
         retval++;
@@ -828,7 +828,7 @@ CCTK_INT MoL_RegisterEvolvedReal(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
 
   if (!(CCTK_GroupTypeFromVarI(EvolvedIndex)==CCTK_GF))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The variable %s is not a GF and so should "
                "not be registered with MoLRegisterEvolved.", 
                CCTK_VarName(EvolvedIndex)); 
@@ -836,7 +836,7 @@ CCTK_INT MoL_RegisterEvolvedReal(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
 
   if (!(CCTK_GroupTypeFromVarI(RHSIndex)==CCTK_GF))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The rhs variable %s is not a GF and so should "
                "not be registered with MoLRegisterEvolved.", 
                CCTK_VarName(RHSIndex)); 
@@ -844,7 +844,7 @@ CCTK_INT MoL_RegisterEvolvedReal(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
 
   if (!(CCTK_VarTypeI(EvolvedIndex)==CCTK_VARIABLE_REAL))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The variable %s is not of type CCTK_REAL and so "
                "should not be registered with MoLRegisterEvolved.", 
                CCTK_VarName(EvolvedIndex)); 
@@ -852,7 +852,7 @@ CCTK_INT MoL_RegisterEvolvedReal(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
 
   if (!(CCTK_VarTypeI(RHSIndex)==CCTK_VARIABLE_REAL))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The rhs variable %s is not of type CCTK_REAL and "
                "so should not be registered with MoLRegisterEvolved.", 
                CCTK_VarName(RHSIndex)); 
@@ -863,14 +863,14 @@ CCTK_INT MoL_RegisterEvolvedReal(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
   
   if ( (numtimelevs1 < 0) || (numtimelevs2 < 0) ) 
   {
-    CCTK_VWarn(1,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,
                "Warning for variable index %i", EvolvedIndex); 
     CCTK_WARN(0, "The index passed does not correspond to a GF.");
   }
 
   if (numtimelevs1 < 2)
   {
-    CCTK_VWarn(1,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,
                "Warning for variable index %i name %s", 
                EvolvedIndex, CCTK_VarName(EvolvedIndex));
     CCTK_WARN(0, "The GF passed only has one timelevel. "
@@ -891,7 +891,7 @@ CCTK_INT MoL_RegisterEvolvedReal(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
   if (varused)
   {
 
-    CCTK_VWarn(2,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(2,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The GF %s has already been registered "
                "as an evolved variable with RHS GF %s. "
                "The attempt to register with RHS GF %s will be ignored",
@@ -1008,7 +1008,7 @@ CCTK_INT MoL_RegisterConstrainedReal(CCTK_INT ConstrainedIndex)
 
   if (!(CCTK_GroupTypeFromVarI(ConstrainedIndex)==CCTK_GF))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL","The variable %s is "
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,"The variable %s is "
                "not a GF and so should not be registered with "
                "MoLRegisterConstrained.", 
                CCTK_VarName(ConstrainedIndex)); 
@@ -1016,7 +1016,7 @@ CCTK_INT MoL_RegisterConstrainedReal(CCTK_INT ConstrainedIndex)
 
   if (!(CCTK_VarTypeI(ConstrainedIndex)==CCTK_VARIABLE_REAL))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL","The variable %s is "
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,"The variable %s is "
                "not of type CCTK_REAL and so should not be "
                "registered with MoLRegisterConstrained.", 
                CCTK_VarName(ConstrainedIndex)); 
@@ -1026,7 +1026,7 @@ CCTK_INT MoL_RegisterConstrainedReal(CCTK_INT ConstrainedIndex)
 
   if (numtimelevs < 1) {
 
-    CCTK_VWarn(1,__LINE__,__FILE__,"MoL","Warning for "
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,"Warning for "
                "constrained variable index %i", ConstrainedIndex);
     CCTK_WARN(0, "The index passed does not correspond to a GF.");
 
@@ -1091,7 +1091,7 @@ CCTK_INT MoL_RegisterConstrainedReal(CCTK_INT ConstrainedIndex)
     
     CCTK_VInfo(CCTK_THORNSTRING,
                "MoL will not treat variable %s as a constrained "
-               "variable at it has only one timelevel. This should "
+               "variable as it has only one timelevel. This should "
                "not cause problems with the evolution.\n", 
                CCTK_VarName(ConstrainedIndex));
 
@@ -1125,7 +1125,7 @@ CCTK_INT MoL_RegisterSaveAndRestoreReal(CCTK_INT SandRIndex)
 
   if (!(CCTK_GroupTypeFromVarI(SandRIndex)==CCTK_GF))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL","The variable %s is not "
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,"The variable %s is not "
                "a GF and so should not be registered with "
                "MoLRegisterSaveAndRestore.", 
                CCTK_VarName(SandRIndex)); 
@@ -1133,7 +1133,7 @@ CCTK_INT MoL_RegisterSaveAndRestoreReal(CCTK_INT SandRIndex)
 
   if (!(CCTK_VarTypeI(SandRIndex)==CCTK_VARIABLE_REAL))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL","The variable %s is "
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,"The variable %s is "
                "not of type CCTK_REAL and so should not be "
                "registered with MoLRegisterSaveAndRestore.", 
                CCTK_VarName(SandRIndex)); 
@@ -1143,7 +1143,7 @@ CCTK_INT MoL_RegisterSaveAndRestoreReal(CCTK_INT SandRIndex)
 
   if (numtimelevs < 1) {
 
-    CCTK_VWarn(1,__LINE__,__FILE__,"MoL","Warning for save "
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,"Warning for save "
                "and restore variable index %i", SandRIndex);
     CCTK_WARN(0, "The index passed does not correspond to a GF.");
 
@@ -1191,7 +1191,7 @@ CCTK_INT MoL_RegisterSaveAndRestoreReal(CCTK_INT SandRIndex)
     
     CCTK_VInfo(CCTK_THORNSTRING,
                "MoL will not treat variable %s as a save and "
-               "restore variable at it has only one timelevel. "
+               "restore variable as it has only one timelevel. "
                "This should not cause problems with the evolution.\n", 
                CCTK_VarName(SandRIndex));
 
@@ -1324,7 +1324,7 @@ CCTK_INT MoL_RegisterEvolvedComplex(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
 
   if (!(CCTK_GroupTypeFromVarI(EvolvedIndex)==CCTK_GF))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL","The variable %s is "
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,"The variable %s is "
                "not a GF and so should not be registered with "
                "MoLRegisterEvolved.", 
                CCTK_VarName(EvolvedIndex)); 
@@ -1332,7 +1332,7 @@ CCTK_INT MoL_RegisterEvolvedComplex(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
 
   if (!(CCTK_GroupTypeFromVarI(RHSIndex)==CCTK_GF))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL","The rhs variable %s is "
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,"The rhs variable %s is "
                "not a GF and so should not be registered with "
                "MoLRegisterEvolved.", 
                CCTK_VarName(RHSIndex)); 
@@ -1340,7 +1340,7 @@ CCTK_INT MoL_RegisterEvolvedComplex(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
 
   if (!(CCTK_VarTypeI(EvolvedIndex)==CCTK_VARIABLE_REAL))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL","The variable %s is "
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,"The variable %s is "
                "not of type CCTK_REAL and so should not be "
                "registered with MoLRegisterEvolved.", 
                CCTK_VarName(EvolvedIndex)); 
@@ -1348,7 +1348,7 @@ CCTK_INT MoL_RegisterEvolvedComplex(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
 
   if (!(CCTK_VarTypeI(EvolvedIndex)==CCTK_VARIABLE_COMPLEX))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL","The variable %s is "
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,"The variable %s is "
                "not of type CCTK_COMPLEX and so should not be "
                "registered with MoLRegisterEvolvedComplex.", 
                CCTK_VarName(EvolvedIndex)); 
@@ -1356,7 +1356,7 @@ CCTK_INT MoL_RegisterEvolvedComplex(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
 
   if (!(CCTK_VarTypeI(RHSIndex)==CCTK_VARIABLE_COMPLEX))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL","The rhs variable %s "
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,"The rhs variable %s "
                "is not of type CCTK_COMPLEX and so should not be "
                "registered with MoLRegisterEvolvedComplex.", 
                CCTK_VarName(RHSIndex)); 
@@ -1367,14 +1367,14 @@ CCTK_INT MoL_RegisterEvolvedComplex(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
   
   if ( (numtimelevs1 < 0) || (numtimelevs2 < 0) ) 
   {
-    CCTK_VWarn(1,__LINE__,__FILE__,"MoL","Warning for variable index %i", 
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,"Warning for variable index %i", 
                EvolvedIndex); 
     CCTK_WARN(0, "The index passed does not correspond to a GF.");
   }
 
   if (numtimelevs1 < 2)
   {
-    CCTK_VWarn(1,__LINE__,__FILE__,"MoL","Warning for variable "
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,"Warning for variable "
                "index %i name %s", 
                EvolvedIndex, CCTK_VarName(EvolvedIndex));
     CCTK_WARN(0, "The GF passed only has one timelevel. "
@@ -1396,7 +1396,7 @@ CCTK_INT MoL_RegisterEvolvedComplex(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
   if (varused)
   {
 
-    CCTK_VWarn(2,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(2,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The GF %s has already been registered as a "
                "complex evolved variable with RHS GF %s. "
                "The attempt to register with RHS GF %s will be ignored",
@@ -1485,7 +1485,7 @@ CCTK_INT MoL_RegisterConstrainedComplex(CCTK_INT ConstrainedIndex)
   
   if (!(CCTK_GroupTypeFromVarI(ConstrainedIndex)==CCTK_GF))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL","The variable %s is not "
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,"The variable %s is not "
                "a GF and so should not be registered with "
                "MoLRegisterConstrained.", 
                CCTK_VarName(ConstrainedIndex)); 
@@ -1493,7 +1493,7 @@ CCTK_INT MoL_RegisterConstrainedComplex(CCTK_INT ConstrainedIndex)
 
   if (!(CCTK_VarTypeI(ConstrainedIndex)==CCTK_VARIABLE_COMPLEX))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The variable %s is not of type CCTK_COMPLEX "
                "and so should not be registered with "
                "MoLRegisterConstrainedComplex.", 
@@ -1504,7 +1504,7 @@ CCTK_INT MoL_RegisterConstrainedComplex(CCTK_INT ConstrainedIndex)
 
   if (numtimelevs < 1) {
 
-    CCTK_VWarn(1,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,
                "Warning for constrained complex "
                "variable index %i", ConstrainedIndex);
     CCTK_WARN(0, "The index passed does not correspond to a GF.");
@@ -1573,7 +1573,7 @@ CCTK_INT MoL_RegisterConstrainedComplex(CCTK_INT ConstrainedIndex)
     
     CCTK_VInfo(CCTK_THORNSTRING,
                "MoL will not treat variable %s as a constrained "
-               "complex variable at it has only one timelevel. "
+               "complex variable as it has only one timelevel. "
                "This should not cause problems with the evolution.\n", 
                CCTK_VarName(ConstrainedIndex));
 
@@ -1598,7 +1598,7 @@ CCTK_INT MoL_RegisterSaveAndRestoreComplex(CCTK_INT SandRIndex)
   
   if (!(CCTK_GroupTypeFromVarI(SandRIndex)==CCTK_GF))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The variable %s is not a GF and so should "
                "not be registered with MoLRegisterSaveAndRestore.", 
                CCTK_VarName(SandRIndex)); 
@@ -1606,7 +1606,7 @@ CCTK_INT MoL_RegisterSaveAndRestoreComplex(CCTK_INT SandRIndex)
 
   if (!(CCTK_VarTypeI(SandRIndex)==CCTK_VARIABLE_COMPLEX))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The variable %s is not of type CCTK_COMPLEX "
                "and so should not be registered with "
                "MoLRegisterSaveAndRestoreComplex.", 
@@ -1617,7 +1617,7 @@ CCTK_INT MoL_RegisterSaveAndRestoreComplex(CCTK_INT SandRIndex)
 
   if (numtimelevs < 1) {
 
-    CCTK_VWarn(1,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,
                "Warning for save and restore complex variable index %i", 
                SandRIndex);
     CCTK_WARN(0, "The index passed does not correspond to a GF.");
@@ -1670,7 +1670,7 @@ CCTK_INT MoL_RegisterSaveAndRestoreComplex(CCTK_INT SandRIndex)
     
     CCTK_VInfo(CCTK_THORNSTRING,
                "MoL will not treat variable %s as a save and "
-               "restore complex variable at it has only one "
+               "restore complex variable as it has only one "
                "timelevel. This should not cause problems with "
                "the evolution.\n", 
                CCTK_VarName(SandRIndex));
@@ -1806,7 +1806,7 @@ CCTK_INT MoL_RegisterEvolvedArray(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
 
   if (!(CCTK_GroupTypeFromVarI(EvolvedIndex)==CCTK_ARRAY))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The variable %s is not an array and so should "
                "not be registered with MoLRegisterEvolved.", 
                CCTK_VarName(EvolvedIndex)); 
@@ -1814,7 +1814,7 @@ CCTK_INT MoL_RegisterEvolvedArray(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
 
   if (!(CCTK_GroupTypeFromVarI(RHSIndex)==CCTK_ARRAY))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The rhs variable %s is not an array and so "
                "should not be registered with MoLRegisterEvolved.", 
                CCTK_VarName(RHSIndex)); 
@@ -1822,7 +1822,7 @@ CCTK_INT MoL_RegisterEvolvedArray(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
 
   if (!(CCTK_VarTypeI(EvolvedIndex)==CCTK_VARIABLE_REAL))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The variable %s is not of type CCTK_REAL "
                "and so should not be registered with "
                "MoLRegisterEvolvedArray.", 
@@ -1831,7 +1831,7 @@ CCTK_INT MoL_RegisterEvolvedArray(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
 
   if (!(CCTK_VarTypeI(RHSIndex)==CCTK_VARIABLE_REAL))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The rhs variable %s is not of type CCTK_REAL "
                "and so should not be registered with "
                "MoLRegisterEvolvedArray.", 
@@ -1843,14 +1843,14 @@ CCTK_INT MoL_RegisterEvolvedArray(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
   
   if ( (numtimelevs1 < 0) || (numtimelevs2 < 0) ) 
   {
-    CCTK_VWarn(1,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,
                "Warning for variable index %i", EvolvedIndex); 
     CCTK_WARN(0, "The index passed does not correspond to an array.");
   }
 
   if (numtimelevs1 < 2)
   {
-    CCTK_VWarn(1,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,
                "Warning for variable index %i name %s", 
                EvolvedIndex, CCTK_VarName(EvolvedIndex));
     CCTK_WARN(0, "The array passed only has one timelevel. "
@@ -1871,7 +1871,7 @@ CCTK_INT MoL_RegisterEvolvedArray(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
   if (varused)
   {
 
-    CCTK_VWarn(2,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(2,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The array %s has already been registered "
                "as a array evolved variable with RHS array %s. "
                "The attempt to register with RHS array %s will be ignored",
@@ -1947,7 +1947,7 @@ CCTK_INT MoL_RegisterConstrainedArray(CCTK_INT ConstrainedIndex)
     
   if (!(CCTK_GroupTypeFromVarI(ConstrainedIndex)==CCTK_ARRAY))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The variable %s is not a ARRAY and so "
                "should not be registered with MoLRegisterConstrained.", 
                CCTK_VarName(ConstrainedIndex)); 
@@ -1955,7 +1955,7 @@ CCTK_INT MoL_RegisterConstrainedArray(CCTK_INT ConstrainedIndex)
 
   if (!(CCTK_VarTypeI(ConstrainedIndex)==CCTK_VARIABLE_REAL))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The variable %s is not of type CCTK_REAL "
                "and so should not be registered with "
                "MoLRegisterConstrainedArray.", 
@@ -1966,7 +1966,7 @@ CCTK_INT MoL_RegisterConstrainedArray(CCTK_INT ConstrainedIndex)
 
   if (numtimelevs < 1) {
 
-    CCTK_VWarn(1,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,
                "Warning for constrained array variable index %i", 
                ConstrainedIndex);
     CCTK_WARN(0, "The index passed does not correspond to a array.");
@@ -2032,7 +2032,7 @@ CCTK_INT MoL_RegisterConstrainedArray(CCTK_INT ConstrainedIndex)
     
     CCTK_VInfo(CCTK_THORNSTRING,
                "MoL will not treat variable %s as a constrained "
-               "array variable at it has only one timelevel. "
+               "array variable as it has only one timelevel. "
                "This should not cause problems with the evolution.\n", 
                CCTK_VarName(ConstrainedIndex));
 
@@ -2051,7 +2051,7 @@ CCTK_INT MoL_RegisterSaveAndRestoreArray(CCTK_INT SandRIndex)
   
   if (!(CCTK_GroupTypeFromVarI(SandRIndex)==CCTK_ARRAY))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The variable %s is not an array and so should not "
                "be registered with MoLRegisterSaveAndRestore.", 
                CCTK_VarName(SandRIndex)); 
@@ -2059,7 +2059,7 @@ CCTK_INT MoL_RegisterSaveAndRestoreArray(CCTK_INT SandRIndex)
 
   if (!(CCTK_VarTypeI(SandRIndex)==CCTK_VARIABLE_REAL))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The variable %s is not of type CCTK_REAL and "
                "so should not be registered with "
                "MoLRegisterSaveAndRestoreArray.", 
@@ -2070,7 +2070,7 @@ CCTK_INT MoL_RegisterSaveAndRestoreArray(CCTK_INT SandRIndex)
 
   if (numtimelevs < 1) {
 
-    CCTK_VWarn(1,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,
                "Warning for save and restore array variable index %i", 
                SandRIndex);
     CCTK_WARN(0, "The index passed does not correspond to a GF.");
@@ -2123,7 +2123,7 @@ CCTK_INT MoL_RegisterSaveAndRestoreArray(CCTK_INT SandRIndex)
     
     CCTK_VInfo(CCTK_THORNSTRING,
                "MoL will not treat variable %s as a save "
-               "and restore array variable at it has only one "
+               "and restore array variable as it has only one "
                "timelevel. This should not cause problems "
                "with the evolution.\n", 
                CCTK_VarName(SandRIndex));
@@ -2262,7 +2262,7 @@ CCTK_INT MoL_RegisterEvolvedComplexArray(CCTK_INT EvolvedIndex,
   
   if (!(CCTK_GroupTypeFromVarI(EvolvedIndex)==CCTK_ARRAY))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The variable %s is not an array and so should "
                "not be registered with MoLRegisterEvolved.", 
                CCTK_VarName(EvolvedIndex)); 
@@ -2270,7 +2270,7 @@ CCTK_INT MoL_RegisterEvolvedComplexArray(CCTK_INT EvolvedIndex,
 
   if (!(CCTK_GroupTypeFromVarI(RHSIndex)==CCTK_ARRAY))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The rhs variable %s is not an array and so "
                "should not be registered with MoLRegisterEvolved.", 
                CCTK_VarName(RHSIndex)); 
@@ -2278,7 +2278,7 @@ CCTK_INT MoL_RegisterEvolvedComplexArray(CCTK_INT EvolvedIndex,
 
   if (!(CCTK_VarTypeI(EvolvedIndex)==CCTK_VARIABLE_COMPLEX))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The variable %s is not of type CCTK_COMPLEX "
                "and so should not be registered with "
                "MoLRegisterEvolvedArrayComplex.", 
@@ -2287,7 +2287,7 @@ CCTK_INT MoL_RegisterEvolvedComplexArray(CCTK_INT EvolvedIndex,
 
   if (!(CCTK_VarTypeI(RHSIndex)==CCTK_VARIABLE_COMPLEX))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The rhs variable %s is not of type CCTK_COMPLEX "
                "and so should not be registered with "
                "MoLRegisterEvolvedArrayComplex.", 
@@ -2299,14 +2299,14 @@ CCTK_INT MoL_RegisterEvolvedComplexArray(CCTK_INT EvolvedIndex,
   
   if ( (numtimelevs1 < 0) || (numtimelevs2 < 0) ) 
   {
-    CCTK_VWarn(1,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,
                "Warning for variable index %i", EvolvedIndex); 
     CCTK_WARN(0, "The index passed does not correspond to a GF.");
   }
 
   if (numtimelevs1 < 2)
   {
-    CCTK_VWarn(1,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,
                "Warning for variable index %i name %s", 
                EvolvedIndex, CCTK_VarName(EvolvedIndex));
     CCTK_WARN(0, "The GF passed only has one timelevel. "
@@ -2328,7 +2328,7 @@ CCTK_INT MoL_RegisterEvolvedComplexArray(CCTK_INT EvolvedIndex,
   if (varused)
   {
 
-    CCTK_VWarn(2,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(2,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The GF %s has already been registered as "
                "a complex array evolved variable with RHS GF %s. "
                "The attempt to register with RHS GF %s will be ignored",
@@ -2417,7 +2417,7 @@ CCTK_INT MoL_RegisterConstrainedComplexArray(CCTK_INT ConstrainedIndex)
   
   if (!(CCTK_GroupTypeFromVarI(ConstrainedIndex)==CCTK_ARRAY))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The variable %s is not an array and so should "
                "not be registered with MoLRegisterConstrained.", 
                CCTK_VarName(ConstrainedIndex)); 
@@ -2425,7 +2425,7 @@ CCTK_INT MoL_RegisterConstrainedComplexArray(CCTK_INT ConstrainedIndex)
 
   if (!(CCTK_VarTypeI(ConstrainedIndex)==CCTK_VARIABLE_COMPLEX))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The variable %s is not of type CCTK_COMPLEX and "
                "so should not be registered with "
                "MoLRegisterConstrainedArrayComplex.", 
@@ -2436,7 +2436,7 @@ CCTK_INT MoL_RegisterConstrainedComplexArray(CCTK_INT ConstrainedIndex)
 
   if (numtimelevs < 1) {
 
-    CCTK_VWarn(1,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,
                "Warning for constrained complex array variable index %i", 
                ConstrainedIndex);
     CCTK_WARN(0, "The index passed does not correspond to a GF.");
@@ -2531,7 +2531,7 @@ CCTK_INT MoL_RegisterSaveAndRestoreComplexArray(CCTK_INT SandRIndex)
   
   if (!(CCTK_GroupTypeFromVarI(SandRIndex)==CCTK_ARRAY))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The variable %s is not an array and so should "
                "not be registered with MoLRegisterSaveAndRestore.", 
                CCTK_VarName(SandRIndex)); 
@@ -2539,7 +2539,7 @@ CCTK_INT MoL_RegisterSaveAndRestoreComplexArray(CCTK_INT SandRIndex)
 
   if (!(CCTK_VarTypeI(SandRIndex)==CCTK_VARIABLE_COMPLEX))
   {
-    CCTK_VWarn(0,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
                "The variable %s is not of type CCTK_COMPLEX "
                "and so should not be registered with "
                "MoLRegisterSaveAndRestoreArrayComplex.", 
@@ -2550,7 +2550,7 @@ CCTK_INT MoL_RegisterSaveAndRestoreComplexArray(CCTK_INT SandRIndex)
 
   if (numtimelevs < 1) {
 
-    CCTK_VWarn(1,__LINE__,__FILE__,"MoL",
+    CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING,
                "Warning for save and restore complex "
                "array variable index %i", SandRIndex);
     CCTK_WARN(0, "The index passed does not correspond to a GF.");