CORDEX: cut of dates in filename's period

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

Hide file tree

Showing 4 changed files with 36 additions and 21 deletions.
diff --git a/include/readline.h b/include/readline.h
@@ -214,11 +214,6 @@ class ReadLine
   size_t
     size(void){ return split.size(); }
 
-//! Discard Bash comments.
-/*! From the first appearance to the end of the line.*/
-    void
-    skipBashComment( void ){ isSkipBashComment=true; }
-
     //! Discard characters.
 /*! From the first appearance to the end of the line.*/
     void
@@ -228,6 +223,11 @@ class ReadLine
     void
     skipCharacter(std::string);
 
+//! Discard comments indicated by character [default: #].
+/*! From the first appearance to the end of the line.*/
+    void
+    skipComment(char c='#');
+
 //! Skip the first int lines.
   bool
     skipLines( int );  // skip the first int lines
@@ -254,6 +254,8 @@ class ReadLine
   std::string inFile ;
   std::string line ;
   std::string prevLine ;
+
+  char commentChar; // default #
   char lineContinuation;
   std::vector<char> vSkipChars;
   std::vector<double> val ; //line: converted values
@@ -269,7 +271,7 @@ class ReadLine
   bool isExternalStream;
   bool isPutBackLine;
   bool isReadFloat ;
-  bool isSkipBashComment;
+  bool isSkipComment;
   bool isSkipCharacter;
   bool isSkipWhiteLine;
   bool isSwappedEof;

diff --git a/src/QA.cpp b/src/QA.cpp
@@ -533,7 +533,7 @@ QA::init(void)
    pIn->excludeVars();
 
    qaTime.init(optStr);
-   
+
    // DRS and CV specifications
    drs_cv_table.read(table_DRS_CV);
 
@@ -1250,7 +1250,7 @@ DRS_CV_Table::read(hdhC::FileSplit& fs)
   if( ! ifs.isOpen() )
   {
      std::string key("7_1");
-     if( pQA->notes->inq( key, pQA->fileStr) )
+     if( pQA->notes->inq( key) )
      {
         std::string capt("no path to a table, tried " + fs.getFile()) ;
 
@@ -1269,7 +1269,7 @@ DRS_CV_Table::read(hdhC::FileSplit& fs)
 
   // parse table; trailing ':' indicates variable or 'global'
   ifs.skipWhiteLines();
-  ifs.skipBashComment();
+  ifs.skipComment();
   ifs.skipCharacter("<>");
   ifs.clearSurroundingSpaces();
 
@@ -1380,7 +1380,7 @@ DRS_CV_Table::read(hdhC::FileSplit& fs)
     if( attName.size() == 0 )
     {
       std::string key("7_2");
-      if( notes->inq( key, pQA->fileStr) )
+      if( notes->inq( key) )
       {
         std::string capt(
            "Syntax fault in the DRS_CV table: orphaned attribute, found ");

diff --git a/src/QA_CORDEX.cpp b/src/QA_CORDEX.cpp
@@ -363,7 +363,7 @@ DRS_CV::checkModelName(std::string &aName, std::string &aValue,
 
    // parse table; trailing ':' indicates variable or 'global'
    ifs.skipWhiteLines();
-   ifs.skipBashComment();
+   ifs.skipComment();
 
    bool isModel=false;
    bool isInst=false;
@@ -1226,7 +1226,7 @@ DRS_CV::testPeriodCutRegular(std::vector<std::string> &sd,
        if( ! (sd[0][3] == '1' || sd[0][3] == '6') )
          text.push_back(": StartTime should begin with YYY1 or YYY6");
 
-       if( sd[0].substr(4,4) != "0101" )
+      if( sd[0].substr(4,4) != "0101" )
          text.push_back(": StartTime should be YYYY0101");
      }
 
@@ -1235,8 +1235,10 @@ DRS_CV::testPeriodCutRegular(std::vector<std::string> &sd,
        if( ! (sd[1][3] == '0' || sd[1][3] == '5') )
          text.push_back(": EndTime should begin with YYY0 or YYY5");
 
-       if( sd[1].substr(4,4) != "1231" )
-         text.push_back(": EndTime should be YYYY1231");
+       std::string numDec(hdhC::double2String(
+                          pQA->qaTime.refDate.regularMonthDays[11]));
+       if( sd[1].substr(4,4) != "12"+numDec )
+         text.push_back(": EndTime should be YYYY12"+numDec);
      }
   }
   else if( frequency == "mon" )
@@ -1264,8 +1266,10 @@ DRS_CV::testPeriodCutRegular(std::vector<std::string> &sd,
        if( ! (sd[1][3] == '0' || sd[1][3] == '5') )
          text.push_back(": EndTime should begin with YYY0");
 
+       std::string numDec(hdhC::double2String(
+                          pQA->qaTime.refDate.regularMonthDays[11]));
        if( sd[1].substr(4,4) != "12" )
-         text.push_back(": EndTime should be YYYY1231");
+         text.push_back(": EndTime should be YYYY12"+numDec);
      }
   }
   else if( frequency == "sem" )

diff --git a/src/ReadLine.cpp b/src/ReadLine.cpp
@@ -54,14 +54,15 @@ ReadLine::init()
   isClearSurroundingSpaces = false;
   isEof=false;
   isPutBackLine=false;
-  isSkipBashComment = false;
+  isSkipComment = false;
   isSkipCharacter=false;
   isSkipWhiteLine = false;
   isRange = false ;
   isReadFloat=false;
   is_fopen=false;
 
   lineContinuation='\\';
+  commentChar='#';
 
   stream=0;
 }
@@ -334,18 +335,18 @@ ReadLine::readLine(bool isVoid)
 
   prevLine = line;
   line.erase();
-
-  bool skip=false;
+  bool isSkip;
 
   // variable number of columns
   while( !(isEof = stream->eof()) )
   {
     cbuf = stream->get();
 
     // skip fom #-char to the end of tzhe line
-    if( isSkipBashComment && cbuf == '#' )
-      skip=true;
-    if( skip )
+    if( isSkipComment && cbuf == commentChar )
+      isSkip=true;
+
+    if(isSkip)
     {
       if(cbuf == '\n' || cbuf == '\r')
       {
@@ -513,6 +514,14 @@ ReadLine::skipCharacter(std::string s)
   return;
 }
 
+void
+ReadLine::skipComment(char c)
+{
+  commentChar=c;
+  isSkipComment=true;
+  return;
+}
+
 bool
 ReadLine::skipLines( int count )
 {