diff --git a/Documentation/ProjectFile/prj/parameters/parameter/TimeDependentHeterogeneousParameter/time_series/i_time_series.md b/Documentation/ProjectFile/prj/parameters/parameter/TimeDependentHeterogeneousParameter/time_series/i_time_series.md new file mode 100644 index 0000000000000000000000000000000000000000..def2e4e1948f286018f475ace2697c838ff8ea85 --- /dev/null +++ b/Documentation/ProjectFile/prj/parameters/parameter/TimeDependentHeterogeneousParameter/time_series/i_time_series.md @@ -0,0 +1,2 @@ +Contains time series information. Each entry consists of a pair of time and +parameter name. Values of the parameter are piecewise linear interpolated. diff --git a/Documentation/ProjectFile/prj/parameters/parameter/TimeDependentHeterogeneousParameter/time_series/pair/i_pair.md b/Documentation/ProjectFile/prj/parameters/parameter/TimeDependentHeterogeneousParameter/time_series/pair/i_pair.md new file mode 100644 index 0000000000000000000000000000000000000000..f5cdda5581f84d84cb280271b53e922190e3d253 --- /dev/null +++ b/Documentation/ProjectFile/prj/parameters/parameter/TimeDependentHeterogeneousParameter/time_series/pair/i_pair.md @@ -0,0 +1 @@ +Contains pair of time and parameter name. diff --git a/Documentation/ProjectFile/prj/parameters/parameter/TimeDependentHeterogeneousParameter/time_series/pair/t_parameter_name.md b/Documentation/ProjectFile/prj/parameters/parameter/TimeDependentHeterogeneousParameter/time_series/pair/t_parameter_name.md new file mode 100644 index 0000000000000000000000000000000000000000..646f1b237dca871cd6c05e2b5044e3177aef27b2 --- /dev/null +++ b/Documentation/ProjectFile/prj/parameters/parameter/TimeDependentHeterogeneousParameter/time_series/pair/t_parameter_name.md @@ -0,0 +1,3 @@ +Specification of the parameter name. The specified parameter have to be time +independent, i.e., it must neither be a CurvedParameter nor a +TimeDependentHeterogeneousParameter. diff --git a/Documentation/ProjectFile/prj/parameters/parameter/TimeDependentHeterogeneousParameter/time_series/pair/t_time.md b/Documentation/ProjectFile/prj/parameters/parameter/TimeDependentHeterogeneousParameter/time_series/pair/t_time.md new file mode 100644 index 0000000000000000000000000000000000000000..dec5b818b0035b1ed1c010d2fdfb35842cb6d356 --- /dev/null +++ b/Documentation/ProjectFile/prj/parameters/parameter/TimeDependentHeterogeneousParameter/time_series/pair/t_time.md @@ -0,0 +1 @@ +Specification of point in time in the time-parameter-name relation. diff --git a/ParameterLib/TimeDependentHeterogeneousParameter.cpp b/ParameterLib/TimeDependentHeterogeneousParameter.cpp index ecae53379e5fe18243122dbc58594f96208cb12c..9c27cd23aa6803551ec0798d7c890c5f488d8589 100644 --- a/ParameterLib/TimeDependentHeterogeneousParameter.cpp +++ b/ParameterLib/TimeDependentHeterogeneousParameter.cpp @@ -108,15 +108,18 @@ std::unique_ptr<ParameterBase> createTimeDependentHeterogeneousParameter( //! \ogs_file_param{prj__parameters__parameter__type} config.checkConfigParameter("type", "TimeDependentHeterogeneousParameter"); auto const time_series_config = - //! //\ogs_file_param{prj__parameters__parameter__TimeDependentHeterogeneousParameter__time_serie} + //! \ogs_file_param{prj__parameters__parameter__TimeDependentHeterogeneousParameter__time_series} config.getConfigSubtree("time_series"); std::vector<TimeDependentHeterogeneousParameter::PairTimeParameterName> time_series; + //! \ogs_file_param{prj__parameters__parameter__TimeDependentHeterogeneousParameter__time_series__pair} for (auto const p : time_series_config.getConfigSubtreeList("pair")) { + //! \ogs_file_param{prj__parameters__parameter__TimeDependentHeterogeneousParameter__time_series__pair__time} auto time = p.getConfigParameter<double>("time"); auto parameter_name = + //! \ogs_file_param{prj__parameters__parameter__TimeDependentHeterogeneousParameter__time_series__pair__parameter_name} p.getConfigParameter<std::string>("parameter_name"); time_series.emplace_back(time, parameter_name); }