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

Downstream of filesystem reorganisation in opm-common

Browse Source
This commit is contained in:
Joakim Hove
2021-12-14 08:38:58 +01:00
parent 7bdc2e6539
commit 2a42da1ff7
6 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opm/models/blackoil/blackoilbrinemodules.hh
View File

@@ -35,9 +35,9 @@
#include <opm/material/common/IntervalTabulated2DFunction.hpp> #include <opm/material/common/IntervalTabulated2DFunction.hpp>
#if HAVE_ECL_INPUT #if HAVE_ECL_INPUT
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/input/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PvtwsaltTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/PvtwsaltTable.hpp>
#endif #endif
#include <opm/material/common/Valgrind.hpp> #include <opm/material/common/Valgrind.hpp>

18
opm/models/blackoil/blackoilextbomodules.hh
View File

@@ -42,15 +42,15 @@
#include <opm/material/common/UniformXTabulated2DFunction.hpp> #include <opm/material/common/UniformXTabulated2DFunction.hpp>
#if HAVE_ECL_INPUT #if HAVE_ECL_INPUT
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SsfnTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/SsfnTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Sof2Table.hpp> #include <opm/input/eclipse/EclipseState/Tables/Sof2Table.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/MsfnTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/MsfnTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PmiscTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/PmiscTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/MiscTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/MiscTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SorwmisTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/SorwmisTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SgcwmisTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/SgcwmisTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TlpmixpaTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/TlpmixpaTable.hpp>
#endif #endif
#include <opm/material/common/Valgrind.hpp> #include <opm/material/common/Valgrind.hpp>

8
opm/models/blackoil/blackoilfoammodules.hh
View File

@@ -36,10 +36,10 @@
//#include <opm/material/common/IntervalTabulated2DFunction.hpp> //#include <opm/material/common/IntervalTabulated2DFunction.hpp>
#if HAVE_ECL_INPUT #if HAVE_ECL_INPUT
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/input/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/FoamadsTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/FoamadsTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/FoammobTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/FoammobTable.hpp>
#endif #endif
#include <opm/material/common/Valgrind.hpp> #include <opm/material/common/Valgrind.hpp>

4
opm/models/blackoil/blackoilmicpmodules.hh
View File

@@ -33,8 +33,8 @@
#include <opm/models/common/quantitycallbacks.hh> #include <opm/models/common/quantitycallbacks.hh>
#if HAVE_ECL_INPUT #if HAVE_ECL_INPUT
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/MICPpara.hpp> #include <opm/input/eclipse/EclipseState/MICPpara.hpp>
#endif #endif
#include <dune/common/fvector.hh> #include <dune/common/fvector.hh>

12
opm/models/blackoil/blackoilpolymermodules.hh
View File

@@ -38,12 +38,12 @@
#include <opm/common/OpmLog/OpmLog.hpp> #include <opm/common/OpmLog/OpmLog.hpp>
#if HAVE_ECL_INPUT #if HAVE_ECL_INPUT
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PlyadsTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/PlyadsTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PlymaxTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/PlymaxTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PlyrockTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/PlyrockTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PlyshlogTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/PlyshlogTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PlyviscTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/PlyviscTable.hpp>
#endif #endif
#include <opm/material/common/Valgrind.hpp> #include <opm/material/common/Valgrind.hpp>

20
opm/models/blackoil/blackoilsolventmodules.hh
View File

@@ -36,16 +36,16 @@
#include <opm/material/common/Tabulated1DFunction.hpp> #include <opm/material/common/Tabulated1DFunction.hpp>
#if HAVE_ECL_INPUT #if HAVE_ECL_INPUT
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/input/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SsfnTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/SsfnTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Sof2Table.hpp> #include <opm/input/eclipse/EclipseState/Tables/Sof2Table.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/MsfnTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/MsfnTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PmiscTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/PmiscTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/MiscTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/MiscTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SorwmisTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/SorwmisTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SgcwmisTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/SgcwmisTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TlpmixpaTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/TlpmixpaTable.hpp>
#endif #endif
#include <opm/material/common/Valgrind.hpp> #include <opm/material/common/Valgrind.hpp>