CORDEX: cut of dates in filename's period

IS-ENES-Data · Jan 12, 2016 · b220805 · b220805
1 parent 252ce87
commit b220805
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/include/date.h b/include/date.h
@@ -332,7 +332,7 @@ class Date
 
   static bool
          isValidDate(std::string);
-         
+
   //! Set the calendar type
   /*! Valid types: proleptic_georgian|georgian, noleap,
       equal_months|360_day. The case of the strings doesn't
@@ -400,6 +400,8 @@ class Date
 
   void   clear(void);
 
+  double *regularMonthDays ;
+
 private:
   enum Calendar { GREGORIAN, PROLEPTIC_GREGORIAN, JULIAN,
                   EQUAL_MONTHS, ALL_LEAP, NO_LEAP, UNDEF } ;
@@ -413,8 +415,6 @@ class Date
   int         lY_cycleDays;  // num of days between consecutive leap years
   bool        lY_is;
 
-  // this will be shifted, so index==-1 gets the 31 days from jan
-  double *regularMonthDays ;
   int precision ;
 
   bool         isDateSet ;

diff --git a/include/qa_time.h b/include/qa_time.h
@@ -41,7 +41,7 @@ class TimeOutputBuffer
 
 enum TimeTableMode
 {
-    UNDEF, REGULAR, ORPHAN, DISABLE, CYCLE
+    INIT, UNDEF, REGULAR, ORPHAN, DISABLE, CYCLE
 };
 TimeTableMode timeTableMode;
 

diff --git a/src/QA_time.cpp b/src/QA_time.cpp
@@ -69,7 +69,7 @@ QA_Time::applyOptions(std::vector<std::string> &optStr)
             || split[0] == "table_time_ranges" )
      {
           timeTable.setFile(split[1]) ;
-          timeTableMode=UNDEF;
+          timeTableMode=INIT;
           continue;
      }
    }
@@ -433,7 +433,9 @@ QA_Time::initDefaults(void)
    bufferCount=0;
    maxBufferSize=1500;
 
-  return;
+   timeTableMode=UNDEF;
+
+   return;
 }
 
 bool
@@ -725,6 +727,8 @@ QA_Time::initTimeTable(std::string id_1st, std::string id_2nd)
      return ;
    }
 
+   ifs.skipComment();
+
    // find the identifier in the table
    Split splt_line;
    splt_line.setSeparator(',');
@@ -1242,7 +1246,7 @@ QA_Time::testTimeBounds(NcAPI &nc)
   // checks below don't make any sense for climatologies
   if( pIn->variable[timeBounds_ix].isClimatology )
     return;
-  
+
   if( isFormattedDate )
   {
     refDate.setDate( currTimeBoundsValue[0] );