adjustments due to a renameing within hdhC namespace

IS-ENES-Data · Jan 4, 2016 · d896169 · d896169
1 parent ff60029
commit d896169
Show file tree

Hide file tree

Showing 6 changed files with 766 additions and 748 deletions.
diff --git a/include/variable.h b/include/variable.h
@@ -108,6 +108,7 @@ class VariableMeta
   bool is_1st_rotY;
 
   std::vector<std::string> dimName;
+  std::vector<size_t>      dimSize;
   std::vector<size_t>      dim_ix;
 
 //  std::string associatedTo;

diff --git a/src/CF.cpp b/src/CF.cpp
@@ -224,6 +224,7 @@ CF::analyseCoordWeights(void)
        {
          for( size_t j=0 ; j < pIn->varSz ; ++j )
          {
+// note: verification that the others are also
             if( hdhC::isAmong(var.name, ca_vvs) )
             {
               isC[c]=true;

diff --git a/src/InFile.cpp b/src/InFile.cpp
@@ -431,6 +431,7 @@ InFile::getVariable(void)
     for( size_t j=0 ; j < ds.size() ; ++j)
     {
       var.dimName.push_back( ds[j] );
+      var.dimSize.push_back( nc.getDimSize(ds[j]) );
       var.dim_ix.push_back(j);
     }
 

diff --git a/src/QA_CORDEX.cpp b/src/QA_CORDEX.cpp
@@ -2353,7 +2353,7 @@ QA_Exp::domainFindTableTypeByRange(
                 if( pQA->pIn->variable[k].coord.isCoordVar )
                 {
                   cName.push_back( name );  // is a candidate
-                  cSize.push_back( pQA->pIn->variable[k].dimSize ) ;
+                  cSize.push_back( pQA->pIn->nc.getDimSize(name) ) ;
                 }
 
                 break;
@@ -4796,7 +4796,9 @@ QA_Exp::varReqTableCheck(InFile &in, VariableMetaData &vMD,
 
      for(size_t l=0 ; l < vMD.var->dim_ix.size() ; ++l)
      {
-       if( pQA->pIn->variable[ vMD.var->dim_ix[l] ].dimSize == 1 )
+       Variable& dVar = pQA->pIn->variable[ vMD.var->dim_ix[l] ] ;
+
+       if( dVar.dimSize[l] == 1 )
           continue;
 
        // new instance
@@ -4805,8 +4807,7 @@ QA_Exp::varReqTableCheck(InFile &in, VariableMetaData &vMD,
        // the spot where meta-data of var-reps of dims is taken
        // note: CORDEX standard tables doesn't provide anything, but
        // it is necessary for writing the project table.
-       getDimMetaData(in, vMD, dimNcMeDa.back(),
-                pQA->pIn->variable[ vMD.var->dim_ix[l] ].name) ;
+       getDimMetaData(in, vMD, dimNcMeDa.back(), dVar.name) ;
      }
 
      return;