diff options
Diffstat (limited to 'Carpet/CarpetRegrid2')
| -rw-r--r-- | Carpet/CarpetRegrid2/README | 7 | ||||
| -rw-r--r-- | Carpet/CarpetRegrid2/interface.ccl | 1 | ||||
| -rw-r--r-- | Carpet/CarpetRegrid2/src/regrid.cc | 15 |
3 files changed, 19 insertions, 4 deletions
diff --git a/Carpet/CarpetRegrid2/README b/Carpet/CarpetRegrid2/README index fe220ac82..12db67f2d 100644 --- a/Carpet/CarpetRegrid2/README +++ b/Carpet/CarpetRegrid2/README @@ -1,9 +1,10 @@ Cactus Code Thorn CarpetRegrid2 -Thorn Author(s) : Erik Schnetter <schnetter@cct.lsu.edu> -Thorn Maintainer(s) : Erik Schnetter <schnetter@cct.lsu.edu> +Author(s) : Erik Schnetter <schnetter@cct.lsu.edu> +Maintainer(s): Erik Schnetter <schnetter@cct.lsu.edu> +Licence : GPLv2+ -------------------------------------------------------------------------- -Purpose of the thorn: +1. Purpose Set up refined regions by specifying a set of centres and radii about them. The refined regions are then the conjunction of these regions. diff --git a/Carpet/CarpetRegrid2/interface.ccl b/Carpet/CarpetRegrid2/interface.ccl index 6eb913280..f5a32a7f6 100644 --- a/Carpet/CarpetRegrid2/interface.ccl +++ b/Carpet/CarpetRegrid2/interface.ccl @@ -11,6 +11,7 @@ USES INCLUDE HEADER: region.hh USES INCLUDE HEADER: vect.hh USES INCLUDE HEADER: carpet.hh +USES INCLUDE HEADER: CarpetTimers.hh diff --git a/Carpet/CarpetRegrid2/src/regrid.cc b/Carpet/CarpetRegrid2/src/regrid.cc index b0d4c4d7c..85f1c0b83 100644 --- a/Carpet/CarpetRegrid2/src/regrid.cc +++ b/Carpet/CarpetRegrid2/src/regrid.cc @@ -19,6 +19,7 @@ #include <vect.hh> #include <carpet.hh> +#include <CarpetTimers.hh> #include "indexing.hh" @@ -829,6 +830,10 @@ namespace CarpetRegrid2 { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; + char const * const where = "CarpetRegrid2::Regrid"; + static Carpet::Timer timer (where); + timer.start(); + assert (is_singlemap_mode()); // Decide whether to change the grid hierarchy @@ -950,7 +955,7 @@ namespace CarpetRegrid2 { Regrid (cctkGH, superregss); // Make multiprocessor aware - vector <vector <region_t> > regss; + vector <vector <region_t> > regss (superregss.size()); for (size_t rl = 0; rl < regss.size(); ++ rl) { SplitRegions (cctkGH, superregss.at(rl), regss.at(rl)); } // for rl @@ -973,6 +978,8 @@ namespace CarpetRegrid2 { } // if do_recompose + timer.stop(); + return do_recompose; } @@ -989,6 +996,10 @@ namespace CarpetRegrid2 { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; + char const * const where = "CarpetRegrid2::RegridMaps"; + static Carpet::Timer timer (where); + timer.start(); + assert (is_level_mode()); // Decide whether to change the grid hierarchy @@ -1161,6 +1172,8 @@ namespace CarpetRegrid2 { } // if do_recompose + timer.stop(); + return do_recompose; } |