changed: build onephase simulators as object libraries

allows for building in parallel with the main library

CMakeLists.txt

@@ -345,6 +345,15 @@ foreach(OBJ ${COMMON_MODELS} ${FLOW_MODELS})
 endforeach()
 set_property(TARGET flow_libblackoil PROPERTY POSITION_INDEPENDENT_CODE ON)
 
+if(BUILD_FLOW_VARIANTS)
+  add_library(flow_libonephase_energy OBJECT flow/flow_ebos_onephase_energy.cpp)
+  add_library(flow_libonephase OBJECT flow/flow_ebos_onephase.cpp)
+  if(TARGET fmt::fmt)
+    target_link_libraries(flow_libonephase_energy fmt::fmt)
+    target_link_libraries(flow_libonephase fmt::fmt)
+  endif()
+endif()
+
 # the production oriented general-purpose ECL simulator
 opm_add_test(flow
   ONLY_COMPILE
@@ -432,6 +441,7 @@ opm_add_test(flow_onephase
   SOURCES
   flow/flow_onephase.cpp
   $<TARGET_OBJECTS:moduleVersion>
+  $<TARGET_OBJECTS:flow_libonephase>
   EXE_NAME flow_onephase
   DEPENDS opmsimulators
   LIBRARIES opmsimulators)
@@ -442,8 +452,9 @@ opm_add_test(flow_onephase_energy
   SOURCES
   flow/flow_onephase_energy.cpp
   $<TARGET_OBJECTS:moduleVersion>
+  $<TARGET_OBJECTS:flow_libonephase_energy>
   EXE_NAME flow_onephase_energy
-  DEPENDS opmsimulators
+  DEPENDS opmsimulators flow_libonephase_energy
   LIBRARIES opmsimulators)
 
 if (BUILD_FLOW)

flow/flow_ebos_onephase.cpp

@@ -0,0 +1,65 @@
+/*
+  Copyright 2013, 2014, 2015 SINTEF ICT, Applied Mathematics.
+  Copyright 2014 Dr. Blatt - HPC-Simulation-Software & Services
+  Copyright 2015, 2017 IRIS AS
+
+  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 3 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/>.
+*/
+#include "config.h"
+#include <opm/simulators/flow/Main.hpp>
+#include <opm/models/blackoil/blackoilonephaseindices.hh>
+
+
+namespace Opm {
+namespace Properties {
+
+namespace TTag {
+struct EclFlowProblemSimple {
+    using InheritsFrom = std::tuple<EclFlowProblem>;
+};
+}
+//! The indices required by the model
+template<class TypeTag>
+struct Indices<TypeTag, TTag::EclFlowProblemSimple>
+{
+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.
+    using BaseTypeTag = TTag::EclFlowProblem;
+    using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
+
+public:
+    using type = BlackOilOnePhaseIndices<getPropValue<TypeTag, Properties::EnableSolvent>(),
+                                         getPropValue<TypeTag, Properties::EnableExtbo>(),
+                                         getPropValue<TypeTag, Properties::EnablePolymer>(),
+                                         getPropValue<TypeTag, Properties::EnableEnergy>(),
+                                         getPropValue<TypeTag, Properties::EnableFoam>(),
+                                         getPropValue<TypeTag, Properties::EnableBrine>(),
+                                         /*PVOffset=*/0,
+                                         /*enabledCompIdx=*/FluidSystem::waterCompIdx>;
+};
+
+} // namespace Opm::Properties
+
+int flowEbosOnephaseMain(int argc, char** argv)
+{
+    using TypeTag = Opm::Properties::TTag::EclFlowProblemSimple;
+    auto mainObject = Opm::Main(argc, argv);
+    return mainObject.runStatic<TypeTag>();
+}
+
+}

flow/flow_ebos_onephase.hpp

@@ -0,0 +1,29 @@
+/*
+  Copyright 2013, 2014, 2015 SINTEF ICT, Applied Mathematics.
+  Copyright 2014 Dr. Blatt - HPC-Simulation-Software & Services
+  Copyright 2015, 2017 IRIS AS
+
+  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 3 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/>.
+*/
+
+#ifndef FLOW_ONEPHASE_HPP
+#define FLOW_ONEPHASE_HPP
+
+namespace Opm {
+  int flowEbosOnephaseMain(int argc, char** argv);
+}
+
+#endif

flow/flow_ebos_onephase_energy.cpp

@@ -0,0 +1,69 @@
+/*
+  Copyright 2013, 2014, 2015 SINTEF ICT, Applied Mathematics.
+  Copyright 2014 Dr. Blatt - HPC-Simulation-Software & Services
+  Copyright 2015, 2017 IRIS AS
+
+  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 3 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/>.
+*/
+#include "config.h"
+#include <opm/simulators/flow/Main.hpp>
+#include <opm/models/blackoil/blackoilonephaseindices.hh>
+
+namespace Opm {
+namespace Properties {
+
+namespace TTag {
+struct EclFlowProblemSimple {
+    using InheritsFrom = std::tuple<EclFlowProblem>;
+};
+}
+template<class TypeTag>
+struct EnableEnergy<TypeTag, TTag::EclFlowProblemSimple> {
+    static constexpr bool value = true;
+};
+//! The indices required by the model
+template<class TypeTag>
+struct Indices<TypeTag, TTag::EclFlowProblemSimple>
+{
+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.
+    using BaseTypeTag = TTag::EclFlowProblem;
+    using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
+
+public:
+    typedef Opm::BlackOilOnePhaseIndices<getPropValue<TypeTag, Properties::EnableSolvent>(),
+                                         getPropValue<TypeTag, Properties::EnableExtbo>(),
+                                         getPropValue<TypeTag, Properties::EnablePolymer>(),
+                                         getPropValue<TypeTag, Properties::EnableEnergy>(),
+                                         getPropValue<TypeTag, Properties::EnableFoam>(),
+                                         getPropValue<TypeTag, Properties::EnableBrine>(),
+                                         /*PVOffset=*/0,
+                                         /*enebledCompIdx=*/FluidSystem::waterCompIdx>
+        type;
+};
+
+} // namespace Opm::Properties
+
+int flowEbosOnephaseEnergyMain(int argc, char** argv)
+{
+    using TypeTag = Opm::Properties::TTag::EclFlowProblemSimple;
+    auto mainObject = Opm::Main(argc, argv);
+    return mainObject.runStatic<TypeTag>();
+}
+
+}

flow/flow_ebos_onephase_energy.hpp

@@ -0,0 +1,29 @@
+/*
+  Copyright 2013, 2014, 2015 SINTEF ICT, Applied Mathematics.
+  Copyright 2014 Dr. Blatt - HPC-Simulation-Software & Services
+  Copyright 2015, 2017 IRIS AS
+
+  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 3 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/>.
+*/
+
+#ifndef FLOW_ONEPHASE_ENERGY_HPP
+#define FLOW_ONEPHASE_ENERGY_HPP
+
+namespace Opm {
+  int flowEbosOnephaseEnergyMain(int argc, char** argv);
+}
+
+#endif

flow/flow_onephase.cpp

@@ -19,44 +19,10 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <opm/simulators/flow/Main.hpp>
+#include <flow/flow_ebos_onephase.hpp>
-#include <opm/models/blackoil/blackoilonephaseindices.hh>
 
 
-namespace Opm::Properties {
-
-namespace TTag {
-struct EclFlowProblemSimple {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
-};
-}
-//! The indices required by the model
-template<class TypeTag>
-struct Indices<TypeTag, TTag::EclFlowProblemSimple>
-{
-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.
-    using BaseTypeTag = TTag::EclFlowProblem;
-    using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
-
-public:
-    using type = BlackOilOnePhaseIndices<getPropValue<TypeTag, Properties::EnableSolvent>(),
-                                         getPropValue<TypeTag, Properties::EnableExtbo>(),
-                                         getPropValue<TypeTag, Properties::EnablePolymer>(),
-                                         getPropValue<TypeTag, Properties::EnableEnergy>(),
-                                         getPropValue<TypeTag, Properties::EnableFoam>(),
-                                         getPropValue<TypeTag, Properties::EnableBrine>(),
-                                         /*PVOffset=*/0,
-                                         /*enabledCompIdx=*/FluidSystem::waterCompIdx>;
-};
-
-} // namespace Opm::Properties
-
 int main(int argc, char** argv)
 {
-    using TypeTag = Opm::Properties::TTag::EclFlowProblemSimple;
+    return Opm::flowEbosOnephaseMain(argc, argv);
-    auto mainObject = Opm::Main(argc, argv);
-    return mainObject.runStatic<TypeTag>();
 }

flow/flow_onephase_energy.cpp

@@ -19,48 +19,9 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "config.h"
-#include <opm/simulators/flow/Main.hpp>
+#include <flow/flow_ebos_onephase_energy.hpp>
-#include <opm/models/blackoil/blackoilonephaseindices.hh>
-
-namespace Opm::Properties {
-
-namespace TTag {
-struct EclFlowProblemSimple {
-    using InheritsFrom = std::tuple<EclFlowProblem>;
-};
-}
-template<class TypeTag>
-struct EnableEnergy<TypeTag, TTag::EclFlowProblemSimple> {
-    static constexpr bool value = true;
-};
-//! The indices required by the model
-template<class TypeTag>
-struct Indices<TypeTag, TTag::EclFlowProblemSimple>
-{
-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.
-    using BaseTypeTag = TTag::EclFlowProblem;
-    using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
-
-public:
-    typedef Opm::BlackOilOnePhaseIndices<getPropValue<TypeTag, Properties::EnableSolvent>(),
-                                         getPropValue<TypeTag, Properties::EnableExtbo>(),
-                                         getPropValue<TypeTag, Properties::EnablePolymer>(),
-                                         getPropValue<TypeTag, Properties::EnableEnergy>(),
-                                         getPropValue<TypeTag, Properties::EnableFoam>(),
-                                         getPropValue<TypeTag, Properties::EnableBrine>(),
-                                         /*PVOffset=*/0,
-                                         /*enebledCompIdx=*/FluidSystem::waterCompIdx>
-        type;
-};
-
-} // namespace Opm::Properties
 
 int main(int argc, char** argv)
 {
-    using TypeTag = Opm::Properties::TTag::EclFlowProblemSimple;
+    return Opm::flowEbosOnephaseEnergyMain(argc,argv);
-    auto mainObject = Opm::Main(argc, argv);
-    return mainObject.runStatic<TypeTag>();
 }