FEAT: make seconds 00 in output file when not needed

Author: aaronjridley

include/times.h

@@ -94,6 +94,13 @@ class Times {
    **/
   std::string get_YMD_HMS();
 
+  /**************************************************************
+     \brief Returns the current time as a string (year, month...)
+
+     Returns the current time as a string of format YYYYMMDD_HHMM00
+   **/
+  std::string get_YMD_HM0();
+
   /**************************************************************
      \brief Returns the intermediate time in seconds since ref date
    **/
@@ -221,6 +228,9 @@ class Times {
   /// represented as YYYYMMDD_HHMMSS
   std::string sYMD_HMS;
 
+  /// represented as YYYYMMDD_HHMM00
+  std::string sYMD_HM0;
+
   // -------------------------------------------------------------
   // Keeping track of walltime for the run:
 

src/output.cpp

@@ -296,7 +296,10 @@ bool output(const Neutrals &neutrals,
       if (type_output == "therm")
         filename = "3DTHR_";
 
-      filename = filename + time.get_YMD_HMS();
+      if ((int64_t(input.get_dt_output(iOutput)) % 60) == 0)
+        filename = filename + time.get_YMD_HM0();
+      else
+        filename = filename + time.get_YMD_HMS();
 
       if (nMembers > 1)
         filename = filename + "_" + cMember;

src/time.cpp

@@ -143,6 +143,15 @@ std::string Times::get_YMD_HMS() {
   return sYMD_HMS;
 }
 
+// -----------------------------------------------------------------------------
+// Get the current time as a string, with seconds as 00
+// -----------------------------------------------------------------------------
+
+std::string Times::get_YMD_HM0() {
+  return sYMD_HM0;
+}
+
+
 // -----------------------------------------------------------------------------
 // Get the intermediate stopping time
 // -----------------------------------------------------------------------------
@@ -222,6 +231,9 @@ void Times::increment_time() {
   snprintf(tmp, 100, "%04d%02d%02d_%02d%02d%02d",
            year, month, day, hour, minute, second);
   sYMD_HMS = std::string(tmp);
+  snprintf(tmp, 100, "%04d%02d%02d_%02d%02d%02d",
+           year, month, day, hour, minute, 0);
+  sYMD_HM0 = std::string(tmp);
   snprintf(tmp, 100, "%04d%02d%02d", year, month, day);
   sYMD = std::string(tmp);
   snprintf(tmp, 100, "%02d%02d%02d", hour, minute, second);