From 00eb90b88cd3c82b73dd3ece87a311293952f7a7 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Wed, 3 Apr 2013 16:13:22 -0400 Subject: Requirements: Break lines to make code more readable --- Carpet/Requirements/src/Requirements.cc | 21 +++++++++++++-------- Carpet/Requirements/src/all_clauses.cc | 4 +++- 2 files changed, 16 insertions(+), 9 deletions(-) (limited to 'Carpet/Requirements') diff --git a/Carpet/Requirements/src/Requirements.cc b/Carpet/Requirements/src/Requirements.cc index 3d7fa4103..39a56d815 100644 --- a/Carpet/Requirements/src/Requirements.cc +++ b/Carpet/Requirements/src/Requirements.cc @@ -41,7 +41,6 @@ namespace Requirements { a.output(os); return os; } - all_clauses_t all_clauses; @@ -93,8 +92,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, @@ -343,7 +343,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); } @@ -765,8 +766,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)) { @@ -842,8 +845,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..7e1fece31 100644 --- a/Carpet/Requirements/src/all_clauses.cc +++ b/Carpet/Requirements/src/all_clauses.cc @@ -38,10 +38,12 @@ namespace Requirements { } return; } + void all_clauses_t::output(ostream& os) const { os << "all_clauses: {" << std::endl; - for (std::map::const_iterator ti=clauses_map.begin(); + for (std::map::const_iterator + ti=clauses_map.begin(); ti!=clauses_map.end(); ++ti) { -- cgit v1.2.3