diff --git a/libmpdata++/output/hdf5.hpp b/libmpdata++/output/hdf5.hpp index 663e6b4b..f9190cda 100644 --- a/libmpdata++/output/hdf5.hpp +++ b/libmpdata++/output/hdf5.hpp @@ -583,12 +583,11 @@ namespace libmpdataxx group.createAttribute("opts", type, H5::DataSpace(1, &one)).write(type, opts_str.data()); } { - const auto type = flttype_solver; - group.createAttribute("dt", type, H5::DataSpace(1, &one)).write(type, &this->dt); + group.createAttribute("dt", flttype_output, H5::DataSpace(1, &one)).write(flttype_solver, &this->dt); const auto names = std::vector{"di", "dj", "dk"}; for (int d = 0; d < parent_t::n_dims; ++d) { - group.createAttribute(names[d], type, H5::DataSpace(1, &one)).write(type, &this->dijk[d]); + group.createAttribute(names[d], flttype_output, H5::DataSpace(1, &one)).write(flttype_solver, &this->dijk[d]); } } { @@ -598,8 +597,7 @@ namespace libmpdataxx } if (parent_t::ct_params_t_::var_dt) { - const auto type = flttype_solver; - group.createAttribute("max_courant", type, H5::DataSpace(1, &one)).write(type, &this->max_courant); + group.createAttribute("max_courant", flttype_output, H5::DataSpace(1, &one)).write(flttype_solver, &this->max_courant); } { const auto type = H5::PredType::NATIVE_INT; @@ -645,8 +643,7 @@ namespace libmpdataxx group.createAttribute("prs_scheme", type, H5::DataSpace(1, &one)).write(type, prs_scheme_str.data()); } { - const auto type = flttype_solver; - group.createAttribute("prs_tol", type, H5::DataSpace(1, &one)).write(type, &this->prs_tol); + group.createAttribute("prs_tol", flttype_output, H5::DataSpace(1, &one)).write(flttype_solver, &this->prs_tol); } } @@ -668,8 +665,7 @@ namespace libmpdataxx group.createAttribute("stress_diff", type, H5::DataSpace(1, &one)).write(type, sdiff_str.data()); } { - const auto type = flttype_solver; - group.createAttribute("cdrag", type, H5::DataSpace(1, &one)).write(type, &this->cdrag); + group.createAttribute("cdrag", flttype_output, H5::DataSpace(1, &one)).write(flttype_solver, &this->cdrag); } } @@ -680,8 +676,7 @@ namespace libmpdataxx const auto &group = hdfcp.openGroup("sgs"); { - const auto type = flttype_solver; - group.createAttribute("eta", type, H5::DataSpace(1, &one)).write(type, &this->eta); + group.createAttribute("eta", flttype_output, H5::DataSpace(1, &one)).write(flttype_solver, &this->eta); } } @@ -692,9 +687,8 @@ namespace libmpdataxx const auto &group = hdfcp.openGroup("sgs"); { - const auto type = flttype_solver; - group.createAttribute("smg_c", type, H5::DataSpace(1, &one)).write(type, &this->smg_c); - group.createAttribute("c_m", type, H5::DataSpace(1, &one)).write(type, &this->c_m); + group.createAttribute("smg_c", flttype_output, H5::DataSpace(1, &one)).write(flttype_solver, &this->smg_c); + group.createAttribute("c_m", flttype_output, H5::DataSpace(1, &one)).write(flttype_solver, &this->c_m); } } @@ -708,10 +702,9 @@ namespace libmpdataxx hdfcp.createGroup("boussinesq"); const auto &group = hdfcp.openGroup("boussinesq"); { - const auto type = flttype_solver; - group.createAttribute("g", type, H5::DataSpace(1, &one)).write(type, &this->g); - group.createAttribute("Tht_ref", type, H5::DataSpace(1, &one)).write(type, &this->Tht_ref); - group.createAttribute("hflux_const", type, H5::DataSpace(1, &one)).write(type, &this->hflux_const); + group.createAttribute("g", flttype_output, H5::DataSpace(1, &one)).write(flttype_solver, &this->g); + group.createAttribute("Tht_ref", flttype_output, H5::DataSpace(1, &one)).write(flttype_solver, &this->Tht_ref); + group.createAttribute("hflux_const", flttype_output, H5::DataSpace(1, &one)).write(flttype_solver, &this->hflux_const); } { auto dset = group.createDataSet("tht_e", flttype_output, sspace); @@ -726,8 +719,7 @@ namespace libmpdataxx const auto &group = hdfcp.openGroup("boussinesq"); { - const auto type = flttype_solver; - group.createAttribute("prandtl_num", type, H5::DataSpace(1, &one)).write(type, &this->prandtl_num); + group.createAttribute("prandtl_num", flttype_output, H5::DataSpace(1, &one)).write(flttype_solver, &this->prandtl_num); } { auto dset = group.createDataSet("mix_len", flttype_output, sspace); diff --git a/tests/nair_jablonowski_2008/stationary/refdata/nug_i2_96/const.h5 b/tests/nair_jablonowski_2008/stationary/refdata/nug_i2_96/const.h5 index bd4d8b13..31ebbca4 100644 Binary files a/tests/nair_jablonowski_2008/stationary/refdata/nug_i2_96/const.h5 and b/tests/nair_jablonowski_2008/stationary/refdata/nug_i2_96/const.h5 differ diff --git a/tests/nair_jablonowski_2008/stationary/refdata/nug_iga_fct_i2_96/const.h5 b/tests/nair_jablonowski_2008/stationary/refdata/nug_iga_fct_i2_96/const.h5 index 1e837062..078262f4 100644 Binary files a/tests/nair_jablonowski_2008/stationary/refdata/nug_iga_fct_i2_96/const.h5 and b/tests/nair_jablonowski_2008/stationary/refdata/nug_iga_fct_i2_96/const.h5 differ diff --git a/tests/nair_jablonowski_2008/stationary/refdata/nug_iga_tot_fct_i2_96/const.h5 b/tests/nair_jablonowski_2008/stationary/refdata/nug_iga_tot_fct_i2_96/const.h5 index 15011a05..b716241a 100644 Binary files a/tests/nair_jablonowski_2008/stationary/refdata/nug_iga_tot_fct_i2_96/const.h5 and b/tests/nair_jablonowski_2008/stationary/refdata/nug_iga_tot_fct_i2_96/const.h5 differ diff --git a/tests/nair_jablonowski_2008/stationary/refdata/nug_tot_i3_96/const.h5 b/tests/nair_jablonowski_2008/stationary/refdata/nug_tot_i3_96/const.h5 index 8e93bae3..d58acfcd 100644 Binary files a/tests/nair_jablonowski_2008/stationary/refdata/nug_tot_i3_96/const.h5 and b/tests/nair_jablonowski_2008/stationary/refdata/nug_tot_i3_96/const.h5 differ diff --git a/tests/paper_2015_GMD/4_revolving_sphere_3d/refdata/basic/const.h5 b/tests/paper_2015_GMD/4_revolving_sphere_3d/refdata/basic/const.h5 index 8f5fad3d..94324b44 100644 Binary files a/tests/paper_2015_GMD/4_revolving_sphere_3d/refdata/basic/const.h5 and b/tests/paper_2015_GMD/4_revolving_sphere_3d/refdata/basic/const.h5 differ diff --git a/tests/paper_2015_GMD/4_revolving_sphere_3d/refdata/fct/const.h5 b/tests/paper_2015_GMD/4_revolving_sphere_3d/refdata/fct/const.h5 index 3a498de9..06711277 100644 Binary files a/tests/paper_2015_GMD/4_revolving_sphere_3d/refdata/fct/const.h5 and b/tests/paper_2015_GMD/4_revolving_sphere_3d/refdata/fct/const.h5 differ diff --git a/tests/paper_2015_GMD/4_revolving_sphere_3d/refdata/iga/const.h5 b/tests/paper_2015_GMD/4_revolving_sphere_3d/refdata/iga/const.h5 index f05a3b77..8163d592 100644 Binary files a/tests/paper_2015_GMD/4_revolving_sphere_3d/refdata/iga/const.h5 and b/tests/paper_2015_GMD/4_revolving_sphere_3d/refdata/iga/const.h5 differ diff --git a/tests/paper_2015_GMD/4_revolving_sphere_3d/refdata/iga_fct/const.h5 b/tests/paper_2015_GMD/4_revolving_sphere_3d/refdata/iga_fct/const.h5 index ba9abc34..891eb5b5 100644 Binary files a/tests/paper_2015_GMD/4_revolving_sphere_3d/refdata/iga_fct/const.h5 and b/tests/paper_2015_GMD/4_revolving_sphere_3d/refdata/iga_fct/const.h5 differ diff --git a/tests/paper_2015_GMD/4_revolving_sphere_3d/refdata/upwind/const.h5 b/tests/paper_2015_GMD/4_revolving_sphere_3d/refdata/upwind/const.h5 index a46118ab..79acd0f6 100644 Binary files a/tests/paper_2015_GMD/4_revolving_sphere_3d/refdata/upwind/const.h5 and b/tests/paper_2015_GMD/4_revolving_sphere_3d/refdata/upwind/const.h5 differ diff --git a/tests/paper_2015_GMD/7_shallow_water/refdata/1d_fct_abs/const.h5 b/tests/paper_2015_GMD/7_shallow_water/refdata/1d_fct_abs/const.h5 index 1b31068c..07a14048 100644 Binary files a/tests/paper_2015_GMD/7_shallow_water/refdata/1d_fct_abs/const.h5 and b/tests/paper_2015_GMD/7_shallow_water/refdata/1d_fct_abs/const.h5 differ diff --git a/tests/paper_2015_GMD/7_shallow_water/refdata/1d_fct_abs_stats.txt.gz b/tests/paper_2015_GMD/7_shallow_water/refdata/1d_fct_abs_stats.txt.gz index 4a7958c5..4b230e4a 100644 Binary files a/tests/paper_2015_GMD/7_shallow_water/refdata/1d_fct_abs_stats.txt.gz and b/tests/paper_2015_GMD/7_shallow_water/refdata/1d_fct_abs_stats.txt.gz differ diff --git a/tests/paper_2015_GMD/7_shallow_water/refdata/1d_fct_iga/const.h5 b/tests/paper_2015_GMD/7_shallow_water/refdata/1d_fct_iga/const.h5 index f5120e99..b8079aa7 100644 Binary files a/tests/paper_2015_GMD/7_shallow_water/refdata/1d_fct_iga/const.h5 and b/tests/paper_2015_GMD/7_shallow_water/refdata/1d_fct_iga/const.h5 differ diff --git a/tests/paper_2015_GMD/7_shallow_water/refdata/1d_fct_iga_stats.txt.gz b/tests/paper_2015_GMD/7_shallow_water/refdata/1d_fct_iga_stats.txt.gz index eb68230e..32f6514f 100644 Binary files a/tests/paper_2015_GMD/7_shallow_water/refdata/1d_fct_iga_stats.txt.gz and b/tests/paper_2015_GMD/7_shallow_water/refdata/1d_fct_iga_stats.txt.gz differ diff --git a/tests/paper_2015_GMD/7_shallow_water/refdata/2d_fct_abs/const.h5 b/tests/paper_2015_GMD/7_shallow_water/refdata/2d_fct_abs/const.h5 index d48ed405..1b6313f2 100644 Binary files a/tests/paper_2015_GMD/7_shallow_water/refdata/2d_fct_abs/const.h5 and b/tests/paper_2015_GMD/7_shallow_water/refdata/2d_fct_abs/const.h5 differ diff --git a/tests/paper_2015_GMD/7_shallow_water/refdata/2d_fct_iga/const.h5 b/tests/paper_2015_GMD/7_shallow_water/refdata/2d_fct_iga/const.h5 index f6781843..9b48ab10 100644 Binary files a/tests/paper_2015_GMD/7_shallow_water/refdata/2d_fct_iga/const.h5 and b/tests/paper_2015_GMD/7_shallow_water/refdata/2d_fct_iga/const.h5 differ diff --git a/tests/sandbox/pbl/refdata/out_pbl_iles_short/const.h5 b/tests/sandbox/pbl/refdata/out_pbl_iles_short/const.h5 index 84f6f4a0..a0880968 100644 Binary files a/tests/sandbox/pbl/refdata/out_pbl_iles_short/const.h5 and b/tests/sandbox/pbl/refdata/out_pbl_iles_short/const.h5 differ diff --git a/tests/sandbox/pbl/refdata/out_pbl_smg_short/const.h5 b/tests/sandbox/pbl/refdata/out_pbl_smg_short/const.h5 index 0b2a052a..a1be6abb 100644 Binary files a/tests/sandbox/pbl/refdata/out_pbl_smg_short/const.h5 and b/tests/sandbox/pbl/refdata/out_pbl_smg_short/const.h5 differ