From 03b8626e27f45e4a3144b8583471ceb4856baa54 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Fri, 9 Nov 2018 15:25:37 +0100
Subject: [PATCH] [components] Reset tabulated component in init
---
.../material/components/tabulatedcomponent.hh | 25 ++++++++++++++++---
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/dumux/material/components/tabulatedcomponent.hh b/dumux/material/components/tabulatedcomponent.hh
index 059fe021cf..08fe858bdc 100644
--- a/dumux/material/components/tabulatedcomponent.hh
+++ b/dumux/material/components/tabulatedcomponent.hh
@@ -100,10 +100,6 @@ public:
static void init(Scalar tempMin, Scalar tempMax, std::size_t nTemp,
Scalar pressMin, Scalar pressMax, std::size_t nPress)
{
-#ifndef NDEBUG
- initialized_ = true;
- warningPrinted_ = false;
-#endif
tempMin_ = tempMin;
tempMax_ = tempMax;
nTemp_ = nTemp;
@@ -145,8 +141,29 @@ public:
gasPressure_.resize(numEntriesTp, NaN);
liquidPressure_.resize(numEntriesTp, NaN);
+ // reset all flags
+ minMaxLiquidDensityInitialized_ = false;
+ minMaxGasDensityInitialized_ = false;
+ gasEnthalpyInitialized_ = false;
+ liquidEnthalpyInitialized_ = false;
+ gasHeatCapacityInitialized_ = false;
+ liquidHeatCapacityInitialized_ = false;
+ gasDensityInitialized_ = false;
+ liquidDensityInitialized_ = false;
+ gasViscosityInitialized_ = false;
+ liquidViscosityInitialized_ = false;
+ gasThermalConductivityInitialized_ = false;
+ liquidThermalConductivityInitialized_ = false;
+ gasPressureInitialized_ = false;
+ liquidPressureInitialized_ = false;
+
//! initialize vapor pressure array depending on useVaporPressure
initVaporPressure_();
+
+#ifndef NDEBUG
+ initialized_ = true;
+ warningPrinted_ = false;
+#endif
}
/*!
--
GitLab