From c7124e06bf9f7acd552139ee8e4812e986116d12 Mon Sep 17 00:00:00 2001
From: Lukas Riedel <mail@lukasriedel.com>
Date: Wed, 13 Feb 2019 22:00:39 +0100
Subject: [PATCH] Build interpolator in H5 initial condition directly from
 config

---
 dune/dorie/common/initial_condition/h5.hh | 63 +++--------------------
 1 file changed, 7 insertions(+), 56 deletions(-)

diff --git a/dune/dorie/common/initial_condition/h5.hh b/dune/dorie/common/initial_condition/h5.hh
index bcb2d744..cbf81135 100644
--- a/dune/dorie/common/initial_condition/h5.hh
+++ b/dune/dorie/common/initial_condition/h5.hh
@@ -41,60 +41,11 @@ public:
   InitialConditionH5( const GV& grid_view,
                       const Dune::ParameterTree& config, 
                       std::shared_ptr<spdlog::logger> log)
-    : Base(grid_view)
-  {
-    // open the H5 file
-    const auto datafile = config.template get<std::string>("initial.datafile");
-    const auto dataset = config.template get<std::string>("initial.dataset");
-
-    H5File h5file(datafile, log);
-
-    // read the dataset
-    std::vector<RF> data;
-    std::vector<size_t> shape;
-    h5file.read_dataset(dataset, H5T_NATIVE_DOUBLE, data, shape);
-    std::reverse(std::begin(shape), std::end(shape));
-
-    /// retrieve extensions and offset from grid extensions
-    const auto level_gv = grid_view.grid().levelGridView(0);
-    const auto [off, upper_right] = get_grid_extensions(level_gv);
-    const auto ext = upper_right - off;
-
-    if (shape.size() != dim) {
-        log->error("Expected {}-dimensional dataset. File: {}, "
-                    "Dataset: {}, Dimensions: {}",
-                    dim, datafile, dataset, shape.size());
-        DUNE_THROW(Dune::IOError, "Invalid dataset for interpolator");
-    }
-    if (ext.size() != dim) {
-        log->error("Expected {}-dimensional sequence as 'extensions'",
-                    dim);
-        DUNE_THROW(Dune::IOError, "Invalid interpolator input");
-    }
-    if (off.size() != dim) {
-        log->error("Expected {}-dimensional sequence as 'offset'",
-                    dim);
-        DUNE_THROW(Dune::IOError, "Invalid interpolator input");
-    }
-
-    // copy into correct data structure
-    Domain extensions;
-    std::copy(std::begin(ext), std::end(ext), std::begin(extensions));
-    Domain offset;
-    std::copy(std::begin(off), std::end(off), std::begin(offset));
-
-    // build interpolator
-    _interpolator = InterpolatorFactory<T>::create(
-            config.template get<std::string>("initial.interpolation"),
-            data,
-            shape,
-            extensions,
-            offset,
-            log
-        );
-
-  }
-
+    : Base(grid_view),
+      _interpolator(InterpolatorFactory<T>::create(config.sub("initial"),
+                                                   grid_view,
+                                                   log))
+  { }
 
   /// Evaluate the initial condition at certain position
   /** \param y 
@@ -110,10 +61,10 @@ public:
   }
 
 private:
-  std::shared_ptr<Interpolator<RF,T>> _interpolator;
+  std::shared_ptr<Interpolator<RF, T>> _interpolator;
 };
 
 } // namespace Dorie
 } // namespace Dune
 
-#endif // DUNE_DORIE_INITIAL_CONDITION_H5_HH
\ No newline at end of file
+#endif // DUNE_DORIE_INITIAL_CONDITION_H5_HH
-- 
GitLab