ebos headers: use forwarding

This commit is contained in:
Arne Morten Kvarving
2021-04-29 12:36:38 +02:00
parent dae6b61370
commit bce4590404
11 changed files with 72 additions and 45 deletions
+5 -4
View File
@@ -28,14 +28,15 @@
#ifndef EBOS_BLACK_OIL_HH
#define EBOS_BLACK_OIL_HH
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
#include <memory>
#include <string>
namespace Opm {
class Deck;
class ErrorGuard;
class ParseContext;
bool ebosBlackOilDeckFileNameIsSet(int argc, char** argv);
std::string ebosBlackOilGetDeckFileName(int argc, char** argv);
std::unique_ptr<Opm::ParseContext> ebosBlackOilCreateParseContext(int argc, char** argv);
+8 -7
View File
@@ -28,15 +28,16 @@
#ifndef EBOS_BRINE_HH
#define EBOS_BRINE_HH
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
namespace Opm {
class Deck;
class ErrorGuard;
class ParseContext;
void ebosBrineSetDeck(Opm::Deck* deck,
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,
double externalSetupTime);
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,
double externalSetupTime);
int ebosBrineMain(int argc, char** argv);
}
+6 -3
View File
@@ -28,11 +28,14 @@
#ifndef EBOS_ENERGY_HH
#define EBOS_ENERGY_HH
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
#include <memory>
namespace Opm {
class Deck;
class ErrorGuard;
class ParseContext;
void ebosEnergySetDeck(std::unique_ptr<Opm::Deck> deck,
std::unique_ptr<Opm::ParseContext> parseContext,
std::unique_ptr<Opm::ErrorGuard> errorGuard,
+8 -7
View File
@@ -28,15 +28,16 @@
#ifndef EBOS_EXTBO_HH
#define EBOS_EXTBO_HH
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
namespace Opm {
class Deck;
class ErrorGuard;
class ParseContext;
void ebosExtboSetDeck(Opm::Deck* deck,
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,
double externalSetupTime);
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,
double externalSetupTime);
int ebosExtboMain(int argc, char** argv);
}
+6 -3
View File
@@ -28,11 +28,14 @@
#ifndef EBOS_FOAM_HH
#define EBOS_FOAM_HH
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
#include <memory>
namespace Opm {
class Deck;
class ErrorGuard;
class ParseContext;
void ebosFoamSetDeck(std::unique_ptr<Opm::Deck> deck,
std::unique_ptr<Opm::ParseContext> parseContext,
std::unique_ptr<Opm::ErrorGuard> errorGuard,
+6 -3
View File
@@ -28,11 +28,14 @@
#ifndef EBOS_GAS_OIL_HH
#define EBOS_GAS_OIL_HH
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
#include <memory>
namespace Opm {
class Deck;
class ErrorGuard;
class ParseContext;
void ebosGasOilSetDeck(std::unique_ptr<Opm::Deck> deck,
std::unique_ptr<Opm::ParseContext> parseContext,
std::unique_ptr<Opm::ErrorGuard> errorGuard,
+9 -6
View File
@@ -28,15 +28,18 @@
#ifndef EBOS_GAS_WATER_HH
#define EBOS_GAS_WATER_HH
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
#include <memory>
namespace Opm {
class Deck;
class ErrorGuard;
class ParseContext;
void ebosGasWaterSetDeck(std::unique_ptr<Opm::Deck> deck,
std::unique_ptr<Opm::ParseContext> parseContext,
std::unique_ptr<Opm::ErrorGuard> errorGuard,
double externalSetupTime);
std::unique_ptr<Opm::ParseContext> parseContext,
std::unique_ptr<Opm::ErrorGuard> errorGuard,
double externalSetupTime);
int ebosGasWaterMain(int argc, char** argv);
}
+6 -3
View File
@@ -28,11 +28,14 @@
#ifndef EBOS_OIL_WATER_HH
#define EBOS_OIL_WATER_HH
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
#include <memory>
namespace Opm {
class Deck;
class ErrorGuard;
class ParseContext;
void ebosOilWaterSetDeck(std::unique_ptr<Opm::Deck> deck,
std::unique_ptr<Opm::ParseContext> parseContext,
std::unique_ptr<Opm::ErrorGuard> errorGuard,
+6 -3
View File
@@ -28,11 +28,14 @@
#ifndef EBOS_OIL_WATER_POLYMER_HH
#define EBOS_OIL_WATER_POLYMER_HH
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
#include <memory>
namespace Opm {
class Deck;
class ErrorGuard;
class ParseContext;
void ebosOilWaterPolymerSetDeck(std::unique_ptr<Opm::Deck> deck,
std::unique_ptr<Opm::ParseContext> parseContext,
std::unique_ptr<Opm::ErrorGuard> errorGuard,
+6 -3
View File
@@ -28,11 +28,14 @@
#ifndef EBOS_POLYMER_HH
#define EBOS_POLYMER_HH
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
#include <memory>
namespace Opm {
class Deck;
class ParseContext;
class ErrorGuard;
void ebosPolymerSetDeck(std::unique_ptr<Opm::Deck> deck,
std::unique_ptr<Opm::ParseContext> parseContext,
std::unique_ptr<Opm::ErrorGuard> errorGuard,
+6 -3
View File
@@ -28,11 +28,14 @@
#ifndef EBOS_SOLVENT_HH
#define EBOS_SOLVENT_HH
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
#include <memory>
namespace Opm {
class Deck;
class ErrorGuard;
class ParseContext;
void ebosSolventSetDeck(std::unique_ptr<Opm::Deck> deck,
std::unique_ptr<Opm::ParseContext> parseContext,
std::unique_ptr<Opm::ErrorGuard> errorGuard,