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, 18 insertions, 18 deletions

diff --git a/src/RK2.c b/src/RK2.c
index d722623..1301e26 100644
--- a/src/RK2.c
+++ b/src/RK2.c
@@ -74,17 +74,17 @@ void MoL_RK2Add(CCTK_ARGUMENTS)
   
   CCTK_INT index, var;
   CCTK_INT totalsize;
-  CCTK_REAL *OldVar;
-  CCTK_REAL *UpdateVar;
-  CCTK_REAL *RHSVar;
+  CCTK_REAL const * restrict OldVar;
+  CCTK_REAL       * restrict UpdateVar;
+  CCTK_REAL const * restrict RHSVar;
   
   /* FIXME */
 
 #ifdef MOLDOESCOMPLEX
 
-  CCTK_COMPLEX *OldComplexVar;
-  CCTK_COMPLEX *UpdateComplexVar;
-  CCTK_COMPLEX *RHSComplexVar;
+  CCTK_COMPLEX const * restrict OldComplexVar;
+  CCTK_COMPLEX       * restrict UpdateComplexVar;
+  CCTK_COMPLEX const * restrict RHSComplexVar;
   CCTK_COMPLEX Complex_Delta_Time = CCTK_Cmplx(CCTK_DELTA_TIME, 0);
   CCTK_COMPLEX Complex_Half = CCTK_Cmplx(0.5, 0);
 
@@ -115,7 +115,7 @@ void MoL_RK2Add(CCTK_ARGUMENTS)
         {
           UpdateVar = (CCTK_REAL*)CCTK_VarDataPtrI(cctkGH, 0,
                                                    EvolvedVariableIndex[var]);
-          RHSVar = (CCTK_REAL*)CCTK_VarDataPtrI(cctkGH, 0, 
+          RHSVar = (CCTK_REAL const*)CCTK_VarDataPtrI(cctkGH, 0, 
                                                 RHSVariableIndex[var]);
           
           for (index = 0; index < totalsize; index++)
@@ -128,7 +128,7 @@ void MoL_RK2Add(CCTK_ARGUMENTS)
         {
           UpdateVar = (CCTK_REAL*)CCTK_VarDataPtrI(cctkGH, 0,
                                                    EvolvedArrayVariableIndex[var]);
-          RHSVar = (CCTK_REAL*)CCTK_VarDataPtrI(cctkGH, 0, 
+          RHSVar = (CCTK_REAL const*)CCTK_VarDataPtrI(cctkGH, 0, 
                                                 RHSArrayVariableIndex[var]);
           groupindex = CCTK_GroupIndexFromVarI(EvolvedArrayVariableIndex[var]);
           ierr = CCTK_GroupDynamicData(cctkGH, groupindex,
@@ -160,7 +160,7 @@ void MoL_RK2Add(CCTK_ARGUMENTS)
         {
           UpdateComplexVar = (CCTK_COMPLEX*)CCTK_VarDataPtrI(cctkGH, 0,
                                                              EvolvedComplexVariableIndex[var]);
-          RHSComplexVar = (CCTK_COMPLEX*)CCTK_VarDataPtrI(cctkGH, 0, 
+          RHSComplexVar = (CCTK_COMPLEX const*)CCTK_VarDataPtrI(cctkGH, 0, 
                                                           RHSComplexVariableIndex[var]);
           
           for (index = 0; index < totalsize; index++)
@@ -179,11 +179,11 @@ void MoL_RK2Add(CCTK_ARGUMENTS)
       {
         for (var = 0; var < MoLNumEvolvedVariables; var++)
         {
-          OldVar = (CCTK_REAL*)CCTK_VarDataPtrI(cctkGH, 1,
+          OldVar = (CCTK_REAL const*)CCTK_VarDataPtrI(cctkGH, 1,
                                                 EvolvedVariableIndex[var]);
           UpdateVar = (CCTK_REAL*)CCTK_VarDataPtrI(cctkGH, 0,
                                                    EvolvedVariableIndex[var]);
-          RHSVar = (CCTK_REAL*)CCTK_VarDataPtrI(cctkGH, 0, 
+          RHSVar = (CCTK_REAL const*)CCTK_VarDataPtrI(cctkGH, 0, 
                                                 RHSVariableIndex[var]);
           
           for (index = 0; index < totalsize; index++)
@@ -195,12 +195,12 @@ void MoL_RK2Add(CCTK_ARGUMENTS)
 
         for (var = 0; var < MoLNumEvolvedArrayVariables; var++)
         {
-          OldVar = (CCTK_REAL*)CCTK_VarDataPtrI(cctkGH, 1,
-                                                   EvolvedVariableIndex[var]);
+          OldVar = (CCTK_REAL const*)CCTK_VarDataPtrI(cctkGH, 1,
+                                                   EvolvedArrayVariableIndex[var]);
           UpdateVar = (CCTK_REAL*)CCTK_VarDataPtrI(cctkGH, 0,
-                                                   EvolvedVariableIndex[var]);
-          RHSVar = (CCTK_REAL*)CCTK_VarDataPtrI(cctkGH, 0, 
-                                                RHSVariableIndex[var]);
+                                                   EvolvedArrayVariableIndex[var]);
+          RHSVar = (CCTK_REAL const*)CCTK_VarDataPtrI(cctkGH, 0, 
+                                                RHSArrayVariableIndex[var]);
 
           groupindex = CCTK_GroupIndexFromVarI(EvolvedArrayVariableIndex[var]);
           ierr = CCTK_GroupDynamicData(cctkGH, groupindex,
@@ -231,11 +231,11 @@ void MoL_RK2Add(CCTK_ARGUMENTS)
 
         for (var = 0; var < MoLNumEvolvedComplexVariables; var++)
         {
-          OldComplexVar = (CCTK_COMPLEX*)CCTK_VarDataPtrI(cctkGH, 1,
+          OldComplexVar = (CCTK_COMPLEX const*)CCTK_VarDataPtrI(cctkGH, 1,
                                                        EvolvedComplexVariableIndex[var]);
           UpdateComplexVar = (CCTK_COMPLEX*)CCTK_VarDataPtrI(cctkGH, 0,
                                                              EvolvedComplexVariableIndex[var]);
-          RHSComplexVar = (CCTK_COMPLEX*)CCTK_VarDataPtrI(cctkGH, 0, 
+          RHSComplexVar = (CCTK_COMPLEX const*)CCTK_VarDataPtrI(cctkGH, 0, 
                                                           RHSComplexVariableIndex[var]);
           
           for (index = 0; index < totalsize; index++)