Add const and restrict qualifiers to the pointers.

Simplify some complex arithmetic.

Initialise the error variable in the RK45 integrator only after the
last iteration.


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

1 files changed, 20 insertions, 20 deletions

diff --git a/src/InitialCopy.c b/src/InitialCopy.c
index 06a89da..f326ead 100644
--- a/src/InitialCopy.c
+++ b/src/InitialCopy.c
@@ -84,18 +84,18 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
   CCTK_INT var;
   CCTK_INT totalsize;
 
-  CCTK_REAL *CurrentVar;
-  CCTK_REAL *PreviousVar;
-  CCTK_REAL *ScratchVar;
+  CCTK_REAL       * restrict CurrentVar;
+  CCTK_REAL const * restrict PreviousVar;
+  CCTK_REAL       * restrict ScratchVar;
   CCTK_INT StorageOn;
 
   /* FIXME */
 
 #ifdef MOLDOESCOMPLEX
 
-  CCTK_COMPLEX *CurrentComplexVar;
-  CCTK_COMPLEX *PreviousComplexVar;
-  CCTK_COMPLEX *ScratchComplexVar;
+  CCTK_COMPLEX       * restrict CurrentComplexVar;
+  CCTK_COMPLEX const * restrict PreviousComplexVar;
+  CCTK_COMPLEX       * restrict ScratchComplexVar;
 
 #endif
 
@@ -128,7 +128,7 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
       CCTK_WARN(0, "The grid function does not have storage assigned.");
     }
     
-    PreviousVar = (CCTK_REAL*)CCTK_VarDataPtrI(cctkGH, 1, 
+    PreviousVar = (CCTK_REAL const*)CCTK_VarDataPtrI(cctkGH, 1, 
                                                EvolvedVariableIndex[var]);
     CurrentVar = (CCTK_REAL*)CCTK_VarDataPtrI(cctkGH, 0, 
                                               EvolvedVariableIndex[var]);
@@ -146,7 +146,7 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
     
   for (var = 0; var < MoLNumEvolvedArrayVariables; var++)
   {
-    PreviousVar = (CCTK_REAL*)CCTK_VarDataPtrI(cctkGH, 1,
+    PreviousVar = (CCTK_REAL const*)CCTK_VarDataPtrI(cctkGH, 1,
                                                EvolvedArrayVariableIndex[var]);
     CurrentVar = (CCTK_REAL*)CCTK_VarDataPtrI(cctkGH, 0,
                                               EvolvedArrayVariableIndex[var]);
@@ -203,7 +203,7 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
       CCTK_WARN(0, "The grid function does not have storage assigned.");
     }
     
-    PreviousComplexVar = (CCTK_COMPLEX*)CCTK_VarDataPtrI(cctkGH, 1, 
+    PreviousComplexVar = (CCTK_COMPLEX const*)CCTK_VarDataPtrI(cctkGH, 1, 
                                                EvolvedComplexVariableIndex[var]);
     CurrentComplexVar = (CCTK_COMPLEX*)CCTK_VarDataPtrI(cctkGH, 0, 
                                               EvolvedComplexVariableIndex[var]);
@@ -244,7 +244,7 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
       CCTK_WARN(0, "The grid function does not have storage assigned.");
     }
 
-    PreviousVar = (CCTK_REAL*)CCTK_VarDataPtrI(cctkGH, 1, 
+    PreviousVar = (CCTK_REAL const*)CCTK_VarDataPtrI(cctkGH, 1, 
                                                SandRVariableIndex[var]);
     CurrentVar = (CCTK_REAL*)CCTK_VarDataPtrI(cctkGH, 0, 
                                               SandRVariableIndex[var]);
@@ -301,7 +301,7 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
       CCTK_WARN(0, "The grid function does not have storage assigned.");
     }
 
-    PreviousComplexVar = (CCTK_COMPLEX*)CCTK_VarDataPtrI(cctkGH, 1, 
+    PreviousComplexVar = (CCTK_COMPLEX const*)CCTK_VarDataPtrI(cctkGH, 1, 
                                                SandRComplexVariableIndex[var]);
     CurrentComplexVar = (CCTK_COMPLEX*)CCTK_VarDataPtrI(cctkGH, 0, 
                                               SandRComplexVariableIndex[var]);
@@ -359,7 +359,7 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
     if (StorageOn > 1)
     {
       
-      PreviousVar = (CCTK_REAL*)CCTK_VarDataPtrI(cctkGH, 1, 
+      PreviousVar = (CCTK_REAL const*)CCTK_VarDataPtrI(cctkGH, 1, 
                                                  ConstrainedVariableIndex[var]);
       CurrentVar = (CCTK_REAL*)CCTK_VarDataPtrI(cctkGH, 0, 
                                                 ConstrainedVariableIndex[var]);
@@ -411,7 +411,7 @@ void MoL_InitialCopy(CCTK_ARGUMENTS)
     if (StorageOn > 1)
     {
 
-      PreviousComplexVar = (CCTK_COMPLEX*)CCTK_VarDataPtrI(cctkGH, 1, 
+      PreviousComplexVar = (CCTK_COMPLEX const*)CCTK_VarDataPtrI(cctkGH, 1, 
                                                            ConstrainedComplexVariableIndex[var]);
       CurrentComplexVar = (CCTK_COMPLEX*)CCTK_VarDataPtrI(cctkGH, 0, 
                                                           ConstrainedComplexVariableIndex[var]);
@@ -465,14 +465,14 @@ void MoL_InitRHS(CCTK_ARGUMENTS)
 /*   CCTK_INT i,j,k; */
   CCTK_INT totalsize;
 
-  CCTK_REAL *RHSVar;
+  CCTK_REAL * restrict RHSVar;
   CCTK_INT StorageOn;
 
   /* FIXME */
 
 #ifdef MOLDOESCOMPLEX
 
-  CCTK_COMPLEX *RHSComplexVar;
+  CCTK_COMPLEX * restsrict RHSComplexVar;
 
 #endif
 
@@ -631,8 +631,8 @@ void MoL_FillAllLevels(CCTK_ARGUMENTS)
   CCTK_INT var, level;
   CCTK_INT totalsize, arraydim;
 
-  CCTK_REAL *CurrentVar;
-  CCTK_REAL *PreviousVar;
+  CCTK_REAL const * restrict CurrentVar;
+  CCTK_REAL       * restrict PreviousVar;
 
   totalsize = 1;
   for (arraydim = 0; arraydim < cctk_dim; arraydim++)
@@ -642,7 +642,7 @@ void MoL_FillAllLevels(CCTK_ARGUMENTS)
 
   for (var = 0; var < MoLNumEvolvedVariables; var++)
   {
-    CurrentVar = (CCTK_REAL*)CCTK_VarDataPtrI(cctkGH, 0, 
+    CurrentVar = (CCTK_REAL const*)CCTK_VarDataPtrI(cctkGH, 0, 
                                               EvolvedVariableIndex[var]);
     for (level = 1; 
          level < CCTK_ActiveTimeLevelsVI(cctkGH,
@@ -661,7 +661,7 @@ void MoL_FillAllLevels(CCTK_ARGUMENTS)
 
   for (var = 0; var < MoLNumConstrainedVariables; var++)
   {
-    CurrentVar = (CCTK_REAL*)CCTK_VarDataPtrI(cctkGH, 0, 
+    CurrentVar = (CCTK_REAL const*)CCTK_VarDataPtrI(cctkGH, 0, 
                                               ConstrainedVariableIndex[var]);
     for (level = 1; level < CCTK_ActiveTimeLevelsVI(cctkGH,
                                                     ConstrainedVariableIndex[var]); level++)
@@ -678,7 +678,7 @@ void MoL_FillAllLevels(CCTK_ARGUMENTS)
 
   for (var = 0; var < MoLNumSandRVariables; var++)
   {
-    CurrentVar = (CCTK_REAL*)CCTK_VarDataPtrI(cctkGH, 0, 
+    CurrentVar = (CCTK_REAL const*)CCTK_VarDataPtrI(cctkGH, 0, 
                                               SandRVariableIndex[var]);
     for (level = 1; level < CCTK_ActiveTimeLevelsVI(cctkGH,
                                                     SandRVariableIndex[var]);