From 7574c9b18e5ba7bf2ebbdb49444b6b200c168bbb Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Fri, 1 Oct 2010 20:57:11 -0500 Subject: CarpetReduce: Remove unused variable "mask" --- Carpet/Carpet/src/CarpetStartup.cc | 12 +++++++++--- Carpet/Carpet/src/SetupGH.cc | 24 ++++++++++++++++++++++++ Carpet/CarpetLib/src/bboxset.cc | 3 +++ Carpet/CarpetLib/src/bboxset.hh | 5 ++++- Carpet/CarpetReduce/src/mask_carpet.cc | 10 +--------- CarpetDev/CarpetIOF5/src/output.cc | 11 ++++++----- CarpetExtra/Nirvana/dist/Nirvana.tar.gz | Bin 19154 -> 19155 bytes 7 files changed, 47 insertions(+), 18 deletions(-) diff --git a/Carpet/Carpet/src/CarpetStartup.cc b/Carpet/Carpet/src/CarpetStartup.cc index d8d1cd439..7314cda43 100644 --- a/Carpet/Carpet/src/CarpetStartup.cc +++ b/Carpet/Carpet/src/CarpetStartup.cc @@ -1,5 +1,7 @@ #include #include +#include +#include #include #include @@ -18,12 +20,16 @@ namespace Carpet { { DECLARE_CCTK_PARAMETERS; + // Increase the default output precision, so that all relevant + // digits are displayed. (The C++ output streams are mostly used + // for debug messages.) + int const precision = numeric_limits::digits10; + cout << setprecision(precision); + cerr << setprecision(precision); + comm_universe = MPI_COMM_WORLD; - // cerr << "QQQ: CarpetMultiModelStartup[1]" << endl; SplitUniverse (comm_universe, model, comm_world, true); - // cerr << "QQQ: CarpetMultiModelStartup[2]" << endl; dist::pseudoinit (comm_world); - // cerr << "QQQ: CarpetMultiModelStartup[3]" << endl; return 0; } diff --git a/Carpet/Carpet/src/SetupGH.cc b/Carpet/Carpet/src/SetupGH.cc index 0fbc657f0..0b62c4d3d 100644 --- a/Carpet/Carpet/src/SetupGH.cc +++ b/Carpet/Carpet/src/SetupGH.cc @@ -165,6 +165,8 @@ namespace Carpet { static void ensure_CartGrid3D_type (); static void + ensure_CartGrid3D_domain (); // UNUSED + static void ensure_CartGrid3D_avoid_origin (); static void ensure_ReflectionSymmetry_avoid_origin (centering refcentering); @@ -2250,6 +2252,28 @@ namespace Carpet { + // UNUSED: + // Ensure that CartGrid3D doesn't apply symmetries + void + ensure_CartGrid3D_domain () + { + if (CCTK_IsThornActive ("CartGrid3D")) { + int type; + void const * ptr; + + ptr = CCTK_ParameterGet ("domain", "CartGrid3D", & type); + assert (ptr != 0); + assert (type == PARAMETER_KEYWORD); + char const * const domain + = * static_cast (ptr); + if (not CCTK_EQUALS (domain, "full")) { + CCTK_WARN (0, "When Carpet::domain_from_coordbase = no, and when Carpet::max_refinement_levels > 1, then thorn CartGrid3D cannot provide symmetry boundaries"); + } + } + } + + + // Ensure that CartGrid3D::avoid_origin = no void ensure_CartGrid3D_avoid_origin () diff --git a/Carpet/CarpetLib/src/bboxset.cc b/Carpet/CarpetLib/src/bboxset.cc index a830c0b73..71bf62014 100644 --- a/Carpet/CarpetLib/src/bboxset.cc +++ b/Carpet/CarpetLib/src/bboxset.cc @@ -506,6 +506,8 @@ bboxset bboxset::expanded_for (const box& b) const { return res; } +#warning "TODO: this is incorrect" +#if 1 template bboxset bboxset::contracted_for (const box& b) const { bboxset res; @@ -514,6 +516,7 @@ bboxset bboxset::contracted_for (const box& b) const { } return res; } +#endif diff --git a/Carpet/CarpetLib/src/bboxset.hh b/Carpet/CarpetLib/src/bboxset.hh index 23b2dc18c..5363d1673 100644 --- a/Carpet/CarpetLib/src/bboxset.hh +++ b/Carpet/CarpetLib/src/bboxset.hh @@ -38,7 +38,7 @@ ostream& operator<< (ostream& os, const bboxset& s); -// Bounding box class +// Bounding box set class template class bboxset { @@ -166,8 +166,11 @@ public: ("compatible" means having the same stride.) */ bboxset expanded_for (const box& b) const; +#warning "TODO: this is incorrect" +#if 1 /** Find the largest b-compatible box inside this bbox. */ bboxset contracted_for (const box& b) const; +#endif // Equality bool operator== (const bboxset& s) const; diff --git a/Carpet/CarpetReduce/src/mask_carpet.cc b/Carpet/CarpetReduce/src/mask_carpet.cc index 6db04bc9a..f176057e0 100644 --- a/Carpet/CarpetReduce/src/mask_carpet.cc +++ b/Carpet/CarpetReduce/src/mask_carpet.cc @@ -182,7 +182,6 @@ namespace CarpetMask { } END_LOOP_OVER_BSET; vector imask (prod(ivect::ref(cctk_lsh))); - vector mask (prod(ivect::ref(cctk_lsh))); assert (dim == 3); #pragma omp parallel @@ -193,7 +192,6 @@ namespace CarpetMask { { int const ind = CCTK_GFINDEX3D (cctkGH, i, j, k); imask[ind] = 0; - mask[ind] = 0; } LC_ENDLOOP3(CarpetMaskSetup_restriction_boundary_init); for (int d=0; d 0) { - iweight[ind] &= imask[ind]; - } + iweight[ind] &= imask[ind]; } LC_ENDLOOP3(CarpetMaskSetup_restriction_boundary_apply); } END_LOCAL_COMPONENT_LOOP; diff --git a/CarpetDev/CarpetIOF5/src/output.cc b/CarpetDev/CarpetIOF5/src/output.cc index 423d55222..123c40524 100644 --- a/CarpetDev/CarpetIOF5/src/output.cc +++ b/CarpetDev/CarpetIOF5/src/output.cc @@ -110,8 +110,6 @@ namespace CarpetIOF5 { DECLARE_CCTK_ARGUMENTS; indent_t indent; - herr_t herr; - assert (is_singlemap_mode() and reflevel==0); cout << indent << "map=" << Carpet::map << "\n"; @@ -168,11 +166,14 @@ namespace CarpetIOF5 { if (not is_multipatch) { // Define level geometry + F5_vec3_double_t const vlower = v2d(lower); + F5_vec3_double_t const vupper = v2d(upper); + F5_vec3_double_t const vdelta = v2d(delta); F5Fwrite_linear (path, FIBER_HDF5_POSITIONS_STRING, dim, &v2h(gsh)[0], F5T_COORD3_DOUBLE, - &v2d(lower), &v2d(delta)); - F5Fset_range (path, &v2d(lower), &v2d(upper)); + &vlower, &vdelta); + F5Fset_range (path, &vlower, &vupper); } BEGIN_LOCAL_COMPONENT_LOOP (cctkGH, CCTK_GF) { @@ -398,7 +399,7 @@ namespace CarpetIOF5 { case tt_vector: { // Vector field CCTK_REAL const* rdata[cctk_dim]; - vector idata[cctk_dim]; + vector > idata(cctk_dim); void const* data[cctk_dim]; for (int d=0; d