From 3f9822ce7f7a2ffa7c50ef50b809eb094bed3f50 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Sat, 2 Nov 2019 22:59:53 +0100
Subject: [PATCH] [PL] TES; Replace named function "vapour part. p".
The named function is replaced with the "normal" secondary
variable.
---
ProcessLib/TES/TESProcess.cpp | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
diff --git a/ProcessLib/TES/TESProcess.cpp b/ProcessLib/TES/TESProcess.cpp
index ced8ba1e2cc..a41b96072d4 100644
--- a/ProcessLib/TES/TESProcess.cpp
+++ b/ProcessLib/TES/TESProcess.cpp
@@ -175,24 +175,6 @@ void TESProcess::initializeSecondaryVariables()
_local_assemblers, method);
};
- // named functions: vapour partial pressure ////////////////////////////////
- auto p_V_fct = [=](const double p, const double x_mV) {
- const double x_nV = Adsorption::AdsorptionReaction::getMolarFraction(
- x_mV, _assembly_params.M_react, _assembly_params.M_inert);
- return p*x_nV;
- };
- _named_function_caller.addNamedFunction(
- {"vapour_partial_pressure",
- {"pressure", "vapour_mass_fraction"},
- BaseLib::easyBind(std::move(p_V_fct))});
- _named_function_caller.plug("vapour_partial_pressure", "pressure",
- "TES_pressure");
- _named_function_caller.plug("vapour_partial_pressure",
- "vapour_mass_fraction",
- "TES_vapour_mass_fraction");
- // /////////////////////////////////////////////////////////////////////////
-
-
add2nd("solid_density",
makeEx(1, &TESLocalAssemblerInterface::getIntPtSolidDensity));
@@ -208,6 +190,10 @@ void TESProcess::initializeSecondaryVariables()
"reaction_damping_factor",
makeEx(1, &TESLocalAssemblerInterface::getIntPtReactionDampingFactor));
+ add2nd(
+ "vapour_partial_pressure",
+ {1, BaseLib::easyBind(&TESProcess::computeVapourPartialPressure, this),
+ nullptr});
add2nd("relative_humidity",
{1, BaseLib::easyBind(&TESProcess::computeRelativeHumidity, this),
nullptr});
--
GitLab