Merge commit 'aefa16d967e09a4258ad64ece18e94eab5443e95'

ARPA-SIMC · Dec 11, 2023 · 44a2b1f · 44a2b1f
2 parents 11a5ea0 + aefa16d
commit 44a2b1f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/agrolib/netcdfHandler/netcdfHandler.cpp b/agrolib/netcdfHandler/netcdfHandler.cpp
@@ -149,6 +149,8 @@ void NetCDFHandler::clear()
     variables.clear();
     metadata.str("");
     timeUnit = "";
+
+    missingValue = NODATA;
 }
 
 
@@ -525,11 +527,25 @@ bool NetCDFHandler::readProperties(string fileName)
             else if (ncTypeId == NC_INT)
             {
                 nc_get_att(ncId, v, attrName, &valueInt);
+
+                // no data
+                if (lowerCase(string(attrName)) == "missing_value" || lowerCase(string(attrName)) == "nodata")
+                {
+                    missingValue = double(valueInt);
+                }
+
                 metadata << attrName << " = " << valueInt << endl;
             }
             else if (ncTypeId == NC_DOUBLE)
             {
                 nc_get_att(ncId, v, attrName, &value);
+
+                // no data
+                if (lowerCase(string(attrName)) == "missing_value" || lowerCase(string(attrName)) == "nodata")
+                {
+                    missingValue = value;
+                }
+
                 metadata << attrName << " = " << value << endl;
             }
         }
@@ -1131,6 +1147,7 @@ bool NetCDFHandler::extractVariableMap(int idVar, const Crit3DTime& myTime, std:
         }
             default:
         {
+            delete[] values;
             errorStr = "Wrong variable type.";
             return false;
         }

diff --git a/agrolib/netcdfHandler/netcdfHandler.h b/agrolib/netcdfHandler/netcdfHandler.h
@@ -54,6 +54,8 @@
         bool isHourly;
         bool isDaily;
 
+        double missingValue;
+
         gis::Crit3DLatLonHeader latLonHeader;
 
         NetCDFHandler();