diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c42a4f6b..82139da8a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 $) if(TARGET fmt::fmt) target_link_libraries(flow_lib${OBJ} fmt::fmt) diff --git a/flow/flow_ebos_blackoil.cpp b/flow/flow_blackoil.cpp similarity index 98% rename from flow/flow_ebos_blackoil.cpp rename to flow/flow_blackoil.cpp index 7429f3321..b95731612 100644 --- a/flow/flow_ebos_blackoil.cpp +++ b/flow/flow_blackoil.cpp @@ -16,7 +16,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_blackoil.hpp b/flow/flow_blackoil.hpp similarity index 92% rename from flow/flow_ebos_blackoil.hpp rename to flow/flow_blackoil.hpp index 0820dfc46..350bb35df 100644 --- a/flow/flow_ebos_blackoil.hpp +++ b/flow/flow_blackoil.hpp @@ -14,10 +14,11 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#ifndef FLOW_EBOS_BLACKOIL_TPFA_HPP -#define FLOW_EBOS_BLACKOIL_TPFA_HPP +#ifndef FLOW_BLACKOIL_TPFA_HPP +#define FLOW_BLACKOIL_TPFA_HPP #include +#include 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 diff --git a/flow/flow_ebos_blackoil_legacyassembly.cpp b/flow/flow_blackoil_legacyassembly.cpp similarity index 97% rename from flow/flow_ebos_blackoil_legacyassembly.cpp rename to flow/flow_blackoil_legacyassembly.cpp index 6e89c2a59..00ddd9e91 100644 --- a/flow/flow_ebos_blackoil_legacyassembly.cpp +++ b/flow/flow_blackoil_legacyassembly.cpp @@ -16,7 +16,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_blackoil_legacyassembly.hpp b/flow/flow_blackoil_legacyassembly.hpp similarity index 100% rename from flow/flow_ebos_blackoil_legacyassembly.hpp rename to flow/flow_blackoil_legacyassembly.hpp diff --git a/flow/flow_blackoil_legacyassembly_main.cpp b/flow/flow_blackoil_legacyassembly_main.cpp index 0924906dd..4c7b97f4c 100644 --- a/flow/flow_blackoil_legacyassembly_main.cpp +++ b/flow/flow_blackoil_legacyassembly_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_blackoil_main.cpp b/flow/flow_blackoil_main.cpp index 6ede564ee..f0b0cb370 100644 --- a/flow/flow_blackoil_main.cpp +++ b/flow/flow_blackoil_main.cpp @@ -17,7 +17,7 @@ #include "config.h" -#include +#include int main(int argc, char** argv) { diff --git a/flow/flow_ebos_brine.cpp b/flow/flow_brine.cpp similarity index 98% rename from flow/flow_ebos_brine.cpp rename to flow/flow_brine.cpp index 419b5ad47..0436d0d75 100644 --- a/flow/flow_ebos_brine.cpp +++ b/flow/flow_brine.cpp @@ -16,7 +16,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_brine.hpp b/flow/flow_brine.hpp similarity index 91% rename from flow/flow_ebos_brine.hpp rename to flow/flow_brine.hpp index c4f14dd1a..7fff49a3d 100644 --- a/flow/flow_ebos_brine.hpp +++ b/flow/flow_brine.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_ebos_brine_energy.cpp b/flow/flow_brine_energy.cpp similarity index 100% rename from flow/flow_ebos_brine_energy.cpp rename to flow/flow_brine_energy.cpp diff --git a/flow/flow_ebos_brine_energy.hpp b/flow/flow_brine_energy.hpp similarity index 91% rename from flow/flow_ebos_brine_energy.hpp rename to flow/flow_brine_energy.hpp index 38d7fe932..2c2f0d64b 100644 --- a/flow/flow_ebos_brine_energy.hpp +++ b/flow/flow_brine_energy.hpp @@ -15,8 +15,8 @@ along with OPM. If not, see . */ -#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); diff --git a/flow/flow_brine_energy_main.cpp b/flow/flow_brine_energy_main.cpp index abb487716..6dc288f4d 100644 --- a/flow/flow_brine_energy_main.cpp +++ b/flow/flow_brine_energy_main.cpp @@ -15,8 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include - +#include int main(int argc, char** argv) { diff --git a/flow/flow_brine_main.cpp b/flow/flow_brine_main.cpp index fbc3805a6..baa927d31 100644 --- a/flow/flow_brine_main.cpp +++ b/flow/flow_brine_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_ebos_brine_precsalt_vapwat.cpp b/flow/flow_brine_precsalt_vapwat.cpp similarity index 97% rename from flow/flow_ebos_brine_precsalt_vapwat.cpp rename to flow/flow_brine_precsalt_vapwat.cpp index 690723b8d..5305500c2 100644 --- a/flow/flow_ebos_brine_precsalt_vapwat.cpp +++ b/flow/flow_brine_precsalt_vapwat.cpp @@ -16,7 +16,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_brine_precsalt_vapwat.hpp b/flow/flow_brine_precsalt_vapwat.hpp similarity index 87% rename from flow/flow_ebos_brine_precsalt_vapwat.hpp rename to flow/flow_brine_precsalt_vapwat.hpp index fa28e6f55..073d0c557 100644 --- a/flow/flow_ebos_brine_precsalt_vapwat.hpp +++ b/flow/flow_brine_precsalt_vapwat.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_brine_precsalt_vapwat_main.cpp b/flow/flow_brine_precsalt_vapwat_main.cpp index 60cdada04..2fbb48123 100644 --- a/flow/flow_brine_precsalt_vapwat_main.cpp +++ b/flow/flow_brine_precsalt_vapwat_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_ebos_brine_saltprecipitation.cpp b/flow/flow_brine_saltprecipitation.cpp similarity index 97% rename from flow/flow_ebos_brine_saltprecipitation.cpp rename to flow/flow_brine_saltprecipitation.cpp index 44979d2f7..9016fc52c 100644 --- a/flow/flow_ebos_brine_saltprecipitation.cpp +++ b/flow/flow_brine_saltprecipitation.cpp @@ -16,7 +16,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_brine_saltprecipitation.hpp b/flow/flow_brine_saltprecipitation.hpp similarity index 88% rename from flow/flow_ebos_brine_saltprecipitation.hpp rename to flow/flow_brine_saltprecipitation.hpp index 9832ccc21..60fb736e9 100644 --- a/flow/flow_ebos_brine_saltprecipitation.hpp +++ b/flow/flow_brine_saltprecipitation.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_brine_saltprecipitation_main.cpp b/flow/flow_brine_saltprecipitation_main.cpp index 6b4478c0c..50175578e 100644 --- a/flow/flow_brine_saltprecipitation_main.cpp +++ b/flow/flow_brine_saltprecipitation_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_ebos_energy.cpp b/flow/flow_energy.cpp similarity index 98% rename from flow/flow_ebos_energy.cpp rename to flow/flow_energy.cpp index 7f47692d6..6c83b1f84 100644 --- a/flow/flow_ebos_energy.cpp +++ b/flow/flow_energy.cpp @@ -16,7 +16,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_energy.hpp b/flow/flow_energy.hpp similarity index 91% rename from flow/flow_ebos_energy.hpp rename to flow/flow_energy.hpp index d2f106557..0af2be745 100644 --- a/flow/flow_ebos_energy.hpp +++ b/flow/flow_energy.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_energy_main.cpp b/flow/flow_energy_main.cpp index 5fc2cbf90..3f9ee661e 100644 --- a/flow/flow_energy_main.cpp +++ b/flow/flow_energy_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_ebos_extbo.cpp b/flow/flow_extbo.cpp similarity index 98% rename from flow/flow_ebos_extbo.cpp rename to flow/flow_extbo.cpp index c037f1089..7c9340240 100644 --- a/flow/flow_ebos_extbo.cpp +++ b/flow/flow_extbo.cpp @@ -16,7 +16,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_extbo.hpp b/flow/flow_extbo.hpp similarity index 91% rename from flow/flow_ebos_extbo.hpp rename to flow/flow_extbo.hpp index 78b2a9ad3..8f030f7dc 100644 --- a/flow/flow_ebos_extbo.hpp +++ b/flow/flow_extbo.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_extbo_main.cpp b/flow/flow_extbo_main.cpp index 9aa23e087..2e2b0950a 100644 --- a/flow/flow_extbo_main.cpp +++ b/flow/flow_extbo_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_ebos_foam.cpp b/flow/flow_foam.cpp similarity index 98% rename from flow/flow_ebos_foam.cpp rename to flow/flow_foam.cpp index 0fcae9065..8e1109a16 100644 --- a/flow/flow_ebos_foam.cpp +++ b/flow/flow_foam.cpp @@ -16,7 +16,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_foam.hpp b/flow/flow_foam.hpp similarity index 91% rename from flow/flow_ebos_foam.hpp rename to flow/flow_foam.hpp index 684b578f3..d8db1c4c5 100644 --- a/flow/flow_ebos_foam.hpp +++ b/flow/flow_foam.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_foam_main.cpp b/flow/flow_foam_main.cpp index 07177843c..37e2cd9fe 100644 --- a/flow/flow_foam_main.cpp +++ b/flow/flow_foam_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_ebos_gasoil.cpp b/flow/flow_gasoil.cpp similarity index 98% rename from flow/flow_ebos_gasoil.cpp rename to flow/flow_gasoil.cpp index 41ba6e6e4..d30064476 100644 --- a/flow/flow_ebos_gasoil.cpp +++ b/flow/flow_gasoil.cpp @@ -16,7 +16,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_gasoil.hpp b/flow/flow_gasoil.hpp similarity index 91% rename from flow/flow_ebos_gasoil.hpp rename to flow/flow_gasoil.hpp index f40cebdf1..331a5e8ae 100644 --- a/flow/flow_ebos_gasoil.hpp +++ b/flow/flow_gasoil.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_ebos_gasoil_energy.cpp b/flow/flow_gasoil_energy.cpp similarity index 98% rename from flow/flow_ebos_gasoil_energy.cpp rename to flow/flow_gasoil_energy.cpp index 6cadd53ed..52f1e6924 100644 --- a/flow/flow_ebos_gasoil_energy.cpp +++ b/flow/flow_gasoil_energy.cpp @@ -16,7 +16,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_gasoil_energy.hpp b/flow/flow_gasoil_energy.hpp similarity index 89% rename from flow/flow_ebos_gasoil_energy.hpp rename to flow/flow_gasoil_energy.hpp index f8ccc23e0..8be6061ac 100644 --- a/flow/flow_ebos_gasoil_energy.hpp +++ b/flow/flow_gasoil_energy.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_gasoil_energy_main.cpp b/flow/flow_gasoil_energy_main.cpp index f3623ecd8..18050d204 100644 --- a/flow/flow_gasoil_energy_main.cpp +++ b/flow/flow_gasoil_energy_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_gasoil_main.cpp b/flow/flow_gasoil_main.cpp index 6e1c38978..a89a12371 100644 --- a/flow/flow_gasoil_main.cpp +++ b/flow/flow_gasoil_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_ebos_gasoildiffuse.cpp b/flow/flow_gasoildiffuse.cpp similarity index 99% rename from flow/flow_ebos_gasoildiffuse.cpp rename to flow/flow_gasoildiffuse.cpp index 6e9f37918..91a4c2604 100644 --- a/flow/flow_ebos_gasoildiffuse.cpp +++ b/flow/flow_gasoildiffuse.cpp @@ -16,7 +16,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_gasoildiffuse.hpp b/flow/flow_gasoildiffuse.hpp similarity index 89% rename from flow/flow_ebos_gasoildiffuse.hpp rename to flow/flow_gasoildiffuse.hpp index 119bcfb6e..679a78b80 100644 --- a/flow/flow_ebos_gasoildiffuse.hpp +++ b/flow/flow_gasoildiffuse.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_gasoildiffuse_main.cpp b/flow/flow_gasoildiffuse_main.cpp index b3c91784a..de057257e 100644 --- a/flow/flow_gasoildiffuse_main.cpp +++ b/flow/flow_gasoildiffuse_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_ebos_gaswater.cpp b/flow/flow_gaswater.cpp similarity index 98% rename from flow/flow_ebos_gaswater.cpp rename to flow/flow_gaswater.cpp index 05b41e949..8d35a18be 100644 --- a/flow/flow_ebos_gaswater.cpp +++ b/flow/flow_gaswater.cpp @@ -19,7 +19,7 @@ // Define making clear that the simulator supports AMG #define FLOW_SUPPORT_AMG 1 -#include +#include #include #include diff --git a/flow/flow_ebos_gaswater.hpp b/flow/flow_gaswater.hpp similarity index 90% rename from flow/flow_ebos_gaswater.hpp rename to flow/flow_gaswater.hpp index b2eff23db..b4c5ac4be 100644 --- a/flow/flow_ebos_gaswater.hpp +++ b/flow/flow_gaswater.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_ebos_gaswater_brine.cpp b/flow/flow_gaswater_brine.cpp similarity index 98% rename from flow/flow_ebos_gaswater_brine.cpp rename to flow/flow_gaswater_brine.cpp index df4ed245a..c3ba120a3 100644 --- a/flow/flow_ebos_gaswater_brine.cpp +++ b/flow/flow_gaswater_brine.cpp @@ -16,7 +16,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_gaswater_brine.hpp b/flow/flow_gaswater_brine.hpp similarity index 89% rename from flow/flow_ebos_gaswater_brine.hpp rename to flow/flow_gaswater_brine.hpp index 36a4a2b29..385cfb7b5 100644 --- a/flow/flow_ebos_gaswater_brine.hpp +++ b/flow/flow_gaswater_brine.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_gaswater_brine_main.cpp b/flow/flow_gaswater_brine_main.cpp index f8cada61c..3b902f3f9 100644 --- a/flow/flow_gaswater_brine_main.cpp +++ b/flow/flow_gaswater_brine_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_ebos_gaswater_dissolution.cpp b/flow/flow_gaswater_dissolution.cpp similarity index 98% rename from flow/flow_ebos_gaswater_dissolution.cpp rename to flow/flow_gaswater_dissolution.cpp index 7c14c49b1..f4a8f4b27 100644 --- a/flow/flow_ebos_gaswater_dissolution.cpp +++ b/flow/flow_gaswater_dissolution.cpp @@ -19,7 +19,7 @@ // Define making clear that the simulator supports AMG #define FLOW_SUPPORT_AMG 1 -#include +#include #include #include diff --git a/flow/flow_ebos_gaswater_dissolution.hpp b/flow/flow_gaswater_dissolution.hpp similarity index 88% rename from flow/flow_ebos_gaswater_dissolution.hpp rename to flow/flow_gaswater_dissolution.hpp index e36ebf857..a86393b77 100644 --- a/flow/flow_ebos_gaswater_dissolution.hpp +++ b/flow/flow_gaswater_dissolution.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_ebos_gaswater_dissolution_diffuse.cpp b/flow/flow_gaswater_dissolution_diffuse.cpp similarity index 98% rename from flow/flow_ebos_gaswater_dissolution_diffuse.cpp rename to flow/flow_gaswater_dissolution_diffuse.cpp index 6fd4886a0..52f3de824 100644 --- a/flow/flow_ebos_gaswater_dissolution_diffuse.cpp +++ b/flow/flow_gaswater_dissolution_diffuse.cpp @@ -19,7 +19,7 @@ // Define making clear that the simulator supports AMG #define FLOW_SUPPORT_AMG 1 -#include +#include #include #include diff --git a/flow/flow_ebos_gaswater_dissolution_diffuse.hpp b/flow/flow_gaswater_dissolution_diffuse.hpp similarity index 86% rename from flow/flow_ebos_gaswater_dissolution_diffuse.hpp rename to flow/flow_gaswater_dissolution_diffuse.hpp index 69aef5b72..fabf1b9b1 100644 --- a/flow/flow_ebos_gaswater_dissolution_diffuse.hpp +++ b/flow/flow_gaswater_dissolution_diffuse.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_gaswater_dissolution_diffuse_main.cpp b/flow/flow_gaswater_dissolution_diffuse_main.cpp index fd6e86584..c73b69ae1 100644 --- a/flow/flow_gaswater_dissolution_diffuse_main.cpp +++ b/flow/flow_gaswater_dissolution_diffuse_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_gaswater_dissolution_main.cpp b/flow/flow_gaswater_dissolution_main.cpp index 6399dd633..b8ee199ca 100644 --- a/flow/flow_gaswater_dissolution_main.cpp +++ b/flow/flow_gaswater_dissolution_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_ebos_gaswater_energy.cpp b/flow/flow_gaswater_energy.cpp similarity index 98% rename from flow/flow_ebos_gaswater_energy.cpp rename to flow/flow_gaswater_energy.cpp index bb707c8d0..c7c59fbf5 100644 --- a/flow/flow_ebos_gaswater_energy.cpp +++ b/flow/flow_gaswater_energy.cpp @@ -19,7 +19,7 @@ // Define making clear that the simulator supports AMG #define FLOW_SUPPORT_AMG 1 -#include +#include #include #include diff --git a/flow/flow_ebos_gaswater_energy.hpp b/flow/flow_gaswater_energy.hpp similarity index 89% rename from flow/flow_ebos_gaswater_energy.hpp rename to flow/flow_gaswater_energy.hpp index b47cf9ba0..1c8b6827f 100644 --- a/flow/flow_ebos_gaswater_energy.hpp +++ b/flow/flow_gaswater_energy.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_gaswater_energy_main.cpp b/flow/flow_gaswater_energy_main.cpp index 815f52474..68632bb32 100644 --- a/flow/flow_gaswater_energy_main.cpp +++ b/flow/flow_gaswater_energy_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_gaswater_main.cpp b/flow/flow_gaswater_main.cpp index 77a16ec04..0c8301e94 100644 --- a/flow/flow_gaswater_main.cpp +++ b/flow/flow_gaswater_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_ebos_gaswater_saltprec_energy.cpp b/flow/flow_gaswater_saltprec_energy.cpp similarity index 98% rename from flow/flow_ebos_gaswater_saltprec_energy.cpp rename to flow/flow_gaswater_saltprec_energy.cpp index 441721cce..cefa98ad4 100644 --- a/flow/flow_ebos_gaswater_saltprec_energy.cpp +++ b/flow/flow_gaswater_saltprec_energy.cpp @@ -16,7 +16,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_gaswater_saltprec_energy.hpp b/flow/flow_gaswater_saltprec_energy.hpp similarity index 87% rename from flow/flow_ebos_gaswater_saltprec_energy.hpp rename to flow/flow_gaswater_saltprec_energy.hpp index 5f5f3d8cc..50c5ccb34 100644 --- a/flow/flow_ebos_gaswater_saltprec_energy.hpp +++ b/flow/flow_gaswater_saltprec_energy.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_gaswater_saltprec_energy_main.cpp b/flow/flow_gaswater_saltprec_energy_main.cpp index 12097208b..3db8516b0 100644 --- a/flow/flow_gaswater_saltprec_energy_main.cpp +++ b/flow/flow_gaswater_saltprec_energy_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_ebos_gaswater_saltprec_vapwat.cpp b/flow/flow_gaswater_saltprec_vapwat.cpp similarity index 98% rename from flow/flow_ebos_gaswater_saltprec_vapwat.cpp rename to flow/flow_gaswater_saltprec_vapwat.cpp index 898c414d7..36f10b941 100644 --- a/flow/flow_ebos_gaswater_saltprec_vapwat.cpp +++ b/flow/flow_gaswater_saltprec_vapwat.cpp @@ -16,7 +16,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_gaswater_saltprec_vapwat.hpp b/flow/flow_gaswater_saltprec_vapwat.hpp similarity index 86% rename from flow/flow_ebos_gaswater_saltprec_vapwat.hpp rename to flow/flow_gaswater_saltprec_vapwat.hpp index 419b1f52e..b50d516cf 100644 --- a/flow/flow_ebos_gaswater_saltprec_vapwat.hpp +++ b/flow/flow_gaswater_saltprec_vapwat.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_gaswater_saltprec_vapwat_main.cpp b/flow/flow_gaswater_saltprec_vapwat_main.cpp index e7d7e922d..a9db14b4f 100644 --- a/flow/flow_gaswater_saltprec_vapwat_main.cpp +++ b/flow/flow_gaswater_saltprec_vapwat_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_ebos_gaswater_solvent.cpp b/flow/flow_gaswater_solvent.cpp similarity index 98% rename from flow/flow_ebos_gaswater_solvent.cpp rename to flow/flow_gaswater_solvent.cpp index eb4fcdbbd..8128be8c5 100644 --- a/flow/flow_ebos_gaswater_solvent.cpp +++ b/flow/flow_gaswater_solvent.cpp @@ -19,7 +19,7 @@ // Define making clear that the simulator supports AMG #define FLOW_SUPPORT_AMG 1 -#include +#include #include #include diff --git a/flow/flow_ebos_gaswater_solvent.hpp b/flow/flow_gaswater_solvent.hpp similarity index 88% rename from flow/flow_ebos_gaswater_solvent.hpp rename to flow/flow_gaswater_solvent.hpp index ca4bdfd06..53f3a075e 100644 --- a/flow/flow_ebos_gaswater_solvent.hpp +++ b/flow/flow_gaswater_solvent.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_gaswater_solvent_main.cpp b/flow/flow_gaswater_solvent_main.cpp index 9d074eaea..19262d101 100644 --- a/flow/flow_gaswater_solvent_main.cpp +++ b/flow/flow_gaswater_solvent_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_ebos_micp.cpp b/flow/flow_micp.cpp similarity index 98% rename from flow/flow_ebos_micp.cpp rename to flow/flow_micp.cpp index 1ed91190d..c10fa4504 100644 --- a/flow/flow_ebos_micp.cpp +++ b/flow/flow_micp.cpp @@ -16,7 +16,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_micp.hpp b/flow/flow_micp.hpp similarity index 91% rename from flow/flow_ebos_micp.hpp rename to flow/flow_micp.hpp index 2ca8e583b..12c27f500 100644 --- a/flow/flow_ebos_micp.hpp +++ b/flow/flow_micp.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_micp_main.cpp b/flow/flow_micp_main.cpp index e28cc73d5..2e2d6c653 100644 --- a/flow/flow_micp_main.cpp +++ b/flow/flow_micp_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_ebos_oilwater.cpp b/flow/flow_oilwater.cpp similarity index 98% rename from flow/flow_ebos_oilwater.cpp rename to flow/flow_oilwater.cpp index 99636659f..b7b05a938 100644 --- a/flow/flow_ebos_oilwater.cpp +++ b/flow/flow_oilwater.cpp @@ -16,7 +16,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_oilwater.hpp b/flow/flow_oilwater.hpp similarity index 90% rename from flow/flow_ebos_oilwater.hpp rename to flow/flow_oilwater.hpp index e46f51ca1..93e616a1e 100644 --- a/flow/flow_ebos_oilwater.hpp +++ b/flow/flow_oilwater.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_ebos_oilwater_brine.cpp b/flow/flow_oilwater_brine.cpp similarity index 98% rename from flow/flow_ebos_oilwater_brine.cpp rename to flow/flow_oilwater_brine.cpp index 032eea2cf..a3ab7aa4c 100644 --- a/flow/flow_ebos_oilwater_brine.cpp +++ b/flow/flow_oilwater_brine.cpp @@ -16,7 +16,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_oilwater_brine.hpp b/flow/flow_oilwater_brine.hpp similarity index 89% rename from flow/flow_ebos_oilwater_brine.hpp rename to flow/flow_oilwater_brine.hpp index 06028d135..d8c8f2b06 100644 --- a/flow/flow_ebos_oilwater_brine.hpp +++ b/flow/flow_oilwater_brine.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_oilwater_brine_main.cpp b/flow/flow_oilwater_brine_main.cpp index d33bee4a5..2881e0f34 100644 --- a/flow/flow_oilwater_brine_main.cpp +++ b/flow/flow_oilwater_brine_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_oilwater_main.cpp b/flow/flow_oilwater_main.cpp index d06d0e908..5aa0e5c1f 100644 --- a/flow/flow_oilwater_main.cpp +++ b/flow/flow_oilwater_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_ebos_oilwater_polymer.cpp b/flow/flow_oilwater_polymer.cpp similarity index 98% rename from flow/flow_ebos_oilwater_polymer.cpp rename to flow/flow_oilwater_polymer.cpp index 40b00bff3..4fc5abeec 100644 --- a/flow/flow_ebos_oilwater_polymer.cpp +++ b/flow/flow_oilwater_polymer.cpp @@ -16,7 +16,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_oilwater_polymer.hpp b/flow/flow_oilwater_polymer.hpp similarity index 88% rename from flow/flow_ebos_oilwater_polymer.hpp rename to flow/flow_oilwater_polymer.hpp index d6e537fc4..2ce65a601 100644 --- a/flow/flow_ebos_oilwater_polymer.hpp +++ b/flow/flow_oilwater_polymer.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_ebos_oilwater_polymer_injectivity.cpp b/flow/flow_oilwater_polymer_injectivity.cpp similarity index 98% rename from flow/flow_ebos_oilwater_polymer_injectivity.cpp rename to flow/flow_oilwater_polymer_injectivity.cpp index 2c3beaba3..3d970d287 100644 --- a/flow/flow_ebos_oilwater_polymer_injectivity.cpp +++ b/flow/flow_oilwater_polymer_injectivity.cpp @@ -16,7 +16,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_oilwater_polymer_injectivity.hpp b/flow/flow_oilwater_polymer_injectivity.hpp similarity index 86% rename from flow/flow_ebos_oilwater_polymer_injectivity.hpp rename to flow/flow_oilwater_polymer_injectivity.hpp index 23d58c0ac..f8701e251 100644 --- a/flow/flow_ebos_oilwater_polymer_injectivity.hpp +++ b/flow/flow_oilwater_polymer_injectivity.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_oilwater_polymer_injectivity_main.cpp b/flow/flow_oilwater_polymer_injectivity_main.cpp index 5eea3829d..d71426a08 100644 --- a/flow/flow_oilwater_polymer_injectivity_main.cpp +++ b/flow/flow_oilwater_polymer_injectivity_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_oilwater_polymer_main.cpp b/flow/flow_oilwater_polymer_main.cpp index d20bcf442..3e7d9a4d5 100644 --- a/flow/flow_oilwater_polymer_main.cpp +++ b/flow/flow_oilwater_polymer_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_ebos_onephase.cpp b/flow/flow_onephase.cpp similarity index 100% rename from flow/flow_ebos_onephase.cpp rename to flow/flow_onephase.cpp diff --git a/flow/flow_ebos_onephase.hpp b/flow/flow_onephase.hpp similarity index 100% rename from flow/flow_ebos_onephase.hpp rename to flow/flow_onephase.hpp diff --git a/flow/flow_ebos_onephase_energy.cpp b/flow/flow_onephase_energy.cpp similarity index 98% rename from flow/flow_ebos_onephase_energy.cpp rename to flow/flow_onephase_energy.cpp index 9fd3d36cc..fbc832655 100644 --- a/flow/flow_ebos_onephase_energy.cpp +++ b/flow/flow_onephase_energy.cpp @@ -20,7 +20,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_onephase_energy.hpp b/flow/flow_onephase_energy.hpp similarity index 100% rename from flow/flow_ebos_onephase_energy.hpp rename to flow/flow_onephase_energy.hpp diff --git a/flow/flow_onephase_energy_main.cpp b/flow/flow_onephase_energy_main.cpp index 036eb969b..c32da2bd1 100644 --- a/flow/flow_onephase_energy_main.cpp +++ b/flow/flow_onephase_energy_main.cpp @@ -19,7 +19,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) { diff --git a/flow/flow_onephase_main.cpp b/flow/flow_onephase_main.cpp index 0df28b999..eb972e7d4 100644 --- a/flow/flow_onephase_main.cpp +++ b/flow/flow_onephase_main.cpp @@ -19,7 +19,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_ebos_polymer.cpp b/flow/flow_polymer.cpp similarity index 98% rename from flow/flow_ebos_polymer.cpp rename to flow/flow_polymer.cpp index eb3857a7d..3456b4132 100644 --- a/flow/flow_ebos_polymer.cpp +++ b/flow/flow_polymer.cpp @@ -16,7 +16,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_polymer.hpp b/flow/flow_polymer.hpp similarity index 90% rename from flow/flow_ebos_polymer.hpp rename to flow/flow_polymer.hpp index 925286b59..6b9cb3a4f 100644 --- a/flow/flow_ebos_polymer.hpp +++ b/flow/flow_polymer.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_polymer_main.cpp b/flow/flow_polymer_main.cpp index 29a466a77..6e1297e55 100644 --- a/flow/flow_polymer_main.cpp +++ b/flow/flow_polymer_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_ebos_solvent.cpp b/flow/flow_solvent.cpp similarity index 98% rename from flow/flow_ebos_solvent.cpp rename to flow/flow_solvent.cpp index c7c51e7a0..f331c8544 100644 --- a/flow/flow_ebos_solvent.cpp +++ b/flow/flow_solvent.cpp @@ -16,7 +16,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_solvent.hpp b/flow/flow_solvent.hpp similarity index 90% rename from flow/flow_ebos_solvent.hpp rename to flow/flow_solvent.hpp index bd31114bf..7fda54c97 100644 --- a/flow/flow_ebos_solvent.hpp +++ b/flow/flow_solvent.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_ebos_solvent_foam.cpp b/flow/flow_solvent_foam.cpp similarity index 97% rename from flow/flow_ebos_solvent_foam.cpp rename to flow/flow_solvent_foam.cpp index f8ad6585e..eadd1b740 100644 --- a/flow/flow_ebos_solvent_foam.cpp +++ b/flow/flow_solvent_foam.cpp @@ -16,7 +16,7 @@ */ #include "config.h" -#include +#include #include #include diff --git a/flow/flow_ebos_solvent_foam.hpp b/flow/flow_solvent_foam.hpp similarity index 89% rename from flow/flow_ebos_solvent_foam.hpp rename to flow/flow_solvent_foam.hpp index dd97d631c..438dd9a9e 100644 --- a/flow/flow_ebos_solvent_foam.hpp +++ b/flow/flow_solvent_foam.hpp @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with OPM. If not, see . */ -#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 diff --git a/flow/flow_solvent_foam_main.cpp b/flow/flow_solvent_foam_main.cpp index f3f03c3fa..e1f2fcb43 100644 --- a/flow/flow_solvent_foam_main.cpp +++ b/flow/flow_solvent_foam_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/flow/flow_solvent_main.cpp b/flow/flow_solvent_main.cpp index df44a63e8..68f013b55 100644 --- a/flow/flow_solvent_main.cpp +++ b/flow/flow_solvent_main.cpp @@ -15,7 +15,7 @@ along with OPM. If not, see . */ #include "config.h" -#include +#include int main(int argc, char** argv) diff --git a/opm/simulators/flow/Main.hpp b/opm/simulators/flow/Main.hpp index cb1a2f9ba..0f41b2807 100644 --- a/opm/simulators/flow/Main.hpp +++ b/opm/simulators/flow/Main.hpp @@ -23,36 +23,36 @@ #ifndef OPM_MAIN_HEADER_INCLUDED #define OPM_MAIN_HEADER_INCLUDED -#include -#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include