add some ebos variants

these variants should cover most of the common use cases. That said,
there are no plans to provide simulators for combinations of blackoil
extensions or a "multiplexing" simulator like `flow`: If someone is
interested in e.g., an oil-water simulator with polymer and energy
enabled, a separate self-compiled executable should be added locally.
This commit is contained in:
Andreas Lauser
2019-03-05 11:41:02 +01:00
parent 81c709fabd
commit 383009e031
7 changed files with 342 additions and 0 deletions

View File

@@ -161,7 +161,52 @@ opm_add_test(ebos
LIBRARIES "opmsimulators"
SOURCES ebos/ebos.cc)
opm_add_test(ebos_solvent
ONLY_COMPILE
ALWAYS_ENABLE
SOURCES ebos/ebos_solvent.cc
EXE_NAME ebos_solvent
DEPENDS "opmsimulators"
LIBRARIES "opmsimulators")
opm_add_test(ebos_polymer
ONLY_COMPILE
ALWAYS_ENABLE
SOURCES ebos/ebos_polymer.cc
EXE_NAME ebos_polymer
DEPENDS "opmsimulators"
LIBRARIES "opmsimulators")
opm_add_test(ebos_gasoil
ONLY_COMPILE
ALWAYS_ENABLE
SOURCES ebos/ebos_gasoil.cc
EXE_NAME ebos_gasoil
DEPENDS "opmsimulators"
LIBRARIES "opmsimulators")
opm_add_test(ebos_oilwater
ONLY_COMPILE
ALWAYS_ENABLE
SOURCES ebos/ebos_oilwater.cc
EXE_NAME ebos_oilwater
DEPENDS "opmsimulators"
LIBRARIES "opmsimulators")
opm_add_test(ebos_thermal
ONLY_COMPILE
ALWAYS_ENABLE
SOURCES ebos/ebos_thermal.cc
EXE_NAME ebos_thermal
DEPENDS "opmsimulators"
LIBRARIES "opmsimulators")
install(TARGETS ebos DESTINATION bin)
install(TARGETS ebos_solvent DESTINATION bin)
install(TARGETS ebos_polymer DESTINATION bin)
install(TARGETS ebos_gasoil DESTINATION bin)
install(TARGETS ebos_oilwater DESTINATION bin)
install(TARGETS ebos_thermal DESTINATION bin)
include(OpmBashCompletion)
opm_add_bash_completion(flow)

59
ebos/ebos_gasoil.cc Normal file
View File

@@ -0,0 +1,59 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
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 2 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/>.
Consult the COPYING file in the top-level source directory of this
module for the precise wording of the license and the list of
copyright holders.
*/
/*!
* \file
*
* \brief A general-purpose simulator for ECL decks using the black-oil model.
*/
#include "config.h"
#include "ebos.hh"
BEGIN_PROPERTIES
NEW_TYPE_TAG(EbosGasOilTypeTag, INHERITS_FROM(EbosTypeTag));
//! The indices indices which only enable oil and water
SET_PROP(EbosGasOilTypeTag, Indices)
{
private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads
// to cyclic definitions of some properties. if this happens the compiler error
// messages unfortunately are *really* confusing and not really helpful.
typedef typename GET_PROP_TYPE(TTAG(EbosTypeTag), FluidSystem) FluidSystem;
public:
typedef Ewoms::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
GET_PROP_VALUE(TypeTag, EnablePolymer),
GET_PROP_VALUE(TypeTag, EnableEnergy),
/*PVOffset=*/0,
/*disabledCompIdx=*/FluidSystem::waterCompIdx> type;
};
END_PROPERTIES
int main(int argc, char **argv)
{
typedef TTAG(EbosGasOilTypeTag) ProblemTypeTag;
return Ewoms::start<ProblemTypeTag>(argc, argv);
}

59
ebos/ebos_oilwater.cc Normal file
View File

@@ -0,0 +1,59 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
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 2 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/>.
Consult the COPYING file in the top-level source directory of this
module for the precise wording of the license and the list of
copyright holders.
*/
/*!
* \file
*
* \brief A general-purpose simulator for ECL decks using the black-oil model.
*/
#include "config.h"
#include "ebos.hh"
BEGIN_PROPERTIES
NEW_TYPE_TAG(EbosOilWaterTypeTag, INHERITS_FROM(EbosTypeTag));
//! The indices indices which only enable oil and water
SET_PROP(EbosOilWaterTypeTag, Indices)
{
private:
// it is unfortunately not possible to simply use 'TypeTag' here because this leads
// to cyclic definitions of some properties. if this happens the compiler error
// messages unfortunately are *really* confusing and not really helpful.
typedef typename GET_PROP_TYPE(TTAG(EbosTypeTag), FluidSystem) FluidSystem;
public:
typedef Ewoms::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
GET_PROP_VALUE(TypeTag, EnablePolymer),
GET_PROP_VALUE(TypeTag, EnableEnergy),
/*PVOffset=*/0,
/*disabledCompIdx=*/FluidSystem::gasCompIdx> type;
};
END_PROPERTIES
int main(int argc, char **argv)
{
typedef TTAG(EbosOilWaterTypeTag) ProblemTypeTag;
return Ewoms::start<ProblemTypeTag>(argc, argv);
}

44
ebos/ebos_plain.cc Normal file
View File

@@ -0,0 +1,44 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
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 2 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/>.
Consult the COPYING file in the top-level source directory of this
module for the precise wording of the license and the list of
copyright holders.
*/
/*!
* \file
*
* \brief A general-purpose simulator for ECL decks using the black-oil model.
*/
#include "config.h"
#include "eclproblem.hh"
#include <ewoms/common/start.hh>
BEGIN_PROPERTIES
NEW_TYPE_TAG(EbosPlainTypeTag, INHERITS_FROM(BlackOilModel, EclBaseProblem));
END_PROPERTIES
int main(int argc, char **argv)
{
typedef TTAG(EbosPlainTypeTag) ProblemTypeTag;
return Ewoms::start<ProblemTypeTag>(argc, argv);
}

45
ebos/ebos_polymer.cc Normal file
View File

@@ -0,0 +1,45 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
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 2 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/>.
Consult the COPYING file in the top-level source directory of this
module for the precise wording of the license and the list of
copyright holders.
*/
/*!
* \file
*
* \brief A general-purpose simulator for ECL decks using the black-oil model.
*/
#include "config.h"
#include "ebos.hh"
BEGIN_PROPERTIES
NEW_TYPE_TAG(EbosPolymerTypeTag, INHERITS_FROM(EbosTypeTag));
// enable the polymer extension of the black oil model
SET_BOOL_PROP(EbosPolymerTypeTag, EnablePolymer, true);
END_PROPERTIES
int main(int argc, char **argv)
{
typedef TTAG(EbosPolymerTypeTag) ProblemTypeTag;
return Ewoms::start<ProblemTypeTag>(argc, argv);
}

45
ebos/ebos_solvent.cc Normal file
View File

@@ -0,0 +1,45 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
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 2 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/>.
Consult the COPYING file in the top-level source directory of this
module for the precise wording of the license and the list of
copyright holders.
*/
/*!
* \file
*
* \brief A general-purpose simulator for ECL decks using the black-oil model.
*/
#include "config.h"
#include "ebos.hh"
BEGIN_PROPERTIES
NEW_TYPE_TAG(EbosSolventTypeTag, INHERITS_FROM(EbosTypeTag));
// enable the solvent extension of the black oil model
SET_BOOL_PROP(EbosSolventTypeTag, EnableSolvent, true);
END_PROPERTIES
int main(int argc, char **argv)
{
typedef TTAG(EbosSolventTypeTag) ProblemTypeTag;
return Ewoms::start<ProblemTypeTag>(argc, argv);
}

45
ebos/ebos_thermal.cc Normal file
View File

@@ -0,0 +1,45 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
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 2 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/>.
Consult the COPYING file in the top-level source directory of this
module for the precise wording of the license and the list of
copyright holders.
*/
/*!
* \file
*
* \brief A general-purpose simulator for ECL decks using the black-oil model.
*/
#include "config.h"
#include "ebos.hh"
BEGIN_PROPERTIES
NEW_TYPE_TAG(EbosThermalTypeTag, INHERITS_FROM(EbosTypeTag));
// enable the energy extension of the black oil model
SET_BOOL_PROP(EbosThermalTypeTag, EnableEnergy, true);
END_PROPERTIES
int main(int argc, char **argv)
{
typedef TTAG(EbosThermalTypeTag) ProblemTypeTag;
return Ewoms::start<ProblemTypeTag>(argc, argv);
}