Skip to content
Snippets Groups Projects
Commit a8198412 authored by Christoph Lehmann's avatar Christoph Lehmann Committed by Dmitri Naumov
Browse files

added/updated doxygen comments

parent c48f6b3b
No related branches found
No related tags found
No related merge requests found
Showing
with 58 additions and 49 deletions
...@@ -263,12 +263,13 @@ void ProjectData::parseProcesses(BaseLib::ConfigTree const& processes_config, ...@@ -263,12 +263,13 @@ void ProjectData::parseProcesses(BaseLib::ConfigTree const& processes_config,
//! \ogs_file_param{process__type} //! \ogs_file_param{process__type}
auto const type = process_config.peekConfigParameter<std::string>("type"); auto const type = process_config.peekConfigParameter<std::string>("type");
//! \ogs_file_param{process__type} //! \ogs_file_param{process__name}
auto const name = process_config.getConfigParameter<std::string>("name"); auto const name = process_config.getConfigParameter<std::string>("name");
std::unique_ptr<ProcessLib::Process> process; std::unique_ptr<ProcessLib::Process> process;
auto jacobian_assembler = ProcessLib::createJacobianAssembler( auto jacobian_assembler = ProcessLib::createJacobianAssembler(
//! \ogs_file_param{process__jacobian_assembler}
process_config.getConfigSubtreeOptional("jacobian_assembler")); process_config.getConfigSubtreeOptional("jacobian_assembler"));
if (type == "GROUNDWATER_FLOW") if (type == "GROUNDWATER_FLOW")
...@@ -297,6 +298,7 @@ void ProjectData::parseProcesses(BaseLib::ConfigTree const& processes_config, ...@@ -297,6 +298,7 @@ void ProjectData::parseProcesses(BaseLib::ConfigTree const& processes_config,
} }
else if (type == "SMALL_DEFORMATION") else if (type == "SMALL_DEFORMATION")
{ {
//! \ogs_file_param{process__SMALL_DEFORMATION__dimension}
switch (process_config.getConfigParameter<int>("dimension")) switch (process_config.getConfigParameter<int>("dimension"))
{ {
case 2: case 2:
......
...@@ -24,17 +24,20 @@ createLinearElasticIsotropic( ...@@ -24,17 +24,20 @@ createLinearElasticIsotropic(
std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters, std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
BaseLib::ConfigTree const& config) BaseLib::ConfigTree const& config)
{ {
//! \ogs_file_param{process__SMALL_DEFORMATION__constitutive_relation__type}
config.checkConfigParameter("type", "LinearElasticIsotropic"); config.checkConfigParameter("type", "LinearElasticIsotropic");
DBUG("Create LinearElasticIsotropic material"); DBUG("Create LinearElasticIsotropic material");
// Youngs modulus // Youngs modulus
auto& youngs_modulus = ProcessLib::findParameter<double>( auto& youngs_modulus = ProcessLib::findParameter<double>(
//! \ogs_file_param_special{process__SMALL_DEFORMATION__constitutive_relation__LinearElasticIsotropic__youngs_modulus}
config, "youngs_modulus", parameters, 1); config, "youngs_modulus", parameters, 1);
DBUG("Use '%s' as youngs_modulus parameter.", youngs_modulus.name.c_str()); DBUG("Use '%s' as youngs_modulus parameter.", youngs_modulus.name.c_str());
// Poissons ratio // Poissons ratio
auto& poissons_ratio = ProcessLib::findParameter<double>( auto& poissons_ratio = ProcessLib::findParameter<double>(
//! \ogs_file_param_special{process__SMALL_DEFORMATION__constitutive_relation__LinearElasticIsotropic__poissons_ratio}
config, "poissons_ratio", parameters, 1); config, "poissons_ratio", parameters, 1);
DBUG("Use '%s' as poissons_ratio parameter.", poissons_ratio.name.c_str()); DBUG("Use '%s' as poissons_ratio parameter.", poissons_ratio.name.c_str());
......
...@@ -21,7 +21,7 @@ namespace NumLib ...@@ -21,7 +21,7 @@ namespace NumLib
std::unique_ptr<ConvergenceCriterion> createConvergenceCriterion( std::unique_ptr<ConvergenceCriterion> createConvergenceCriterion(
const BaseLib::ConfigTree& config) const BaseLib::ConfigTree& config)
{ {
//! \ogs_file_param{process__convergence_criterion__type} //! \ogs_file_param{prj__time_loop__processes__process__convergence_criterion__type}
auto const type = config.peekConfigParameter<std::string>("type"); auto const type = config.peekConfigParameter<std::string>("type");
if (type == "DeltaX") { if (type == "DeltaX") {
......
...@@ -54,15 +54,15 @@ void ConvergenceCriterionDeltaX::checkDeltaX(const GlobalVector& minus_delta_x, ...@@ -54,15 +54,15 @@ void ConvergenceCriterionDeltaX::checkDeltaX(const GlobalVector& minus_delta_x,
std::unique_ptr<ConvergenceCriterionDeltaX> createConvergenceCriterionDeltaX( std::unique_ptr<ConvergenceCriterionDeltaX> createConvergenceCriterionDeltaX(
const BaseLib::ConfigTree& config) const BaseLib::ConfigTree& config)
{ {
//! \ogs_file_param{process__convergence_criterion__type} //! \ogs_file_param{prj__time_loop__processes__process__convergence_criterion__type}
config.checkConfigParameter("type", "DeltaX"); config.checkConfigParameter("type", "DeltaX");
//! \ogs_file_param{process__convergence_criterion__DeltaX__abstol} //! \ogs_file_param{prj__time_loop__processes__process__convergence_criterion__DeltaX__abstol}
auto abstol = config.getConfigParameterOptional<double>("abstol"); auto abstol = config.getConfigParameterOptional<double>("abstol");
//! \ogs_file_param{process__convergence_criterion__DeltaX__reltol} //! \ogs_file_param{prj__time_loop__processes__process__convergence_criterion__DeltaX__reltol}
auto reltol = config.getConfigParameterOptional<double>("reltol"); auto reltol = config.getConfigParameterOptional<double>("reltol");
auto const norm_type_str = auto const norm_type_str =
//! \ogs_file_param{process__convergence_criterion__DeltaX__norm_type} //! \ogs_file_param{prj__time_loop__processes__process__convergence_criterion__DeltaX__norm_type}
config.getConfigParameter<std::string>("norm_type"); config.getConfigParameter<std::string>("norm_type");
auto const norm_type = MathLib::convertStringToVecNormType(norm_type_str); auto const norm_type = MathLib::convertStringToVecNormType(norm_type_str);
......
...@@ -80,17 +80,17 @@ void ConvergenceCriterionPerComponentDeltaX::setDOFTable( ...@@ -80,17 +80,17 @@ void ConvergenceCriterionPerComponentDeltaX::setDOFTable(
std::unique_ptr<ConvergenceCriterionPerComponentDeltaX> std::unique_ptr<ConvergenceCriterionPerComponentDeltaX>
createConvergenceCriterionPerComponentDeltaX(const BaseLib::ConfigTree& config) createConvergenceCriterionPerComponentDeltaX(const BaseLib::ConfigTree& config)
{ {
//! \ogs_file_param{process__convergence_criterion__type} //! \ogs_file_param{prj__time_loop__processes__process__convergence_criterion__type}
config.checkConfigParameter("type", "PerComponentDeltaX"); config.checkConfigParameter("type", "PerComponentDeltaX");
auto abstols = auto abstols =
//! \ogs_file_param{process__convergence_criterion__PerComponentDeltaX__abstols} //! \ogs_file_param{prj__time_loop__processes__process__convergence_criterion__PerComponentDeltaX__abstols}
config.getConfigParameterOptional<std::vector<double>>("abstols"); config.getConfigParameterOptional<std::vector<double>>("abstols");
auto reltols = auto reltols =
//! \ogs_file_param{process__convergence_criterion__PerComponentDeltaX__reltols} //! \ogs_file_param{prj__time_loop__processes__process__convergence_criterion__PerComponentDeltaX__reltols}
config.getConfigParameterOptional<std::vector<double>>("reltols"); config.getConfigParameterOptional<std::vector<double>>("reltols");
auto const norm_type_str = auto const norm_type_str =
//! \ogs_file_param{process__convergence_criterion__PerComponentDeltaX__norm_type} //! \ogs_file_param{prj__time_loop__processes__process__convergence_criterion__PerComponentDeltaX__norm_type}
config.getConfigParameter<std::string>("norm_type"); config.getConfigParameter<std::string>("norm_type");
if ((!abstols) && (!reltols)) if ((!abstols) && (!reltols))
......
...@@ -90,17 +90,17 @@ std::unique_ptr<ConvergenceCriterionPerComponentResidual> ...@@ -90,17 +90,17 @@ std::unique_ptr<ConvergenceCriterionPerComponentResidual>
createConvergenceCriterionPerComponentResidual( createConvergenceCriterionPerComponentResidual(
const BaseLib::ConfigTree& config) const BaseLib::ConfigTree& config)
{ {
//! \ogs_file_param{process__convergence_criterion__type} //! \ogs_file_param{prj__time_loop__processes__process__convergence_criterion__type}
config.checkConfigParameter("type", "PerComponentResidual"); config.checkConfigParameter("type", "PerComponentResidual");
auto abstols = auto abstols =
//! \ogs_file_param{process__convergence_criterion__PerComponentResidual__abstols} //! \ogs_file_param{prj__time_loop__processes__process__convergence_criterion__PerComponentResidual__abstols}
config.getConfigParameterOptional<std::vector<double>>("abstols"); config.getConfigParameterOptional<std::vector<double>>("abstols");
auto reltols = auto reltols =
//! \ogs_file_param{process__convergence_criterion__PerComponentResidual__reltols} //! \ogs_file_param{prj__time_loop__processes__process__convergence_criterion__PerComponentResidual__reltols}
config.getConfigParameterOptional<std::vector<double>>("reltols"); config.getConfigParameterOptional<std::vector<double>>("reltols");
auto const norm_type_str = auto const norm_type_str =
//! \ogs_file_param{process__convergence_criterion__PerComponentResidual__norm_type} //! \ogs_file_param{prj__time_loop__processes__process__convergence_criterion__PerComponentResidual__norm_type}
config.getConfigParameter<std::string>("norm_type"); config.getConfigParameter<std::string>("norm_type");
if ((!abstols) && (!reltols)) if ((!abstols) && (!reltols))
......
...@@ -58,15 +58,15 @@ void ConvergenceCriterionResidual::checkResidual(const GlobalVector& residual) ...@@ -58,15 +58,15 @@ void ConvergenceCriterionResidual::checkResidual(const GlobalVector& residual)
std::unique_ptr<ConvergenceCriterionResidual> std::unique_ptr<ConvergenceCriterionResidual>
createConvergenceCriterionResidual(const BaseLib::ConfigTree& config) createConvergenceCriterionResidual(const BaseLib::ConfigTree& config)
{ {
//! \ogs_file_param{process__convergence_criterion__type} //! \ogs_file_param{prj__time_loop__processes__process__convergence_criterion__type}
config.checkConfigParameter("type", "Residual"); config.checkConfigParameter("type", "Residual");
//! \ogs_file_param{process__convergence_criterion__Residual__abstol} //! \ogs_file_param{prj__time_loop__processes__process__convergence_criterion__Residual__abstol}
auto abstol = config.getConfigParameterOptional<double>("abstol"); auto abstol = config.getConfigParameterOptional<double>("abstol");
//! \ogs_file_param{process__convergence_criterion__Residual__reltol} //! \ogs_file_param{prj__time_loop__processes__process__convergence_criterion__Residual__reltol}
auto reltol = config.getConfigParameterOptional<double>("reltol"); auto reltol = config.getConfigParameterOptional<double>("reltol");
auto const norm_type_str = auto const norm_type_str =
//! \ogs_file_param{process__convergence_criterion__Residual__norm_type} //! \ogs_file_param{prj__time_loop__processes__process__convergence_criterion__Residual__norm_type}
config.getConfigParameter<std::string>("norm_type"); config.getConfigParameter<std::string>("norm_type");
auto const norm_type = MathLib::convertStringToVecNormType(norm_type_str); auto const norm_type = MathLib::convertStringToVecNormType(norm_type_str);
......
...@@ -18,31 +18,31 @@ std::unique_ptr<TimeDiscretization> createTimeDiscretization( ...@@ -18,31 +18,31 @@ std::unique_ptr<TimeDiscretization> createTimeDiscretization(
{ {
using T = std::unique_ptr<TimeDiscretization>; using T = std::unique_ptr<TimeDiscretization>;
//! \ogs_file_param{process__time_discretization__type} //! \ogs_file_param{prj__time_loop__processes__process__time_discretization__type}
auto const type = config.getConfigParameter<std::string>("type"); auto const type = config.getConfigParameter<std::string>("type");
if (type == "BackwardEuler") if (type == "BackwardEuler")
{ {
//! \ogs_file_param_special{process__time_discretization__BackwardEuler} //! \ogs_file_param_special{prj__time_loop__processes__process__time_discretization__BackwardEuler}
using ConcreteTD = BackwardEuler; using ConcreteTD = BackwardEuler;
return T(new ConcreteTD); return T(new ConcreteTD);
} }
else if (type == "ForwardEuler") else if (type == "ForwardEuler")
{ {
//! \ogs_file_param_special{process__time_discretization__ForwardEuler} //! \ogs_file_param_special{prj__time_loop__processes__process__time_discretization__ForwardEuler}
using ConcreteTD = ForwardEuler; using ConcreteTD = ForwardEuler;
return T(new ConcreteTD); return T(new ConcreteTD);
} }
else if (type == "CrankNicolson") else if (type == "CrankNicolson")
{ {
//! \ogs_file_param{process__time_discretization__CrankNicolson__theta} //! \ogs_file_param{prj__time_loop__processes__process__time_discretization__CrankNicolson__theta}
auto const theta = config.getConfigParameter<double>("theta"); auto const theta = config.getConfigParameter<double>("theta");
using ConcreteTD = CrankNicolson; using ConcreteTD = CrankNicolson;
return T(new ConcreteTD(theta)); return T(new ConcreteTD(theta));
} }
else if (type == "BackwardDifferentiationFormula") else if (type == "BackwardDifferentiationFormula")
{ {
//! \ogs_file_param{process__time_discretization__BackwardDifferentiationFormula__order} //! \ogs_file_param{prj__time_loop__processes__process__time_discretization__BackwardDifferentiationFormula__order}
auto const order = config.getConfigParameter<unsigned>("order"); auto const order = config.getConfigParameter<unsigned>("order");
using ConcreteTD = BackwardDifferentiationFormula; using ConcreteTD = BackwardDifferentiationFormula;
return T(new ConcreteTD(order)); return T(new ConcreteTD(order));
......
...@@ -36,14 +36,14 @@ FixedTimeStepping::FixedTimeStepping(double t0, double tn, double dt) ...@@ -36,14 +36,14 @@ FixedTimeStepping::FixedTimeStepping(double t0, double tn, double dt)
std::unique_ptr<ITimeStepAlgorithm> std::unique_ptr<ITimeStepAlgorithm>
FixedTimeStepping::newInstance(BaseLib::ConfigTree const& config) FixedTimeStepping::newInstance(BaseLib::ConfigTree const& config)
{ {
//! \ogs_file_param{prj__time_stepping__type} //! \ogs_file_param{prj__time_loop__time_stepping__type}
config.checkConfigParameter("type", "FixedTimeStepping"); config.checkConfigParameter("type", "FixedTimeStepping");
//! \ogs_file_param{prj__time_stepping__FixedTimeStepping__t_initial} //! \ogs_file_param{prj__time_loop__time_stepping__FixedTimeStepping__t_initial}
auto const t_initial = config.getConfigParameter<double>("t_initial"); auto const t_initial = config.getConfigParameter<double>("t_initial");
//! \ogs_file_param{prj__time_stepping__FixedTimeStepping__t_end} //! \ogs_file_param{prj__time_loop__time_stepping__FixedTimeStepping__t_end}
auto const t_end = config.getConfigParameter<double>("t_end"); auto const t_end = config.getConfigParameter<double>("t_end");
//! \ogs_file_param{prj__time_stepping__FixedTimeStepping__timesteps} //! \ogs_file_param{prj__time_loop__time_stepping__FixedTimeStepping__timesteps}
auto const delta_ts = config.getConfigSubtree("timesteps"); auto const delta_ts = config.getConfigSubtree("timesteps");
std::vector<double> timesteps; std::vector<double> timesteps;
...@@ -51,16 +51,16 @@ FixedTimeStepping::newInstance(BaseLib::ConfigTree const& config) ...@@ -51,16 +51,16 @@ FixedTimeStepping::newInstance(BaseLib::ConfigTree const& config)
double delta_t = 0.0; double delta_t = 0.0;
// TODO: consider adding call "listNonEmpty" to config tree // TODO: consider adding call "listNonEmpty" to config tree
//! \ogs_file_param{prj__time_stepping__FixedTimeStepping__timesteps__pair} //! \ogs_file_param{prj__time_loop__time_stepping__FixedTimeStepping__timesteps__pair}
auto const range = delta_ts.getConfigSubtreeList("pair"); auto const range = delta_ts.getConfigSubtreeList("pair");
if (range.begin() == range.end()) { if (range.begin() == range.end()) {
OGS_FATAL("no timesteps have been given"); OGS_FATAL("no timesteps have been given");
} }
for (auto const pair : range) for (auto const pair : range)
{ {
//! \ogs_file_param{prj__time_stepping__FixedTimeStepping__timesteps__pair__repeat} //! \ogs_file_param{prj__time_loop__time_stepping__FixedTimeStepping__timesteps__pair__repeat}
auto const repeat = pair.getConfigParameter<std::size_t>("repeat"); auto const repeat = pair.getConfigParameter<std::size_t>("repeat");
//! \ogs_file_param{prj__time_stepping__FixedTimeStepping__timesteps__pair__delta_t} //! \ogs_file_param{prj__time_loop__time_stepping__FixedTimeStepping__timesteps__pair__delta_t}
delta_t = pair.getConfigParameter<double>("delta_t"); delta_t = pair.getConfigParameter<double>("delta_t");
if (repeat == 0) { if (repeat == 0) {
......
...@@ -23,14 +23,14 @@ void parseCalculateSurfaceFluxData(BaseLib::ConfigTree const& config, ...@@ -23,14 +23,14 @@ void parseCalculateSurfaceFluxData(BaseLib::ConfigTree const& config,
return; return;
mesh_name = mesh_name =
//! \ogs_file_attr{process__calculatesurfaceflux__mesh} //! \ogs_file_param{process__calculatesurfaceflux__mesh}
calculatesurfaceflux_config->getConfigParameter<std::string>("mesh"); calculatesurfaceflux_config->getConfigParameter<std::string>("mesh");
property_name = property_name =
//! \ogs_file_attr{process__calculatesurfaceflux__property_name} //! \ogs_file_param{process__calculatesurfaceflux__property_name}
calculatesurfaceflux_config->getConfigParameter<std::string>( calculatesurfaceflux_config->getConfigParameter<std::string>(
"property_name"); "property_name");
out_fname = out_fname =
//! \ogs_file_attr{process__calculatesurfaceflux__output_mesh} //! \ogs_file_param{process__calculatesurfaceflux__output_mesh}
calculatesurfaceflux_config->getConfigParameter<std::string>( calculatesurfaceflux_config->getConfigParameter<std::string>(
"output_mesh"); "output_mesh");
} }
......
...@@ -130,11 +130,14 @@ void CentralDifferencesJacobianAssembler::assembleWithJacobian( ...@@ -130,11 +130,14 @@ void CentralDifferencesJacobianAssembler::assembleWithJacobian(
std::unique_ptr<CentralDifferencesJacobianAssembler> std::unique_ptr<CentralDifferencesJacobianAssembler>
createCentralDifferencesJacobianAssembler(BaseLib::ConfigTree const& config) createCentralDifferencesJacobianAssembler(BaseLib::ConfigTree const& config)
{ {
//! \ogs_file_param{process__jacobian_assembler__type}
config.checkConfigParameter("type", "CentralDifferences"); config.checkConfigParameter("type", "CentralDifferences");
// TODO make non-optional. // TODO make non-optional.
//! \ogs_file_param{process__jacobian_assembler__relative_epsilons}
auto rel_eps = config.getConfigParameterOptional<std::vector<double>>( auto rel_eps = config.getConfigParameterOptional<std::vector<double>>(
"relative_epsilons"); "relative_epsilons");
//! \ogs_file_param{process__jacobian_assembler__component_magnitudes}
auto comp_mag = config.getConfigParameterOptional<std::vector<double>>( auto comp_mag = config.getConfigParameterOptional<std::vector<double>>(
"component_magnitudes"); "component_magnitudes");
......
...@@ -22,6 +22,7 @@ std::unique_ptr<AbstractJacobianAssembler> createJacobianAssembler( ...@@ -22,6 +22,7 @@ std::unique_ptr<AbstractJacobianAssembler> createJacobianAssembler(
return std::unique_ptr<AbstractJacobianAssembler>( return std::unique_ptr<AbstractJacobianAssembler>(
new AnalyticalJacobianAssembler); new AnalyticalJacobianAssembler);
//! \ogs_file_param{process__jacobian_assembler__type}
auto const type = config->peekConfigParameter<std::string>("type"); auto const type = config->peekConfigParameter<std::string>("type");
if (type == "Analytical") { if (type == "Analytical") {
......
...@@ -49,24 +49,24 @@ std::unique_ptr<Output> Output:: ...@@ -49,24 +49,24 @@ std::unique_ptr<Output> Output::
newInstance(const BaseLib::ConfigTree &config, std::string const& output_directory) newInstance(const BaseLib::ConfigTree &config, std::string const& output_directory)
{ {
auto const output_iteration_results = auto const output_iteration_results =
//! \ogs_file_param{prj__output__output_iteration_results} //! \ogs_file_param{prj__time_loop__output__output_iteration_results}
config.getConfigParameterOptional<bool>("output_iteration_results"); config.getConfigParameterOptional<bool>("output_iteration_results");
std::unique_ptr<Output> out{new Output{ std::unique_ptr<Output> out{new Output{
BaseLib::joinPaths(output_directory, BaseLib::joinPaths(output_directory,
//! \ogs_file_param{prj__output__prefix} //! \ogs_file_param{prj__time_loop__output__prefix}
config.getConfigParameter<std::string>("prefix")), config.getConfigParameter<std::string>("prefix")),
output_iteration_results ? *output_iteration_results : false}}; output_iteration_results ? *output_iteration_results : false}};
//! \ogs_file_param{prj__output__timesteps} //! \ogs_file_param{prj__time_loop__output__timesteps}
if (auto const timesteps = config.getConfigSubtreeOptional("timesteps")) if (auto const timesteps = config.getConfigSubtreeOptional("timesteps"))
{ {
//! \ogs_file_param{prj__output__timesteps__pair} //! \ogs_file_param{prj__time_loop__output__timesteps__pair}
for (auto pair : timesteps->getConfigSubtreeList("pair")) for (auto pair : timesteps->getConfigSubtreeList("pair"))
{ {
//! \ogs_file_param{prj__output__timesteps__pair__repeat} //! \ogs_file_param{prj__time_loop__output__timesteps__pair__repeat}
auto repeat = pair.getConfigParameter<unsigned>("repeat"); auto repeat = pair.getConfigParameter<unsigned>("repeat");
//! \ogs_file_param{prj__output__timesteps__pair__each_steps} //! \ogs_file_param{prj__time_loop__output__timesteps__pair__each_steps}
auto each_steps = pair.getConfigParameter<unsigned>("each_steps"); auto each_steps = pair.getConfigParameter<unsigned>("each_steps");
assert(repeat != 0 && each_steps != 0); assert(repeat != 0 && each_steps != 0);
......
...@@ -17,10 +17,10 @@ namespace ProcessLib ...@@ -17,10 +17,10 @@ namespace ProcessLib
ProcessOutput::ProcessOutput(BaseLib::ConfigTree const& output_config) ProcessOutput::ProcessOutput(BaseLib::ConfigTree const& output_config)
{ {
//! \ogs_file_param{process__output__variables} //! \ogs_file_param{prj__time_loop__processes__process__output__variables}
auto const out_vars = output_config.getConfigSubtree("variables"); auto const out_vars = output_config.getConfigSubtree("variables");
//! \ogs_file_param{process__output__variables__variable} //! \ogs_file_param{prj__time_loop__processes__process__output__variables__variable}
for (auto out_var : out_vars.getConfigParameterList<std::string>("variable")) for (auto out_var : out_vars.getConfigParameterList<std::string>("variable"))
{ {
if (output_variables.find(out_var) != output_variables.cend()) if (output_variables.find(out_var) != output_variables.cend())
...@@ -33,7 +33,7 @@ ProcessOutput::ProcessOutput(BaseLib::ConfigTree const& output_config) ...@@ -33,7 +33,7 @@ ProcessOutput::ProcessOutput(BaseLib::ConfigTree const& output_config)
} }
if (auto out_resid = if (auto out_resid =
//! \ogs_file_param{process__output__output_extrapolation_residuals} //! \ogs_file_param{prj__time_loop__processes__process__output__output_extrapolation_residuals}
output_config.getConfigParameterOptional<bool>("output_extrapolation_residuals")) output_config.getConfigParameterOptional<bool>("output_extrapolation_residuals"))
{ {
output_residuals = *out_resid; output_residuals = *out_resid;
......
...@@ -68,6 +68,7 @@ createSmallDeformationProcess( ...@@ -68,6 +68,7 @@ createSmallDeformationProcess(
config.getConfigSubtree("constitutive_relation"); config.getConfigSubtree("constitutive_relation");
auto const type = auto const type =
//! \ogs_file_param{process__SMALL_DEFORMATION__constitutive_relation__type}
constitutive_relation_config.peekConfigParameter<std::string>("type"); constitutive_relation_config.peekConfigParameter<std::string>("type");
std::unique_ptr<MaterialLib::Solids::MechanicsBase<DisplacementDim>> std::unique_ptr<MaterialLib::Solids::MechanicsBase<DisplacementDim>>
......
...@@ -25,7 +25,7 @@ std::unique_ptr<NumLib::ITimeStepAlgorithm> createTimeStepper( ...@@ -25,7 +25,7 @@ std::unique_ptr<NumLib::ITimeStepAlgorithm> createTimeStepper(
if (type == "SingleStep") if (type == "SingleStep")
{ {
//! \ogs_file_param_special{prj__time_stepping__SingleStep} //! \ogs_file_param_special{prj__time_loop__time_stepping__SingleStep}
config.ignoreConfigParameter("type"); config.ignoreConfigParameter("type");
timestepper.reset(new NumLib::FixedTimeStepping(0.0, 1.0, 1.0)); timestepper.reset(new NumLib::FixedTimeStepping(0.0, 1.0, 1.0));
} }
...@@ -282,8 +282,8 @@ std::vector<std::unique_ptr<SingleProcessData>> createPerProcessData( ...@@ -282,8 +282,8 @@ std::vector<std::unique_ptr<SingleProcessData>> createPerProcessData(
processes, pcs_name, processes, pcs_name,
"A process with the given name has not been defined."); "A process with the given name has not been defined.");
//! \ogs_file_param{prj__time_loop__processes__process__nonlinear_solver}
auto const nl_slv_name = auto const nl_slv_name =
//! \ogs_file_param{prj__time_loop__processes__process__nonlinear_solver}
pcs_config.getConfigParameter<std::string>("nonlinear_solver"); pcs_config.getConfigParameter<std::string>("nonlinear_solver");
auto& nl_slv = *BaseLib::getOrError( auto& nl_slv = *BaseLib::getOrError(
nonlinear_solvers, nl_slv_name, nonlinear_solvers, nl_slv_name,
...@@ -298,8 +298,7 @@ std::vector<std::unique_ptr<SingleProcessData>> createPerProcessData( ...@@ -298,8 +298,7 @@ std::vector<std::unique_ptr<SingleProcessData>> createPerProcessData(
pcs_config.getConfigSubtree("convergence_criterion")); pcs_config.getConfigSubtree("convergence_criterion"));
//! \ogs_file_param{prj__time_loop__processes__process__output} //! \ogs_file_param{prj__time_loop__processes__process__output}
ProcessOutput process_output{ ProcessOutput process_output{pcs_config.getConfigSubtree("output")};
pcs_config.getConfigSubtree("output")};
per_process_data.emplace_back(makeSingleProcessData( per_process_data.emplace_back(makeSingleProcessData(
nl_slv, pcs, std::move(time_disc), std::move(conv_crit), nl_slv, pcs, std::move(time_disc), std::move(conv_crit),
...@@ -321,16 +320,16 @@ std::unique_ptr<UncoupledProcessesTimeLoop> createUncoupledProcessesTimeLoop( ...@@ -321,16 +320,16 @@ std::unique_ptr<UncoupledProcessesTimeLoop> createUncoupledProcessesTimeLoop(
const std::map<std::string, std::unique_ptr<NumLib::NonlinearSolverBase>>& const std::map<std::string, std::unique_ptr<NumLib::NonlinearSolverBase>>&
nonlinear_solvers) nonlinear_solvers)
{ {
//! \ogs_file_param{prj__time_loop__time_stepping}
auto timestepper = auto timestepper =
//! \ogs_file_param{prj__time_loop__time_stepping}
createTimeStepper(config.getConfigSubtree("time_stepping")); createTimeStepper(config.getConfigSubtree("time_stepping"));
//! \ogs_file_param{prj__time_loop__output}
auto output = auto output =
//! \ogs_file_param{prj__time_loop__output}
createOutput(config.getConfigSubtree("output"), output_directory); createOutput(config.getConfigSubtree("output"), output_directory);
//! \ogs_file_param{prj__time_loop__processes}
auto per_process_data = createPerProcessData( auto per_process_data = createPerProcessData(
//! \ogs_file_param{prj__time_loop__processes}
config.getConfigSubtree("processes"), processes, nonlinear_solvers); config.getConfigSubtree("processes"), processes, nonlinear_solvers);
return std::unique_ptr<UncoupledProcessesTimeLoop>{ return std::unique_ptr<UncoupledProcessesTimeLoop>{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment