Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add simple materiallawmanager #4401

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CMakeLists_files.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,11 @@ if(ENABLE_ECL_INPUT)
opm/material/fluidmatrixinteractions/EclHysteresisConfig.cpp
opm/material/fluidmatrixinteractions/EclMaterialLawManager.cpp
opm/material/fluidmatrixinteractions/EclMaterialLawManagerReadEffectiveParams.cpp
opm/material/fluidmatrixinteractions/EclMaterialLawManagerSimple.cpp
opm/material/fluidmatrixinteractions/EclMaterialLawManagerSimpleReadEffectiveParams.cpp
opm/material/fluidmatrixinteractions/EclMaterialLawManagerSimpleHystParams.cpp
opm/material/fluidmatrixinteractions/EclMaterialLawManagerInitParams.cpp
opm/material/fluidmatrixinteractions/EclMaterialLawManagerSimpleInitParams.cpp
opm/material/fluidmatrixinteractions/EclMaterialLawManagerHystParams.cpp
opm/material/thermal/EclThermalLawManager.cpp
)
Expand Down Expand Up @@ -997,6 +1001,7 @@ list( APPEND PUBLIC_HEADER_FILES
opm/material/fluidmatrixinteractions/EclEpsTwoPhaseLaw.hpp
opm/material/fluidmatrixinteractions/TwoPhaseLETCurves.hpp
opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp
opm/material/fluidmatrixinteractions/EclMaterialLawManagerSimple.hpp
opm/material/fluidmatrixinteractions/DirectionalMaterialLawParams.hpp
opm/material/fluidmatrixinteractions/DirectionalMaterialLawParams.hpp
opm/material/fluidmatrixinteractions/RegularizedVanGenuchten.hpp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ class EclHysteresisTwoPhaseLaw : public EffectiveLawT::Traits
//! are dependent on the phase composition
static constexpr bool isCompositionDependent = false;

static constexpr bool isHysteresisDependent = true;

/*!
* \brief The capillary pressure-saturation curves depending on absolute saturations.
*
Expand Down
Loading