diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2013-04-04 15:29:14 -0400 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2013-04-04 15:29:14 -0400 |
| commit | 21a97f9756161e7aa2407c810fd77e46fec2fc1e (patch) | |
| tree | 5a6d7e90c1af1e4a7505b3a68cf597dba7266170 /Carpet/Carpet | |
| parent | 3a31ba2df380c593282b2442ad2f5513eaa1f843 (diff) | |
Requirements: Use location_t to output warnings and errors
Add function_data to location_t.
Update location_t's output routine.
Pass iteration number to Requirements::Recompose. Update callers in Carpet.
Diffstat (limited to 'Carpet/Carpet')
| -rw-r--r-- | Carpet/Carpet/src/Evolve.cc | 2 | ||||
| -rw-r--r-- | Carpet/Carpet/src/Initialise.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Carpet/Carpet/src/Evolve.cc b/Carpet/Carpet/src/Evolve.cc index 4c97d13a9..bf90787e6 100644 --- a/Carpet/Carpet/src/Evolve.cc +++ b/Carpet/Carpet/src/Evolve.cc @@ -311,7 +311,7 @@ namespace Carpet { bool const did_recompose = Recompose (cctkGH, rl, true); did_any_recompose = did_any_recompose or did_recompose; #ifdef REQUIREMENTS_HH - Requirements::Recompose(rl, + Requirements::Recompose(cctkGH->cctk_iteration, rl, not did_recompose ? Requirements::valid::everywhere : Requirements::valid::interior); diff --git a/Carpet/Carpet/src/Initialise.cc b/Carpet/Carpet/src/Initialise.cc index 0668e28c0..ac0189af1 100644 --- a/Carpet/Carpet/src/Initialise.cc +++ b/Carpet/Carpet/src/Initialise.cc @@ -943,7 +943,7 @@ namespace Carpet { did_recompose = Recompose (cctkGH, rl, prolongate_initial_data); did_any_recompose = did_any_recompose or did_recompose; #ifdef REQUIREMENTS_HH - Requirements::Recompose(rl, + Requirements::Recompose(cctkGH->cctk_iteration, rl, not did_recompose ? Requirements::valid::everywhere : prolongate_initial_data ? @@ -1068,7 +1068,7 @@ namespace Carpet { if (not enable_no_storage) { Recompose (cctkGH, rl, prolongate_initial_data); #ifdef REQUIREMENTS_HH - Requirements::Recompose(rl, + Requirements::Recompose(cctkGH->cctk_iteration, rl, prolongate_initial_data ? Requirements::valid::interior : Requirements::valid::nowhere); @@ -1156,7 +1156,7 @@ namespace Carpet { bool did_recompose = Recompose (cctkGH, rl, prolongate_initial_data); did_any_recompose = did_any_recompose or did_recompose; #ifdef REQUIREMENTS_HH - Requirements::Recompose(rl, + Requirements::Recompose(cctkGH->cctk_iteration, rl, not did_recompose ? Requirements::valid::everywhere : prolongate_initial_data ? |