Only active cells (#1298)

Use FieldProps implementation for 3D properties
This commit is contained in:
Joakim Hove
2020-01-13 15:46:06 +01:00
committed by GitHub
parent 13b3d1e17b
commit ecb5fce19b
45 changed files with 340 additions and 771 deletions

View File

@@ -21,8 +21,8 @@
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/DeckSection.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.hpp>
#include <opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/Fault.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/FaultFace.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp>
@@ -34,7 +34,7 @@
namespace Opm {
TransMult::TransMult(const GridDims& dims, const Deck& deck, const FieldPropsManager& fp, const Eclipse3DProperties& props) :
TransMult::TransMult(const GridDims& dims, const Deck& deck, const FieldPropsManager& fp) :
m_nx( dims.getNX()),
m_ny( dims.getNY()),
m_nz( dims.getNZ()),
@@ -44,7 +44,7 @@ namespace Opm {
{ FaceDir::XMinus, "MULTX-" },
{ FaceDir::YMinus, "MULTY-" },
{ FaceDir::ZMinus, "MULTZ-" }}),
m_multregtScanner( dims, fp, props, deck.getKeywordList( "MULTREGT" ))
m_multregtScanner( dims, fp, deck.getKeywordList( "MULTREGT" ))
{
EDITSection edit_section(deck);
if (edit_section.hasKeyword("MULTREGT")) {