From 353f5a9532cd4f79be3ecbc84b0d3ff55b9e9064 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Thu, 22 Nov 2018 16:17:49 +0100
Subject: [PATCH] [cleanup] Remove wetting phase index from immiscible fluid
state
---
dumux/material/fluidstates/immiscible.hh | 16 ----------------
.../immiscibleflash/test_immiscibleflash.cc | 2 --
2 files changed, 18 deletions(-)
diff --git a/dumux/material/fluidstates/immiscible.hh b/dumux/material/fluidstates/immiscible.hh
index f041a43c15..e03e69332b 100644
--- a/dumux/material/fluidstates/immiscible.hh
+++ b/dumux/material/fluidstates/immiscible.hh
@@ -65,11 +65,6 @@ public:
* Generic access to fluid properties (No assumptions
* on thermodynamic equilibrium required)
*****************************************************/
- /*!
- * \brief Returns the index of the wetting phase in the
- * fluid-solid configuration (for porous medium systems).
- */
- int wettingPhase() const { return wPhaseIdx_; }
/*!
* \brief Returns the saturation \f$S_\alpha\f$ of a fluid phase \f$\alpha\f$ in \f$\mathrm{[-]}\f$.
@@ -286,7 +281,6 @@ public:
viscosity_[phaseIdx] = fs.viscosity(phaseIdx);
temperature_[phaseIdx] = fs.temperature(0);
}
- wPhaseIdx_ = fs.wettingPhase();
}
/*!
@@ -339,13 +333,6 @@ public:
*/
void setViscosity(int phaseIdx, Scalar value)
{ viscosity_[phaseIdx] = value; }
-
- /*!
- * \brief Set the index of the wetting phase
- */
- void setWettingPhase(int phaseIdx)
- { wPhaseIdx_ = phaseIdx; }
-
protected:
//! zero-initialize all data members with braces syntax
Scalar pressure_[numPhases] = {};
@@ -355,9 +342,6 @@ protected:
Scalar enthalpy_[numPhases] = {};
Scalar viscosity_[numPhases] = {};
Scalar temperature_[numPhases] = {};
-
- // For porous medium flow models the index of the wetting
- int wPhaseIdx_{0};
};
} // end namespace Dumux
diff --git a/test/material/immiscibleflash/test_immiscibleflash.cc b/test/material/immiscibleflash/test_immiscibleflash.cc
index f6135005bd..e009097110 100644
--- a/test/material/immiscibleflash/test_immiscibleflash.cc
+++ b/test/material/immiscibleflash/test_immiscibleflash.cc
@@ -232,8 +232,6 @@ int main()
fsRef.setSaturation(liquidPhaseIdx, 0.5);
fsRef.setPressure(liquidPhaseIdx, 1e6);
- fsRef.setWettingPhase(liquidPhaseIdx);
-
// set the remaining parameters of the reference fluid state
completeReferenceFluidState<Scalar, FluidSystem, MPAdapter>(fsRef, matParams, liquidPhaseIdx);
--
GitLab