IOFormatSaver

Src/Base/AMReX_IOFormat.H

@@ -0,0 +1,51 @@
+#ifndef AMREX_IO_FORMAT_H_
+#define AMREX_IO_FORMAT_H_
+
+#include <ios>
+
+namespace amrex {
+
+/*
+ * \brief I/O stream format saver
+ *
+ * This class can be used to save and restore I/O stream format in a RAII
+ * way. It handles fill, fmtflag, precision, and width.
+ */
+template <class CharT, class Traits>
+class IOFormatSaver
+{
+public:
+    using BasicIos = std::basic_ios<CharT, Traits>;
+
+    explicit IOFormatSaver (BasicIos& ios)
+        : m_ios(&ios),
+          m_fill(ios.fill()),
+          m_flags(ios.flags()),
+          m_precision(ios.precision()),
+          m_width(ios.width())
+    {}
+
+    ~IOFormatSaver ()
+    {
+        m_ios->fill(m_fill);
+        m_ios->flags(m_flags);
+        m_ios->precision(m_precision);
+        m_ios->width(m_width);
+    }
+
+    IOFormatSaver (IOFormatSaver const&) = delete;
+    IOFormatSaver (IOFormatSaver &&) noexcept = delete;
+    IOFormatSaver& operator= (IOFormatSaver const&) = delete;
+    IOFormatSaver& operator= (IOFormatSaver &&) noexcept = delete;
+
+private:
+    BasicIos*                   m_ios;
+    CharT                       m_fill;
+    typename BasicIos::fmtflags m_flags;
+    std::streamsize             m_precision;
+    std::streamsize             m_width;
+};
+
+}
+
+#endif

Src/Base/AMReX_TinyProfiler.cpp

@@ -10,6 +10,7 @@
 #include <AMReX_GpuDevice.H>
 #endif
 #include <AMReX_Print.H>
+#include <AMReX_IOFormat.H>
 
 #ifdef AMREX_USE_OMP
 #include <omp.h>
@@ -380,7 +381,6 @@ TinyProfiler::Finalize (bool bFlushing) noexcept
 
     std::ofstream ofs;
     std::ostream* os = nullptr;
-    std::streamsize oldprec = 0;
     if (ParallelDescriptor::IOProcessor()) {
         auto const& ofile = get_output_file();
         if (ofile.empty()) {
@@ -394,6 +394,8 @@ TinyProfiler::Finalize (bool bFlushing) noexcept
         }
     }
 
+    IOFormatSaver iofmtsaver(amrex::OutStream());
+
     if (os)
     {
         os->precision(4);
@@ -439,8 +441,6 @@ TinyProfiler::Finalize (bool bFlushing) noexcept
         ttstack.clear();
         statsmap.clear();
     }
-
-    if(os) { os->precision(oldprec); }
 }
 
 void
@@ -595,6 +595,8 @@ TinyProfiler::PrintStats (std::map<std::string,Stats>& regstats, double dt_max,
 
     if (ParallelDescriptor::IOProcessor() && os)
     {
+        IOFormatSaver iofmtsaver(*os);
+
         *os << std::setfill(' ') << std::setprecision(4);
         int wt = 9;
 
@@ -878,6 +880,8 @@ TinyProfiler::PrintMemStats (std::map<std::string, MemStat>& memstats,
 
     if (allstatsstr.size() == 1 || !os) { return; }
 
+    IOFormatSaver iofmtsaver(*os);
+
     int lenhline = 0;
     for (auto i : maxlen) {
         lenhline += i;

Src/Base/AMReX_VisMF.cpp

@@ -1,6 +1,7 @@
 
 #include <AMReX_FabArrayUtility.H>
 #include <AMReX_FPC.H>
+#include <AMReX_IOFormat.H>
 #include <AMReX_ParmParse.H>
 #include <AMReX_Utility.H>
 #include <AMReX_VisMF.H>
@@ -277,9 +278,9 @@ operator<< (std::ostream        &os,
     // Up the precision for the Reals in m_min and m_max.
     // Force it to be written in scientific notation to match fParallel code.
     //
-    std::ios::fmtflags oflags = os.flags();
+    IOFormatSaver iofmtsaver(os);
     os.setf(std::ios::floatfield, std::ios::scientific);
-    int oldPrec = static_cast<int>(os.precision(16));
+    os.precision(17);
 
     os << hd.m_vers     << '\n';
     os << int(hd.m_how) << '\n';
@@ -327,9 +328,6 @@ operator<< (std::ostream        &os,
       }
     }
 
-    os.flags(oflags);
-    os.precision(oldPrec);
-
     if( ! os.good()) {
         amrex::Error("Write of VisMF::Header failed");
     }

Src/Base/CMakeLists.txt

@@ -98,6 +98,7 @@ foreach(D IN LISTS AMReX_SPACEDIM)
        AMReX_Print.H
        AMReX_IntConv.H
        AMReX_IntConv.cpp
+       AMReX_IOFormat.H
        # Index space -------------------------------------------------------------
        AMReX_Box.H
        AMReX_Box.cpp

Src/Base/Make.package

@@ -123,6 +123,7 @@ C$(AMREX_BASE)_headers += AMReX_ParReduce.H
 #
 C${AMREX_BASE}_headers += AMReX_ANSIEscCode.H AMReX_FabConv.H AMReX_FPC.H AMReX_Print.H AMReX_IntConv.H AMReX_VectorIO.H
 C${AMREX_BASE}_sources += AMReX_FabConv.cpp AMReX_FPC.cpp AMReX_IntConv.cpp AMReX_VectorIO.cpp
+C${AMREX_BASE}_headers += AMReX_IOFormat.H
 
 #
 # Index space.