diff options
| -rw-r--r-- | Carpet/CarpetLib/param.ccl | 6 | ||||
| -rw-r--r-- | Carpet/CarpetLib/src/dgdh.cc | 4 | ||||
| -rw-r--r-- | Carpet/CarpetLib/src/dh.cc | 83 |
3 files changed, 49 insertions, 44 deletions
diff --git a/Carpet/CarpetLib/param.ccl b/Carpet/CarpetLib/param.ccl index d89b15413..bba42acd0 100644 --- a/Carpet/CarpetLib/param.ccl +++ b/Carpet/CarpetLib/param.ccl @@ -1,5 +1,5 @@ # Parameter definitions for thorn CarpetLib -# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/param.ccl,v 1.2 2001/03/07 13:00:05 eschnett Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/param.ccl,v 1.3 2002/10/24 11:36:34 schnetter Exp $ private: @@ -10,3 +10,7 @@ BOOLEAN verbose "Print info to the screen" BOOLEAN barriers "Insert barriers at strategic places for debugging purposes (slows down execution)" { } "no" + +BOOLEAN output_bboxes "Output bounding box information to the screen" +{ +} "no" diff --git a/Carpet/CarpetLib/src/dgdh.cc b/Carpet/CarpetLib/src/dgdh.cc index 27cd2e335..79dca23a2 100644 --- a/Carpet/CarpetLib/src/dgdh.cc +++ b/Carpet/CarpetLib/src/dgdh.cc @@ -6,7 +6,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/Attic/dgdh.cc,v 1.3 2002/05/05 22:17:00 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/Attic/dgdh.cc,v 1.4 2002/10/24 11:36:34 schnetter Exp $ ***************************************************************************/ @@ -27,8 +27,6 @@ #include "dgdh.hh" -#undef DEBUG_OUTPUT - using namespace std; diff --git a/Carpet/CarpetLib/src/dh.cc b/Carpet/CarpetLib/src/dh.cc index a77187e14..2239cd44f 100644 --- a/Carpet/CarpetLib/src/dh.cc +++ b/Carpet/CarpetLib/src/dh.cc @@ -6,7 +6,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/dh.cc,v 1.21 2002/10/14 20:40:38 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/dh.cc,v 1.22 2002/10/24 11:36:34 schnetter Exp $ ***************************************************************************/ @@ -21,6 +21,9 @@ #include <assert.h> +#include "cctk.h" +#include "cctk_Parameters.h" + #include "defs.hh" #include "dist.hh" #include "ggf.hh" @@ -28,8 +31,6 @@ #include "dh.hh" -#undef DEBUG_OUTPUT - using namespace std; @@ -59,6 +60,8 @@ dh<D>::~dh () // Modifiers template<int D> void dh<D>::recompose () { + DECLARE_CCTK_PARAMETERS; + CHECKPOINT; boxes.clear(); @@ -288,47 +291,47 @@ void dh<D>::recompose () { } } -#ifdef DEBUG_OUTPUT - cout << endl << h << endl; - for (int rl=0; rl<h.reflevels(); ++rl) { - for (int c=0; c<h.components(rl); ++c) { - for (int ml=0; ml<h.mglevels(rl,c); ++ml) { - cout << endl; - cout << "dh bboxes:" << endl; - cout << "rl=" << rl << " c=" << c << " ml=" << ml << endl; - cout << "exterior=" << boxes[rl][c][ml].exterior << endl; - cout << "interior=" << boxes[rl][c][ml].interior << endl; - cout << "send_mg_fine=" << boxes[rl][c][ml].send_mg_fine << endl; - cout << "send_mg_coarse=" << boxes[rl][c][ml].send_mg_coarse << endl; - cout << "recv_mg_fine=" << boxes[rl][c][ml].recv_mg_fine << endl; - cout << "recv_mg_coarse=" << boxes[rl][c][ml].recv_mg_coarse << endl; - cout << "send_ref_fine=" << boxes[rl][c][ml].send_ref_fine << endl; - cout << "send_ref_coarse=" << boxes[rl][c][ml].send_ref_coarse << endl; - cout << "recv_ref_fine=" << boxes[rl][c][ml].recv_ref_fine << endl; - cout << "recv_ref_coarse=" << boxes[rl][c][ml].recv_ref_coarse << endl; - cout << "send_sync=" << boxes[rl][c][ml].send_sync << endl; - cout << "send_ref_bnd_fine=" << boxes[rl][c][ml].send_ref_bnd_fine << endl; - cout << "boundaries=" << boxes[rl][c][ml].boundaries << endl; - cout << "recv_sync=" << boxes[rl][c][ml].recv_sync << endl; - cout << "recv_ref_bnd_coarse=" << boxes[rl][c][ml].recv_ref_bnd_coarse << endl; - cout << "sync_not=" << boxes[rl][c][ml].sync_not << endl; - cout << "recv_not=" << boxes[rl][c][ml].recv_not << endl; + if (output_bboxes) { + cout << endl << h << endl; + for (int rl=0; rl<h.reflevels(); ++rl) { + for (int c=0; c<h.components(rl); ++c) { + for (int ml=0; ml<h.mglevels(rl,c); ++ml) { + cout << endl; + cout << "dh bboxes:" << endl; + cout << "rl=" << rl << " c=" << c << " ml=" << ml << endl; + cout << "exterior=" << boxes[rl][c][ml].exterior << endl; + cout << "interior=" << boxes[rl][c][ml].interior << endl; + cout << "send_mg_fine=" << boxes[rl][c][ml].send_mg_fine << endl; + cout << "send_mg_coarse=" << boxes[rl][c][ml].send_mg_coarse << endl; + cout << "recv_mg_fine=" << boxes[rl][c][ml].recv_mg_fine << endl; + cout << "recv_mg_coarse=" << boxes[rl][c][ml].recv_mg_coarse << endl; + cout << "send_ref_fine=" << boxes[rl][c][ml].send_ref_fine << endl; + cout << "send_ref_coarse=" << boxes[rl][c][ml].send_ref_coarse << endl; + cout << "recv_ref_fine=" << boxes[rl][c][ml].recv_ref_fine << endl; + cout << "recv_ref_coarse=" << boxes[rl][c][ml].recv_ref_coarse << endl; + cout << "send_sync=" << boxes[rl][c][ml].send_sync << endl; + cout << "send_ref_bnd_fine=" << boxes[rl][c][ml].send_ref_bnd_fine << endl; + cout << "boundaries=" << boxes[rl][c][ml].boundaries << endl; + cout << "recv_sync=" << boxes[rl][c][ml].recv_sync << endl; + cout << "recv_ref_bnd_coarse=" << boxes[rl][c][ml].recv_ref_bnd_coarse << endl; + cout << "sync_not=" << boxes[rl][c][ml].sync_not << endl; + cout << "recv_not=" << boxes[rl][c][ml].recv_not << endl; + } } } - } - for (int rl=0; rl<h.reflevels(); ++rl) { - if (h.components(rl)>0) { - for (int ml=0; ml<h.mglevels(rl,0); ++ml) { - cout << endl; - cout << "dh bases:" << endl; - cout << "rl=" << rl << " ml=" << ml << endl; - cout << "exterior=" << bases[rl][ml].exterior << endl; - cout << "interior=" << bases[rl][ml].interior << endl; - cout << "boundaries=" << bases[rl][ml].boundaries << endl; + for (int rl=0; rl<h.reflevels(); ++rl) { + if (h.components(rl)>0) { + for (int ml=0; ml<h.mglevels(rl,0); ++ml) { + cout << endl; + cout << "dh bases:" << endl; + cout << "rl=" << rl << " ml=" << ml << endl; + cout << "exterior=" << bases[rl][ml].exterior << endl; + cout << "interior=" << bases[rl][ml].interior << endl; + cout << "boundaries=" << bases[rl][ml].boundaries << endl; + } } } - } -#endif + } // if output_bboxes for (typename list<generic_gf<D>*>::iterator f=gfs.begin(); f!=gfs.end(); ++f) { |