diff options
-rw-r--r-- | src/ICN.c | 2 | ||||
-rw-r--r-- | src/RK2.c | 2 | ||||
-rw-r--r-- | src/SetTime.c | 28 |
3 files changed, 16 insertions, 16 deletions
@@ -95,7 +95,7 @@ void MoL_ICNAdd(CCTK_ARGUMENTS) CCTK_MyProc(cctkGH), MoL_Intermediate_Steps - *MoL_Intermediate_Step + 1, *cctk_levfac, - cctk_delta_time, + CCTK_DELTA_TIME, CCTK_DELTA_SPACE(0), cctk_time); #endif @@ -94,7 +94,7 @@ void MoL_RK2Add(CCTK_ARGUMENTS) printf("Inside RK2.\nStep %d.\nRefinement %d.\nTimestep %g.\nSpacestep %g.\nTime %g\n", MoL_Intermediate_Steps - *MoL_Intermediate_Step + 1, *cctk_levfac, - cctk_delta_time, + CCTK_DELTA_TIME, CCTK_DELTA_SPACE(0), cctk_time); #endif diff --git a/src/SetTime.c b/src/SetTime.c index 0516e27..7774102 100644 --- a/src/SetTime.c +++ b/src/SetTime.c @@ -71,18 +71,18 @@ int MoL_SetTime(CCTK_ARGUMENTS) CCTK_REAL beta; *Original_Time = cctkGH->cctk_time; - *Original_Delta_Time = cctkGH->CCTK_DELTA_TIME; - cctkGH->cctk_time -= cctkGH->CCTK_DELTA_TIME; + *Original_Delta_Time = cctkGH->cctk_delta_time; + cctkGH->cctk_time -= cctkGH->cctk_delta_time / cctkGH->cctk_timefac; if (CCTK_EQUALS(ODE_Method,"ICN")) { - cctkGH->CCTK_DELTA_TIME = 0.5*(*Original_Delta_Time); + cctkGH->cctk_delta_time = 0.5*(*Original_Delta_Time); } else if (CCTK_EQUALS(ODE_Method,"Generic")) { beta = RKBetaCoefficients[0]; - cctkGH->CCTK_DELTA_TIME = beta*(*Original_Delta_Time); + cctkGH->cctk_delta_time = beta*(*Original_Delta_Time); } return 0; @@ -123,26 +123,26 @@ int MoL_ResetTime(CCTK_ARGUMENTS) if (*MoL_Intermediate_Step == 0) { cctkGH->cctk_time = (*Original_Time); - cctkGH->CCTK_DELTA_TIME = (*Original_Delta_Time); + cctkGH->cctk_delta_time = (*Original_Delta_Time); } else if (CCTK_EQUALS(ODE_Method,"ICN")) { if (*MoL_Intermediate_Step == 1) { - cctkGH->CCTK_DELTA_TIME = (*Original_Delta_Time); + cctkGH->cctk_delta_time = (*Original_Delta_Time); } else { - cctkGH->CCTK_DELTA_TIME = 0.5*(*Original_Delta_Time); + cctkGH->cctk_delta_time = 0.5*(*Original_Delta_Time); } - cctkGH->cctk_time = (*Original_Time)-0.5*(*Original_Delta_Time); + cctkGH->cctk_time = (*Original_Time)-0.5*(*Original_Delta_Time)/cctkGH->cctk_timefac; } else if (CCTK_EQUALS(ODE_Method,"Generic")) { - cctkGH->CCTK_DELTA_TIME = RKBetaCoefficients[MoL_Intermediate_Steps - + cctkGH->cctk_delta_time = RKBetaCoefficients[MoL_Intermediate_Steps - (*MoL_Intermediate_Step)] * - (*Original_Delta_Time); - previous_times[0] = (*Original_Time) - (*Original_Delta_Time); + (*Original_Delta_Time)/cctkGH->cctk_timefac; + previous_times[0] = (*Original_Time) - (*Original_Delta_Time)/cctkGH->cctk_timefac; for (i = MoL_Intermediate_Steps - 1; i > *MoL_Intermediate_Step; i--) { for (j = MoL_Intermediate_Steps; j > i; j--) @@ -151,7 +151,7 @@ int MoL_ResetTime(CCTK_ARGUMENTS) MoL_Intermediate_Steps + j; previous_times[MoL_Intermediate_Steps - i] = RKBetaCoefficients[MoL_Intermediate_Steps - j] * - (*Original_Delta_Time) + + (*Original_Delta_Time)/cctkGH->cctk_timefac + RKAlphaCoefficients[alphaindex]; } } @@ -162,13 +162,13 @@ int MoL_ResetTime(CCTK_ARGUMENTS) { if (*MoL_Intermediate_Step == 1) { - cctkGH->CCTK_DELTA_TIME = 0.5*(*Original_Delta_Time); + cctkGH->cctk_delta_time = 0.5*(*Original_Delta_Time); cctkGH->cctk_time = (*Original_Time); } } #ifdef MOLDEBUG printf("MoL has once more reset t: %f: and dt: %f.\n", cctkGH->cctk_time, - cctkGH->CCTK_DELTA_TIME); + cctkGH->cctk_delta_time/cctkGH->cctk_timefac); #endif free(previous_times); |