diff options
author | Erik Schnetter <schnetter@cct.lsu.edu> | 2010-10-02 00:40:20 -0500 |
---|---|---|
committer | Barry Wardell <barry.wardell@gmail.com> | 2011-12-14 18:25:29 +0000 |
commit | 9b4abb4a14c0a5a4ed555955cc4788bad6671282 (patch) | |
tree | e92f57e771f52019eae5933e15f845e2104e6bdf /CarpetDev | |
parent | 6bba60b788be8c8a1a6c2e5f92f999130f838aac (diff) |
Backed out changeset 1b5c07de6243
Diffstat (limited to 'CarpetDev')
-rw-r--r-- | CarpetDev/CarpetIOF5/src/output.cc | 11 |
1 files changed, 5 insertions, 6 deletions
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] = |