SimulatorFullyIplicitBlackoilEbos: avoid boost includes in header

CMakeLists_files.cmake

@@ -37,6 +37,7 @@ list (APPEND MAIN_SOURCE_FILES
   opm/simulators/timestepping/SimulatorReport.cpp
   opm/simulators/flow/countGlobalCells.cpp
   opm/simulators/flow/KeywordValidation.cpp
+  opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.cpp
   opm/simulators/linalg/ExtractParallelGridInformationToISTL.cpp
   opm/simulators/linalg/FlexibleSolver1.cpp
   opm/simulators/linalg/FlexibleSolver2.cpp

opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.cpp

@@ -0,0 +1,64 @@
+/*
+  Copyright 2013, 2015, 2020 SINTEF Digital, Mathematics and Cybernetics.
+  Copyright 2015 Andreas Lauser
+  Copyright 2017 IRIS
+
+  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/common/OpmLog/OpmLog.hpp>
+#include <opm/parser/eclipse/Units/Units.hpp>
+#include <opm/simulators/timestepping/SimulatorTimer.hpp>
+
+#include <boost/date_time.hpp>
+
+#include <sstream>
+#include <string>
+
+namespace Opm {
+
+void outputReportStep(const SimulatorTimer& timer)
+{
+    std::ostringstream stepMsg;
+    boost::posix_time::time_facet* facet = new boost::posix_time::time_facet("%d-%b-%Y");
+    stepMsg.imbue(std::locale(std::locale::classic(), facet));
+    stepMsg << "\nReport step " << std::setw(2) <<timer.currentStepNum()
+          << "/" << timer.numSteps()
+          << " at day " << (double)unit::convert::to(timer.simulationTimeElapsed(), unit::day)
+          << "/" << (double)unit::convert::to(timer.totalTime(), unit::day)
+          << ", date = " << timer.currentDateTime();
+    OpmLog::info(stepMsg.str());
+}
+
+void outputTimestampFIP(const SimulatorTimer& timer,
+                        const std::string& title,
+                        const std::string& version)
+{
+    std::ostringstream ss;
+    boost::posix_time::time_facet* facet = new boost::posix_time::time_facet("%d %b %Y");
+    ss.imbue(std::locale(std::locale::classic(), facet));
+    ss << "\n                              **************************************************************************\n"
+    << "  Balance  at" << std::setw(10) << (double)unit::convert::to(timer.simulationTimeElapsed(), unit::day) << "  Days"
+    << " *" << std::setw(30) << title << "                                          *\n"
+    << "  Report " << std::setw(4) << timer.reportStepNum() << "    " << timer.currentDateTime()
+    << "  *                                             Flow  version " << std::setw(11) << version << "  *\n"
+    << "                              **************************************************************************\n";
+    OpmLog::note(ss.str());
+}
+
+} // namespace Opm

opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp

@@ -61,6 +61,10 @@ struct EnableTuning<TypeTag, TTag::EclFlowProblem> {
 
 namespace Opm {
 
+void outputReportStep(const SimulatorTimer& timer);
+void outputTimestampFIP(const SimulatorTimer& timer,
+                        const std::string& title,
+                        const std::string& version);
 
 /// a simulator for the blackoil model
 template<class TypeTag>
@@ -199,15 +203,7 @@ public:
         }
 
         if (terminalOutput_) {
-            std::ostringstream stepMsg;
+            outputReportStep(timer);
-            boost::posix_time::time_facet* facet = new boost::posix_time::time_facet("%d-%b-%Y");
-            stepMsg.imbue(std::locale(std::locale::classic(), facet));
-            stepMsg << "\nReport step " << std::setw(2) <<timer.currentStepNum()
-                    << "/" << timer.numSteps()
-                    << " at day " << (double)unit::convert::to(timer.simulationTimeElapsed(), unit::day)
-                    << "/" << (double)unit::convert::to(timer.totalTime(), unit::day)
-                    << ", date = " << timer.currentDateTime();
-            OpmLog::info(stepMsg.str());
         }
 
         // write the inital state at the report stage
@@ -289,7 +285,7 @@ public:
         if (terminalOutput_) {
             if (!timer.initialStep()) {
                 const std::string version = moduleVersionName();
-                outputTimestampFIP(timer, version);
+                outputTimestampFIP(timer, eclState().getTitle(), version);
             }
         }
 
@@ -336,20 +332,6 @@ protected:
         return std::make_unique<Solver>(solverParam_, std::move(model));
     }
 
-    void outputTimestampFIP(const SimulatorTimer& timer, const std::string version)
-    {
-        std::ostringstream ss;
-        boost::posix_time::time_facet* facet = new boost::posix_time::time_facet("%d %b %Y");
-        ss.imbue(std::locale(std::locale::classic(), facet));
-        ss << "\n                              **************************************************************************\n"
-        << "  Balance  at" << std::setw(10) << (double)unit::convert::to(timer.simulationTimeElapsed(), unit::day) << "  Days"
-        << " *" << std::setw(30) << eclState().getTitle() << "                                          *\n"
-        << "  Report " << std::setw(4) << timer.reportStepNum() << "    " << timer.currentDateTime()
-        << "  *                                             Flow  version " << std::setw(11) << version << "  *\n"
-        << "                              **************************************************************************\n";
-        OpmLog::note(ss.str());
-    }
-
     const EclipseState& eclState() const
     { return ebosSimulator_.vanguard().eclState(); }