diff options
Diffstat (limited to 'src/InitialCopy.c')
| -rw-r--r-- | src/InitialCopy.c | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/src/InitialCopy.c b/src/InitialCopy.c index 5a8979d..4a1a454 100644 --- a/src/InitialCopy.c +++ b/src/InitialCopy.c @@ -297,9 +297,8 @@ void MoL_InitialCopy(CCTK_ARGUMENTS) /* ScratchVar = &SandRScratchSpace[var*totalsize]; */ - ScratchVar = CCTK_VarDataPtrI(cctkGH, 0, - CCTK_FirstVarIndex("MOL::SANDRSCRATCHSPACE") - + var); + ScratchVar = CCTK_VarDataPtrI(cctkGH, var, + CCTK_FirstVarIndex("MOL::SANDRSCRATCHSPACE")); #ifdef MOLDEBUG printf("Pointers for the SandR vars are to %ld, %ld and %ld.\n", PreviousVar, CurrentVar, ScratchVar); @@ -351,7 +350,8 @@ void MoL_InitialCopy(CCTK_ARGUMENTS) SandRComplexVariableIndex[var]); CurrentComplexVar = (CCTK_COMPLEX*)CCTK_VarDataPtrI(cctkGH, 0, SandRComplexVariableIndex[var]); - ScratchComplexVar = &ComplexSandRScratchSpace[var*totalsize]; + ScratchComplexVar = CCTK_VarDataPtrI(cctkGH, var, + CCTK_FirstVarIndex("MOL::COMPLEXSANDRSCRATCHSPACE")); #ifdef MOLDEBUG printf("Pointers for the SandR vars are to %ld, %ld and %ld.\n", PreviousComplexVar, CurrentComplexVar, ScratchComplexVar); @@ -424,7 +424,7 @@ void MoL_InitialCopy(CCTK_ARGUMENTS) } - /* FIXME */ + /* FIXME: constrained GA are not copied forward the way constrained GF are */ #ifdef MOLDOESCOMPLEX @@ -762,71 +762,76 @@ void MoL_ReportNumberVariables(CCTK_ARGUMENTS) DECLARE_CCTK_PARAMETERS; CCTK_INT var; - + CCTK_VInfo(CCTK_THORNSTRING, "The maximum number of evolved variables is %d. " "%d are registered.", - MoL_Num_Evolved_Vars,MoLNumEvolvedVariables); + MoLMaxNumRegisteredVariables,MoLNumEvolvedVariables); + + CCTK_VInfo(CCTK_THORNSTRING, + "The maximum number of slow evolved variables is %d. " + "%d are registered.", + MoLMaxNumRegisteredVariables,MoLNumEvolvedVariablesSlow); CCTK_VInfo(CCTK_THORNSTRING, "The maximum number of constrained variables is %d. " "%d are registered.", - MoL_Num_Constrained_Vars,MoLNumConstrainedVariables); + MoLMaxNumRegisteredVariables,MoLNumConstrainedVariables); CCTK_VInfo(CCTK_THORNSTRING, "The maximum number of SandR variables is %d. " "%d are registered.", - MoL_Num_SaveAndRestore_Vars,MoLNumSandRVariables); + MoLMaxNumRegisteredVariables,MoLNumSandRVariables); CCTK_VInfo(CCTK_THORNSTRING, "The maximum number of evolved complex variables is %d. " "%d are registered.", - MoL_Num_ComplexEvolved_Vars,MoLNumEvolvedComplexVariables); + MoLMaxNumRegisteredVariables,MoLNumEvolvedComplexVariables); CCTK_VInfo(CCTK_THORNSTRING, "The maximum number of constrained complex variables is %d. " "%d are registered.", - MoL_Num_ComplexConstrained_Vars,MoLNumConstrainedComplexVariables); + MoLMaxNumRegisteredVariables,MoLNumConstrainedComplexVariables); CCTK_VInfo(CCTK_THORNSTRING, "The maximum number of SandR complex variables is %d. " "%d are registered.", - MoL_Num_ComplexSaveAndRestore_Vars,MoLNumSandRComplexVariables); + MoLMaxNumRegisteredVariables,MoLNumSandRComplexVariables); CCTK_VInfo(CCTK_THORNSTRING, "The maximum number of evolved array variables is %d. " "%d are registered.", - MoL_Num_ArrayEvolved_Vars,MoLNumEvolvedArrayVariables); + MoLMaxNumRegisteredVariables,MoLNumEvolvedArrayVariables); CCTK_VInfo(CCTK_THORNSTRING, "The maximum number of constrained array variables is %d. " "%d are registered.", - MoL_Num_ArrayConstrained_Vars,MoLNumConstrainedArrayVariables); + MoLMaxNumRegisteredVariables,MoLNumConstrainedArrayVariables); CCTK_VInfo(CCTK_THORNSTRING, "The maximum number of SandR array variables is %d. " "%d are registered.", - MoL_Num_ArraySaveAndRestore_Vars,MoLNumSandRArrayVariables); + MoLMaxNumRegisteredVariables,MoLNumSandRArrayVariables); CCTK_VInfo(CCTK_THORNSTRING, "The maximum number of evolved complex array variables is %d. " "%d are registered.", - MoL_Num_ComplexArrayEvolved_Vars, + MoLMaxNumRegisteredVariables, MoLNumEvolvedComplexArrayVariables); CCTK_VInfo(CCTK_THORNSTRING, "The maximum number of constrained complex array " "variables is %d. %d are registered.", - MoL_Num_ComplexArrayConstrained_Vars, + MoLMaxNumRegisteredVariables, MoLNumConstrainedComplexArrayVariables); CCTK_VInfo(CCTK_THORNSTRING, "The maximum number of SandR complex array " "variables is %d. %d are registered.", - MoL_Num_ComplexArraySaveAndRestore_Vars, + MoLMaxNumRegisteredVariables, MoLNumSandRComplexArrayVariables); CCTK_VInfo(CCTK_THORNSTRING, @@ -960,7 +965,3 @@ void MoL_ReportNumberVariables(CCTK_ARGUMENTS) return; } - -/******************************************************************** - ********************* Local Routines ************************* - ********************************************************************/ |