Flow: drop ebos from simulator object filenames

This commit is contained in:
Arne Morten Kvarving 2024-02-01 13:39:45 +01:00
parent f04f4c5765
commit 388c6c72f7
92 changed files with 169 additions and 169 deletions

View File

@ -614,7 +614,7 @@ set(FLOW_VARIANT_MODELS brine_energy onephase onephase_energy)
set(FLOW_TGTS)
foreach(OBJ ${COMMON_MODELS} ${FLOW_MODELS} ${FLOW_VARIANT_MODELS})
add_library(flow_lib${OBJ} OBJECT flow/flow_ebos_${OBJ}.cpp)
add_library(flow_lib${OBJ} OBJECT flow/flow_${OBJ}.cpp)
list(APPEND FLOW_TGTS $<TARGET_OBJECTS:flow_lib${OBJ}>)
if(TARGET fmt::fmt)
target_link_libraries(flow_lib${OBJ} fmt::fmt)

View File

@ -16,7 +16,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_blackoil.hpp>
#include <flow/flow_blackoil.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/grid/CpGrid.hpp>

View File

@ -14,10 +14,11 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_BLACKOIL_TPFA_HPP
#define FLOW_EBOS_BLACKOIL_TPFA_HPP
#ifndef FLOW_BLACKOIL_TPFA_HPP
#define FLOW_BLACKOIL_TPFA_HPP
#include <memory>
#include <tuple>
namespace Opm::Properties::TTag {
struct FlowProblem;
@ -42,4 +43,4 @@ int flowBlackoilTpfaMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_BLACKOIL_TPFA_HPP
#endif // FLOW_BLACKOIL_TPFA_HPP

View File

@ -16,7 +16,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_blackoil_legacyassembly.hpp>
#include <flow/flow_blackoil_legacyassembly.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp>

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_blackoil_legacyassembly.hpp>
#include <flow/flow_blackoil_legacyassembly.hpp>
int main(int argc, char** argv)

View File

@ -17,7 +17,7 @@
#include "config.h"
#include <flow/flow_ebos_blackoil.hpp>
#include <flow/flow_blackoil.hpp>
int main(int argc, char** argv)
{

View File

@ -16,7 +16,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_brine.hpp>
#include <flow/flow_brine.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/grid/CpGrid.hpp>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_BRINE_HPP
#define FLOW_EBOS_BRINE_HPP
#ifndef FLOW_BRINE_HPP
#define FLOW_BRINE_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowBrineMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_BRINE_HPP
#endif // FLOW_EBOS_HPP

View File

@ -15,8 +15,8 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_BRINE_ENERGY_HPP
#define FLOW_EBOS_BRINE_ENERGY_HPP
#ifndef FLOW_BRINE_ENERGY_HPP
#define FLOW_BRINE_ENERGY_HPP
namespace Opm {
int flowBrineEnergyMain(int argc, char** argv);

View File

@ -15,8 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_brine_energy.hpp>
#include <flow/flow_brine_energy.hpp>
int main(int argc, char** argv)
{

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_brine.hpp>
#include <flow/flow_brine.hpp>
int main(int argc, char** argv)

View File

@ -16,7 +16,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_brine_precsalt_vapwat.hpp>
#include <flow/flow_brine_precsalt_vapwat.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/grid/CpGrid.hpp>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_BRINE_PRECSALT_VAPWAT_HPP
#define FLOW_EBOS_BRINE_PRECSALT_VAPWAT_HPP
#ifndef FLOW_BRINE_PRECSALT_VAPWAT_HPP
#define FLOW_BRINE_PRECSALT_VAPWAT_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowBrinePrecsaltVapwatMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_BRINE_PRECSALT_VAPWAT_HPP
#endif // FLOW_BRINE_PRECSALT_VAPWAT_HPP

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_brine_precsalt_vapwat.hpp>
#include <flow/flow_brine_precsalt_vapwat.hpp>
int main(int argc, char** argv)

View File

@ -16,7 +16,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_brine_saltprecipitation.hpp>
#include <flow/flow_brine_saltprecipitation.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/grid/CpGrid.hpp>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_BRINE_SALTPRECIPITATION_HPP
#define FLOW_EBOS_BRINE_SALTPRECIPITATION_HPP
#ifndef FLOW_BRINE_SALTPRECIPITATION_HPP
#define FLOW_BRINE_SALTPRECIPITATION_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowBrineSaltPrecipitationMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_BRINE_HPP
#endif // FLOW_BRINE_HPP

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_brine_saltprecipitation.hpp>
#include <flow/flow_brine_saltprecipitation.hpp>
int main(int argc, char** argv)

View File

@ -16,7 +16,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_energy.hpp>
#include <flow/flow_energy.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/grid/CpGrid.hpp>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_ENERGY_HPP
#define FLOW_EBOS_ENERGY_HPP
#ifndef FLOW_ENERGY_HPP
#define FLOW_ENERGY_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowEnergyMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_ENERGY_HPP
#endif // FLOW_ENERGY_HPP

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_energy.hpp>
#include <flow/flow_energy.hpp>
int main(int argc, char** argv)

View File

@ -16,7 +16,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_extbo.hpp>
#include <flow/flow_extbo.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/grid/CpGrid.hpp>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_EXTBO_HPP
#define FLOW_EBOS_EXTBO_HPP
#ifndef FLOW_EXTBO_HPP
#define FLOW_EXTBO_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowExtboMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_EXTBO_HPP
#endif // FLOW_EXTBO_HPP

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_extbo.hpp>
#include <flow/flow_extbo.hpp>
int main(int argc, char** argv)

View File

@ -16,7 +16,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_foam.hpp>
#include <flow/flow_foam.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/grid/CpGrid.hpp>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_FOAM_HPP
#define FLOW_EBOS_FOAM_HPP
#ifndef FLOW_FOAM_HPP
#define FLOW_FOAM_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowFoamMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_FOAM_HPP
#endif // FLOW_FOAM_HPP

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_foam.hpp>
#include <flow/flow_foam.hpp>
int main(int argc, char** argv)

View File

@ -16,7 +16,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_gasoil.hpp>
#include <flow/flow_gasoil.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/models/blackoil/blackoiltwophaseindices.hh>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_GASOIL_HPP
#define FLOW_EBOS_GASOIL_HPP
#ifndef FLOW_GASOIL_HPP
#define FLOW_GASOIL_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowGasOilMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_GASOIL_HPP
#endif // FLOW_GASOIL_HPP

View File

@ -16,7 +16,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_gasoil_energy.hpp>
#include <flow/flow_gasoil_energy.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/models/blackoil/blackoiltwophaseindices.hh>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_GASOIL_ENERGY_HPP
#define FLOW_EBOS_GASOIL_ENERGY_HPP
#ifndef FLOW_GASOIL_ENERGY_HPP
#define FLOW_GASOIL_ENERGY_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowGasOilEnergyMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_GASOIL_ENERGY_HPP
#endif // FLOW_GASOIL_ENERGY_HPP

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_gasoil_energy.hpp>
#include <flow/flow_gasoil_energy.hpp>
int main(int argc, char** argv)

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_gasoil.hpp>
#include <flow/flow_gasoil.hpp>
int main(int argc, char** argv)

View File

@ -16,7 +16,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_gasoil.hpp>
#include <flow/flow_gasoil.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/models/blackoil/blackoiltwophaseindices.hh>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_GASOILDIFFUSE_HPP
#define FLOW_EBOS_GASOILDIFFUSE_HPP
#ifndef FLOW_GASOILDIFFUSE_HPP
#define FLOW_GASOILDIFFUSE_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowGasOilDiffuseMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_GASOILDIFFUSE_HPP
#endif // FLOW_GASOILDIFFUSE_HPP

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_gasoildiffuse.hpp>
#include <flow/flow_gasoildiffuse.hpp>
int main(int argc, char** argv)

View File

@ -19,7 +19,7 @@
// Define making clear that the simulator supports AMG
#define FLOW_SUPPORT_AMG 1
#include <flow/flow_ebos_gaswater.hpp>
#include <flow/flow_gaswater.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/models/blackoil/blackoiltwophaseindices.hh>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_GASWATER_HPP
#define FLOW_EBOS_GASWATER_HPP
#ifndef FLOW_GASWATER_HPP
#define FLOW_GASWATER_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowGasWaterMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_GASWATER_HPP
#endif // FLOW_GASWATER_HPP

View File

@ -16,7 +16,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_gaswater_brine.hpp>
#include <flow/flow_gaswater_brine.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/models/blackoil/blackoiltwophaseindices.hh>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_GASWATER_BRINE_HPP
#define FLOW_EBOS_GASWATER_BRINE_HPP
#ifndef FLOW_GASWATER_BRINE_HPP
#define FLOW_GASWATER_BRINE_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowGasWaterBrineMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_GASWATER_BRINE_HPP
#endif // FLOW_GASWATER_BRINE_HPP

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_gaswater_brine.hpp>
#include <flow/flow_gaswater_brine.hpp>
int main(int argc, char** argv)

View File

@ -19,7 +19,7 @@
// Define making clear that the simulator supports AMG
#define FLOW_SUPPORT_AMG 1
#include <flow/flow_ebos_gaswater_dissolution.hpp>
#include <flow/flow_gaswater_dissolution.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/models/blackoil/blackoiltwophaseindices.hh>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_GASWATER_DISSOLUTION_HPP
#define FLOW_EBOS_GASWATER_DISSOLUTION_HPP
#ifndef FLOW_GASWATER_DISSOLUTION_HPP
#define FLOW_GASWATER_DISSOLUTION_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowGasWaterDissolutionMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_GASWATER_DISSOLUTION_HPP
#endif // FLOW_GASWATER_DISSOLUTION_HPP

View File

@ -19,7 +19,7 @@
// Define making clear that the simulator supports AMG
#define FLOW_SUPPORT_AMG 1
#include <flow/flow_ebos_gaswater_dissolution_diffuse.hpp>
#include <flow/flow_gaswater_dissolution_diffuse.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/models/blackoil/blackoiltwophaseindices.hh>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_GASWATER_DISSOLUTION_DIFFUSE_HPP
#define FLOW_EBOS_GASWATER_DISSOLUTION_DIFFUSE_HPP
#ifndef FLOW_GASWATER_DISSOLUTION_DIFFUSE_HPP
#define FLOW_GASWATER_DISSOLUTION_DIFFUSE_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowGasWaterDissolutionDiffuseMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_GASWATER_DISSOLUTION_DIFFUSE_HPP
#endif // FLOW_GASWATER_DISSOLUTION_DIFFUSE_HPP

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_gaswater_dissolution_diffuse.hpp>
#include <flow/flow_gaswater_dissolution_diffuse.hpp>
int main(int argc, char** argv)

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_gaswater_dissolution.hpp>
#include <flow/flow_gaswater_dissolution.hpp>
int main(int argc, char** argv)

View File

@ -19,7 +19,7 @@
// Define making clear that the simulator supports AMG
#define FLOW_SUPPORT_AMG 1
#include <flow/flow_ebos_gaswater_energy.hpp>
#include <flow/flow_gaswater_energy.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/models/blackoil/blackoiltwophaseindices.hh>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_GASWATER_ENERGY_HPP
#define FLOW_EBOS_GASWATER_ENERGY_HPP
#ifndef FLOW_GASWATER_ENERGY_HPP
#define FLOW_GASWATER_ENERGY_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowGasWaterEnergyMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_GASWATER_ENERGY_HPP
#endif // FLOW_GASWATER_ENERGY_HPP

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_gaswater_energy.hpp>
#include <flow/flow_gaswater_energy.hpp>
int main(int argc, char** argv)

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_gaswater.hpp>
#include <flow/flow_gaswater.hpp>
int main(int argc, char** argv)

View File

@ -16,7 +16,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_gaswater_saltprec_energy.hpp>
#include <flow/flow_gaswater_saltprec_energy.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/models/blackoil/blackoiltwophaseindices.hh>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_GASWATER_SALTPREC_ENERGY_HPP
#define FLOW_EBOS_GASWATER_SALTPREC_ENERGY_HPP
#ifndef FLOW_GASWATER_SALTPREC_ENERGY_HPP
#define FLOW_GASWATER_SALTPREC_ENERGY_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowGasWaterSaltprecEnergyMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_GASWATER_SALTPREC_ENERGY_HPP
#endif // FLOW_GASWATER_SALTPREC_ENERGY_HPP

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_gaswater_saltprec_energy.hpp>
#include <flow/flow_gaswater_saltprec_energy.hpp>
int main(int argc, char** argv)

View File

@ -16,7 +16,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_gaswater_saltprec_vapwat.hpp>
#include <flow/flow_gaswater_saltprec_vapwat.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/models/blackoil/blackoiltwophaseindices.hh>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_GASWATERSALTPRECVAPWAT_BRINE_HPP
#define FLOW_EBOS_GASWATERSALTPRECVAPWAT_BRINE_HPP
#ifndef FLOW_GASWATERSALTPRECVAPWAT_BRINE_HPP
#define FLOW_GASWATERSALTPRECVAPWAT_BRINE_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowGasWaterSaltprecVapwatMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_GASWATERSALTPRECVAPWAT_HPP
#endif // FLOW_GASWATERSALTPRECVAPWAT_HPP

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_gaswater_saltprec_vapwat.hpp>
#include <flow/flow_gaswater_saltprec_vapwat.hpp>
int main(int argc, char** argv)

View File

@ -19,7 +19,7 @@
// Define making clear that the simulator supports AMG
#define FLOW_SUPPORT_AMG 1
#include <flow/flow_ebos_gaswater_solvent.hpp>
#include <flow/flow_gaswater_solvent.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/models/blackoil/blackoiltwophaseindices.hh>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_GASWATER_SOLVENT_HPP
#define FLOW_EBOS_GASWATER_SOLVENT_HPP
#ifndef FLOW_GASWATER_SOLVENT_HPP
#define FLOW_GASWATER_SOLVENT_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowGasWaterSolventMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_GASWATER_SOLVENT_HPP
#endif // FLOW_GASWATER_SOLVENT_HPP

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_gaswater_solvent.hpp>
#include <flow/flow_gaswater_solvent.hpp>
int main(int argc, char** argv)

View File

@ -16,7 +16,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_micp.hpp>
#include <flow/flow_micp.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/models/blackoil/blackoilonephaseindices.hh>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_MICP_HPP
#define FLOW_EBOS_MICP_HPP
#ifndef FLOW_MICP_HPP
#define FLOW_MICP_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowMICPMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_MICP_HPP
#endif // FLOW_MICP_HPP

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_micp.hpp>
#include <flow/flow_micp.hpp>
int main(int argc, char** argv)

View File

@ -16,7 +16,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_oilwater.hpp>
#include <flow/flow_oilwater.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/models/blackoil/blackoiltwophaseindices.hh>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_OILWATER_HPP
#define FLOW_EBOS_OILWATER_HPP
#ifndef FLOW_OILWATER_HPP
#define FLOW_OILWATER_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowOilWaterMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_OILWATER_HPP
#endif // FLOW_OILWATER_HPP

View File

@ -16,7 +16,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_oilwater_brine.hpp>
#include <flow/flow_oilwater_brine.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/models/blackoil/blackoiltwophaseindices.hh>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_OILWATER_BRINE_HPP
#define FLOW_EBOS_OILWATER_BRINE_HPP
#ifndef FLOW_OILWATER_BRINE_HPP
#define FLOW_OILWATER_BRINE_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowOilWaterBrineMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_OILWATER_BRINE_HPP
#endif // FLOW_OILWATER_BRINE_HPP

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_oilwater_brine.hpp>
#include <flow/flow_oilwater_brine.hpp>
int main(int argc, char** argv)

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_oilwater.hpp>
#include <flow/flow_oilwater.hpp>
int main(int argc, char** argv)

View File

@ -16,7 +16,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_oilwater_polymer.hpp>
#include <flow/flow_oilwater_polymer.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/models/blackoil/blackoiltwophaseindices.hh>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_OILWATER_POLYMER_HPP
#define FLOW_EBOS_OILWATER_POLYMER_HPP
#ifndef FLOW_OILWATER_POLYMER_HPP
#define FLOW_OILWATER_POLYMER_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowOilWaterPolymerMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_OILWATER_POLYMER_HPP
#endif // FLOW_OILWATER_POLYMER_HPP

View File

@ -16,7 +16,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_oilwater_polymer_injectivity.hpp>
#include <flow/flow_oilwater_polymer_injectivity.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/models/blackoil/blackoiltwophaseindices.hh>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_OILWATER_POLYMER_INJECTIVITY_HPP
#define FLOW_EBOS_OILWATER_POLYMER_INJECTIVITY_HPP
#ifndef FLOW_OILWATER_POLYMER_INJECTIVITY_HPP
#define FLOW_OILWATER_POLYMER_INJECTIVITY_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowOilWaterPolymerInjectivityMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_OILWATER_POLYMER_INJECTIVITY_HPP
#endif // FLOW_OILWATER_POLYMER_INJECTIVITY_HPP

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_oilwater_polymer_injectivity.hpp>
#include <flow/flow_oilwater_polymer_injectivity.hpp>
int main(int argc, char** argv)

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_oilwater_polymer.hpp>
#include <flow/flow_oilwater_polymer.hpp>
int main(int argc, char** argv)

View File

@ -20,7 +20,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_onephase_energy.hpp>
#include <flow/flow_onephase_energy.hpp>
#include <opm/simulators/flow/Main.hpp>
#include <opm/models/blackoil/blackoilonephaseindices.hh>

View File

@ -19,7 +19,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_onephase_energy.hpp>
#include <flow/flow_onephase_energy.hpp>
int main(int argc, char** argv)
{

View File

@ -19,7 +19,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_onephase.hpp>
#include <flow/flow_onephase.hpp>
int main(int argc, char** argv)

View File

@ -16,7 +16,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_polymer.hpp>
#include <flow/flow_polymer.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/grid/CpGrid.hpp>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_POLYMER_HPP
#define FLOW_EBOS_POLYMER_HPP
#ifndef FLOW_POLYMER_HPP
#define FLOW_POLYMER_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowPolymerMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_POLYMER_HPP
#endif // FLOW_POLYMER_HPP

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_polymer.hpp>
#include <flow/flow_polymer.hpp>
int main(int argc, char** argv)

View File

@ -16,7 +16,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_solvent.hpp>
#include <flow/flow_solvent.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/grid/CpGrid.hpp>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_SOLVENT_HPP
#define FLOW_EBOS_SOLVENT_HPP
#ifndef FLOW_SOLVENT_HPP
#define FLOW_SOLVENT_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowSolventMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_SOLVENT_HPP
#endif // FLOW_SOLVENT_HPP

View File

@ -16,7 +16,7 @@
*/
#include "config.h"
#include <flow/flow_ebos_solvent_foam.hpp>
#include <flow/flow_solvent_foam.hpp>
#include <opm/material/common/ResetLocale.hpp>
#include <opm/grid/CpGrid.hpp>

View File

@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FLOW_EBOS_SOLVENT_FOAM_HPP
#define FLOW_EBOS_SOLVENT_FOAM_HPP
#ifndef FLOW_SOLVENT_FOAM_HPP
#define FLOW_SOLVENT_FOAM_HPP
namespace Opm {
@ -27,4 +27,4 @@ int flowSolventFoamMainStandalone(int argc, char** argv);
}
#endif // FLOW_EBOS_SOLVENT_FOAM_HPP
#endif // FLOW_SOLVENT_FOAM_HPP

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_solvent_foam.hpp>
#include <flow/flow_solvent_foam.hpp>
int main(int argc, char** argv)

View File

@ -15,7 +15,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <flow/flow_ebos_solvent.hpp>
#include <flow/flow_solvent.hpp>
int main(int argc, char** argv)

View File

@ -23,36 +23,36 @@
#ifndef OPM_MAIN_HEADER_INCLUDED
#define OPM_MAIN_HEADER_INCLUDED
#include <flow/flow_ebos_blackoil.hpp>
#include <flow/flow_ebos_blackoil_legacyassembly.hpp>
#include <flow/flow_blackoil.hpp>
#include <flow/flow_blackoil_legacyassembly.hpp>
#include <flow/flow_ebos_gasoil.hpp>
#include <flow/flow_ebos_gasoildiffuse.hpp>
#include <flow/flow_ebos_gasoil_energy.hpp>
#include <flow/flow_ebos_oilwater.hpp>
#include <flow/flow_ebos_gaswater.hpp>
#include <flow/flow_ebos_gaswater_solvent.hpp>
#include <flow/flow_ebos_solvent.hpp>
#include <flow/flow_ebos_solvent_foam.hpp>
#include <flow/flow_ebos_polymer.hpp>
#include <flow/flow_ebos_extbo.hpp>
#include <flow/flow_ebos_foam.hpp>
#include <flow/flow_ebos_brine.hpp>
#include <flow/flow_ebos_brine_saltprecipitation.hpp>
#include <flow/flow_ebos_gaswater_saltprec_vapwat.hpp>
#include <flow/flow_ebos_gaswater_saltprec_energy.hpp>
#include <flow/flow_ebos_brine_precsalt_vapwat.hpp>
#include <flow/flow_ebos_onephase.hpp>
#include <flow/flow_ebos_onephase_energy.hpp>
#include <flow/flow_ebos_oilwater_brine.hpp>
#include <flow/flow_ebos_gaswater_brine.hpp>
#include <flow/flow_ebos_gaswater_energy.hpp>
#include <flow/flow_ebos_gaswater_dissolution.hpp>
#include <flow/flow_ebos_gaswater_dissolution_diffuse.hpp>
#include <flow/flow_ebos_energy.hpp>
#include <flow/flow_ebos_oilwater_polymer.hpp>
#include <flow/flow_ebos_oilwater_polymer_injectivity.hpp>
#include <flow/flow_ebos_micp.hpp>
#include <flow/flow_gasoil.hpp>
#include <flow/flow_gasoildiffuse.hpp>
#include <flow/flow_gasoil_energy.hpp>
#include <flow/flow_oilwater.hpp>
#include <flow/flow_gaswater.hpp>
#include <flow/flow_gaswater_solvent.hpp>
#include <flow/flow_solvent.hpp>
#include <flow/flow_solvent_foam.hpp>
#include <flow/flow_polymer.hpp>
#include <flow/flow_extbo.hpp>
#include <flow/flow_foam.hpp>
#include <flow/flow_brine.hpp>
#include <flow/flow_brine_saltprecipitation.hpp>
#include <flow/flow_gaswater_saltprec_vapwat.hpp>
#include <flow/flow_gaswater_saltprec_energy.hpp>
#include <flow/flow_brine_precsalt_vapwat.hpp>
#include <flow/flow_onephase.hpp>
#include <flow/flow_onephase_energy.hpp>
#include <flow/flow_oilwater_brine.hpp>
#include <flow/flow_gaswater_brine.hpp>
#include <flow/flow_gaswater_energy.hpp>
#include <flow/flow_gaswater_dissolution.hpp>
#include <flow/flow_gaswater_dissolution_diffuse.hpp>
#include <flow/flow_energy.hpp>
#include <flow/flow_oilwater_polymer.hpp>
#include <flow/flow_oilwater_polymer_injectivity.hpp>
#include <flow/flow_micp.hpp>
#include <opm/input/eclipse/EclipseState/EclipseState.hpp>