diff options
Diffstat (limited to 'Carpet/Carpet/src')
| -rw-r--r-- | Carpet/Carpet/src/Comm.cc | 4 | ||||
| -rw-r--r-- | Carpet/Carpet/src/Initialise.cc | 19 | ||||
| -rw-r--r-- | Carpet/Carpet/src/Restrict.cc | 10 |
3 files changed, 14 insertions, 19 deletions
diff --git a/Carpet/Carpet/src/Comm.cc b/Carpet/Carpet/src/Comm.cc index c445bb3e9..e00efbfa6 100644 --- a/Carpet/Carpet/src/Comm.cc +++ b/Carpet/Carpet/src/Comm.cc @@ -10,7 +10,7 @@ #include "carpet.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Comm.cc,v 1.20 2003/07/20 21:03:43 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Comm.cc,v 1.21 2003/08/10 12:52:09 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_Comm_cc); } @@ -75,7 +75,7 @@ namespace Carpet { // user) const CCTK_REAL time = (cgh->cctk_time - cctk_initial_time) / delta_time; #if 0 - const CCTK_REAL time1 = tt->time (tl, reflevel, mglevel); + const CCTK_REAL time1 = tt->time (tl, reflevel, mglevel) / tt->get_delta (0, 0); const CCTK_REAL time2 = (cgh->cctk_time - cctk_initial_time) / delta_time; assert (fabs((time1 - time2) / (fabs(time1) + fabs(time2) + fabs(cgh->cctk_delta_time))) < 1e-12); #endif diff --git a/Carpet/Carpet/src/Initialise.cc b/Carpet/Carpet/src/Initialise.cc index 49b1b8da1..d7baabef3 100644 --- a/Carpet/Carpet/src/Initialise.cc +++ b/Carpet/Carpet/src/Initialise.cc @@ -12,7 +12,7 @@ #include "carpet.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Initialise.cc,v 1.30 2003/06/18 18:24:27 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Initialise.cc,v 1.31 2003/08/10 12:52:09 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_Initialise_cc); } @@ -229,7 +229,6 @@ namespace Carpet { BEGIN_REFLEVEL_LOOP(cgh) { BEGIN_MGLEVEL_LOOP(cgh) { - // Cycle time levels (ignore arrays) cout << "3TL rl=" << reflevel << " cycling" << endl; CycleTimeLevels (cgh); @@ -304,15 +303,6 @@ namespace Carpet { BEGIN_REVERSE_REFLEVEL_LOOP(cgh) { BEGIN_MGLEVEL_LOOP(cgh) { - cgh->cctk_time = cctk_initial_time + cgh->cctk_delta_time / cgh->cctk_timefac; - - // Restrict - cout << "3TL rl=" << reflevel << " restricting" << endl; - Restrict (cgh); - - Waypoint ("%*sScheduling POSTRESTRICT", 2*reflevel, ""); - CCTK_ScheduleTraverse ("POSTRESTRICT", cgh, CallFunction); - // Flip time levels cout << "3TL rl=" << reflevel << " flipping" << endl; FlipTimeLevels (cgh); @@ -330,6 +320,13 @@ namespace Carpet { << " time=" << tt->get_time (reflevel, mglevel) << " time=" << cgh->cctk_time / cgh->cctk_delta_time << endl; + // Restrict + cout << "3TL rl=" << reflevel << " restricting" << endl; + Restrict (cgh); + + Waypoint ("%*sScheduling POSTRESTRICT", 2*reflevel, ""); + CCTK_ScheduleTraverse ("POSTRESTRICT", cgh, CallFunction); + // Cycle time levels cout << "3TL rl=" << reflevel << " cycling" << endl; CycleTimeLevels (cgh); diff --git a/Carpet/Carpet/src/Restrict.cc b/Carpet/Carpet/src/Restrict.cc index e392af3ca..1467cdd58 100644 --- a/Carpet/Carpet/src/Restrict.cc +++ b/Carpet/Carpet/src/Restrict.cc @@ -10,7 +10,7 @@ #include "carpet.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Restrict.cc,v 1.19 2003/07/20 21:03:43 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Restrict.cc,v 1.20 2003/08/10 12:52:09 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_Restrict_cc); } @@ -40,11 +40,9 @@ namespace Carpet { // use background time here (which may not be modified by // the user) const CCTK_REAL time = tt->time (tl, reflevel, mglevel); - if (tl==0) { - const CCTK_REAL time1 = tt->time (tl, reflevel, mglevel); - const CCTK_REAL time2 = cgh->cctk_time / cgh->cctk_delta_time; - assert (fabs((time1 - time2) / (fabs(time1) + fabs(time2) + fabs(cgh->cctk_delta_time))) < 1e-12); - } + const CCTK_REAL time1 = tt->time (0, reflevel, mglevel) / tt->get_delta (0, 0); + const CCTK_REAL time2 = cgh->cctk_time / cgh->cctk_delta_time; + assert (fabs((time1 - time2) / (fabs(time1) + fabs(time2) + fabs(cgh->cctk_delta_time))) < 1e-12); if (reflevel < hh->reflevels()-1) { |