From 7a91bcf29be6dbecb7d8d5d021cfba8ad3b8589a Mon Sep 17 00:00:00 2001 From: Dmitri Naumov <github@naumov.de> Date: Wed, 5 Oct 2016 20:08:15 +0200 Subject: [PATCH] [doc] Fix some fluid density ogs_file_param's. --- .../ProjectFile/material/fluid/density/t_value.md | 1 + MaterialLib/Fluid/Density/createFluidDensityModel.cpp | 8 ++------ MaterialLib/Fluid/Viscosity/createViscosityModel.cpp | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) create mode 100644 Documentation/ProjectFile/material/fluid/density/t_value.md diff --git a/Documentation/ProjectFile/material/fluid/density/t_value.md b/Documentation/ProjectFile/material/fluid/density/t_value.md new file mode 100644 index 00000000000..576add64edc --- /dev/null +++ b/Documentation/ProjectFile/material/fluid/density/t_value.md @@ -0,0 +1 @@ +\ogs_missing_documentation diff --git a/MaterialLib/Fluid/Density/createFluidDensityModel.cpp b/MaterialLib/Fluid/Density/createFluidDensityModel.cpp index bf7f23e3cac..ec380411d0b 100644 --- a/MaterialLib/Fluid/Density/createFluidDensityModel.cpp +++ b/MaterialLib/Fluid/Density/createFluidDensityModel.cpp @@ -74,21 +74,17 @@ std::unique_ptr<FluidProperty> createFluidDensityModel( if (type == "Constant") { return std::unique_ptr<FluidProperty>(new ConstantFluidProperty( - //! \ogs_file_param{material__fluid__density__Constant_value} + //! \ogs_file_param{material__fluid__density__value} config.getConfigParameter<double>("value"))); } - //! \ogs_file_param{material__fluid__density__LiquidDensity} else if (type == "LiquidDensity") return createLiquidDensity(config); - - //! \ogs_file_param{material__fluid__density__TemperatureDependent} else if (type == "TemperatureDependent") return createLinearTemperatureDependentDensity(config); - //! \ogs_file_param{material__fluid__density__IdealGasLaw} else if (type == "IdealGasLaw") { - //! \ogs_file_param{material__fluid__density__IdealGasLaw__molar_mass} return std::unique_ptr<FluidProperty>( + //! \ogs_file_param{material__fluid__density__IdealGasLaw__molar_mass} new IdealGasLaw(config.getConfigParameter<double>("molar_mass"))); } else diff --git a/MaterialLib/Fluid/Viscosity/createViscosityModel.cpp b/MaterialLib/Fluid/Viscosity/createViscosityModel.cpp index 2d82e0e66a2..3cc564b1c97 100644 --- a/MaterialLib/Fluid/Viscosity/createViscosityModel.cpp +++ b/MaterialLib/Fluid/Viscosity/createViscosityModel.cpp @@ -80,7 +80,7 @@ std::unique_ptr<FluidProperty> createViscosityModel( { INFO("Using Vogels model, which gives viscosity in SI unit, Pa s"); auto const fluid_type = - //! \ogs_file_param{material__fluid__viscosity__Vogels__fluid_type} + //! \ogs_file_param{material__fluid__viscosity__Vogels__liquid_type} config.getConfigParameter<std::string>("liquid_type"); if (fluid_type == "Water") { -- GitLab