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

Factor out ewoms typetag system to separate header.

Browse Source 
We will need the typetag information also for the wells.
If it is not in a separate header we get problems
with recursive inclusion of the headers (BlackoilEbos.hpp
includes the header that also needs the typetag information).
This commit is contained in:
Markus Blatt
2017-03-24 11:40:37 +01:00
parent 1232a7a021
commit f6153f8133
3 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists_files.cmake
View File

@@ -157,6 +157,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/autodiff/BlackoilModelBase.hpp opm/autodiff/BlackoilModelBase.hpp
opm/autodiff/BlackoilModelBase_impl.hpp opm/autodiff/BlackoilModelBase_impl.hpp
opm/autodiff/BlackoilModelEnums.hpp opm/autodiff/BlackoilModelEnums.hpp
opm/autodiff/BlackoilModelEbosTypeTags.hpp
opm/autodiff/BlackoilModelParameters.hpp opm/autodiff/BlackoilModelParameters.hpp
opm/autodiff/BlackoilPressureModel.hpp opm/autodiff/BlackoilPressureModel.hpp
opm/autodiff/BlackoilPropsAdFromDeck.hpp opm/autodiff/BlackoilPropsAdFromDeck.hpp

11
opm/autodiff/BlackoilModelEbos.hpp
View File

@@ -24,6 +24,7 @@
#ifndef OPM_BLACKOILMODELEBOS_HEADER_INCLUDED #ifndef OPM_BLACKOILMODELEBOS_HEADER_INCLUDED
#define OPM_BLACKOILMODELEBOS_HEADER_INCLUDED #define OPM_BLACKOILMODELEBOS_HEADER_INCLUDED
#include <opm/autodiff/BlackoilModelEbosTypeTags.hpp>
#include <ebos/eclproblem.hh> #include <ebos/eclproblem.hh>
#include <ewoms/common/start.hh> #include <ewoms/common/start.hh>
@@ -79,16 +80,6 @@
namespace Ewoms {
namespace Properties {
NEW_TYPE_TAG(EclFlowProblem, INHERITS_FROM(BlackOilModel, EclBaseProblem));
SET_BOOL_PROP(EclFlowProblem, DisableWells, true);
SET_BOOL_PROP(EclFlowProblem, EnableDebuggingChecks, false);
// SWATINIT is done by the flow part of flow_ebos. this can be removed once the legacy
// code for fluid and satfunc handling gets fully retired.
SET_BOOL_PROP(EclFlowProblem, EnableSwatinit, false);
}}
namespace Opm { namespace Opm {

38
opm/autodiff/BlackoilModelEbosTypeTags.hpp Normal file
View File

@@ -0,0 +1,38 @@
#ifndef OPM_BLACKOILMODELEBOSTYPETAGS_HEADER_INCLUDED
#define OPM_BLACKOILMODELEBOSTYPETAGS_HEADER_INCLUDED
/*
Copyright 2013, 2015 SINTEF ICT, Applied Mathematics.
Copyright 2014, 2015 Statoil ASA.
Copyright 2015 NTNU
Copyright 2015 IRIS AS
This file is part of the Open Porous Media project (OPM).
OPM is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OPM is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <ebos/eclproblem.hh>
namespace Ewoms {
namespace Properties {
NEW_TYPE_TAG(EclFlowProblem, INHERITS_FROM(BlackOilModel, EclBaseProblem));
SET_BOOL_PROP(EclFlowProblem, DisableWells, true);
SET_BOOL_PROP(EclFlowProblem, EnableDebuggingChecks, false);
// SWATINIT is done by the flow part of flow_ebos. this can be removed once the legacy
// code for fluid and satfunc handling gets fully retired.
SET_BOOL_PROP(EclFlowProblem, EnableSwatinit, false);
}}
#endif