diff --git a/ProcessLib/TH2M/ConstitutiveRelations/ConstitutiveModels.h b/ProcessLib/TH2M/ConstitutiveRelations/ConstitutiveModels.h
index ec38e07b1a983fc2b8af9a90272b766aa61c6ca7..e37d7c906d204a71574007e1dea7db3a946e4bf4 100644
--- a/ProcessLib/TH2M/ConstitutiveRelations/ConstitutiveModels.h
+++ b/ProcessLib/TH2M/ConstitutiveRelations/ConstitutiveModels.h
@@ -62,6 +62,7 @@ struct ConstitutiveModels
PermeabilityModel<DisplacementDim> permeability_model;
PureLiquidDensityModel pure_liquid_density_model;
PhaseTransitionModel const& phase_transition_model;
+ ViscosityModel viscosity_model;
#ifdef NON_CONSTANT_SOLID_PHASE_VOLUME_FRACTION
PorosityModelNonConstantSolidPhaseVolumeFraction<DisplacementDim>
porosity_model;
diff --git a/ProcessLib/TH2M/ConstitutiveRelations/NoPhaseTransition.cpp b/ProcessLib/TH2M/ConstitutiveRelations/NoPhaseTransition.cpp
index 43f2212b006e31082d8f5df2fdbeb9a5018fde14..782b8b60ecbec18059c1bd9aef3134bd22c95baa 100644
--- a/ProcessLib/TH2M/ConstitutiveRelations/NoPhaseTransition.cpp
+++ b/ProcessLib/TH2M/ConstitutiveRelations/NoPhaseTransition.cpp
@@ -43,7 +43,6 @@ void NoPhaseTransition::eval(SpaceTimeData const& x_t,
CapillaryPressureData const& p_cap,
TemperatureData const& T_data,
PureLiquidDensityData const& rho_W_LR,
- ViscosityData& viscosity_data,
EnthalpyData& enthalpy_data,
MassMoleFractionsData& mass_mole_fractions_data,
FluidDensityData& fluid_density_data,
@@ -81,9 +80,6 @@ void NoPhaseTransition::eval(SpaceTimeData const& x_t,
fluid_density_data.rho_GR =
gas_phase.property(MaterialPropertyLib::PropertyType::density)
.template value<double>(variables, x_t.x, x_t.t, x_t.dt);
- viscosity_data.mu_GR =
- gas_phase.property(MaterialPropertyLib::PropertyType::viscosity)
- .template value<double>(variables, x_t.x, x_t.t, x_t.dt);
constituent_density_data.rho_C_GR = fluid_density_data.rho_GR;
constituent_density_data.rho_W_GR = 0;
@@ -100,10 +96,6 @@ void NoPhaseTransition::eval(SpaceTimeData const& x_t,
fluid_density_data.rho_LR = rho_W_LR();
variables.density = fluid_density_data.rho_LR;
- viscosity_data.mu_LR =
- liquid_phase.property(MaterialPropertyLib::PropertyType::viscosity)
- .template value<double>(variables, x_t.x, x_t.t, x_t.dt);
-
// specific heat capacities
auto const cpG =
gas_phase
diff --git a/ProcessLib/TH2M/ConstitutiveRelations/NoPhaseTransition.h b/ProcessLib/TH2M/ConstitutiveRelations/NoPhaseTransition.h
index 20c7b5abd0ae27dac461618ab3e6551a10c27a0b..918723e906012fb59a5bb1c1cd7c99b67dd23e0c 100644
--- a/ProcessLib/TH2M/ConstitutiveRelations/NoPhaseTransition.h
+++ b/ProcessLib/TH2M/ConstitutiveRelations/NoPhaseTransition.h
@@ -28,7 +28,7 @@ struct NoPhaseTransition : PhaseTransitionModel
GasPressureData const& p_GR, CapillaryPressureData const& p_cap,
TemperatureData const& T_data,
PureLiquidDensityData const& rho_W_LR,
- ViscosityData& viscosity_data, EnthalpyData& enthalpy_data,
+ EnthalpyData& enthalpy_data,
MassMoleFractionsData& mass_mole_fractions_data,
FluidDensityData& fluid_density_data,
VapourPartialPressureData& vapour_pressure_data,
diff --git a/ProcessLib/TH2M/ConstitutiveRelations/PhaseTransition.cpp b/ProcessLib/TH2M/ConstitutiveRelations/PhaseTransition.cpp
index 748fd9cca9862eda2834e9849be773b408dbf31c..7f71fcb24920fee9f6fd6094cec574158f19a83d 100644
--- a/ProcessLib/TH2M/ConstitutiveRelations/PhaseTransition.cpp
+++ b/ProcessLib/TH2M/ConstitutiveRelations/PhaseTransition.cpp
@@ -112,11 +112,10 @@ PhaseTransition::PhaseTransition(
std::array const required_solvent_component_properties = {
MaterialPropertyLib::specific_heat_capacity};
- std::array const required_gas_properties = {MaterialPropertyLib::density,
- MaterialPropertyLib::viscosity};
+ std::array const required_gas_properties = {MaterialPropertyLib::density};
std::array const required_liquid_properties = {
- MaterialPropertyLib::density, MaterialPropertyLib::viscosity};
+ MaterialPropertyLib::density};
checkRequiredProperties(
gas_phase.component(gas_phase_vapour_component_index_),
@@ -140,7 +139,6 @@ void PhaseTransition::eval(SpaceTimeData const& x_t,
CapillaryPressureData const& p_cap,
TemperatureData const& T_data,
PureLiquidDensityData const& rho_W_LR,
- ViscosityData& viscosity_data,
EnthalpyData& enthalpy_data,
MassMoleFractionsData& mass_mole_fractions_data,
FluidDensityData& fluid_density_data,
@@ -357,11 +355,6 @@ void PhaseTransition::eval(SpaceTimeData const& x_t,
variables.molar_fraction = mass_mole_fractions_data.xnCG;
- // gas phase viscosity
- viscosity_data.mu_GR =
- gas_phase.property(MaterialPropertyLib::PropertyType::viscosity)
- .template value<double>(variables, x_t.x, x_t.t, x_t.dt);
-
// Dissolution part -- Liquid phase properties
// -------------------------------------------
@@ -526,11 +519,6 @@ void PhaseTransition::eval(SpaceTimeData const& x_t,
cv.diffusion_coefficient_solute =
tortuosity * D_C_L_m; // Note here that D_C_L = D_W_L.
- // liquid phase viscosity
- viscosity_data.mu_LR =
- liquid_phase.property(MaterialPropertyLib::PropertyType::viscosity)
- .template value<double>(variables, x_t.x, x_t.t, x_t.dt);
-
// Some default initializations.
cv.drho_LR_dp_LR = 0;
cv.drho_W_LR_dp_GR = 0.;
diff --git a/ProcessLib/TH2M/ConstitutiveRelations/PhaseTransition.h b/ProcessLib/TH2M/ConstitutiveRelations/PhaseTransition.h
index d4ffbc950f21d2213f4e7acd301782b8bd69b63f..69d621b3dad66159bbf4b350d62e1102a74f893a 100644
--- a/ProcessLib/TH2M/ConstitutiveRelations/PhaseTransition.h
+++ b/ProcessLib/TH2M/ConstitutiveRelations/PhaseTransition.h
@@ -28,7 +28,7 @@ struct PhaseTransition : PhaseTransitionModel
GasPressureData const& p_GR, CapillaryPressureData const& p_cap,
TemperatureData const& T_data,
PureLiquidDensityData const& rho_W_LR,
- ViscosityData& viscosity_data, EnthalpyData& enthalpy_data,
+ EnthalpyData& enthalpy_data,
MassMoleFractionsData& mass_mole_fractions_data,
FluidDensityData& fluid_density_data,
VapourPartialPressureData& vapour_pressure_data,
diff --git a/ProcessLib/TH2M/ConstitutiveRelations/PhaseTransitionModel.h b/ProcessLib/TH2M/ConstitutiveRelations/PhaseTransitionModel.h
index 63672d93664ad04ba7807e5c3ec5dba9f6f2f0ed..8cf92e94f7e03421a82a9c6dd8f7c30178cfe37d 100644
--- a/ProcessLib/TH2M/ConstitutiveRelations/PhaseTransitionModel.h
+++ b/ProcessLib/TH2M/ConstitutiveRelations/PhaseTransitionModel.h
@@ -17,7 +17,6 @@
#include "PhaseTransitionData.h"
#include "PureLiquidDensity.h"
#include "VapourPartialPressure.h"
-#include "Viscosity.h"
namespace ProcessLib::TH2M
{
@@ -33,9 +32,9 @@ struct PhaseTransitionModel
// check for minimum requirement definitions in media object
std::array const required_gas_properties = {
- MaterialPropertyLib::viscosity, MaterialPropertyLib::density};
+ MaterialPropertyLib::density};
std::array const required_liquid_properties = {
- MaterialPropertyLib::viscosity, MaterialPropertyLib::density};
+ MaterialPropertyLib::density};
for (auto const& m : media)
{
@@ -53,7 +52,6 @@ struct PhaseTransitionModel
CapillaryPressureData const& p_cap,
TemperatureData const& T_data,
PureLiquidDensityData const& rho_W_LR,
- ViscosityData& viscosity_data,
EnthalpyData& enthalpy_data,
MassMoleFractionsData& mass_mole_fractions_data,
FluidDensityData& fluid_density_data,
diff --git a/ProcessLib/TH2M/ConstitutiveRelations/Viscosity.cpp b/ProcessLib/TH2M/ConstitutiveRelations/Viscosity.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..782dcb40c5ce7c91f70edcbe476871f441892c41
--- /dev/null
+++ b/ProcessLib/TH2M/ConstitutiveRelations/Viscosity.cpp
@@ -0,0 +1,38 @@
+/**
+ * \file
+ * \copyright
+ * Copyright (c) 2012-2024, OpenGeoSys Community (http://www.opengeosys.org)
+ * Distributed under a Modified BSD License.
+ * See accompanying file LICENSE.txt or
+ * http://www.opengeosys.org/project/license
+ */
+
+#include "Viscosity.h"
+
+namespace ProcessLib::TH2M
+{
+namespace ConstitutiveRelations
+{
+void ViscosityModel::eval(SpaceTimeData const& x_t, MediaData const& media_data,
+ TemperatureData const& T_data,
+ MassMoleFractionsData const& mass_mole_fractions_data,
+ ViscosityData& viscosity_data) const
+{
+ MaterialPropertyLib::VariableArray variables;
+
+ variables.temperature = T_data.T;
+ variables.molar_fraction = mass_mole_fractions_data.xnCG;
+
+ auto const& liquid_phase = media_data.liquid;
+ auto const& gas_phase = media_data.gas;
+
+ viscosity_data.mu_GR =
+ gas_phase[MaterialPropertyLib::PropertyType::viscosity]
+ .template value<double>(variables, x_t.x, x_t.t, x_t.dt);
+
+ viscosity_data.mu_LR =
+ liquid_phase[MaterialPropertyLib::PropertyType::viscosity]
+ .template value<double>(variables, x_t.x, x_t.t, x_t.dt);
+}
+} // namespace ConstitutiveRelations
+} // namespace ProcessLib::TH2M
diff --git a/ProcessLib/TH2M/ConstitutiveRelations/Viscosity.h b/ProcessLib/TH2M/ConstitutiveRelations/Viscosity.h
index 95a38fd1d24e5aeb68e46916de982a215cae48f2..c46e48c702dc14c6db1e1fe2d9a4c03b8ea41ef3 100644
--- a/ProcessLib/TH2M/ConstitutiveRelations/Viscosity.h
+++ b/ProcessLib/TH2M/ConstitutiveRelations/Viscosity.h
@@ -10,6 +10,7 @@
#pragma once
#include "Base.h"
+#include "MassMoleFractions.h"
namespace ProcessLib::TH2M
{
@@ -20,5 +21,13 @@ struct ViscosityData
double mu_GR = nan;
double mu_LR = nan;
};
+
+struct ViscosityModel
+{
+ void eval(SpaceTimeData const& x_t, MediaData const& media_data,
+ TemperatureData const& T_data,
+ MassMoleFractionsData const& mass_mole_fractions_data,
+ ViscosityData& viscosity_data) const;
+};
} // namespace ConstitutiveRelations
} // namespace ProcessLib::TH2M
diff --git a/ProcessLib/TH2M/TH2MFEM-impl.h b/ProcessLib/TH2M/TH2MFEM-impl.h
index edad848419167501870d14b3984c708adfdc3488..1ecdc9cfd6d54294c9cba0055168e183f6d9a08e 100644
--- a/ProcessLib/TH2M/TH2MFEM-impl.h
+++ b/ProcessLib/TH2M/TH2MFEM-impl.h
@@ -223,11 +223,15 @@ TH2MLocalAssembler<ShapeFunctionDisplacement, ShapeFunctionPressure,
models.phase_transition_model.eval(
{pos, t, dt}, media_data, pGR_data, pCap_data, T_data,
- current_state.rho_W_LR, ip_cv.viscosity_data, ip_out.enthalpy_data,
+ current_state.rho_W_LR, ip_out.enthalpy_data,
ip_out.mass_mole_fractions_data, ip_out.fluid_density_data,
ip_out.vapour_pressure_data, current_state.constituent_density_data,
ip_cv.phase_transition_data);
+ models.viscosity_model.eval({pos, t, dt}, media_data, T_data,
+ ip_out.mass_mole_fractions_data,
+ ip_cv.viscosity_data);
+
models.porosity_model.eval({pos, t, dt}, media_data,
#ifdef NON_CONSTANT_SOLID_PHASE_VOLUME_FRACTION
ip_cv.biot_data, ip_out.eps_data,
diff --git a/Tests/ProcessLib/TH2M/TestTH2MNoPhaseTransition.cpp b/Tests/ProcessLib/TH2M/TestTH2MNoPhaseTransition.cpp
index a11601304c2a3758f4ae409895701207d90d2289..bc74bda9cf09507481432554aa35bdcc9144697e 100644
--- a/Tests/ProcessLib/TH2M/TestTH2MNoPhaseTransition.cpp
+++ b/Tests/ProcessLib/TH2M/TestTH2MNoPhaseTransition.cpp
@@ -34,9 +34,6 @@ TEST(ProcessLib, TH2MNoPhaseTransition)
auto const diffusion_coefficient_vapour = 0.0;
- auto const viscosity_air = 1.e-5;
- auto const viscosity_water = 1.e-3;
-
m << "<medium>\n";
m << " <phases>\n";
@@ -54,7 +51,6 @@ TEST(ProcessLib, TH2MNoPhaseTransition)
// gas phase properties
m << "<properties>\n";
- m << Tests::makeConstantPropertyElement("viscosity", viscosity_air);
m << Tests::makeConstantPropertyElement("density", density_air);
m << Tests::makeConstantPropertyElement("specific_heat_capacity",
specific_heat_capacity_air);
@@ -69,7 +65,6 @@ TEST(ProcessLib, TH2MNoPhaseTransition)
// liquid phase properties
m << "<properties>\n";
- m << Tests::makeConstantPropertyElement("viscosity", viscosity_water);
m << Tests::makeConstantPropertyElement("density", density_water);
m << Tests::makeConstantPropertyElement("specific_heat_capacity",
specific_heat_capacity_water);
@@ -113,7 +108,6 @@ TEST(ProcessLib, TH2MNoPhaseTransition)
rhoWLR);
ASSERT_NEAR(density_water, rhoWLR(), 1e-10);
- CR::ViscosityData viscosity;
CR::EnthalpyData enthalpy;
CR::MassMoleFractionsData mass_mole_fractions;
CR::FluidDensityData fluid_density;
@@ -122,8 +116,8 @@ TEST(ProcessLib, TH2MNoPhaseTransition)
CR::PhaseTransitionData cv;
ptm->eval(x_t, media_data, CR::GasPressureData{pGR},
CR::CapillaryPressureData{pGR}, CR::TemperatureData{T, T}, rhoWLR,
- viscosity, enthalpy, mass_mole_fractions, fluid_density,
- vapour_pressure, constituent_density, cv);
+ enthalpy, mass_mole_fractions, fluid_density, vapour_pressure,
+ constituent_density, cv);
// reference values
double const rhoCGR = density_air;
@@ -141,8 +135,6 @@ TEST(ProcessLib, TH2MNoPhaseTransition)
double const hL = specific_heat_capacity_water * T;
double const uG = hG - pGR / density_air;
double const uL = hL;
- double const muGR = viscosity_air;
- double const muLR = viscosity_water;
ASSERT_NEAR(density_air, fluid_density.rho_GR, 1.0e-10);
ASSERT_NEAR(density_water, fluid_density.rho_LR, 1.0e-10);
@@ -163,6 +155,4 @@ TEST(ProcessLib, TH2MNoPhaseTransition)
ASSERT_NEAR(uL, cv.uL, 1.0e-10);
ASSERT_NEAR(diffusion_coefficient_vapour, cv.diffusion_coefficient_vapour,
1.0e-10);
- ASSERT_NEAR(muGR, viscosity.mu_GR, 1.0e-10);
- ASSERT_NEAR(muLR, viscosity.mu_LR, 1.0e-10);
}
diff --git a/Tests/ProcessLib/TH2M/TestTH2MPhaseTransition.cpp b/Tests/ProcessLib/TH2M/TestTH2MPhaseTransition.cpp
index 3bdf25f935f6675c3c7a8e4177dea414103513e0..f636edf49f64ce20807819e0d276115e7285432f 100644
--- a/Tests/ProcessLib/TH2M/TestTH2MPhaseTransition.cpp
+++ b/Tests/ProcessLib/TH2M/TestTH2MPhaseTransition.cpp
@@ -28,8 +28,6 @@ static const double specific_latent_heat_water = 2258000.;
static const double diffusion_coefficient_vapour = 2.6e-6;
static const double thermal_conductivity_air = 0.2;
static const double thermal_conductivity_water = 0.6;
-static const double viscosity_air = 1.e-5;
-static const double viscosity_water = 1.e-3;
// In case of constant gas density
static const double constant_gas_density = 1.;
@@ -100,7 +98,6 @@ std::string MediumDefinition(const bool density_is_constant)
// gas phase properties
m << "<properties>\n";
- m << Tests::makeConstantPropertyElement("viscosity", viscosity_air);
m << Tests::makeConstantPropertyElement("thermal_conductivity",
thermal_conductivity_air);
@@ -149,7 +146,6 @@ std::string MediumDefinition(const bool density_is_constant)
// liquid phase properties
m << "<properties>\n";
- m << Tests::makeConstantPropertyElement("viscosity", viscosity_water);
m << Tests::makeConstantPropertyElement("specific_heat_capacity",
specific_heat_capacity_water);
@@ -222,7 +218,6 @@ TEST(ProcessLib, TH2MPhaseTransition)
CR::PureLiquidDensityData rhoWLR;
CR::PureLiquidDensityModel rhoWLR_model;
- CR::ViscosityData viscosity;
CR::EnthalpyData enthalpy;
CR::MassMoleFractionsData mass_mole_fractions;
CR::FluidDensityData fluid_density;
@@ -246,9 +241,8 @@ TEST(ProcessLib, TH2MPhaseTransition)
rhoWLR_model.eval(x_t, media_data, CR::GasPressureData{pGR + eps_pGR},
p_cap_data, T_data, rhoWLR);
ptm->eval(x_t, media_data, CR::GasPressureData{pGR + eps_pGR},
- p_cap_data, T_data, rhoWLR, viscosity, enthalpy,
- mass_mole_fractions, fluid_density, vapour_pressure,
- constituent_density, cv);
+ p_cap_data, T_data, rhoWLR, enthalpy, mass_mole_fractions,
+ fluid_density, vapour_pressure, constituent_density, cv);
auto xmWG_plus = 1 - mass_mole_fractions.xmCG;
auto rhoGR_plus = fluid_density.rho_GR;
@@ -258,9 +252,8 @@ TEST(ProcessLib, TH2MPhaseTransition)
rhoWLR_model.eval(x_t, media_data, CR::GasPressureData{pGR - eps_pGR},
p_cap_data, T_data, rhoWLR);
ptm->eval(x_t, media_data, CR::GasPressureData{pGR - eps_pGR},
- p_cap_data, T_data, rhoWLR, viscosity, enthalpy,
- mass_mole_fractions, fluid_density, vapour_pressure,
- constituent_density, cv);
+ p_cap_data, T_data, rhoWLR, enthalpy, mass_mole_fractions,
+ fluid_density, vapour_pressure, constituent_density, cv);
auto xmWG_minus = 1 - mass_mole_fractions.xmCG;
auto rhoGR_minus = fluid_density.rho_GR;
@@ -271,8 +264,8 @@ TEST(ProcessLib, TH2MPhaseTransition)
rhoWLR_model.eval(x_t, media_data, CR::GasPressureData{pGR}, p_cap_data,
T_data, rhoWLR);
ptm->eval(x_t, media_data, p_GR_data, p_cap_data, T_data, rhoWLR,
- viscosity, enthalpy, mass_mole_fractions, fluid_density,
- vapour_pressure, constituent_density, cv);
+ enthalpy, mass_mole_fractions, fluid_density, vapour_pressure,
+ constituent_density, cv);
// Central difference derivatives
auto const dxmWG_dpGR = (xmWG_plus - xmWG_minus) / (2. * eps_pGR);
@@ -297,8 +290,8 @@ TEST(ProcessLib, TH2MPhaseTransition)
rhoWLR);
ptm->eval(x_t, media_data, p_GR_data,
CR::CapillaryPressureData{pCap + eps_pCap}, T_data, rhoWLR,
- viscosity, enthalpy, mass_mole_fractions, fluid_density,
- vapour_pressure, constituent_density, cv);
+ enthalpy, mass_mole_fractions, fluid_density, vapour_pressure,
+ constituent_density, cv);
xmWG_plus = 1 - mass_mole_fractions.xmCG;
rhoGR_plus = fluid_density.rho_GR;
@@ -310,8 +303,8 @@ TEST(ProcessLib, TH2MPhaseTransition)
rhoWLR);
ptm->eval(x_t, media_data, p_GR_data,
CR::CapillaryPressureData{pCap - eps_pCap}, T_data, rhoWLR,
- viscosity, enthalpy, mass_mole_fractions, fluid_density,
- vapour_pressure, constituent_density, cv);
+ enthalpy, mass_mole_fractions, fluid_density, vapour_pressure,
+ constituent_density, cv);
xmWG_minus = 1 - mass_mole_fractions.xmCG;
rhoGR_minus = fluid_density.rho_GR;
@@ -322,8 +315,8 @@ TEST(ProcessLib, TH2MPhaseTransition)
rhoWLR_model.eval(x_t, media_data, p_GR_data, p_cap_data, T_data,
rhoWLR);
ptm->eval(x_t, media_data, p_GR_data, p_cap_data, T_data, rhoWLR,
- viscosity, enthalpy, mass_mole_fractions, fluid_density,
- vapour_pressure, constituent_density, cv);
+ enthalpy, mass_mole_fractions, fluid_density, vapour_pressure,
+ constituent_density, cv);
// Central difference derivatives
auto const dxmWG_dpCap = (xmWG_plus - xmWG_minus) / (2. * eps_pCap);
@@ -348,8 +341,8 @@ TEST(ProcessLib, TH2MPhaseTransition)
rhoWLR_model.eval(x_t, media_data, p_GR_data, p_cap_data,
CR::TemperatureData{T + eps_T, T}, rhoWLR);
ptm->eval(x_t, media_data, p_GR_data, p_cap_data,
- CR::TemperatureData{T + eps_T, T}, rhoWLR, viscosity,
- enthalpy, mass_mole_fractions, fluid_density, vapour_pressure,
+ CR::TemperatureData{T + eps_T, T}, rhoWLR, enthalpy,
+ mass_mole_fractions, fluid_density, vapour_pressure,
constituent_density, cv);
xmWG_plus = 1 - mass_mole_fractions.xmCG;
@@ -360,8 +353,8 @@ TEST(ProcessLib, TH2MPhaseTransition)
rhoWLR_model.eval(x_t, media_data, p_GR_data, p_cap_data,
CR::TemperatureData{T - eps_T, T}, rhoWLR);
ptm->eval(x_t, media_data, p_GR_data, p_cap_data,
- CR::TemperatureData{T - eps_T, T}, rhoWLR, viscosity,
- enthalpy, mass_mole_fractions, fluid_density, vapour_pressure,
+ CR::TemperatureData{T - eps_T, T}, rhoWLR, enthalpy,
+ mass_mole_fractions, fluid_density, vapour_pressure,
constituent_density, cv);
xmWG_minus = 1 - mass_mole_fractions.xmCG;
@@ -373,8 +366,8 @@ TEST(ProcessLib, TH2MPhaseTransition)
rhoWLR_model.eval(x_t, media_data, p_GR_data, p_cap_data, T_data,
rhoWLR);
ptm->eval(x_t, media_data, p_GR_data, p_cap_data, T_data, rhoWLR,
- viscosity, enthalpy, mass_mole_fractions, fluid_density,
- vapour_pressure, constituent_density, cv);
+ enthalpy, mass_mole_fractions, fluid_density, vapour_pressure,
+ constituent_density, cv);
// Central difference derivatives
auto const dxmWG_dT = (xmWG_plus - xmWG_minus) / (2. * eps_T);
@@ -450,9 +443,6 @@ TEST(ProcessLib, TH2MPhaseTransition)
diffusion_coefficient_vapour;
ASSERT_NEAR(diffusion_gas_phase, cv.diffusion_coefficient_vapour,
1.0e-10);
-
- ASSERT_NEAR(viscosity_air, viscosity.mu_GR, 1.0e-10);
- ASSERT_NEAR(viscosity_water, viscosity.mu_LR, 1.0e-10);
}
}
@@ -490,7 +480,6 @@ TEST(ProcessLib, TH2MPhaseTransitionConstRho)
CR::PureLiquidDensityData rhoWLR;
CR::PureLiquidDensityModel rhoWLR_model;
- CR::ViscosityData viscosity;
CR::EnthalpyData enthalpy;
CR::MassMoleFractionsData mass_mole_fractions;
CR::FluidDensityData fluid_density;
@@ -514,9 +503,8 @@ TEST(ProcessLib, TH2MPhaseTransitionConstRho)
rhoWLR_model.eval(x_t, media_data, CR::GasPressureData{pGR + eps_pGR},
p_cap_data, T_data, rhoWLR);
ptm->eval(x_t, media_data, CR::GasPressureData{pGR + eps_pGR},
- p_cap_data, T_data, rhoWLR, viscosity, enthalpy,
- mass_mole_fractions, fluid_density, vapour_pressure,
- constituent_density, cv);
+ p_cap_data, T_data, rhoWLR, enthalpy, mass_mole_fractions,
+ fluid_density, vapour_pressure, constituent_density, cv);
auto xmWG_plus = 1 - mass_mole_fractions.xmCG;
auto rhoCGR_plus = constituent_density.rho_C_GR;
@@ -525,9 +513,8 @@ TEST(ProcessLib, TH2MPhaseTransitionConstRho)
rhoWLR_model.eval(x_t, media_data, CR::GasPressureData{pGR - eps_pGR},
p_cap_data, T_data, rhoWLR);
ptm->eval(x_t, media_data, CR::GasPressureData{pGR - eps_pGR},
- p_cap_data, T_data, rhoWLR, viscosity, enthalpy,
- mass_mole_fractions, fluid_density, vapour_pressure,
- constituent_density, cv);
+ p_cap_data, T_data, rhoWLR, enthalpy, mass_mole_fractions,
+ fluid_density, vapour_pressure, constituent_density, cv);
auto xmWG_minus = 1 - mass_mole_fractions.xmCG;
auto rhoCGR_minus = constituent_density.rho_C_GR;
@@ -537,8 +524,8 @@ TEST(ProcessLib, TH2MPhaseTransitionConstRho)
rhoWLR_model.eval(x_t, media_data, p_GR_data, p_cap_data, T_data,
rhoWLR);
ptm->eval(x_t, media_data, p_GR_data, p_cap_data, T_data, rhoWLR,
- viscosity, enthalpy, mass_mole_fractions, fluid_density,
- vapour_pressure, constituent_density, cv);
+ enthalpy, mass_mole_fractions, fluid_density, vapour_pressure,
+ constituent_density, cv);
// Central difference derivatives
auto const dxmWG_dpGR = (xmWG_plus - xmWG_minus) / (2. * eps_pGR);
@@ -562,8 +549,8 @@ TEST(ProcessLib, TH2MPhaseTransitionConstRho)
rhoWLR);
ptm->eval(x_t, media_data, p_GR_data,
CR::CapillaryPressureData{pCap + eps_pCap}, T_data, rhoWLR,
- viscosity, enthalpy, mass_mole_fractions, fluid_density,
- vapour_pressure, constituent_density, cv);
+ enthalpy, mass_mole_fractions, fluid_density, vapour_pressure,
+ constituent_density, cv);
xmWG_plus = 1 - mass_mole_fractions.xmCG;
rhoCGR_plus = constituent_density.rho_C_GR;
@@ -574,8 +561,8 @@ TEST(ProcessLib, TH2MPhaseTransitionConstRho)
rhoWLR);
ptm->eval(x_t, media_data, p_GR_data,
CR::CapillaryPressureData{pCap - eps_pCap}, T_data, rhoWLR,
- viscosity, enthalpy, mass_mole_fractions, fluid_density,
- vapour_pressure, constituent_density, cv);
+ enthalpy, mass_mole_fractions, fluid_density, vapour_pressure,
+ constituent_density, cv);
xmWG_minus = 1 - mass_mole_fractions.xmCG;
rhoCGR_minus = constituent_density.rho_C_GR;
@@ -585,8 +572,8 @@ TEST(ProcessLib, TH2MPhaseTransitionConstRho)
rhoWLR_model.eval(x_t, media_data, p_GR_data, p_cap_data, T_data,
rhoWLR);
ptm->eval(x_t, media_data, p_GR_data, p_cap_data, T_data, rhoWLR,
- viscosity, enthalpy, mass_mole_fractions, fluid_density,
- vapour_pressure, constituent_density, cv);
+ enthalpy, mass_mole_fractions, fluid_density, vapour_pressure,
+ constituent_density, cv);
// Central difference derivatives
auto const dxmWG_dpCap = (xmWG_plus - xmWG_minus) / (2. * eps_pCap);
@@ -610,8 +597,8 @@ TEST(ProcessLib, TH2MPhaseTransitionConstRho)
rhoWLR_model.eval(x_t, media_data, p_GR_data, p_cap_data,
CR::TemperatureData{T + eps_T, T}, rhoWLR);
ptm->eval(x_t, media_data, p_GR_data, p_cap_data,
- CR::TemperatureData{T + eps_T, T}, rhoWLR, viscosity,
- enthalpy, mass_mole_fractions, fluid_density, vapour_pressure,
+ CR::TemperatureData{T + eps_T, T}, rhoWLR, enthalpy,
+ mass_mole_fractions, fluid_density, vapour_pressure,
constituent_density, cv);
xmWG_plus = 1 - mass_mole_fractions.xmCG;
@@ -621,8 +608,8 @@ TEST(ProcessLib, TH2MPhaseTransitionConstRho)
rhoWLR_model.eval(x_t, media_data, p_GR_data, p_cap_data,
CR::TemperatureData{T - eps_T, T}, rhoWLR);
ptm->eval(x_t, media_data, p_GR_data, p_cap_data,
- CR::TemperatureData{T - eps_T, T}, rhoWLR, viscosity,
- enthalpy, mass_mole_fractions, fluid_density, vapour_pressure,
+ CR::TemperatureData{T - eps_T, T}, rhoWLR, enthalpy,
+ mass_mole_fractions, fluid_density, vapour_pressure,
constituent_density, cv);
xmWG_minus = 1 - mass_mole_fractions.xmCG;
@@ -633,8 +620,8 @@ TEST(ProcessLib, TH2MPhaseTransitionConstRho)
rhoWLR_model.eval(x_t, media_data, p_GR_data, p_cap_data, T_data,
rhoWLR);
ptm->eval(x_t, media_data, p_GR_data, p_cap_data, T_data, rhoWLR,
- viscosity, enthalpy, mass_mole_fractions, fluid_density,
- vapour_pressure, constituent_density, cv);
+ enthalpy, mass_mole_fractions, fluid_density, vapour_pressure,
+ constituent_density, cv);
// Central difference derivatives
auto const dxmWG_dT = (xmWG_plus - xmWG_minus) / (2. * eps_T);
@@ -706,8 +693,5 @@ TEST(ProcessLib, TH2MPhaseTransitionConstRho)
diffusion_coefficient_vapour;
ASSERT_NEAR(diffusion_gas_phase, cv.diffusion_coefficient_vapour,
1.0e-10);
-
- ASSERT_NEAR(viscosity_air, viscosity.mu_GR, 1.0e-10);
- ASSERT_NEAR(viscosity_water, viscosity.mu_LR, 1.0e-10);
}
}