diff --git a/Documentation/ProjectFile/prj/processes/process/ComponentTransport/t_decay_rate.md b/Documentation/ProjectFile/prj/processes/process/ComponentTransport/t_decay_rate.md
deleted file mode 100644
index b4992a3ad7ed0168eb9b3cc33da764dd4ed0819d..0000000000000000000000000000000000000000
--- a/Documentation/ProjectFile/prj/processes/process/ComponentTransport/t_decay_rate.md
+++ /dev/null
@@ -1 +0,0 @@
-Parameter to specify the decay rate.
diff --git a/Documentation/ProjectFile/prj/processes/process/ComponentTransport/t_fluid_reference_density.md b/Documentation/ProjectFile/prj/processes/process/ComponentTransport/t_fluid_reference_density.md
deleted file mode 100644
index 7a9d865b220af527c3d672b644f8875d8b924c75..0000000000000000000000000000000000000000
--- a/Documentation/ProjectFile/prj/processes/process/ComponentTransport/t_fluid_reference_density.md
+++ /dev/null
@@ -1 +0,0 @@
-Parameter for the specification of the reference density of the fluid.
diff --git a/MaterialLib/MPL/CreateProperty.cpp b/MaterialLib/MPL/CreateProperty.cpp
index ca5359f81c047cae4452328be3c8b069ce4364b9..bafdd151fad50cb2d9287c0bf259f02b352cc6b0 100644
--- a/MaterialLib/MPL/CreateProperty.cpp
+++ b/MaterialLib/MPL/CreateProperty.cpp
@@ -186,7 +186,7 @@ std::unique_ptr<MaterialPropertyLib::Property> createProperty(
//! \ogs_file_param{properties__property__Parameter__parameter_name}
config.getConfigParameter<std::string>("parameter_name");
auto const& parameter = ParameterLib::findParameter<double>(
- parameter_name, parameters, 1, nullptr);
+ parameter_name, parameters, 0, nullptr);
return std::make_unique<MaterialPropertyLib::ParameterProperty>(
parameter);
}
diff --git a/MaterialLib/MPL/PropertyType.h b/MaterialLib/MPL/PropertyType.h
index 7caa86f50d8bbe7034fc87f808676691c58a2482..636b14b77c0b9c21599801851a612e92211a2b03 100644
--- a/MaterialLib/MPL/PropertyType.h
+++ b/MaterialLib/MPL/PropertyType.h
@@ -43,6 +43,8 @@ enum PropertyType : int
critical_pressure,
critical_temperature,
compressibility,
+ /// used to specify decay rate of a substance.
+ decay_rate,
density,
drhodT,
effective_stress,
@@ -123,6 +125,10 @@ inline PropertyType convertStringToProperty(std::string const& inString)
{
return PropertyType::compressibility;
}
+ if (boost::iequals(inString, "decay_rate"))
+ {
+ return PropertyType::decay_rate;
+ }
if (boost::iequals(inString, "density"))
{
return PropertyType::density;
diff --git a/MaterialLib/MPL/VariableType.cpp b/MaterialLib/MPL/VariableType.cpp
index 37086e0b74f55ca8f7ac39a70b0a7414124631b2..fee2bcf3764fbef3efb5e36eb44afe61ba5e23e6 100644
--- a/MaterialLib/MPL/VariableType.cpp
+++ b/MaterialLib/MPL/VariableType.cpp
@@ -17,6 +17,10 @@ namespace MaterialPropertyLib
{
Variable convertStringToVariable(std::string const& input)
{
+ if (boost::iequals(input, "concentration"))
+ {
+ return Variable::concentration;
+ }
if (boost::iequals(input, "phase_pressure"))
{
return Variable::phase_pressure;
diff --git a/MaterialLib/MPL/VariableType.h b/MaterialLib/MPL/VariableType.h
index e913af377007a101675bbbf9d2997cb4b55f5b3a..e11d51ba5335ad812e341278d9924dcfe96bc8d5 100644
--- a/MaterialLib/MPL/VariableType.h
+++ b/MaterialLib/MPL/VariableType.h
@@ -42,6 +42,7 @@ using Tensor = std::array<double, 9>;
/// is missing, simply add it somewhere at the list, but above the last entry.
enum class Variable : int
{
+ concentration,
phase_pressure,
capillary_pressure,
density,
diff --git a/ProcessLib/ComponentTransport/ComponentTransportFEM.h b/ProcessLib/ComponentTransport/ComponentTransportFEM.h
index d2ad7fea31c62f781492c3f156b0fc9dd4cd266f..619a0e3707b534bbd675c1a44333831ea799aa91 100644
--- a/ProcessLib/ComponentTransport/ComponentTransportFEM.h
+++ b/ProcessLib/ComponentTransport/ComponentTransportFEM.h
@@ -13,10 +13,10 @@
#include <vector>
#include "ComponentTransportProcessData.h"
-#include "MaterialLib/Fluid/FluidProperties/FluidProperties.h"
#include "MaterialLib/MPL/MaterialSpatialDistributionMap.h"
#include "MaterialLib/MPL/Medium.h"
#include "MaterialLib/MPL/Property.h"
+#include "MaterialLib/MPL/Utils/FormEigenTensor.h"
#include "MathLib/LinAlg/Eigen/EigenMapTools.h"
#include "NumLib/DOF/DOFTableUtil.h"
#include "NumLib/Extrapolation/ExtrapolatableElement.h"
@@ -238,7 +238,7 @@ public:
auto const& b = _process_data.specific_body_force;
- MaterialLib::Fluid::FluidProperty::ArrayType vars;
+ MaterialPropertyLib::VariableArray vars;
GlobalDimMatrixType const& I(
GlobalDimMatrixType::Identity(GlobalDim, GlobalDim));
@@ -270,13 +270,21 @@ public:
NumLib::shapeFunctionInterpolate(C_nodal_values, N, C_int_pt);
NumLib::shapeFunctionInterpolate(p_nodal_values, N, p_int_pt);
+ vars[static_cast<int>(
+ MaterialPropertyLib::Variable::concentration)] = C_int_pt;
+ vars[static_cast<int>(
+ MaterialPropertyLib::Variable::phase_pressure)] = p_int_pt;
+
// porosity model
auto const porosity =
- _process_data.porous_media_properties.getPorosity(t, pos)
- .getValue(t, pos, 0.0, C_int_pt);
+ medium.property(MaterialPropertyLib::PropertyType::porosity)
+ .template value<double>(vars, pos, t);
- auto const& retardation_factor = component.template value<double>(
- MaterialPropertyLib::PropertyType::retardation_factor);
+ auto const& retardation_factor =
+ component
+ .property(
+ MaterialPropertyLib::PropertyType::retardation_factor)
+ .template value<double>(vars, pos, t);
auto const& solute_dispersivity_transverse = medium.template value<
double>(
@@ -290,24 +298,29 @@ public:
// Use the fluid density model to compute the density
// TODO (renchao): concentration of which component as the argument
// for calculation of fluid density
- vars[static_cast<int>(
- MaterialLib::Fluid::PropertyVariableType::C)] = C_int_pt;
- vars[static_cast<int>(
- MaterialLib::Fluid::PropertyVariableType::p)] = p_int_pt;
- auto const density = _process_data.fluid_properties->getValue(
- MaterialLib::Fluid::FluidPropertyType::Density, vars);
- auto const decay_rate = _process_data.decay_rate(t, pos)[0];
+ auto const density =
+ phase.property(MaterialPropertyLib::PropertyType::density)
+ .template value<double>(vars, pos, t);
+
+ auto const decay_rate =
+ component
+ .property(MaterialPropertyLib::PropertyType::decay_rate)
+ .template value<double>(vars, pos, t);
auto const& molecular_diffusion_coefficient =
- component.template value<double>(
- MaterialPropertyLib::PropertyType::molecular_diffusion);
+ component
+ .property(
+ MaterialPropertyLib::PropertyType::molecular_diffusion)
+ .template value<double>(vars, pos, t);
+
+ auto const& K = MaterialPropertyLib::formEigenTensor<GlobalDim>(
+ medium.property(MaterialPropertyLib::PropertyType::permeability)
+ .value(vars, pos, t));
- auto const& K =
- _process_data.porous_media_properties.getIntrinsicPermeability(
- t, pos).getValue(t, pos, 0.0, 0.0);
// Use the viscosity model to compute the viscosity
- auto const mu = _process_data.fluid_properties->getValue(
- MaterialLib::Fluid::FluidPropertyType::Viscosity, vars);
+ auto const mu =
+ phase.property(MaterialPropertyLib::PropertyType::viscosity)
+ .template value<double>(vars, pos, t);
GlobalDimMatrixType const K_over_mu = K / mu;
GlobalDimVectorType const velocity =
@@ -316,15 +329,18 @@ public:
(dNdx * p_nodal_values - density * b))
: GlobalDimVectorType(-K_over_mu * dNdx * p_nodal_values);
- const double drho_dp = _process_data.fluid_properties->getdValue(
- MaterialLib::Fluid::FluidPropertyType::Density,
- vars,
- MaterialLib::Fluid::PropertyVariableType::p);
+ const double drho_dp =
+ phase.property(MaterialPropertyLib::PropertyType::density)
+ .template dValue<double>(
+ vars, MaterialPropertyLib::Variable::phase_pressure,
+ pos, t);
+
+ const double drho_dC =
+ phase.property(MaterialPropertyLib::PropertyType::density)
+ .template dValue<double>(
+ vars, MaterialPropertyLib::Variable::concentration, pos,
+ t);
- const double drho_dC = _process_data.fluid_properties->getdValue(
- MaterialLib::Fluid::FluidPropertyType::Density,
- vars,
- MaterialLib::Fluid::PropertyVariableType::C);
double const velocity_magnitude = velocity.norm();
GlobalDimMatrixType const hydrodynamic_dispersion =
velocity_magnitude != 0.0
@@ -432,7 +448,11 @@ public:
auto const& b = _process_data.specific_body_force;
- MaterialLib::Fluid::FluidProperty::ArrayType vars;
+ auto const& medium =
+ *_process_data.media_map->getMedium(_element.getID());
+ auto const& phase = medium.phase("AqueousLiquid");
+
+ MaterialPropertyLib::VariableArray vars;
for (unsigned ip(0); ip < n_integration_points; ++ip)
{
@@ -449,38 +469,44 @@ public:
NumLib::shapeFunctionInterpolate(local_C, N, C_int_pt);
NumLib::shapeFunctionInterpolate(local_p, N, p_int_pt);
+ vars[static_cast<int>(
+ MaterialPropertyLib::Variable::concentration)] = C_int_pt;
+ vars[static_cast<int>(
+ MaterialPropertyLib::Variable::phase_pressure)] = p_int_pt;
+
// porosity model
auto const porosity =
- _process_data.porous_media_properties.getPorosity(t, pos)
- .getValue(t, pos, 0.0, C_int_pt);
+ medium.property(MaterialPropertyLib::PropertyType::porosity)
+ .template value<double>(vars, pos, t);
// Use the fluid density model to compute the density
// TODO: Concentration of which component as one of arguments for
// calculation of fluid density
- vars[static_cast<int>(
- MaterialLib::Fluid::PropertyVariableType::C)] = C_int_pt;
- vars[static_cast<int>(
- MaterialLib::Fluid::PropertyVariableType::p)] = p_int_pt;
- auto const density = _process_data.fluid_properties->getValue(
- MaterialLib::Fluid::FluidPropertyType::Density, vars);
+ auto const density =
+ phase.property(MaterialPropertyLib::PropertyType::density)
+ .template value<double>(vars, pos, t);
+
+ auto const& K = MaterialPropertyLib::formEigenTensor<GlobalDim>(
+ medium.property(MaterialPropertyLib::PropertyType::permeability)
+ .value(vars, pos, t));
- auto const& K =
- _process_data.porous_media_properties.getIntrinsicPermeability(
- t, pos).getValue(t, pos, 0.0, 0.0);
// Use the viscosity model to compute the viscosity
- auto const mu = _process_data.fluid_properties->getValue(
- MaterialLib::Fluid::FluidPropertyType::Viscosity, vars);
+ auto const mu =
+ phase.property(MaterialPropertyLib::PropertyType::viscosity)
+ .template value<double>(vars, pos, t);
GlobalDimMatrixType const K_over_mu = K / mu;
- const double drho_dp = _process_data.fluid_properties->getdValue(
- MaterialLib::Fluid::FluidPropertyType::Density,
- vars,
- MaterialLib::Fluid::PropertyVariableType::p);
- const double drho_dC = _process_data.fluid_properties->getdValue(
- MaterialLib::Fluid::FluidPropertyType::Density,
- vars,
- MaterialLib::Fluid::PropertyVariableType::C);
+ const double drho_dp =
+ phase.property(MaterialPropertyLib::PropertyType::density)
+ .template dValue<double>(
+ vars, MaterialPropertyLib::Variable::phase_pressure,
+ pos, t);
+ const double drho_dC =
+ phase.property(MaterialPropertyLib::PropertyType::density)
+ .template dValue<double>(
+ vars, MaterialPropertyLib::Variable::concentration, pos,
+ t);
// matrix assembly
local_M.noalias() += w * N.transpose() * porosity * drho_dp * N;
@@ -534,7 +560,7 @@ public:
auto const& b = _process_data.specific_body_force;
- MaterialLib::Fluid::FluidProperty::ArrayType vars;
+ MaterialPropertyLib::VariableArray vars;
GlobalDimMatrixType const& I(
GlobalDimMatrixType::Identity(GlobalDim, GlobalDim));
@@ -563,13 +589,21 @@ public:
NumLib::shapeFunctionInterpolate(local_C, N, C_int_pt);
NumLib::shapeFunctionInterpolate(local_p, N, p_int_pt);
+ vars[static_cast<int>(
+ MaterialPropertyLib::Variable::concentration)] = C_int_pt;
+ vars[static_cast<int>(
+ MaterialPropertyLib::Variable::phase_pressure)] = p_int_pt;
+
// porosity model
auto const porosity =
- _process_data.porous_media_properties.getPorosity(t, pos)
- .getValue(t, pos, 0.0, C_int_pt);
+ medium.property(MaterialPropertyLib::PropertyType::porosity)
+ .template value<double>(vars, pos, t);
- auto const& retardation_factor = component.template value<double>(
- MaterialPropertyLib::PropertyType::retardation_factor);
+ auto const& retardation_factor =
+ component
+ .property(
+ MaterialPropertyLib::PropertyType::retardation_factor)
+ .template value<double>(vars, pos, t);
auto const& solute_dispersivity_transverse = medium.template value<
double>(
@@ -580,24 +614,27 @@ public:
longitudinal_dispersivity);
// Use the fluid density model to compute the density
- vars[static_cast<int>(
- MaterialLib::Fluid::PropertyVariableType::C)] = C_int_pt;
- vars[static_cast<int>(
- MaterialLib::Fluid::PropertyVariableType::p)] = p_int_pt;
- auto const density = _process_data.fluid_properties->getValue(
- MaterialLib::Fluid::FluidPropertyType::Density, vars);
- auto const decay_rate = _process_data.decay_rate(t, pos)[0];
+ auto const density =
+ phase.property(MaterialPropertyLib::PropertyType::density)
+ .template value<double>(vars, pos, t);
+ auto const decay_rate =
+ component
+ .property(MaterialPropertyLib::PropertyType::decay_rate)
+ .template value<double>(vars, pos, t);
auto const& molecular_diffusion_coefficient =
- component.template value<double>(
- MaterialPropertyLib::PropertyType::molecular_diffusion);
-
- auto const& K =
- _process_data.porous_media_properties.getIntrinsicPermeability(
- t, pos).getValue(t, pos, 0.0, 0.0);
+ component
+ .property(
+ MaterialPropertyLib::PropertyType::molecular_diffusion)
+ .template value<double>(vars, pos, t);
+
+ auto const& K = MaterialPropertyLib::formEigenTensor<GlobalDim>(
+ medium.property(MaterialPropertyLib::PropertyType::permeability)
+ .value(vars, pos, t));
// Use the viscosity model to compute the viscosity
- auto const mu = _process_data.fluid_properties->getValue(
- MaterialLib::Fluid::FluidPropertyType::Viscosity, vars);
+ auto const mu =
+ phase.property(MaterialPropertyLib::PropertyType::viscosity)
+ .template value<double>(vars, pos, t);
GlobalDimMatrixType const K_over_mu = K / mu;
GlobalDimVectorType const velocity =
@@ -631,10 +668,10 @@ public:
if (_process_data.non_advective_form)
{
const double drho_dC =
- _process_data.fluid_properties->getdValue(
- MaterialLib::Fluid::FluidPropertyType::Density,
- vars,
- MaterialLib::Fluid::PropertyVariableType::C);
+ phase.property(MaterialPropertyLib::PropertyType::density)
+ .template dValue<double>(
+ vars, MaterialPropertyLib::Variable::concentration,
+ pos, t);
local_M.noalias() +=
N_t_N * (R_times_phi * C_int_pt * drho_dC * w);
}
@@ -649,10 +686,10 @@ public:
NumLib::shapeFunctionInterpolate(local_p0, N, p0_int_pt);
const double drho_dp =
- _process_data.fluid_properties->getdValue(
- MaterialLib::Fluid::FluidPropertyType::Density,
- vars,
- MaterialLib::Fluid::PropertyVariableType::p);
+ phase.property(MaterialPropertyLib::PropertyType::density)
+ .template dValue<double>(
+ vars, MaterialPropertyLib::Variable::phase_pressure,
+ pos, t);
local_K.noalias() +=
N_t_N *
((R_times_phi * drho_dp * (p_int_pt - p0_int_pt) / dt) *
@@ -727,7 +764,11 @@ public:
ParameterLib::SpatialPosition pos;
pos.setElementID(_element.getID());
- MaterialLib::Fluid::FluidProperty::ArrayType vars;
+ MaterialPropertyLib::VariableArray vars;
+
+ auto const& medium =
+ *_process_data.media_map->getMedium(_element.getID());
+ auto const& phase = medium.phase("AqueousLiquid");
for (unsigned ip = 0; ip < n_integration_points; ++ip)
{
@@ -737,29 +778,31 @@ public:
pos.setIntegrationPoint(ip);
- auto const& K =
- _process_data.porous_media_properties.getIntrinsicPermeability(
- t, pos).getValue(t, pos, 0.0, 0.0);
- auto const mu = _process_data.fluid_properties->getValue(
- MaterialLib::Fluid::FluidPropertyType::Viscosity, vars);
+ double C_int_pt = 0.0;
+ double p_int_pt = 0.0;
+
+ NumLib::shapeFunctionInterpolate(C_nodal_values, N, C_int_pt);
+ NumLib::shapeFunctionInterpolate(p_nodal_values, N, p_int_pt);
+
+ vars[static_cast<int>(
+ MaterialPropertyLib::Variable::concentration)] = C_int_pt;
+ vars[static_cast<int>(
+ MaterialPropertyLib::Variable::phase_pressure)] = p_int_pt;
+
+ auto const& K = MaterialPropertyLib::formEigenTensor<GlobalDim>(
+ medium.property(MaterialPropertyLib::PropertyType::permeability)
+ .value(vars, pos, t));
+ auto const mu =
+ phase.property(MaterialPropertyLib::PropertyType::viscosity)
+ .template value<double>(vars, pos, t);
GlobalDimMatrixType const K_over_mu = K / mu;
cache_mat.col(ip).noalias() = -K_over_mu * dNdx * p_nodal_values;
if (_process_data.has_gravity)
{
- double C_int_pt = 0.0;
- double p_int_pt = 0.0;
-
- NumLib::shapeFunctionInterpolate(C_nodal_values, N, C_int_pt);
- NumLib::shapeFunctionInterpolate(p_nodal_values, N, p_int_pt);
-
- vars[static_cast<int>(
- MaterialLib::Fluid::PropertyVariableType::C)] = C_int_pt;
- vars[static_cast<int>(
- MaterialLib::Fluid::PropertyVariableType::p)] = p_int_pt;
-
- auto const rho_w = _process_data.fluid_properties->getValue(
- MaterialLib::Fluid::FluidPropertyType::Density, vars);
+ auto const rho_w =
+ phase.property(MaterialPropertyLib::PropertyType::density)
+ .template value<double>(vars, pos, t);
auto const b = _process_data.specific_body_force;
// here it is assumed that the vector b is directed 'downwards'
cache_mat.col(ip).noalias() += K_over_mu * rho_w * b;
@@ -827,33 +870,36 @@ public:
ParameterLib::SpatialPosition pos;
pos.setElementID(_element.getID());
- MaterialLib::Fluid::FluidProperty::ArrayType vars;
+ MaterialPropertyLib::VariableArray vars;
+
+ auto const& medium =
+ *_process_data.media_map->getMedium(_element.getID());
+ auto const& phase = medium.phase("AqueousLiquid");
// local_x contains the local concentration and pressure values
NumLib::shapeFunctionInterpolate(
C_nodal_values, shape_matrices.N,
- vars[static_cast<int>(
- MaterialLib::Fluid::PropertyVariableType::C)]);
+ std::get<double>(vars[static_cast<int>(
+ MaterialPropertyLib::Variable::concentration)]));
NumLib::shapeFunctionInterpolate(
p_nodal_values, shape_matrices.N,
- vars[static_cast<int>(
- MaterialLib::Fluid::PropertyVariableType::p)]);
+ std::get<double>(vars[static_cast<int>(
+ MaterialPropertyLib::Variable::phase_pressure)]));
- auto const K =
- _process_data.porous_media_properties
- .getIntrinsicPermeability(t, pos)
- .getValue(t, pos, 0.0,
- vars[static_cast<int>(
- MaterialLib::Fluid::PropertyVariableType::C)]);
+ auto const K = MaterialPropertyLib::formEigenTensor<GlobalDim>(
+ medium.property(MaterialPropertyLib::PropertyType::permeability)
+ .value(vars, pos, t));
- auto const mu = _process_data.fluid_properties->getValue(
- MaterialLib::Fluid::FluidPropertyType::Viscosity, vars);
+ auto const mu =
+ phase.property(MaterialPropertyLib::PropertyType::viscosity)
+ .template value<double>(vars, pos, t);
GlobalDimMatrixType const K_over_mu = K / mu;
GlobalDimVectorType q =
-K_over_mu * shape_matrices.dNdx * p_nodal_values;
- auto const rho_w = _process_data.fluid_properties->getValue(
- MaterialLib::Fluid::FluidPropertyType::Density, vars);
+ auto const rho_w =
+ phase.property(MaterialPropertyLib::PropertyType::density)
+ .template value<double>(vars, pos, t);
if (_process_data.has_gravity)
{
auto const b = _process_data.specific_body_force;
diff --git a/ProcessLib/ComponentTransport/ComponentTransportProcessData.h b/ProcessLib/ComponentTransport/ComponentTransportProcessData.h
index 1c2b96961f098d874c612f25b9f4e95d4b2b4417..f1c25b9dcc25b83a3d107c4e317f01efee646dfd 100644
--- a/ProcessLib/ComponentTransport/ComponentTransportProcessData.h
+++ b/ProcessLib/ComponentTransport/ComponentTransportProcessData.h
@@ -11,11 +11,8 @@
#include <memory>
-#include "MaterialLib/Fluid/FluidProperties/FluidProperties.h"
#include "MaterialLib/MPL/CreateMaterialSpatialDistributionMap.h"
-#include "MaterialLib/PorousMedium/Porosity/Porosity.h"
-#include "MaterialLib/PorousMedium/Storage/Storage.h"
-#include "MaterialLib/PorousMedium/PorousMediaProperties.h"
+#include "MathLib/LinAlg/Eigen/EigenMapTools.h"
namespace MaterialPropertyLib
{
@@ -24,41 +21,24 @@ class Medium;
namespace ProcessLib
{
-template <typename ReturnType>
-struct Parameter;
-
namespace ComponentTransport
{
struct ComponentTransportProcessData
{
ComponentTransportProcessData(
- MaterialLib::PorousMedium::PorousMediaProperties&&
- porous_media_properties_,
- ParameterLib::Parameter<double> const& fluid_reference_density_,
- std::unique_ptr<MaterialLib::Fluid::FluidProperties>&&
- fluid_properties_,
std::unique_ptr<MaterialPropertyLib::MaterialSpatialDistributionMap>&&
media_map_,
- ParameterLib::Parameter<double> const& decay_rate_,
Eigen::VectorXd const& specific_body_force_, bool const has_gravity_,
bool const non_advective_form_)
- : porous_media_properties(std::move(porous_media_properties_)),
- fluid_reference_density(fluid_reference_density_),
- fluid_properties(std::move(fluid_properties_)),
- media_map(std::move(media_map_)),
- decay_rate(decay_rate_),
+ : media_map(std::move(media_map_)),
specific_body_force(specific_body_force_),
has_gravity(has_gravity_),
non_advective_form(non_advective_form_)
{
}
- MaterialLib::PorousMedium::PorousMediaProperties porous_media_properties;
- ParameterLib::Parameter<double> const& fluid_reference_density;
- std::unique_ptr<MaterialLib::Fluid::FluidProperties> fluid_properties;
std::unique_ptr<MaterialPropertyLib::MaterialSpatialDistributionMap>
media_map;
- ParameterLib::Parameter<double> const& decay_rate;
Eigen::VectorXd const specific_body_force;
bool const has_gravity;
bool const non_advective_form;
diff --git a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp
index ed8751c9fe10327a78aacd0557236ba4dec8f2aa..636bb05a83d2fc7c9b34b968f4f1e966dee357df 100644
--- a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp
+++ b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp
@@ -9,12 +9,8 @@
#include "CreateComponentTransportProcess.h"
-#include "MaterialLib/Fluid/FluidProperties/CreateFluidProperties.h"
#include "MaterialLib/MPL/CreateMaterialSpatialDistributionMap.h"
-#include "MaterialLib/PorousMedium/CreatePorousMediaProperties.h"
#include "MeshLib/IO/readMeshFromFile.h"
-#include "ParameterLib/ConstantParameter.h"
-#include "ParameterLib/Utils.h"
#include "ProcessLib/Output/CreateSecondaryVariables.h"
#include "ProcessLib/SurfaceFlux/SurfaceFluxData.h"
#include "ProcessLib/Utils/ProcessUtils.h"
@@ -110,30 +106,6 @@ std::unique_ptr<Process> createComponentTransportProcess(
}
}
- MaterialLib::PorousMedium::PorousMediaProperties porous_media_properties{
- MaterialLib::PorousMedium::createPorousMediaProperties(
- mesh, config, parameters)};
-
- //! \ogs_file_param{prj__processes__process__ComponentTransport__fluid}
- auto const& fluid_config = config.getConfigSubtree("fluid");
-
- auto fluid_properties =
- MaterialLib::Fluid::createFluidProperties(fluid_config);
-
- // Parameter for the density of the fluid.
- auto& fluid_reference_density = ParameterLib::findParameter<double>(
- config,
- //! \ogs_file_param_special{prj__processes__process__ComponentTransport__fluid_reference_density}
- "fluid_reference_density", parameters, 1);
- DBUG("Use '%s' as fluid_reference_density parameter.",
- fluid_reference_density.name.c_str(), &mesh);
-
- // Parameter for the decay rate.
- auto const& decay_rate = ParameterLib::findParameter<double>(
- config,
- //! \ogs_file_param_special{prj__processes__process__ComponentTransport__decay_rate}
- "decay_rate", parameters, 1, &mesh);
-
// Specific body force parameter.
Eigen::VectorXd specific_body_force;
std::vector<double> const b =
@@ -162,11 +134,7 @@ std::unique_ptr<Process> createComponentTransportProcess(
MaterialPropertyLib::createMaterialSpatialDistributionMap(media, mesh);
ComponentTransportProcessData process_data{
- std::move(porous_media_properties),
- fluid_reference_density,
- std::move(fluid_properties),
std::move(media_map),
- decay_rate,
specific_body_force,
has_gravity,
non_advective_form};
diff --git a/Tests/Data/Elliptic/square_100x100_ComponentTransport/square_1e4_heterogeneity.prj b/Tests/Data/Elliptic/square_100x100_ComponentTransport/square_1e4_heterogeneity.prj
index 42f8bf071ad1ab286932cb0eeaab4488c41f6c9a..135620b68cc5eeae2bb43a56eb203f45815cfca9 100644
--- a/Tests/Data/Elliptic/square_100x100_ComponentTransport/square_1e4_heterogeneity.prj
+++ b/Tests/Data/Elliptic/square_100x100_ComponentTransport/square_1e4_heterogeneity.prj
@@ -11,34 +11,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>Constant</type>
- <value>1e3</value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -64,12 +36,39 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1e3</value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -125,11 +124,6 @@
</output>
</time_loop>
<parameters>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d.prj b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d.prj
index 74774f0ac77106358a2eacd628cf81f2a1d2a0fa..156f3cfd75c569fe1a41405651d38ea4e25e1f5c 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d.prj
@@ -12,34 +12,6 @@
<concentration>Cs</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>Constant</type>
- <value>1e3</value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <type>Constant</type>
- <permeability_tensor_entries>kappa</permeability_tensor_entries>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>porosity</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0.0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -65,12 +37,39 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1e3</value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>porosity</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -177,11 +176,6 @@
<type>Constant</type>
<value>0.38</value>
</parameter>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>retardation</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_2d.prj b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_2d.prj
index aff238c3f49dad3eb30c0d73a31612cc19716f03..7448f129302b604322ff2653c5f72f64e26fd7b9 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_2d.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_2d.prj
@@ -12,34 +12,6 @@
<concentration>Cs</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>Constant</type>
- <value>1e3</value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <type>Constant</type>
- <permeability_tensor_entries>kappa</permeability_tensor_entries>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>porosity</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0.0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 -9.81</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -65,12 +37,39 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1e3</value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>porosity</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -177,11 +176,6 @@
<type>Constant</type>
<value>0.38</value>
</parameter>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>retardation</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/MassConservation/mass_conservation.prj b/Tests/Data/Parabolic/ComponentTransport/MassConservation/mass_conservation.prj
index e91dd0d8c53185268fd548d40809228f1600519e..4745fa4653a61020287648ebed53e99551cada72 100644
--- a/Tests/Data/Parabolic/ComponentTransport/MassConservation/mass_conservation.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/MassConservation/mass_conservation.prj
@@ -15,36 +15,6 @@
<pressure>pressure</pressure>
</process_variables>
<non_advective_form>true</non_advective_form>
- <fluid>
- <density>
- <type>ConcentrationDependent</type>
- <reference_density>1e3</reference_density>
- <reference_concentration>0</reference_concentration>
- <fluid_density_difference_ratio>0.0</fluid_density_difference_ratio>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -70,12 +40,46 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1e3</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>0.0</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>transversal_dispersivity</name>
<type>Constant</type>
@@ -132,11 +136,6 @@
</output>
</time_loop>
<parameters>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/EquilibriumPhase/calcite.prj b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/EquilibriumPhase/calcite.prj
index 4f65ea2e33e7eb6fe4fbac692807b0074157fd03..85db351b60fcfda943ef728fc4a5bbd2e8f8475c 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/EquilibriumPhase/calcite.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/EquilibriumPhase/calcite.prj
@@ -16,34 +16,6 @@
<concentration>H</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>Constant</type>
- <value>1e3</value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <type>Constant</type>
- <permeability_tensor_entries>kappa</permeability_tensor_entries>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>porosity</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0.0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -69,6 +41,11 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
<component>
@@ -84,6 +61,11 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
<component>
@@ -99,6 +81,11 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
<component>
@@ -114,6 +101,11 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
<component>
@@ -129,12 +121,39 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1e3</value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>porosity</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -388,11 +407,6 @@
<type>Constant</type>
<value>0.32</value>
</parameter>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac.prj b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac.prj
index 1c328b75223eaafc8a2fa24b2f59a9f8e82941ca..866a244a15b18be83c790f02eef0522208b9ca58 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac.prj
@@ -14,34 +14,6 @@
<concentration>Syntheticb</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>Constant</type>
- <value>1e3</value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <type>Constant</type>
- <permeability_tensor_entries>kappa</permeability_tensor_entries>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>porosity</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0.0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -67,6 +39,11 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
<component>
@@ -82,6 +59,11 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
<component>
@@ -97,12 +79,39 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1e3</value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>porosity</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -323,11 +332,6 @@
<type>Constant</type>
<value>1</value>
</parameter>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac_flag_formula.prj b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac_flag_formula.prj
index 9ca2291e387e64ae10825985cc1e6a1e0d65f5f8..e27bf2c6fb82e7d21bb29cd175c481f88bcb4032 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac_flag_formula.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant/1d_isofrac_flag_formula.prj
@@ -14,34 +14,6 @@
<concentration>Syntheticb</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>Constant</type>
- <value>1e3</value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <type>Constant</type>
- <permeability_tensor_entries>kappa</permeability_tensor_entries>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>porosity</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0.0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -67,6 +39,11 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
<component>
@@ -82,6 +59,11 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
<component>
@@ -97,12 +79,39 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1e3</value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>porosity</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -300,11 +309,6 @@
<type>Constant</type>
<value>1</value>
</parameter>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2.prj b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2.prj
index 49b98a3b51c2f9a82a43a7a74a1bbcac51aaa180..494c4a8f42e649b39c76e56e70303684d6b1e8dc 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2.prj
@@ -15,34 +15,6 @@
<concentration>Productd</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>Constant</type>
- <value>1e3</value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <type>Constant</type>
- <permeability_tensor_entries>kappa</permeability_tensor_entries>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>porosity</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0.0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -68,6 +40,11 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
<component>
@@ -83,6 +60,11 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
<component>
@@ -98,6 +80,11 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
<component>
@@ -113,12 +100,39 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1e3</value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>porosity</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -347,11 +361,6 @@
<type>Constant</type>
<value>1</value>
</parameter>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>retardation</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_2d.prj b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_2d.prj
index a5e8d3ac4509248e6557e9afc4179f69df990abf..47c29e735b6c91b1b715616531a98361c648f7d0 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_2d.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_2d.prj
@@ -15,34 +15,6 @@
<concentration>Productd</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>Constant</type>
- <value>1e3</value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <type>Constant</type>
- <permeability_tensor_entries>kappa</permeability_tensor_entries>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>porosity</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0.0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -68,6 +40,11 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
<component>
@@ -83,6 +60,11 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
<component>
@@ -98,6 +80,11 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
<component>
@@ -113,12 +100,39 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1e3</value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>porosity</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -347,11 +361,6 @@
<type>Constant</type>
<value>1</value>
</parameter>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>retardation</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj
index 8f952f09d8b5aaef921cd89e1d8178c1e9698579..9cae2ee138bc5188dddff371bdcde818a28acaa9 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj
@@ -11,52 +11,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>ConcentrationAndPressureDependent</type>
- <reference_density>1</reference_density>
- <reference_concentration>0</reference_concentration>
- <fluid_density_concentration_difference_ratio>0.0</fluid_density_concentration_difference_ratio>
- <reference_pressure>0</reference_pressure>
- <fluid_density_pressure_difference_ratio>5e-5</fluid_density_pressure_difference_ratio>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>1e-5</value>
- </storage>
- </porous_medium>
- <porous_medium id="1">
- <permeability>
- <permeability_tensor_entries>kappa2</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>1e-5</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -82,12 +36,51 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>0.0</slope>
+ </independent_variable>
+ <independent_variable>
+ <variable_name>phase_pressure</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>5e-5</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -156,11 +149,6 @@
<type>Constant</type>
<value>0.2</value>
</parameter>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly.prj
index 41ef82138142b8093c07447ec7304b2bab454a6c..a6a0a9eb681d57964df2d279998a2f3a71a5dbca 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly.prj
@@ -11,50 +11,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>ConcentrationDependent</type>
- <reference_density>1</reference_density>
- <reference_concentration>0</reference_concentration>
- <fluid_density_difference_ratio>0.0</fluid_density_difference_ratio>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <type>Constant</type>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>1e-5</value>
- </storage>
- </porous_medium>
- <porous_medium id="1">
- <permeability>
- <type>Constant</type>
- <permeability_tensor_entries>kappa2</permeability_tensor_entries>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -80,12 +36,46 @@
<type>Constant</type>
<value>0</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>0.0</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -156,11 +146,6 @@
<type>Constant</type>
<value>0.2</value>
</parameter>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly_3Components.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly_3Components.prj
index 0a5ff0d6e70fb41c33968a83eeb76b8769950756..54f0576602a48f1954b5265587e73a6201fee950 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly_3Components.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly_3Components.prj
@@ -13,50 +13,6 @@
<concentration>Cl</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>ConcentrationDependent</type>
- <reference_density>1</reference_density>
- <reference_concentration>0</reference_concentration>
- <fluid_density_difference_ratio>0.0</fluid_density_difference_ratio>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <type>Constant</type>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>1e-5</value>
- </storage>
- </porous_medium>
- <porous_medium id="1">
- <permeability>
- <type>Constant</type>
- <permeability_tensor_entries>kappa2</permeability_tensor_entries>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -82,6 +38,11 @@
<type>Constant</type>
<value>0</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
<component>
@@ -97,6 +58,11 @@
<type>Constant</type>
<value>0</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
<component>
@@ -112,12 +78,46 @@
<type>Constant</type>
<value>0</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>0.0</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -190,11 +190,6 @@
<type>Constant</type>
<value>0.2</value>
</parameter>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj
index 0056dcdcaddf1c8b24421448949e10c0774cdf1e..9adfed90e52b51961ea8893791896328bffd7a45 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj
@@ -11,52 +11,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>ConcentrationAndPressureDependent</type>
- <reference_density>1</reference_density>
- <reference_concentration>0</reference_concentration>
- <fluid_density_concentration_difference_ratio>0.026</fluid_density_concentration_difference_ratio>
- <reference_pressure>0.5</reference_pressure>
- <fluid_density_pressure_difference_ratio>5e-5</fluid_density_pressure_difference_ratio>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>1e-5</value>
- </storage>
- </porous_medium>
- <porous_medium id="1">
- <permeability>
- <permeability_tensor_entries>kappa2</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>1e-5</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -82,12 +36,51 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>0.026</slope>
+ </independent_variable>
+ <independent_variable>
+ <variable_name>phase_pressure</variable_name>
+ <reference_condition>0.5</reference_condition>
+ <slope>5e-5</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -175,11 +168,6 @@
</output>
</time_loop>
<parameters>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj
index fc16f4fad8f1187c28d243991db71fbe9ff0b87a..8c7239ca5a6323e716afe9dd1f8519e6e231f138 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj
@@ -11,52 +11,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>ConcentrationAndPressureDependent</type>
- <reference_density>1</reference_density>
- <reference_concentration>0</reference_concentration>
- <fluid_density_concentration_difference_ratio>0.026</fluid_density_concentration_difference_ratio>
- <reference_pressure>0.5</reference_pressure>
- <fluid_density_pressure_difference_ratio>2e-5</fluid_density_pressure_difference_ratio>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>1e-5</value>
- </storage>
- </porous_medium>
- <porous_medium id="1">
- <permeability>
- <permeability_tensor_entries>kappa2</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>1e-5</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -82,12 +36,51 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>0.026</slope>
+ </independent_variable>
+ <independent_variable>
+ <variable_name>phase_pressure</variable_name>
+ <reference_condition>0.5</reference_condition>
+ <slope>2e-5</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -175,11 +168,6 @@
</output>
</time_loop>
<parameters>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj
index 3dd41cb015051dad80f5aacd4b5193e214e9fb8a..f34b01269e4ab83707972fd3840e1ae47f7eaa00 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj
@@ -11,52 +11,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>ConcentrationAndPressureDependent</type>
- <reference_density>1</reference_density>
- <reference_concentration>0</reference_concentration>
- <fluid_density_concentration_difference_ratio>0.026</fluid_density_concentration_difference_ratio>
- <reference_pressure>0.5</reference_pressure>
- <fluid_density_pressure_difference_ratio>2e-5</fluid_density_pressure_difference_ratio>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>1e-5</value>
- </storage>
- </porous_medium>
- <porous_medium id="1">
- <permeability>
- <permeability_tensor_entries>kappa2</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>1e-5</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -82,12 +36,51 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>0.026</slope>
+ </independent_variable>
+ <independent_variable>
+ <variable_name>phase_pressure</variable_name>
+ <reference_condition>0.5</reference_condition>
+ <slope>2e-5</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -175,11 +168,6 @@
</output>
</time_loop>
<parameters>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj
index bb257b501f6e31e1c049d93baf3a62bcccf4adac..2eb4a436e39de9d7ba2945ce465175f5d0e88655 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj
@@ -11,52 +11,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>ConcentrationAndPressureDependent</type>
- <reference_density>1</reference_density>
- <reference_concentration>0</reference_concentration>
- <fluid_density_concentration_difference_ratio>.026</fluid_density_concentration_difference_ratio>
- <reference_pressure>0</reference_pressure>
- <fluid_density_pressure_difference_ratio>5e-5</fluid_density_pressure_difference_ratio>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>1e-5</value>
- </storage>
- </porous_medium>
- <porous_medium id="1">
- <permeability>
- <permeability_tensor_entries>kappa2</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>1e-5</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -82,12 +36,51 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>.026</slope>
+ </independent_variable>
+ <independent_variable>
+ <variable_name>phase_pressure</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>5e-5</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -175,11 +168,6 @@
</output>
</time_loop>
<parameters>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj
index 23d2d4d88a088b6c196c27d0e5c96d770069330b..564c74d0f0b8bfcb6dcb629f2c48a6fb160d73e1 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj
@@ -11,52 +11,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>ConcentrationAndPressureDependent</type>
- <reference_density>1</reference_density>
- <reference_concentration>0</reference_concentration>
- <fluid_density_concentration_difference_ratio>1</fluid_density_concentration_difference_ratio>
- <reference_pressure>0</reference_pressure>
- <fluid_density_pressure_difference_ratio>5e-5</fluid_density_pressure_difference_ratio>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>1e-5</value>
- </storage>
- </porous_medium>
- <porous_medium id="1">
- <permeability>
- <permeability_tensor_entries>kappa2</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>1e-5</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 -1</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -82,12 +36,51 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>1</slope>
+ </independent_variable>
+ <independent_variable>
+ <variable_name>phase_pressure</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>5e-5</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -151,11 +144,6 @@
</output>
</time_loop>
<parameters>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/open_boundary_component-transport_cube_1e3.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/open_boundary_component-transport_cube_1e3.prj
index 3e0e3815b9e2d91354dcef96009e0e6e1b0e27cc..910a3cb2dc435a83caa62e43fa73daf5c637ca3d 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/open_boundary_component-transport_cube_1e3.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/open_boundary_component-transport_cube_1e3.prj
@@ -16,34 +16,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>Constant</type>
- <value>1e3</value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <type>Constant</type>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -69,12 +41,39 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1e3</value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -140,11 +139,6 @@
<type>Constant</type>
<value>0.2</value>
</parameter>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/open_boundary_component-transport_cube_1e3_advective_form.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/open_boundary_component-transport_cube_1e3_advective_form.prj
index 7b47c359800aa436b5578e9e4b5e015dfdad0021..42a66eb92b8584daaf373c25519c0134f4123866 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/open_boundary_component-transport_cube_1e3_advective_form.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/open_boundary_component-transport_cube_1e3_advective_form.prj
@@ -15,34 +15,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>Constant</type>
- <value>1e3</value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <type>Constant</type>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -68,12 +40,39 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1e3</value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -139,11 +138,6 @@
<type>Constant</type>
<value>0.2</value>
</parameter>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/surfaceflux_component-transport_cube_1e3.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/surfaceflux_component-transport_cube_1e3.prj
index 18cbde823388df8a1d834f4f9b91320f34e05902..4a972da2b84f02cea33faa33fadca5dfc7f2b341 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/surfaceflux_component-transport_cube_1e3.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/surfaceflux_component-transport_cube_1e3.prj
@@ -15,36 +15,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>ConcentrationDependent</type>
- <reference_density>1</reference_density>
- <reference_concentration>0</reference_concentration>
- <fluid_density_difference_ratio>0.0</fluid_density_difference_ratio>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <type>Constant</type>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -75,12 +45,46 @@
<type>Constant</type>
<value>0</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>0.0</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -151,11 +155,6 @@
<type>Constant</type>
<value>0.2</value>
</parameter>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionAndStorage.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionAndStorage.prj
index 3fc02b21c74ac5a669efdb847c30b7287e3d4fb1..12cf4c8ae2d2d2a7e70904578d8167e63ca0aded 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionAndStorage.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionAndStorage.prj
@@ -12,38 +12,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>ConcentrationAndPressureDependent</type>
- <reference_density>1</reference_density>
- <reference_concentration>0</reference_concentration>
- <fluid_density_concentration_difference_ratio>0.0</fluid_density_concentration_difference_ratio>
- <reference_pressure>0</reference_pressure>
- <fluid_density_pressure_difference_ratio>5e-5</fluid_density_pressure_difference_ratio>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>1e-5</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -69,12 +37,51 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>0.0</slope>
+ </independent_variable>
+ <independent_variable>
+ <variable_name>phase_pressure</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>5e-5</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -192,11 +199,6 @@
<type>Constant</type>
<value>0.2</value>
</parameter>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionOnly.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionOnly.prj
index 16d51163866eb470ecd2e47fc9fcd6d0a62bd3d5..149934eeeedb40fa844d469feeae85d4a4f8bae2 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionOnly.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionOnly.prj
@@ -12,36 +12,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>ConcentrationDependent</type>
- <reference_density>1</reference_density>
- <reference_concentration>0</reference_concentration>
- <fluid_density_difference_ratio>0.0</fluid_density_difference_ratio>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <type>Constant</type>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>1e-5</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -67,12 +37,46 @@
<type>Constant</type>
<value>0</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>0.0</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -179,11 +183,6 @@
<type>Constant</type>
<value>0.2</value>
</parameter>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvection.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvection.prj
index 68c4ae6012e6400f33c2cf009cdd5762efed06b3..9236f69e0de505f6f608e436cc13ce59cd1560f3 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvection.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvection.prj
@@ -12,38 +12,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>ConcentrationAndPressureDependent</type>
- <reference_density>1</reference_density>
- <reference_concentration>0</reference_concentration>
- <fluid_density_concentration_difference_ratio>0.026</fluid_density_concentration_difference_ratio>
- <reference_pressure>0.5</reference_pressure>
- <fluid_density_pressure_difference_ratio>5e-5</fluid_density_pressure_difference_ratio>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>1e-5</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -69,12 +37,51 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>0.026</slope>
+ </independent_variable>
+ <independent_variable>
+ <variable_name>phase_pressure</variable_name>
+ <reference_condition>0.5</reference_condition>
+ <slope>5e-5</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -235,11 +242,6 @@
</output>
</time_loop>
<parameters>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDecay.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDecay.prj
index c2db344e287e42badd5ef9524d6d147b734089f7..0b9ff4a7428658859b6d26175e56df8ddcd3791c 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDecay.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDecay.prj
@@ -12,38 +12,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>ConcentrationAndPressureDependent</type>
- <reference_density>1</reference_density>
- <reference_concentration>0</reference_concentration>
- <fluid_density_concentration_difference_ratio>0.026</fluid_density_concentration_difference_ratio>
- <reference_pressure>0.5</reference_pressure>
- <fluid_density_pressure_difference_ratio>2e-5</fluid_density_pressure_difference_ratio>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>1e-5</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -69,12 +37,51 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>0.026</slope>
+ </independent_variable>
+ <independent_variable>
+ <variable_name>phase_pressure</variable_name>
+ <reference_condition>0.5</reference_condition>
+ <slope>2e-5</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -235,11 +242,6 @@
</output>
</time_loop>
<parameters>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion.prj
index 07a534e546190c4b8b2b7ebc671a83af003e1460..1baac43487aa9ffcd6cc716e7c76afe5129531ad 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion.prj
@@ -12,38 +12,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>ConcentrationAndPressureDependent</type>
- <reference_density>1</reference_density>
- <reference_concentration>0</reference_concentration>
- <fluid_density_concentration_difference_ratio>0.026</fluid_density_concentration_difference_ratio>
- <reference_pressure>0.5</reference_pressure>
- <fluid_density_pressure_difference_ratio>2e-5</fluid_density_pressure_difference_ratio>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>1e-5</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -69,12 +37,51 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>0.026</slope>
+ </independent_variable>
+ <independent_variable>
+ <variable_name>phase_pressure</variable_name>
+ <reference_condition>0.5</reference_condition>
+ <slope>2e-5</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -235,11 +242,6 @@
</output>
</time_loop>
<parameters>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj
index 937e0048b0281605719e783c142cb30add274ca6..697bded4c6476e0dcd66e8832975bbb84ca1e60e 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj
@@ -12,38 +12,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>ConcentrationAndPressureDependent</type>
- <reference_density>1</reference_density>
- <reference_concentration>0</reference_concentration>
- <fluid_density_concentration_difference_ratio>0.026</fluid_density_concentration_difference_ratio>
- <reference_pressure>0</reference_pressure>
- <fluid_density_pressure_difference_ratio>5e-5</fluid_density_pressure_difference_ratio>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>1e-5</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -69,12 +37,51 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>0.026</slope>
+ </independent_variable>
+ <independent_variable>
+ <variable_name>phase_pressure</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>5e-5</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -235,11 +242,6 @@
</output>
</time_loop>
<parameters>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion_3Components.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion_3Components.prj
index 49a1c784536a16ea9602aff7429c74072317a859..cc0c258826d0b8bee36edc1332727452ce22f77f 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion_3Components.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion_3Components.prj
@@ -14,38 +14,6 @@
<concentration>Cl</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>ConcentrationAndPressureDependent</type>
- <reference_density>1</reference_density>
- <reference_concentration>0</reference_concentration>
- <fluid_density_concentration_difference_ratio>0.026</fluid_density_concentration_difference_ratio>
- <reference_pressure>0.5</reference_pressure>
- <fluid_density_pressure_difference_ratio>2e-5</fluid_density_pressure_difference_ratio>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>1e-5</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -71,6 +39,11 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
<component>
@@ -86,6 +59,11 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
<component>
@@ -101,12 +79,51 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>0.026</slope>
+ </independent_variable>
+ <independent_variable>
+ <variable_name>phase_pressure</variable_name>
+ <reference_condition>0.5</reference_condition>
+ <slope>2e-5</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -391,11 +408,6 @@
</output>
</time_loop>
<parameters>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndGravityAndDispersionHalf.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndGravityAndDispersionHalf.prj
index 27f85ee51c3580491d652917971c990b90426349..6271b2f3ddd0e7799e677c79b6ecf518af421bbc 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndGravityAndDispersionHalf.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndGravityAndDispersionHalf.prj
@@ -12,38 +12,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>ConcentrationAndPressureDependent</type>
- <reference_density>1</reference_density>
- <reference_concentration>0</reference_concentration>
- <fluid_density_concentration_difference_ratio>1</fluid_density_concentration_difference_ratio>
- <reference_pressure>0</reference_pressure>
- <fluid_density_pressure_difference_ratio>5e-5</fluid_density_pressure_difference_ratio>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>1e-5</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 -1</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -69,12 +37,51 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>1</slope>
+ </independent_variable>
+ <independent_variable>
+ <variable_name>phase_pressure</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>5e-5</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -183,11 +190,6 @@
</output>
</time_loop>
<parameters>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/surfaceflux_component-transport_cube_1e3.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/surfaceflux_component-transport_cube_1e3.prj
index 78fd1caa51f75839f6325866ef1b7cc8ace48788..e613f06cf3605c22a85b19e9fbf3d8eded744494 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/surfaceflux_component-transport_cube_1e3.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/surfaceflux_component-transport_cube_1e3.prj
@@ -16,36 +16,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>ConcentrationDependent</type>
- <reference_density>1</reference_density>
- <reference_concentration>0</reference_concentration>
- <fluid_density_difference_ratio>0.0</fluid_density_difference_ratio>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <type>Constant</type>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -76,12 +46,46 @@
<type>Constant</type>
<value>0</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>0.0</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -193,11 +197,6 @@
<type>Constant</type>
<value>0.2</value>
</parameter>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/Theis/theis.prj b/Tests/Data/Parabolic/ComponentTransport/Theis/theis.prj
index 0a44540a848a66d73e80bc8a3cfde29b1f969143..67380a662e9302c354561995fa0aaad654dbdb01 100644
--- a/Tests/Data/Parabolic/ComponentTransport/Theis/theis.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/Theis/theis.prj
@@ -22,42 +22,6 @@
<property_name>flux</property_name>
<output_mesh>out_abstraction_whole_surf_flux.vtu</output_mesh>
</calculatesurfaceflux> -->
- <fluid>
- <density>
- <type>ConcentrationAndPressureDependent</type>
- <fluid_density_concentration_difference_ratio>0</fluid_density_concentration_difference_ratio>
- <fluid_density_pressure_difference_ratio>5.0968E-08</fluid_density_pressure_difference_ratio>
- <reference_concentration>0</reference_concentration>
- <reference_pressure>0</reference_pressure>
- <reference_density>1000</reference_density>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <type>Constant</type>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>porosity1</porosity_parameter>
- </porosity>
- <!-- The implementation of the ComponentTransport process
- is without Boussinesq approximations, thus, 'storage' is not
- used here, but should be set through S =thickness * gravity
- * porosity * d\rho / dp / rho. -->
- <storage>
- <type>Constant</type>
- <value>0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0 -9.81</specific_body_force>
</process>
</processes>
@@ -80,12 +44,60 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1000</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>0</slope>
+ </independent_variable>
+ <independent_variable>
+ <variable_name>phase_pressure</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>5.0968E-08</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>porosity1</parameter_name>
+ </property>
+ <!-- The implementation of the ComponentTransport process
+ is without Boussinesq approximations, thus, 'storage' is not
+ used here, but should be set through S =thickness * gravity
+ * porosity * d\rho / dp / rho. -->
+ <!--property>
+ <name>storage</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property-->
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -185,11 +197,6 @@
</output>
</time_loop>
<parameters>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/TracerSimulation.prj b/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/TracerSimulation.prj
index 46380cbaadbec0d635ed1df1a73c2fe9d9abb27d..64d2edff1afdeb8387e3e732900bc71262bf207f 100644
--- a/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/TracerSimulation.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/TracerSimulation.prj
@@ -12,34 +12,6 @@
<concentration>Cs</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>Constant</type>
- <value>1e3</value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <type>Constant</type>
- <permeability_tensor_entries>kappa</permeability_tensor_entries>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>porosity</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0.0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -65,12 +37,39 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1e3</value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>porosity</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -177,11 +176,6 @@
<type>Constant</type>
<value>0.2</value>
</parameter>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/VariableNeumannBoundary/vdbc_input.prj b/Tests/Data/Parabolic/ComponentTransport/VariableNeumannBoundary/vdbc_input.prj
index b3e32118c6cfbf14b72f9a29316ddb980edbdeb1..d8dfc6e3b69365c45f0efb2fb85c4470b903cd90 100644
--- a/Tests/Data/Parabolic/ComponentTransport/VariableNeumannBoundary/vdbc_input.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/VariableNeumannBoundary/vdbc_input.prj
@@ -14,34 +14,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>Constant</type>
- <value>1000</value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -67,12 +39,39 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1e3</value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -148,11 +147,6 @@
</output>
</time_loop>
<parameters>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/elder/elder-python.prj b/Tests/Data/Parabolic/ComponentTransport/elder/elder-python.prj
index a2e4cfe320993e242617114657c4312752ee3954..f25c563652dc406bc4d598b05792a1cc8ca70f78 100644
--- a/Tests/Data/Parabolic/ComponentTransport/elder/elder-python.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/elder/elder-python.prj
@@ -14,36 +14,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>ConcentrationDependent</type>
- <reference_density>1000</reference_density>
- <reference_concentration>0</reference_concentration>
- <fluid_density_difference_ratio>0.2</fluid_density_difference_ratio>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0.0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <decay_rate>decay_rate</decay_rate>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
<specific_body_force>0 0 -9.81</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -69,12 +39,46 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay_rate</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1000</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>0.2</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -130,11 +134,6 @@
</output>
</time_loop>
<parameters>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000.0</value>
- </parameter>
<parameter>
<name>decay_rate</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/elder/elder.prj b/Tests/Data/Parabolic/ComponentTransport/elder/elder.prj
index ffb51345598b8cfc5e043bd9cab6cd3c1a3f0396..536703e4ff9501784ad40225e1e4f35bdbdc0f65 100644
--- a/Tests/Data/Parabolic/ComponentTransport/elder/elder.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/elder/elder.prj
@@ -11,40 +11,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <!-- <density>
- <type>Constant</type>
- <value>1000</value>
- </density> -->
- <density>
- <type>ConcentrationDependent</type>
- <reference_density>1000</reference_density>
- <reference_concentration>0</reference_concentration>
- <fluid_density_difference_ratio>0.2</fluid_density_difference_ratio>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0.0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <decay_rate>decay_rate</decay_rate>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
<specific_body_force>0 0 -9.81</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -70,12 +36,46 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay_rate</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1000</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>0.2</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -134,11 +134,6 @@
</output>
</time_loop>
<parameters>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000.0</value>
- </parameter>
<parameter>
<name>decay_rate</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj
index 04b6359a141513e6854314b3c92d4b6981dc100d..159e40c0141a4a44bf72d2ce5ba12de96363e6aa 100644
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj
@@ -14,36 +14,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>ConcentrationDependent</type>
- <reference_density>1000</reference_density>
- <reference_concentration>0</reference_concentration>
- <fluid_density_difference_ratio>0.701</fluid_density_difference_ratio>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 -9.81</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -69,12 +39,46 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Linear</type>
+ <reference_value>1000</reference_value>
+ <independent_variables>
+ <independent_variable>
+ <variable_name>concentration</variable_name>
+ <reference_condition>0</reference_condition>
+ <slope>0.701</slope>
+ </independent_variable>
+ </independent_variables>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -150,11 +154,6 @@
</output>
</time_loop>
<parameters>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_2D/ogs5_H_2d.prj b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_2D/ogs5_H_2d.prj
index 1eeea9dd13a01b5e7f4cd768c378e048dd579e8d..40b914a0548c3210adb39fcdef52764dbf3a5766 100644
--- a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_2D/ogs5_H_2d.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_2D/ogs5_H_2d.prj
@@ -11,34 +11,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>Constant</type>
- <value>1e3</value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -64,12 +36,39 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1e3</value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -125,11 +124,6 @@
</output>
</time_loop>
<parameters>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>
diff --git a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.prj b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.prj
index 46310325d50081d7089cb13e907850fbf4faefb9..15e3d0ecc6283d8b199bd368a693d28971a170f2 100644
--- a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.prj
@@ -14,34 +14,6 @@
<concentration>Si</concentration>
<pressure>pressure</pressure>
</process_variables>
- <fluid>
- <density>
- <type>Constant</type>
- <value>1e3</value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value>1.0e-3</value>
- </viscosity>
- </fluid>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <permeability_tensor_entries>kappa1</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0</value>
- </storage>
- </porous_medium>
- </porous_medium>
- <fluid_reference_density>rho_fluid</fluid_reference_density>
- <decay_rate>decay</decay_rate>
<specific_body_force>0 0 -9.81</specific_body_force>
<secondary_variables>
<secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/>
@@ -67,12 +39,39 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>decay_rate</name>
+ <type>Parameter</type>
+ <parameter_name>decay</parameter_name>
+ </property>
</properties>
</component>
</components>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1e3</value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ </properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>kappa1</parameter_name>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Parameter</type>
+ <parameter_name>constant_porosity_parameter</parameter_name>
+ </property>
<property>
<name>longitudinal_dispersivity</name>
<type>Constant</type>
@@ -128,11 +127,6 @@
</output>
</time_loop>
<parameters>
- <parameter>
- <name>rho_fluid</name>
- <type>Constant</type>
- <value>1000</value>
- </parameter>
<parameter>
<name>decay</name>
<type>Constant</type>