diff options
author | Frank Löffler <knarf@cct.lsu.edu> | 2013-04-03 15:35:26 -0500 |
---|---|---|
committer | Frank Löffler <knarf@cct.lsu.edu> | 2013-04-03 15:35:26 -0500 |
commit | 86079b6bc84fbd50791ba4a4e80f5871bb543511 (patch) | |
tree | b8ae94b1f5a188e501f452d977b3f00e64bb69c0 /Carpet/Requirements/src | |
parent | fa459d512e8e454f5fb69062f53cb6b0963b5959 (diff) | |
parent | f6e6d8280a92f51b2d1046c067e244a88570f86f (diff) |
Merge branch 'master' of carpetcode.org:carpet
Diffstat (limited to 'Carpet/Requirements/src')
-rw-r--r-- | Carpet/Requirements/src/Requirements.cc | 23 | ||||
-rw-r--r-- | Carpet/Requirements/src/all_clauses.cc | 10 | ||||
-rw-r--r-- | Carpet/Requirements/src/all_clauses.hh | 12 | ||||
-rw-r--r-- | Carpet/Requirements/src/clause.cc | 1 | ||||
-rw-r--r-- | Carpet/Requirements/src/clause.hh | 21 | ||||
-rw-r--r-- | Carpet/Requirements/src/clauses.cc | 3 | ||||
-rw-r--r-- | Carpet/Requirements/src/clauses.hh | 6 | ||||
-rw-r--r-- | Carpet/Requirements/src/util.cc | 2 | ||||
-rw-r--r-- | Carpet/Requirements/src/util.hh | 17 |
9 files changed, 50 insertions, 45 deletions
diff --git a/Carpet/Requirements/src/Requirements.cc b/Carpet/Requirements/src/Requirements.cc index a8f8269ca..f5e6546ca 100644 --- a/Carpet/Requirements/src/Requirements.cc +++ b/Carpet/Requirements/src/Requirements.cc @@ -18,9 +18,9 @@ #include <string> #include <vector> +#include <all_clauses.hh> #include <clause.hh> #include <clauses.hh> -#include <all_clauses.hh> #include <util.hh> using namespace std; @@ -41,7 +41,6 @@ namespace Requirements { a.output(os); return os; } - all_clauses_t all_clauses; @@ -126,8 +125,9 @@ namespace Requirements { a.output(os); return os; } - - + + + // Check that all the parts of the grid variables read by a function // are valid. This will be called before the function is executed. void gridpoint_t::check_state(clause_t const& clause, @@ -376,7 +376,8 @@ namespace Requirements { std::ostringstream stream; stream << "groups: " << groups << " timelevels: " << timelevels; CCTK_VInfo(CCTK_THORNSTRING, - "ChangeStorage reflevel=%d %s", reflevel, stream.str().c_str()); + "ChangeStorage reflevel=%d %s", + reflevel, stream.str().c_str()); } all_state.change_storage(groups, timelevels, reflevel); } @@ -798,8 +799,10 @@ namespace Requirements { assert(timelevel != -1); assert(timelevels >= clause.min_num_timelevels()); // TODO: properly handle timelevels the way enter_local_mode() does - const int mintl = timelevel == 0 || timelevels == 1 ? 0 : timelevel; - const int maxtl = timelevel == 0 || timelevels == 1 ? timelevels-1 : timelevel; + const int mintl = + timelevel == 0 || timelevels == 1 ? 0 : timelevel; + const int maxtl = + timelevel == 0 || timelevels == 1 ? timelevels-1 : timelevel; const int tl_of = timelevels > 1 ? timelevel : 0; for (int tl=mintl; tl<=maxtl; ++tl) { if (timelevel==-1 or clause.active_on_timelevel(tl-tl_of)) { @@ -875,8 +878,10 @@ namespace Requirements { assert(timelevel != -1); assert(timelevels >= clause.min_num_timelevels()); // TODO: properly handle timelevels the way enter_local_mode() does - const int mintl = timelevel == 0 || timelevels == 1 ? 0 : timelevel; - const int maxtl = timelevel == 0 || timelevels == 1 ? timelevels-1 : timelevel; + const int mintl = + timelevel == 0 || timelevels == 1 ? 0 : timelevel; + const int maxtl = + timelevel == 0 || timelevels == 1 ? timelevels-1 : timelevel; const int tl_of = timelevels > 1 ? timelevel : 0; for (int tl=mintl; tl<=maxtl; ++tl) { if (timelevel==-1 or clause.active_on_timelevel(tl-tl_of)) { diff --git a/Carpet/Requirements/src/all_clauses.cc b/Carpet/Requirements/src/all_clauses.cc index 950b73386..179a411a3 100644 --- a/Carpet/Requirements/src/all_clauses.cc +++ b/Carpet/Requirements/src/all_clauses.cc @@ -1,14 +1,12 @@ - #include <iostream> +#include <map> #include <vector> #include <cctk.h> #include <cctki_Schedule.h> -//#include <clauses.hh> -//#include <clause.hh> + #include <all_clauses.hh> #include <util.hh> -#include <map> using namespace std; @@ -38,10 +36,12 @@ namespace Requirements { } return; } + void all_clauses_t::output(ostream& os) const { os << "all_clauses: {" << std::endl; - for (std::map<cFunctionData const*, clauses_t const*>::const_iterator ti=clauses_map.begin(); + for (std::map<cFunctionData const*, clauses_t const*>::const_iterator + ti=clauses_map.begin(); ti!=clauses_map.end(); ++ti) { diff --git a/Carpet/Requirements/src/all_clauses.hh b/Carpet/Requirements/src/all_clauses.hh index 3219aa3fa..ceedc330b 100644 --- a/Carpet/Requirements/src/all_clauses.hh +++ b/Carpet/Requirements/src/all_clauses.hh @@ -1,18 +1,18 @@ #ifndef ALL_CLAUSES_HH #define ALL_CLAUSES_HH -#include <iostream> -#include <map> - #include <cctk.h> #include <cctki_Schedule.h> -#include <clauses.hh> +#include <iostream> +#include <map> -using namespace std; +#include <clauses.hh> namespace Requirements { - + + using namespace std; + class all_clauses_t { // TODO: Represent I/O as well? typedef std::map<cFunctionData const*, clauses_t const*> clauses_map_t; diff --git a/Carpet/Requirements/src/clause.cc b/Carpet/Requirements/src/clause.cc index a9d25625b..cfaa24a08 100644 --- a/Carpet/Requirements/src/clause.cc +++ b/Carpet/Requirements/src/clause.cc @@ -6,6 +6,7 @@ #include <vector> #include <clause.hh> +#include <util.hh> using namespace std; diff --git a/Carpet/Requirements/src/clause.hh b/Carpet/Requirements/src/clause.hh index d27659b8b..0e7822673 100644 --- a/Carpet/Requirements/src/clause.hh +++ b/Carpet/Requirements/src/clause.hh @@ -5,25 +5,10 @@ #include <vector> -using namespace std; - - - -// Use this macro AT instead of vector's operator[] or at(). Depending -// on the macro NDEBUG, this macro AT either checks for valid indices -// or not. -#ifndef AT -# ifndef NDEBUG -# define AT(index) at(index) -# else -# define AT(index) operator[](index) -# endif -#endif - - - namespace Requirements { - + + using namespace std; + // Represent scheduled functions and their dependencies // This reflects exactly what was written in the schedule.ccl file struct clause_t { diff --git a/Carpet/Requirements/src/clauses.cc b/Carpet/Requirements/src/clauses.cc index ad0a3aea9..c3d71ba09 100644 --- a/Carpet/Requirements/src/clauses.cc +++ b/Carpet/Requirements/src/clauses.cc @@ -4,8 +4,9 @@ #include <cctk.h> #include <cctki_Schedule.h> -#include <clauses.hh> + #include <clause.hh> +#include <clauses.hh> #include <util.hh> using namespace std; diff --git a/Carpet/Requirements/src/clauses.hh b/Carpet/Requirements/src/clauses.hh index 368f45772..d5441c880 100644 --- a/Carpet/Requirements/src/clauses.hh +++ b/Carpet/Requirements/src/clauses.hh @@ -8,10 +8,10 @@ #include <clause.hh> -using namespace std; - namespace Requirements { - + + using namespace std; + struct clauses_t { vector<clause_t> reads, writes; clauses_t() {} diff --git a/Carpet/Requirements/src/util.cc b/Carpet/Requirements/src/util.cc index 20df87d89..3d8e16d0c 100644 --- a/Carpet/Requirements/src/util.cc +++ b/Carpet/Requirements/src/util.cc @@ -1,3 +1 @@ - #include <util.hh> - diff --git a/Carpet/Requirements/src/util.hh b/Carpet/Requirements/src/util.hh index 73b5faa1e..0ed99cda6 100644 --- a/Carpet/Requirements/src/util.hh +++ b/Carpet/Requirements/src/util.hh @@ -4,9 +4,24 @@ #include <iostream> #include <vector> + + +// Use this macro AT instead of vector's operator[] or at(). Depending +// on the macro NDEBUG, this macro AT either checks for valid indices +// or not. +#ifndef AT +# ifndef NDEBUG +# define AT(index) at(index) +# else +# define AT(index) operator[](index) +# endif +#endif + + + namespace Requirements { -using namespace std; + using namespace std; // taken from defs.cc and defs.hh // Vector output |