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

FlowMainEbos: rename to FlowMain

Browse Source
This commit is contained in:
Arne Morten Kvarving
2024-01-31 14:14:50 +01:00
parent 97bef564da
commit b09c70213b
38 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flow/flow_ebos_blackoil.cpp
View File

@@ -44,14 +44,14 @@ namespace Opm {
namespace Opm
{
std::unique_ptr<FlowMainEbos<Properties::TTag::EclFlowProblemTPFA>>
std::unique_ptr<FlowMain<Properties::TTag::EclFlowProblemTPFA>>
flowEbosBlackoilTpfaMainInit(int argc, char** argv, bool outputCout, bool outputFiles)
{
// we always want to use the default locale, and thus spare us the trouble
// with incorrect locale settings.
resetLocale();
return std::make_unique<FlowMainEbos<Properties::TTag::EclFlowProblemTPFA>>(
return std::make_unique<FlowMain<Properties::TTag::EclFlowProblemTPFA>>(
argc, argv, outputCout, outputFiles);
}
@@ -62,7 +62,7 @@ int flowEbosBlackoilTpfaMain(int argc, char** argv, bool outputCout, bool output
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowProblemTPFA>
FlowMain<Properties::TTag::EclFlowProblemTPFA>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();
}

4
flow/flow_ebos_blackoil.hpp
View File

@@ -39,10 +39,10 @@ namespace Opm {
//! \brief Main function used in flow binary.
int flowEbosBlackoilTpfaMain(int argc, char** argv, bool outputCout, bool outputFiles);
template<class TypeTag> class FlowMainEbos;
template<class TypeTag> class FlowMain;
//! \brief Initialization function used in flow binary and python simulator.
std::unique_ptr<FlowMainEbos<Properties::TTag::EclFlowProblemTPFA>>
std::unique_ptr<FlowMain<Properties::TTag::EclFlowProblemTPFA>>
flowEbosBlackoilTpfaMainInit(int argc, char** argv, bool outputCout, bool outputFiles);
//! \brief Main function used in flow_brine binary.

4
flow/flow_ebos_blackoil_legacyassembly.cpp
View File

@@ -24,14 +24,14 @@
namespace Opm {
std::unique_ptr<FlowMainEbos<Properties::TTag::EclFlowProblem>>
std::unique_ptr<FlowMain<Properties::TTag::EclFlowProblem>>
flowEbosBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFiles)
{
// we always want to use the default locale, and thus spare us the trouble
// with incorrect locale settings.
resetLocale();
return std::make_unique<FlowMainEbos<Properties::TTag::EclFlowProblem>>(
return std::make_unique<FlowMain<Properties::TTag::EclFlowProblem>>(
argc, argv, outputCout, outputFiles);
}

4
flow/flow_ebos_blackoil_legacyassembly.hpp
View File

@@ -21,7 +21,7 @@
namespace Opm {
template<class TypeTag> class FlowMainEbos;
template<class TypeTag> class FlowMain;
namespace Action {
class State;
@@ -32,7 +32,7 @@ namespace Properties { namespace TTag { struct EclFlowProblem; } }
int flowEbosBlackoilMain(int argc, char** argv, bool outputCout, bool outputFiles);
//! \brief Initialization function used in flow binary and python simulator.
std::unique_ptr<FlowMainEbos<Properties::TTag::EclFlowProblem>>
std::unique_ptr<FlowMain<Properties::TTag::EclFlowProblem>>
flowEbosBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFiles);
//! \brief Main function used in flow_blackoil binary.

2
flow/flow_ebos_brine.cpp
View File

@@ -45,7 +45,7 @@ int flowEbosBrineMain(int argc, char** argv, bool outputCout, bool outputFiles)
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowBrineProblem>
FlowMain<Properties::TTag::EclFlowBrineProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();
}

2
flow/flow_ebos_brine_precsalt_vapwat.cpp
View File

@@ -55,7 +55,7 @@ int flowEbosBrinePrecsaltVapwatMain(int argc, char** argv, bool outputCout, bool
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowBrinePrecsaltVapwatProblem>
FlowMain<Properties::TTag::EclFlowBrinePrecsaltVapwatProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();
}

2
flow/flow_ebos_brine_saltprecipitation.cpp
View File

@@ -50,7 +50,7 @@ int flowEbosBrineSaltPrecipitationMain(int argc, char** argv, bool outputCout, b
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowBrineSaltPrecipitationProblem>
FlowMain<Properties::TTag::EclFlowBrineSaltPrecipitationProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();
}

2
flow/flow_ebos_energy.cpp
View File

@@ -46,7 +46,7 @@ int flowEbosEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles)
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowEnergyProblem>
FlowMain<Properties::TTag::EclFlowEnergyProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();
}

2
flow/flow_ebos_extbo.cpp
View File

@@ -45,7 +45,7 @@ int flowEbosExtboMain(int argc, char** argv, bool outputCout, bool outputFiles)
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowExtboProblem>
FlowMain<Properties::TTag::EclFlowExtboProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();
}

2
flow/flow_ebos_foam.cpp
View File

@@ -45,7 +45,7 @@ int flowEbosFoamMain(int argc, char** argv, bool outputCout, bool outputFiles)
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowFoamProblem>
FlowMain<Properties::TTag::EclFlowFoamProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();
}

2
flow/flow_ebos_gasoil.cpp
View File

@@ -78,7 +78,7 @@ int flowEbosGasOilMain(int argc, char** argv, bool outputCout, bool outputFiles)
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowGasOilProblem>
FlowMain<Properties::TTag::EclFlowGasOilProblem>
mainfunc {argc, argv, outputCout, outputFiles} ;
return mainfunc.execute();
}

2
flow/flow_ebos_gasoil_energy.cpp
View File

@@ -84,7 +84,7 @@ int flowEbosGasOilEnergyMain(int argc, char** argv, bool outputCout, bool output
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowGasOilEnergyProblem>
FlowMain<Properties::TTag::EclFlowGasOilEnergyProblem>
mainfunc {argc, argv, outputCout, outputFiles} ;
return mainfunc.execute();
}

2
flow/flow_ebos_gasoildiffuse.cpp
View File

@@ -80,7 +80,7 @@ int flowEbosGasOilDiffuseMain(int argc, char** argv, bool outputCout, bool outpu
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowGasOilDiffuseProblem>
FlowMain<Properties::TTag::EclFlowGasOilDiffuseProblem>
mainfunc {argc, argv, outputCout, outputFiles} ;
return mainfunc.execute();
}

2
flow/flow_ebos_gaswater.cpp
View File

@@ -82,7 +82,7 @@ int flowEbosGasWaterMain(int argc, char** argv, bool outputCout, bool outputFile
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowGasWaterProblem>
FlowMain<Properties::TTag::EclFlowGasWaterProblem>
mainfunc {argc, argv, outputCout, outputFiles} ;
return mainfunc.execute();
}

2
flow/flow_ebos_gaswater_brine.cpp
View File

@@ -77,7 +77,7 @@ int flowEbosGasWaterBrineMain(int argc, char** argv, bool outputCout, bool outpu
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowGasWaterBrineProblem>
FlowMain<Properties::TTag::EclFlowGasWaterBrineProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();
}

2
flow/flow_ebos_gaswater_dissolution.cpp
View File

@@ -92,7 +92,7 @@ int flowEbosGasWaterDissolutionMain(int argc, char** argv, bool outputCout, bool
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowGasWaterDissolutionProblem>
FlowMain<Properties::TTag::EclFlowGasWaterDissolutionProblem>
mainfunc {argc, argv, outputCout, outputFiles} ;
return mainfunc.execute();
}

2
flow/flow_ebos_gaswater_dissolution_diffuse.cpp
View File

@@ -95,7 +95,7 @@ int flowEbosGasWaterDissolutionDiffuseMain(int argc, char** argv, bool outputCou
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowGasWaterDissolutionDiffuseProblem>
FlowMain<Properties::TTag::EclFlowGasWaterDissolutionDiffuseProblem>
mainfunc {argc, argv, outputCout, outputFiles} ;
return mainfunc.execute();
}

2
flow/flow_ebos_gaswater_energy.cpp
View File

@@ -100,7 +100,7 @@ int flowEbosGasWaterEnergyMain(int argc, char** argv, bool outputCout, bool outp
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowGasWaterEnergyProblem>
FlowMain<Properties::TTag::EclFlowGasWaterEnergyProblem>
mainfunc {argc, argv, outputCout, outputFiles} ;
return mainfunc.execute();
}

2
flow/flow_ebos_gaswater_saltprec_energy.cpp
View File

@@ -90,7 +90,7 @@ int flowEbosGasWaterSaltprecEnergyMain(int argc, char** argv, bool outputCout, b
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowGasWaterSaltprecEnergyProblem>
FlowMain<Properties::TTag::EclFlowGasWaterSaltprecEnergyProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();
}

2
flow/flow_ebos_gaswater_saltprec_vapwat.cpp
View File

@@ -85,7 +85,7 @@ int flowEbosGasWaterSaltprecVapwatMain(int argc, char** argv, bool outputCout, b
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowGasWaterSaltprecVapwatProblem>
FlowMain<Properties::TTag::EclFlowGasWaterSaltprecVapwatProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();
}

2
flow/flow_ebos_gaswater_solvent.cpp
View File

@@ -75,7 +75,7 @@ int flowEbosGasWaterSolventMain(int argc, char** argv, bool outputCout, bool out
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowGasWaterSolventProblem>
FlowMain<Properties::TTag::EclFlowGasWaterSolventProblem>
mainfunc {argc, argv, outputCout, outputFiles} ;
return mainfunc.execute();
}

2
flow/flow_ebos_micp.cpp
View File

@@ -69,7 +69,7 @@ int flowEbosMICPMain(int argc, char** argv, bool outputCout, bool outputFiles)
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowMICPProblem>
FlowMain<Properties::TTag::EclFlowMICPProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();
}

2
flow/flow_ebos_oilwater.cpp
View File

@@ -81,7 +81,7 @@ int flowEbosOilWaterMain(int argc, char** argv, bool outputCout, bool outputFile
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowOilWaterProblem>
FlowMain<Properties::TTag::EclFlowOilWaterProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();
}

2
flow/flow_ebos_oilwater_brine.cpp
View File

@@ -69,7 +69,7 @@ int flowEbosOilWaterBrineMain(int argc, char** argv, bool outputCout, bool outpu
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowOilWaterBrineProblem>
FlowMain<Properties::TTag::EclFlowOilWaterBrineProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();
}

2
flow/flow_ebos_oilwater_polymer.cpp
View File

@@ -69,7 +69,7 @@ int flowEbosOilWaterPolymerMain(int argc, char** argv, bool outputCout, bool out
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowOilWaterPolymerProblem>
FlowMain<Properties::TTag::EclFlowOilWaterPolymerProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();
}

2
flow/flow_ebos_oilwater_polymer_injectivity.cpp
View File

@@ -82,7 +82,7 @@ int flowEbosOilWaterPolymerInjectivityMain(int argc, char** argv, bool outputCou
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowOilWaterPolymerInjectivityProblem>
FlowMain<Properties::TTag::EclFlowOilWaterPolymerInjectivityProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();
}

2
flow/flow_ebos_onephase.cpp
View File

@@ -76,7 +76,7 @@ int flowEbosWaterOnlyMain(int argc, char** argv, bool outputCout, bool outputFil
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowProblemWaterOnly>
FlowMain<Properties::TTag::EclFlowProblemWaterOnly>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();
}

2
flow/flow_ebos_onephase_energy.cpp
View File

@@ -71,7 +71,7 @@ int flowEbosWaterOnlyEnergyMain(int argc, char** argv, bool outputCout, bool out
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowProblemWaterOnlyEnergy>
FlowMain<Properties::TTag::EclFlowProblemWaterOnlyEnergy>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();
}

2
flow/flow_ebos_polymer.cpp
View File

@@ -45,7 +45,7 @@ int flowEbosPolymerMain(int argc, char** argv, bool outputCout, bool outputFiles
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowPolymerProblem>
FlowMain<Properties::TTag::EclFlowPolymerProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();
}

2
flow/flow_ebos_solvent.cpp
View File

@@ -45,7 +45,7 @@ int flowEbosSolventMain(int argc, char** argv, bool outputCout, bool outputFiles
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowSolventProblem>
FlowMain<Properties::TTag::EclFlowSolventProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();
}

2
flow/flow_ebos_solvent_foam.cpp
View File

@@ -50,7 +50,7 @@ int flowEbosSolventFoamMain(int argc, char** argv, bool outputCout, bool outputF
// with incorrect locale settings.
resetLocale();
FlowMainEbos<Properties::TTag::EclFlowSolventFoamProblem>
FlowMain<Properties::TTag::EclFlowSolventFoamProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();
}