Commit c1585d84 authored by Lukas Riedel's avatar Lukas Riedel

Rename Richards initial condition config parameters

* Datafile is specified by "initial.file".
* Interpolation type is specified by "initial.interpolation".
parent c7124e06
......@@ -139,22 +139,24 @@ adding an empty line, make text **bold** or ``monospaced``.
<suggestion> -1 </suggestion>
<parameter name="datafile">
<definition> Path to the initial condition data file.
(``data`` type only)
<parameter name="file">
<definition> Path to the initial condition data file
(``data`` type only).
<values> path </values>
<parameter name="dataset">
<definition> Dataset to use as initial condition. (``data`` type only)
<definition> Dataset to use as initial condition (``data`` type only).
<values> string </values>
<parameter name="interpolator">
<definition> Interpolator type. </definition>
<values> string </values>
<parameter name="interpolation">
<definition> Interpolation type used for the data (``data`` type only).
<values> nearest </values>
<suggestion> nearest </suggestion>
......@@ -43,13 +43,13 @@ protected:
if (ic_type == "data")
const auto ic_datafile = ini_file.get<std::string>("initial.datafile");
const auto ic_datafile = ini_file.get<std::string>("initial.file");
// determine data type
const auto ext_start = ic_datafile.find_last_of(".");
if (ext_start == std::string::npos) {
log->error("Cannot determine extension of initial condition "
"datafile: {}",
"data file: {}",
DUNE_THROW(IOError, "Initial condition datafile has no apparent "
......@@ -57,7 +57,6 @@ protected:
const auto file_type = ic_datafile.substr(ext_start + 1);
if (file_type == "h5") {
using ICH5 = InitialConditionH5<T>;
ic = std::make_unique<ICH5>(grid_view, ini_file, log);
......@@ -66,10 +65,10 @@ protected:
"Initial condition from VTK data files is not implemented yet!");
else {
log->error("Unsupported initial condition datafile type: .{}",
log->error("Unsupported initial condition data file type: .{}",
"Unsupported initial condition datafile type");
"Unsupported initial condition data file type");
} // ic_type == "data"
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment