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

1 files changed, 28 insertions, 30 deletions

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]));
     }