diff options
-rw-r--r-- | Carpet/Carpet/src/CarpetStartup.cc | 12 | ||||
-rw-r--r-- | Carpet/Carpet/src/SetupGH.cc | 24 | ||||
-rw-r--r-- | Carpet/CarpetLib/src/bboxset.cc | 3 | ||||
-rw-r--r-- | Carpet/CarpetLib/src/bboxset.hh | 5 | ||||
-rw-r--r-- | Carpet/CarpetReduce/src/mask_carpet.cc | 10 | ||||
-rw-r--r-- | CarpetDev/CarpetIOF5/src/output.cc | 11 | ||||
-rw-r--r-- | CarpetExtra/Nirvana/dist/Nirvana.tar.gz | bin | 19155 -> 19154 bytes |
7 files changed, 18 insertions, 47 deletions
diff --git a/Carpet/Carpet/src/CarpetStartup.cc b/Carpet/Carpet/src/CarpetStartup.cc index 7314cda43..d8d1cd439 100644 --- a/Carpet/Carpet/src/CarpetStartup.cc +++ b/Carpet/Carpet/src/CarpetStartup.cc @@ -1,7 +1,5 @@ #include <cassert> #include <cstdlib> -#include <iomanip> -#include <limits> #include <cctk.h> #include <cctk_Parameters.h> @@ -20,16 +18,12 @@ 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<CCTK_REAL>::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 0b62c4d3d..0fbc657f0 100644 --- a/Carpet/Carpet/src/SetupGH.cc +++ b/Carpet/Carpet/src/SetupGH.cc @@ -165,8 +165,6 @@ 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); @@ -2252,28 +2250,6 @@ 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<char const * const *> (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 71bf62014..a830c0b73 100644 --- a/Carpet/CarpetLib/src/bboxset.cc +++ b/Carpet/CarpetLib/src/bboxset.cc @@ -506,8 +506,6 @@ bboxset<T,D> bboxset<T,D>::expanded_for (const box& b) const { return res; } -#warning "TODO: this is incorrect" -#if 1 template<typename T, int D> bboxset<T,D> bboxset<T,D>::contracted_for (const box& b) const { bboxset res; @@ -516,7 +514,6 @@ bboxset<T,D> bboxset<T,D>::contracted_for (const box& b) const { } return res; } -#endif diff --git a/Carpet/CarpetLib/src/bboxset.hh b/Carpet/CarpetLib/src/bboxset.hh index 5363d1673..23b2dc18c 100644 --- a/Carpet/CarpetLib/src/bboxset.hh +++ b/Carpet/CarpetLib/src/bboxset.hh @@ -38,7 +38,7 @@ ostream& operator<< (ostream& os, const bboxset<T,D>& s); -// Bounding box set class +// Bounding box class template<typename T, int D> class bboxset { @@ -166,11 +166,8 @@ 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 f176057e0..6db04bc9a 100644 --- a/Carpet/CarpetReduce/src/mask_carpet.cc +++ b/Carpet/CarpetReduce/src/mask_carpet.cc @@ -182,6 +182,7 @@ namespace CarpetMask { } END_LOOP_OVER_BSET; vector<int> imask (prod(ivect::ref(cctk_lsh))); + vector<int> mask (prod(ivect::ref(cctk_lsh))); assert (dim == 3); #pragma omp parallel @@ -192,6 +193,7 @@ 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<dim; ++d) { @@ -220,6 +222,10 @@ namespace CarpetMask { { int const ind = CCTK_GFINDEX3D (cctkGH, i, j, k); imask[ind] |= bmask; + if (mask[ind] == 0) { + mask[ind] = 1; + } + mask[ind] *= 2; } LC_ENDLOOP3(CarpetMaskSetup_restriction_boundary_partial); } END_LOOP_OVER_BSET; @@ -234,7 +240,9 @@ namespace CarpetMask { cctk_lsh[0],cctk_lsh[1],cctk_lsh[2]) { int const ind = CCTK_GFINDEX3D (cctkGH, i, j, k); - iweight[ind] &= imask[ind]; + if (mask[ind] > 0) { + 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 123c40524..423d55222 100644 --- a/CarpetDev/CarpetIOF5/src/output.cc +++ b/CarpetDev/CarpetIOF5/src/output.cc @@ -110,6 +110,8 @@ namespace CarpetIOF5 { DECLARE_CCTK_ARGUMENTS; indent_t indent; + herr_t herr; + assert (is_singlemap_mode() and reflevel==0); cout << indent << "map=" << Carpet::map << "\n"; @@ -166,14 +168,11 @@ 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, - &vlower, &vdelta); - F5Fset_range (path, &vlower, &vupper); + &v2d(lower), &v2d(delta)); + F5Fset_range (path, &v2d(lower), &v2d(upper)); } BEGIN_LOCAL_COMPONENT_LOOP (cctkGH, CCTK_GF) { @@ -399,7 +398,7 @@ namespace CarpetIOF5 { case tt_vector: { // Vector field CCTK_REAL const* rdata[cctk_dim]; - vector<vector<CCTK_REAL> > idata(cctk_dim); + vector<CCTK_REAL> idata[cctk_dim]; void const* data[cctk_dim]; for (int d=0; d<cctk_dim; ++d) { rdata[d] = diff --git a/CarpetExtra/Nirvana/dist/Nirvana.tar.gz b/CarpetExtra/Nirvana/dist/Nirvana.tar.gz Binary files differindex 4bd9d483e..0fba057cf 100644 --- a/CarpetExtra/Nirvana/dist/Nirvana.tar.gz +++ b/CarpetExtra/Nirvana/dist/Nirvana.tar.gz |