diff --git a/Documentation/ProjectFile/prj/processes/process/HT/fluid/i_fluid.md b/Documentation/ProjectFile/prj/processes/process/HT/fluid/i_fluid.md new file mode 100644 index 0000000000000000000000000000000000000000..b00e9581a71b432d9776cb2b01bc1f77d8e23e37 --- /dev/null +++ b/Documentation/ProjectFile/prj/processes/process/HT/fluid/i_fluid.md @@ -0,0 +1 @@ +Tag that encloses the specification of the fluid properties density and viscosity. diff --git a/Documentation/ProjectFile/prj/processes/process/HT/fluid/t_density.md b/Documentation/ProjectFile/prj/processes/process/HT/fluid/t_density.md new file mode 100644 index 0000000000000000000000000000000000000000..806844735c2ce6a536cc4ca1f3a30d8b02e3bb4a --- /dev/null +++ b/Documentation/ProjectFile/prj/processes/process/HT/fluid/t_density.md @@ -0,0 +1 @@ +Configuration for the constitutive laws for the fluid density from MaterialLib. diff --git a/Documentation/ProjectFile/prj/processes/process/HT/fluid/t_viscosity.md b/Documentation/ProjectFile/prj/processes/process/HT/fluid/t_viscosity.md new file mode 100644 index 0000000000000000000000000000000000000000..6450f353bd411203a03d707282d9bd0f993a62ac --- /dev/null +++ b/Documentation/ProjectFile/prj/processes/process/HT/fluid/t_viscosity.md @@ -0,0 +1 @@ +A tag describing the viscosity law for the process at hand. diff --git a/Documentation/ProjectFile/prj/processes/process/HT/porous_medium/i_porous_medium.md b/Documentation/ProjectFile/prj/processes/process/HT/porous_medium/i_porous_medium.md new file mode 100644 index 0000000000000000000000000000000000000000..b0d0a13f289c7ab931aaf6ba73d933a91274e5d2 --- /dev/null +++ b/Documentation/ProjectFile/prj/processes/process/HT/porous_medium/i_porous_medium.md @@ -0,0 +1 @@ +Tag to specify various porous media. diff --git a/Documentation/ProjectFile/prj/processes/process/HT/porous_medium/porous_medium/a_id.md b/Documentation/ProjectFile/prj/processes/process/HT/porous_medium/porous_medium/a_id.md new file mode 100644 index 0000000000000000000000000000000000000000..15139e4fbcf5bc1bd69fc35c822a5b6b79553d35 --- /dev/null +++ b/Documentation/ProjectFile/prj/processes/process/HT/porous_medium/porous_medium/a_id.md @@ -0,0 +1,3 @@ +The 'id' attribute maps the porous medium property to the mesh elements assigned +to the same 'MaterialIDs' id, where 'MaterialIDs' property vector stored as a +property withinn the mesh. diff --git a/Documentation/ProjectFile/prj/processes/process/HT/porous_medium/porous_medium/i_porous_medium.md b/Documentation/ProjectFile/prj/processes/process/HT/porous_medium/porous_medium/i_porous_medium.md new file mode 100644 index 0000000000000000000000000000000000000000..d877e666d2aca38cd0b049506ce53e710f92c010 --- /dev/null +++ b/Documentation/ProjectFile/prj/processes/process/HT/porous_medium/porous_medium/i_porous_medium.md @@ -0,0 +1,2 @@ +Tag to specify a porous medium property consisting of the permeability, storage +and porosity constitutive laws. diff --git a/Documentation/ProjectFile/prj/processes/process/HT/porous_medium/porous_medium/t_permeability.md b/Documentation/ProjectFile/prj/processes/process/HT/porous_medium/porous_medium/t_permeability.md new file mode 100644 index 0000000000000000000000000000000000000000..18b24ec305fa92156cfc7c9f1e0718baf30ae8c8 --- /dev/null +++ b/Documentation/ProjectFile/prj/processes/process/HT/porous_medium/porous_medium/t_permeability.md @@ -0,0 +1 @@ +This tag describes the permeability model of the porous medium. diff --git a/Documentation/ProjectFile/prj/processes/process/HT/porous_medium/porous_medium/t_porosity.md b/Documentation/ProjectFile/prj/processes/process/HT/porous_medium/porous_medium/t_porosity.md new file mode 100644 index 0000000000000000000000000000000000000000..989158e5409a7bf5d6a78b4f5a58a6c9698b97b1 --- /dev/null +++ b/Documentation/ProjectFile/prj/processes/process/HT/porous_medium/porous_medium/t_porosity.md @@ -0,0 +1 @@ +Tag describing the porosity model of the porous medium. diff --git a/Documentation/ProjectFile/prj/processes/process/HT/porous_medium/porous_medium/t_storage.md b/Documentation/ProjectFile/prj/processes/process/HT/porous_medium/porous_medium/t_storage.md new file mode 100644 index 0000000000000000000000000000000000000000..ae3f924782c2989916388f67995e03a2873f8d28 --- /dev/null +++ b/Documentation/ProjectFile/prj/processes/process/HT/porous_medium/porous_medium/t_storage.md @@ -0,0 +1 @@ +Tag describing the specific storage model of the porous medium. diff --git a/Documentation/ProjectFile/prj/processes/process/HT/t_density_fluid.md b/Documentation/ProjectFile/prj/processes/process/HT/t_density_fluid.md deleted file mode 100644 index 15d0c542585683a3c5be8dff0c724b2814dfebdf..0000000000000000000000000000000000000000 --- a/Documentation/ProjectFile/prj/processes/process/HT/t_density_fluid.md +++ /dev/null @@ -1,5 +0,0 @@ -Density of the fluid. - -At the moment the density of the fluid is read as a parameter. - -\todo{Use constitutive laws for the liquid density from MaterialLib.} diff --git a/Documentation/ProjectFile/prj/processes/process/HT/t_fluid_reference_density.md b/Documentation/ProjectFile/prj/processes/process/HT/t_fluid_reference_density.md new file mode 100644 index 0000000000000000000000000000000000000000..c6a5d6d663dfbe57eec3c3c4f63a283ae216f6b2 --- /dev/null +++ b/Documentation/ProjectFile/prj/processes/process/HT/t_fluid_reference_density.md @@ -0,0 +1,3 @@ +Reference value of the fluid density used in the equation of state for the fluid +density as well as in the calculation of the thermal dispersivity and head +capacity. diff --git a/Documentation/ProjectFile/prj/processes/process/HT/t_intrinsic_permeability.md b/Documentation/ProjectFile/prj/processes/process/HT/t_intrinsic_permeability.md deleted file mode 100644 index 95363481618b5c56ab3ebdbea8ce0a251b3c8d9b..0000000000000000000000000000000000000000 --- a/Documentation/ProjectFile/prj/processes/process/HT/t_intrinsic_permeability.md +++ /dev/null @@ -1 +0,0 @@ -Intrinsic permeability diff --git a/Documentation/ProjectFile/prj/processes/process/HT/t_porosity.md b/Documentation/ProjectFile/prj/processes/process/HT/t_porosity.md deleted file mode 100644 index d8f75290d5bc6903ca03b6f47451876d33b5bcab..0000000000000000000000000000000000000000 --- a/Documentation/ProjectFile/prj/processes/process/HT/t_porosity.md +++ /dev/null @@ -1 +0,0 @@ -Porosity of the solid diff --git a/Documentation/ProjectFile/prj/processes/process/HT/t_reference_temperature.md b/Documentation/ProjectFile/prj/processes/process/HT/t_reference_temperature.md deleted file mode 100644 index a51d70c207dcc3709963d8ed4b0aee7f4a7eab7d..0000000000000000000000000000000000000000 --- a/Documentation/ProjectFile/prj/processes/process/HT/t_reference_temperature.md +++ /dev/null @@ -1 +0,0 @@ -The reference temperature used in temperature dependent viscosity. diff --git a/Documentation/ProjectFile/prj/processes/process/HT/t_specific_storage.md b/Documentation/ProjectFile/prj/processes/process/HT/t_specific_storage.md deleted file mode 100644 index b9423c528fd5efaa7976bfce97a4f8f2234b6ca6..0000000000000000000000000000000000000000 --- a/Documentation/ProjectFile/prj/processes/process/HT/t_specific_storage.md +++ /dev/null @@ -1 +0,0 @@ -Parameter for the specific storage. diff --git a/Documentation/ProjectFile/prj/processes/process/HT/t_thermal_expansion_coefficient_fluid.md b/Documentation/ProjectFile/prj/processes/process/HT/t_thermal_expansion_coefficient_fluid.md deleted file mode 100644 index 2238652355a67439488fa32f196d9a6cd8835122..0000000000000000000000000000000000000000 --- a/Documentation/ProjectFile/prj/processes/process/HT/t_thermal_expansion_coefficient_fluid.md +++ /dev/null @@ -1 +0,0 @@ -Thermal expansion coefficient of the fluid. diff --git a/Documentation/ProjectFile/prj/processes/process/HT/t_viscosity.md b/Documentation/ProjectFile/prj/processes/process/HT/t_viscosity.md deleted file mode 100644 index c2cbd2e942c1ab4b77728c0aa6d87fe216e55538..0000000000000000000000000000000000000000 --- a/Documentation/ProjectFile/prj/processes/process/HT/t_viscosity.md +++ /dev/null @@ -1 +0,0 @@ -Viscosity. diff --git a/ProcessLib/HT/CreateHTProcess.cpp b/ProcessLib/HT/CreateHTProcess.cpp index 4fa349f9d409d084c713b7e242963fea2ebe4f81..d85d6a02903adfd859400cce8fe2388546ece73f 100644 --- a/ProcessLib/HT/CreateHTProcess.cpp +++ b/ProcessLib/HT/CreateHTProcess.cpp @@ -51,14 +51,14 @@ std::unique_ptr<Process> createHTProcess( "pressure"}); auto const& porous_medium_configs = - //! \ogs_file_param_special{prj__processes__process__HT__porous_medium} + //! \ogs_file_param{prj__processes__process__HT__porous_medium} config.getConfigSubtree("porous_medium"); PorousMediaProperties porous_media_properties{ createPorousMediaProperties(mesh, porous_medium_configs)}; - //! \ogs_file_param_special{prj__processes__process__HT__fluid} + //! \ogs_file_param{prj__processes__process__HT__fluid} auto const& fluid_config = config.getConfigSubtree("fluid"); - //! \ogs_file_param_special{prj__processes__process__HT__fluid__viscosity} + //! \ogs_file_param{prj__processes__process__HT__fluid__viscosity} auto const& viscosity_conf = fluid_config.getConfigSubtree("viscosity"); auto viscosity_model = MaterialLib::Fluid::createViscosityModel(viscosity_conf); @@ -70,7 +70,7 @@ std::unique_ptr<Process> createHTProcess( "density_solid", parameters, 1); DBUG("Use \'%s\' as density_solid parameter.", density_solid.name.c_str()); - //! \ogs_file_param_special{prj__processes__process__HT__fluid__density} + //! \ogs_file_param{prj__processes__process__HT__fluid__density} auto const& fluid_density_conf = fluid_config.getConfigSubtree("density"); auto fluid_density = MaterialLib::Fluid::createFluidDensityModel(fluid_density_conf); @@ -78,7 +78,7 @@ std::unique_ptr<Process> createHTProcess( // Parameter for the density of the fluid. auto& fluid_reference_density= findParameter<double>( config, - //! \ogs_file_param{prj__processes__process__HT__fluid_reference_density} + //! \ogs_file_param_special{prj__processes__process__HT__fluid_reference_density} "fluid_reference_density", parameters, 1); DBUG("Use \'%s\' as fluid_reference_density parameter.", fluid_reference_density.name.c_str()); diff --git a/ProcessLib/HT/CreatePorousMediaProperties.cpp b/ProcessLib/HT/CreatePorousMediaProperties.cpp index 13becc7d774ace99585fa7c8eb10de3e8b9b1d45..2c9e9833fa88ab20f10e55cb8bccbb9aff5adc41 100644 --- a/ProcessLib/HT/CreatePorousMediaProperties.cpp +++ b/ProcessLib/HT/CreatePorousMediaProperties.cpp @@ -36,15 +36,15 @@ PorousMediaProperties createPorousMediaProperties( std::vector<int> mat_ids; for (auto const& porous_medium_config : - //! \ogs_file_param_special{prj__processes__process__HT__porous_medium__porous_medium} + //! \ogs_file_param{prj__processes__process__HT__porous_medium__porous_medium} porous_medium_configs.getConfigSubtreeList("porous_medium")) { - //! \ogs_file_param_special{prj__processes__process__HT__porous_medium__porous_medium__id} + //! \ogs_file_attr{prj__processes__process__HT__porous_medium__porous_medium__id} auto const id = porous_medium_config.getConfigAttribute<int>("id"); mat_ids.push_back(id); auto const& porosity_conf = - //! \ogs_file_param_special{prj__processes__process__HT__porous_medium__porous_medium__porosity} + //! \ogs_file_param{prj__processes__process__HT__porous_medium__porous_medium__porosity} porous_medium_config.getConfigSubtree("porosity"); porosity_models.emplace_back( MaterialLib::PorousMedium::createPorosityModel(porosity_conf)); @@ -53,7 +53,7 @@ PorousMediaProperties createPorousMediaProperties( // element, // i.e., the isotropic case is handled at the moment) auto const& permeability_conf = - //! \ogs_file_param_special{prj__processes__process__HT__porous_medium__porous_medium__permeability} + //! \ogs_file_param{prj__processes__process__HT__porous_medium__porous_medium__permeability} porous_medium_config.getConfigSubtree("permeability"); intrinsic_permeability_models.emplace_back( MaterialLib::PorousMedium::createPermeabilityModel( @@ -61,7 +61,7 @@ PorousMediaProperties createPorousMediaProperties( // Parameter for the specific storage. auto const& storage_conf = - //! \ogs_file_param_special{prj__processes__process__HT__porous_medium__porous_medium__storage} + //! \ogs_file_param{prj__processes__process__HT__porous_medium__porous_medium__storage} porous_medium_config.getConfigSubtree("storage"); storage_models.emplace_back( MaterialLib::PorousMedium::createStorageModel(storage_conf));