add files imported from opm-core to build system

change include path for thresholdPressures.hpp in test.
note that the test is currently disabled (it was not enabled in
opm-core and does not build).
This commit is contained in:
Arne Morten Kvarving 2016-04-08 18:35:12 +02:00
parent 66333051e7
commit ec84849361
2 changed files with 5 additions and 1 deletions

View File

@ -63,6 +63,8 @@ list (APPEND MAIN_SOURCE_FILES
opm/polymer/TransportSolverTwophasePolymer.cpp
opm/polymer/fullyimplicit/FullyImplicitCompressiblePolymerSolver.cpp
opm/polymer/fullyimplicit/PolymerPropsAd.cpp
opm/simulators/SimulatorCompressibleTwophase.cpp
opm/simulators/SimulatorIncompTwophase.cpp
)
@ -82,6 +84,7 @@ list (APPEND TEST_SOURCE_FILES
tests/test_vfpproperties.cpp
tests/test_singlecellsolves.cpp
tests/test_solventprops_ad.cpp
# tests/test_thresholdpressure.cpp
)
list (APPEND TEST_DATA_FILES
@ -99,6 +102,7 @@ list (APPEND EXAMPLE_SOURCE_FILES
examples/flow_multisegment.cpp
examples/flow_solvent.cpp
examples/sim_2p_incomp_ad.cpp
examples/sim_2p_comp_reorder.cpp
examples/sim_simple.cpp
examples/opm_init_check.cpp
examples/sim_poly2p_comp_reorder.cpp

View File

@ -6,7 +6,7 @@
#include <opm/core/grid/cornerpoint_grid.h>
#include <opm/core/grid/GridManager.hpp>
#include <opm/autodiff/GridHelpers.hpp>
#include <opm/core/utility/thresholdPressures.hpp> // Note: the GridHelpers must be included before this (to make overloads available)
#include <opm/simulators/thresholdPressures.hpp> // Note: the GridHelpers must be included before this (to make overloads available)
static DeckPtr createDeckSimConfig() {