OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename EclMaterialLawManager::initFromDeck to initFromState

Browse Source 
no deck usage any more
This commit is contained in:
Arne Morten Kvarving
2020-03-09 10:28:46 +01:00
parent c85243314b
commit a2d52da69f
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp
View File

@@ -50,7 +50,6 @@
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <algorithm>
@@ -116,8 +115,7 @@ public:
EclMaterialLawManager()
{}
void initFromDeck(const Opm::Deck& deck,
const Opm::EclipseState& eclState)
void initFromState(const Opm::EclipseState& eclState)
{
// get the number of saturation regions and the number of cells in the deck
const size_t numSatRegions = eclState.runspec().tabdims().getNumSatTables();
@@ -355,7 +353,7 @@ public:
* \brief Modify the initial condition according to the SWATINIT keyword.
*
* The method returns the water saturation which yields a givenn capillary
* pressure. The reason this method is not folded directly into initFromDeck() is
* pressure. The reason this method is not folded directly into initFromState() is
* that the capillary pressure given depends on the particuars of how the simulator
* calculates its initial condition.
*/

10
tests/test_eclmateriallawmanager.cpp
View File

@@ -449,7 +449,7 @@ inline void testAll()
size_t n = eclGrid.getCartesianSize();
MaterialLawManager materialLawManager;
materialLawManager.initFromDeck(deck, eclState);
materialLawManager.initFromState(eclState);
materialLawManager.initParamsForElements(eclState, n);
if (materialLawManager.enableEndPointScaling())
@@ -463,7 +463,7 @@ inline void testAll()
const Opm::EclipseState fam2EclState(fam2Deck);
Opm::EclMaterialLawManager<MaterialTraits> fam2MaterialLawManager;
fam2MaterialLawManager.initFromDeck(fam2Deck, fam2EclState);
fam2MaterialLawManager.initFromState(fam2EclState);
fam2MaterialLawManager.initParamsForElements(fam2EclState, n);
if (fam2MaterialLawManager.enableEndPointScaling())
@@ -476,7 +476,7 @@ inline void testAll()
const Opm::EclipseState hysterEclState(hysterDeck);
Opm::EclMaterialLawManager<MaterialTraits> hysterMaterialLawManager;
hysterMaterialLawManager.initFromDeck(hysterDeck, hysterEclState);
hysterMaterialLawManager.initFromState(hysterEclState);
hysterMaterialLawManager.initParamsForElements(hysterEclState, n);
if (hysterMaterialLawManager.enableEndPointScaling())
@@ -569,14 +569,14 @@ inline void testAll()
const Opm::EclipseState fam1EclState(fam1Deck);
MaterialLawManager fam1materialLawManager;
fam1materialLawManager.initFromDeck(fam1Deck, fam1EclState);
fam1materialLawManager.initFromState(fam1EclState);
fam1materialLawManager.initParamsForElements(fam1EclState, n);
const auto fam2Deck = parser.parseString(fam2DeckStringGasOil);
const Opm::EclipseState fam2EclState(fam2Deck);
Opm::EclMaterialLawManager<MaterialTraits> fam2MaterialLawManager;
fam2MaterialLawManager.initFromDeck(fam2Deck, fam2EclState);
fam2MaterialLawManager.initFromState(fam2EclState);
fam2MaterialLawManager.initParamsForElements(fam2EclState, n);
for (unsigned elemIdx = 0; elemIdx < n; ++ elemIdx) {