OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

capillary pressure laws: move the M-phase laws one directory up

Browse Source 
since they are also generic in the sense that they can depend on
arbitrary quanities expressed by the fluid state, not just
saturations...
This commit is contained in:
Andreas Lauser
2013-11-03 17:03:36 +01:00
parent 2ff952494b
commit 7b49b64eb7
9 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
opm/material/fluidmatrixinteractions/mp/2pAdapter.hpp → opm/material/fluidmatrixinteractions/2pAdapter.hpp
View File

0
opm/material/fluidmatrixinteractions/mp/3pAdapter.hpp → opm/material/fluidmatrixinteractions/3pAdapter.hpp
View File

0
opm/material/fluidmatrixinteractions/mp/MpLinearMaterial.hpp → opm/material/fluidmatrixinteractions/MpLinearMaterial.hpp
View File

0
opm/material/fluidmatrixinteractions/mp/MpLinearMaterialParams.hpp → opm/material/fluidmatrixinteractions/MpLinearMaterialParams.hpp
View File

0
opm/material/fluidmatrixinteractions/mp/NullMaterialLaw.hpp → opm/material/fluidmatrixinteractions/NullMaterialLaw.hpp
View File

0
opm/material/fluidmatrixinteractions/mp/NullMaterialLawParams.hpp → opm/material/fluidmatrixinteractions/NullMaterialLawParams.hpp
View File

4
tests/material/immiscibleflash/test_immiscibleflash.cpp
View File

@@ -36,8 +36,8 @@
#include <opm/material/fluidsystems/H2ON2FluidSystem.hpp>
#include <opm/material/fluidmatrixinteractions/mp/MpLinearMaterial.hpp>
#include <opm/material/fluidmatrixinteractions/mp/2pAdapter.hpp>
#include <opm/material/fluidmatrixinteractions/MpLinearMaterial.hpp>
#include <opm/material/fluidmatrixinteractions/2pAdapter.hpp>
#include <opm/material/fluidmatrixinteractions/2p/LinearMaterial.hpp>
#include <opm/material/fluidmatrixinteractions/2p/RegularizedLinearMaterial.hpp>
#include <opm/material/fluidmatrixinteractions/2p/RegularizedBrooksCorey.hpp>

4
tests/material/ncpflash/test_ncpflash.cpp
View File

@@ -36,8 +36,8 @@
#include <opm/material/fluidsystems/H2ON2FluidSystem.hpp>
#include <opm/material/fluidmatrixinteractions/mp/MpLinearMaterial.hpp>
#include <opm/material/fluidmatrixinteractions/mp/2pAdapter.hpp>
#include <opm/material/fluidmatrixinteractions/MpLinearMaterial.hpp>
#include <opm/material/fluidmatrixinteractions/2pAdapter.hpp>
#include <opm/material/fluidmatrixinteractions/2p/LinearMaterial.hpp>
#include <opm/material/fluidmatrixinteractions/2p/RegularizedLinearMaterial.hpp>
#include <opm/material/fluidmatrixinteractions/2p/RegularizedBrooksCorey.hpp>

2
tests/material/pengrobinson/test_pengrobinson.cpp
View File

@@ -28,7 +28,7 @@
#include <opm/material/constraintsolvers/NcpFlash.hpp>
#include <opm/material/fluidstates/CompositionalFluidState.hpp>
#include <opm/material/fluidsystems/Spe5FluidSystem.hpp>
#include <opm/material/fluidmatrixinteractions/mp/MpLinearMaterial.hpp>
#include <opm/material/fluidmatrixinteractions/MpLinearMaterial.hpp>
template <class FluidSystem, class FluidState>
void guessInitial(FluidState &fluidState,