Netcdf Plotting : fix bug in the interpretation of the date in hivmol…

…ler plots type
ecmwf · Feb 16, 2023 · 30084f3 · 30084f3
1 parent c04596b
commit 30084f3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/src/decoders/NetcdfData.cc b/src/decoders/NetcdfData.cc
@@ -404,6 +404,9 @@ double NetVariable::getDefaultMissing() {
 
 string Netcdf::detect(const string& var, const string& type, bool use_cache) const {
 
+    if ( std::find(ignoredDimensions_.begin(), ignoredDimensions_.end(), type) != ignoredDimensions_.end() )
+    // Here we force to ignore the dimension type
+        return "";
     if ( use_cache ) {
         auto cache = detected_.find(var);
         if ( cache != detected_.end() )

diff --git a/src/decoders/NetcdfData.h b/src/decoders/NetcdfData.h
@@ -476,6 +476,8 @@ class Netcdf {
     }
 
     map<string, NetAttribute> getAttributes() { return attributes_; }
+    void ignoreDimension(const string& dim) { ignoredDimensions_.push_back(dim); }
+    void interpretDimension(const string& dim) { std::remove( ignoredDimensions_.begin(), ignoredDimensions_.end(), dim ); }
 
 
 protected:
@@ -486,6 +488,7 @@ class Netcdf {
     map<string, NetAttribute> attributes_;
     double missing_;
     mutable map<string, string> detected_;
+    vector <string> ignoredDimensions_; 
 
 private:
     int file_;

diff --git a/src/decoders/NetcdfMatrixInterpretor.cc b/src/decoders/NetcdfMatrixInterpretor.cc
@@ -55,8 +55,10 @@ void NetcdfMatrixInterpretor::interpret(Netcdf& netcdf, vector<double>& rows, ve
             x.precision(20);
             y.precision(20);
 
+            netcdf.ignoreDimension("time"); // here we send time as expressed in the data, not as a date. 
             y << y_ << "/" << *r << "/" << *r;
             x << x_ << "/" << columns.front() << "/" << columns.back();
+            netcdf.interpretDimension("time"); 
         }
         std::copy(dimension_.begin(), dimension_.end(), std::back_inserter(dims));
         dims.push_back(y.str());