From d0c08dc7742694401608db289fc1b58eda949141 Mon Sep 17 00:00:00 2001 From: Ian Hinder Date: Thu, 4 Apr 2013 13:17:12 +0200 Subject: Requirements: Pass all_clauses as a reference argument rather than using a global variable --- Carpet/Requirements/src/Requirements.cc | 6 +++--- Carpet/Requirements/src/all_state.cc | 4 ++-- Carpet/Requirements/src/all_state.hh | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) (limited to 'Carpet/Requirements') diff --git a/Carpet/Requirements/src/Requirements.cc b/Carpet/Requirements/src/Requirements.cc index dd28a6ba0..f94e8bf41 100644 --- a/Carpet/Requirements/src/Requirements.cc +++ b/Carpet/Requirements/src/Requirements.cc @@ -158,7 +158,7 @@ namespace Requirements { { DECLARE_CCTK_PARAMETERS; if (check_requirements) { - all_state.before_routine(function_data, + all_state.before_routine(function_data, all_clauses, reflevel, map, timelevel, timelevel_offset); } if (inconsistencies_are_fatal and gridpoint_t::there_was_an_error) { @@ -173,8 +173,8 @@ namespace Requirements { { DECLARE_CCTK_PARAMETERS; if (check_requirements) { - all_state.after_routine(function_data, cctk_iteration, reflevel, map, - timelevel, timelevel_offset); + all_state.after_routine(function_data, all_clauses, cctk_iteration, + reflevel, map, timelevel, timelevel_offset); } if (inconsistencies_are_fatal and gridpoint_t::there_was_an_error) { CCTK_WARN(CCTK_WARN_ABORT, diff --git a/Carpet/Requirements/src/all_state.cc b/Carpet/Requirements/src/all_state.cc index 192187944..bb1e4c40f 100644 --- a/Carpet/Requirements/src/all_state.cc +++ b/Carpet/Requirements/src/all_state.cc @@ -15,8 +15,6 @@ namespace Requirements { // always considered valid std::vector ignored_variables; - extern all_clauses_t all_clauses; - static void add_ignored_variable(int const id, const char *const opstring, void *const callback_arg) { @@ -348,6 +346,7 @@ namespace Requirements { // Check that the grid is in the required state before a given // function is executed void all_state_t::before_routine(cFunctionData const* const function_data, + all_clauses_t &all_clauses, int const reflevel, int const map, int const timelevel, int const timelevel_offset) @@ -417,6 +416,7 @@ namespace Requirements { // Update internal data structures after a function has been // executed to reflect the fact that some variables are now valid void all_state_t::after_routine(cFunctionData const* const function_data, + all_clauses_t &all_clauses, CCTK_INT cctk_iteration, int const reflevel, int const map, int const timelevel, diff --git a/Carpet/Requirements/src/all_state.hh b/Carpet/Requirements/src/all_state.hh index ae890fd86..fff6a437a 100644 --- a/Carpet/Requirements/src/all_state.hh +++ b/Carpet/Requirements/src/all_state.hh @@ -10,6 +10,7 @@ #include #include +#include using namespace std; @@ -38,9 +39,11 @@ namespace Requirements { void regrid_free(); void cycle(int reflevel); void before_routine(cFunctionData const* function_data, + all_clauses_t &all_clauses, int reflevel, int map, int timelevel, int timelevel_offset) const; void after_routine(cFunctionData const* function_data, + all_clauses_t &all_clauses, CCTK_INT cctk_iteration, int reflevel, int map, int timelevel, int timelevel_offset); -- cgit v1.2.3