Switch the order of warning messages and arrays accesses so that you get the WARN(0,...) before the segmentation fault...

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

1 files changed, 64 insertions, 55 deletions

diff --git a/src/Registration.c b/src/Registration.c
index 5693156..38577d7 100644
--- a/src/Registration.c
+++ b/src/Registration.c
@@ -807,6 +807,14 @@ CCTK_INT MoL_RegisterEvolvedReal(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
   }
   else
   {
+
+    if (MoLNumEvolvedVariables+1 > MoL_Num_Evolved_Vars)
+    {
+      CCTK_WARN(0,"You have tried to register more evolved "
+                "variables than the accumulator parameter "
+                "MoL_Num_Evolved_Variables allows. Check that "
+                "you are accumulating onto this parameter correctly");
+    }
   
     EvolvedVariableIndex[MoLNumEvolvedVariables] = EvolvedIndex;
     RHSVariableIndex[MoLNumEvolvedVariables] = RHSIndex;
@@ -819,14 +827,6 @@ CCTK_INT MoL_RegisterEvolvedReal(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
            CCTK_VarName(EvolvedIndex));
 #endif
 
-    if (MoLNumEvolvedVariables > MoL_Num_Evolved_Vars)
-    {
-      CCTK_WARN(0,"You have tried to register more evolved "
-                "variables than the accumulator parameter "
-                "MoL_Num_Evolved_Variables allows. Check that "
-                "you are accumulating onto this parameter correctly");
-    }
-
   }
 
   varused = 0;
@@ -932,10 +932,8 @@ CCTK_INT MoL_RegisterConstrainedReal(CCTK_INT ConstrainedIndex)
     
     if (!varused)
     {
-      ConstrainedVariableIndex[MoLNumConstrainedVariables] = ConstrainedIndex;
-      MoLNumConstrainedVariables++;
 
-      if (MoLNumConstrainedVariables > MoL_Num_Constrained_Vars)
+      if (MoLNumConstrainedVariables+1 > MoL_Num_Constrained_Vars)
       {
         CCTK_WARN(0,"You have tried to register more constrained "
                   "variables than the accumulator parameter "
@@ -944,6 +942,9 @@ CCTK_INT MoL_RegisterConstrainedReal(CCTK_INT ConstrainedIndex)
                   "parameter correctly");
       }
 
+      ConstrainedVariableIndex[MoLNumConstrainedVariables] = ConstrainedIndex;
+      MoLNumConstrainedVariables++;
+
     }
     
     varused = 0;
@@ -1048,10 +1049,8 @@ CCTK_INT MoL_RegisterSaveAndRestoreReal(CCTK_INT SandRIndex)
 
     if (!varused)
     {
-      SandRVariableIndex[MoLNumSandRVariables] = SandRIndex;
-      MoLNumSandRVariables++;
 
-      if (MoLNumSandRVariables > MoL_Num_SaveAndRestore_Vars)
+      if (MoLNumSandRVariables+1 > MoL_Num_SaveAndRestore_Vars)
       {
         CCTK_WARN(0,"You have tried to register more save and restore "
                   "variables than the accumulator parameter "
@@ -1059,6 +1058,9 @@ CCTK_INT MoL_RegisterSaveAndRestoreReal(CCTK_INT SandRIndex)
                   "that you are accumulating onto this parameter correctly");
       }
 
+      SandRVariableIndex[MoLNumSandRVariables] = SandRIndex;
+      MoLNumSandRVariables++;
+
     }
         
   }
@@ -1284,12 +1286,7 @@ CCTK_INT MoL_RegisterEvolvedComplex(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
   else
   {
   
-    EvolvedComplexVariableIndex[MoLNumEvolvedComplexVariables] = EvolvedIndex;
-    RHSComplexVariableIndex[MoLNumEvolvedComplexVariables] = RHSIndex;
-  
-    MoLNumEvolvedComplexVariables++;
-    
-    if (MoLNumEvolvedComplexVariables > MoL_Num_ComplexEvolved_Vars)
+    if (MoLNumEvolvedComplexVariables+1 > MoL_Num_ComplexEvolved_Vars)
     {
       CCTK_WARN(0,"You have tried to register more evolved complex "
                 "variables than the accumulator parameter "
@@ -1298,6 +1295,11 @@ CCTK_INT MoL_RegisterEvolvedComplex(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
                 "parameter correctly");
     }
 
+    EvolvedComplexVariableIndex[MoLNumEvolvedComplexVariables] = EvolvedIndex;
+    RHSComplexVariableIndex[MoLNumEvolvedComplexVariables] = RHSIndex;
+  
+    MoLNumEvolvedComplexVariables++;
+    
   }
 
   varused = 0;
@@ -1398,11 +1400,8 @@ CCTK_INT MoL_RegisterConstrainedComplex(CCTK_INT ConstrainedIndex)
     
     if (!varused)
     {
-      ConstrainedComplexVariableIndex[MoLNumConstrainedComplexVariables] = 
-        ConstrainedIndex;
-      MoLNumConstrainedComplexVariables++;
 
-      if (MoLNumConstrainedComplexVariables >
+      if (MoLNumConstrainedComplexVariables+1 >
           MoL_Num_ComplexConstrained_Vars) 
       {
         CCTK_WARN(0,"You have tried to register more constrained "
@@ -1412,6 +1411,10 @@ CCTK_INT MoL_RegisterConstrainedComplex(CCTK_INT ConstrainedIndex)
                   "parameter correctly");
       }
 
+      ConstrainedComplexVariableIndex[MoLNumConstrainedComplexVariables] = 
+        ConstrainedIndex;
+      MoLNumConstrainedComplexVariables++;
+
     }
     
     varused = 0;
@@ -1514,10 +1517,8 @@ CCTK_INT MoL_RegisterSaveAndRestoreComplex(CCTK_INT SandRIndex)
 
     if (!varused)
     {
-      SandRComplexVariableIndex[MoLNumSandRComplexVariables] = SandRIndex;
-      MoLNumSandRComplexVariables++;
 
-      if (MoLNumSandRComplexVariables > MoL_Num_ComplexSaveAndRestore_Vars)
+      if (MoLNumSandRComplexVariables+1 > MoL_Num_ComplexSaveAndRestore_Vars)
       {
         CCTK_WARN(0,"You have tried to register more save and restore "
                   "complex variables than the accumulator parameter "
@@ -1526,6 +1527,9 @@ CCTK_INT MoL_RegisterSaveAndRestoreComplex(CCTK_INT SandRIndex)
                   "parameter correctly");
       }
 
+      SandRComplexVariableIndex[MoLNumSandRComplexVariables] = SandRIndex;
+      MoLNumSandRComplexVariables++;
+
     }
         
   }
@@ -1747,12 +1751,7 @@ CCTK_INT MoL_RegisterEvolvedArray(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
   else
   {
   
-    EvolvedArrayVariableIndex[MoLNumEvolvedArrayVariables] = EvolvedIndex;
-    RHSArrayVariableIndex[MoLNumEvolvedArrayVariables] = RHSIndex;
-  
-    MoLNumEvolvedArrayVariables++;
-    
-    if (MoLNumEvolvedArrayVariables > MoL_Num_ArrayEvolved_Vars)
+    if (MoLNumEvolvedArrayVariables+1 > MoL_Num_ArrayEvolved_Vars)
     {
       CCTK_WARN(0,"You have tried to register more evolved array "
                 "variables than the accumulator parameter "
@@ -1761,6 +1760,11 @@ CCTK_INT MoL_RegisterEvolvedArray(CCTK_INT EvolvedIndex, CCTK_INT RHSIndex)
                 "parameter correctly");
     }
 
+    EvolvedArrayVariableIndex[MoLNumEvolvedArrayVariables] = EvolvedIndex;
+    RHSArrayVariableIndex[MoLNumEvolvedArrayVariables] = RHSIndex;
+  
+    MoLNumEvolvedArrayVariables++;
+    
   }
 
   varused = 0;
@@ -1855,11 +1859,8 @@ CCTK_INT MoL_RegisterConstrainedArray(CCTK_INT ConstrainedIndex)
     
     if (!varused)
     {
-      ConstrainedArrayVariableIndex[MoLNumConstrainedArrayVariables] = 
-        ConstrainedIndex;
-      MoLNumConstrainedArrayVariables++;
 
-      if (MoLNumConstrainedArrayVariables >
+      if (MoLNumConstrainedArrayVariables+1 >
           MoL_Num_ArrayConstrained_Vars) 
       {
         CCTK_WARN(0,"You have tried to register more constrained "
@@ -1869,6 +1870,10 @@ CCTK_INT MoL_RegisterConstrainedArray(CCTK_INT ConstrainedIndex)
                   "parameter correctly");
       }
 
+      ConstrainedArrayVariableIndex[MoLNumConstrainedArrayVariables] = 
+        ConstrainedIndex;
+      MoLNumConstrainedArrayVariables++;
+
     }
     
     varused = 0;
@@ -1965,10 +1970,8 @@ CCTK_INT MoL_RegisterSaveAndRestoreArray(CCTK_INT SandRIndex)
 
     if (!varused)
     {
-      SandRArrayVariableIndex[MoLNumSandRArrayVariables] = SandRIndex;
-      MoLNumSandRArrayVariables++;
 
-      if (MoLNumSandRArrayVariables > MoL_Num_ArraySaveAndRestore_Vars)
+      if (MoLNumSandRArrayVariables+1 > MoL_Num_ArraySaveAndRestore_Vars)
       {
         CCTK_WARN(0,"You have tried to register more save and restore "
                   "array variables than the accumulator parameter "
@@ -1977,6 +1980,9 @@ CCTK_INT MoL_RegisterSaveAndRestoreArray(CCTK_INT SandRIndex)
                   "this parameter correctly");
       }
 
+      SandRArrayVariableIndex[MoLNumSandRArrayVariables] = SandRIndex;
+      MoLNumSandRArrayVariables++;
+
     }
         
   }
@@ -2202,14 +2208,8 @@ CCTK_INT MoL_RegisterEvolvedComplexArray(CCTK_INT EvolvedIndex,
   else
   {
   
-    EvolvedComplexArrayVariableIndex[MoLNumEvolvedComplexArrayVariables] = 
-      EvolvedIndex;
-    RHSComplexArrayVariableIndex[MoLNumEvolvedComplexArrayVariables] = 
-      RHSIndex;
-  
-    MoLNumEvolvedComplexArrayVariables++;
-    
-    if (MoLNumEvolvedComplexArrayVariables > MoL_Num_ComplexArrayEvolved_Vars)
+    if (MoLNumEvolvedComplexArrayVariables+1 > 
+        MoL_Num_ComplexArrayEvolved_Vars)
     {
       CCTK_WARN(0,"You have tried to register more "
                 "evolved complex array variables than the "
@@ -2219,6 +2219,13 @@ CCTK_INT MoL_RegisterEvolvedComplexArray(CCTK_INT EvolvedIndex,
                 "parameter correctly");
     }
 
+    EvolvedComplexArrayVariableIndex[MoLNumEvolvedComplexArrayVariables] = 
+      EvolvedIndex;
+    RHSComplexArrayVariableIndex[MoLNumEvolvedComplexArrayVariables] = 
+      RHSIndex;
+  
+    MoLNumEvolvedComplexArrayVariables++;
+    
   }
 
   varused = 0;
@@ -2324,10 +2331,8 @@ CCTK_INT MoL_RegisterConstrainedComplexArray(CCTK_INT ConstrainedIndex)
     
     if (!varused)
     {
-      ConstrainedComplexArrayVariableIndex[MoLNumConstrainedComplexArrayVariables] = ConstrainedIndex;
-      MoLNumConstrainedComplexArrayVariables++;
 
-      if (MoLNumConstrainedComplexArrayVariables >
+      if (MoLNumConstrainedComplexArrayVariables+1 >
           MoL_Num_ComplexArrayConstrained_Vars) 
       {
         CCTK_WARN(0,"You have tried to register more constrained "
@@ -2337,6 +2342,9 @@ CCTK_INT MoL_RegisterConstrainedComplexArray(CCTK_INT ConstrainedIndex)
                   "this parameter correctly");
       }
 
+      ConstrainedComplexArrayVariableIndex[MoLNumConstrainedComplexArrayVariables] = ConstrainedIndex;
+      MoLNumConstrainedComplexArrayVariables++;
+
     }
     
     varused = 0;
@@ -2442,11 +2450,8 @@ CCTK_INT MoL_RegisterSaveAndRestoreComplexArray(CCTK_INT SandRIndex)
 
     if (!varused)
     {
-      SandRComplexArrayVariableIndex[MoLNumSandRComplexArrayVariables] = 
-        SandRIndex;
-      MoLNumSandRComplexArrayVariables++;
 
-      if (MoLNumSandRComplexArrayVariables > 
+      if (MoLNumSandRComplexArrayVariables+1 > 
           MoL_Num_ComplexArraySaveAndRestore_Vars)
       {
         CCTK_WARN(0,"You have tried to register more save and restore "
@@ -2456,6 +2461,10 @@ CCTK_INT MoL_RegisterSaveAndRestoreComplexArray(CCTK_INT SandRIndex)
                   "parameter correctly");
       }
 
+      SandRComplexArrayVariableIndex[MoLNumSandRComplexArrayVariables] = 
+        SandRIndex;
+      MoLNumSandRComplexArrayVariables++;
+
     }
         
   }