Fixed #2947 - Regression introduced by #2845

NCAR · Dec 27, 2021 · 8b5a593 · 8b5a593
1 parent 9529a84
commit 8b5a593
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/apps/cf2vdc/cf2vdc.cpp b/apps/cf2vdc/cf2vdc.cpp
@@ -193,7 +193,10 @@ int CopyVar2d3dMask(DC &dc, VDCNetCDF &vdc, size_t ts, string varname, int lod)
     if (fdr < 0) return (fdr);
 
     int fdw = vdc.OpenVariableWrite(ts, maskvar, lod);
-    if (fdw < 0) return (fdw);
+    if (fdw < 0) {
+        dc.CloseVariable(fdr);
+        return (fdw);
+    }
 
     size_t bufsize = vproduct(buffer_dims);
     float *buffer = (float *)dataBuffer.Alloc(bufsize * sizeof(*buffer));

diff --git a/lib/vdc/DCCF.cpp b/lib/vdc/DCCF.cpp
@@ -408,6 +408,7 @@ bool DCCF::_isUniform(NetCDFCFCollection *ncdfc, string varname)
 int DCCF::addCoordvars(NetCDFCFCollection *ncdfc, const vector<string> &cvars, std::map<string, DC::CoordVar> &coordVarsMap)
 {
     for (int i = 0; i < cvars.size(); i++) {
+
         // Get dimension names
         //
         vector<string> dimnames = ncdfc->GetDimNames(cvars[i]);
@@ -669,6 +670,12 @@ int DCCF::initDataVars(NetCDFCFCollection *ncdfc, std::map<string, DC::DataVar>
     // For each variable add a member to dataVarsMap
     //
     for (auto varName : vars) {
+
+        // A variable can't be both a data variable and a coordinate variable
+        //
+        auto itr = _coordVarsMap.find(varName);
+        if (itr != _coordVarsMap.end()) continue;
+
         // variable type must be float or int
         //
         int type = ncdfc->GetXType(varName);

diff --git a/lib/vdc/NetCDFCFCollection.cpp b/lib/vdc/NetCDFCFCollection.cpp
@@ -144,7 +144,10 @@ int NetCDFCFCollection::Initialize(const vector<string> &files)
         } else if (_IsVertCoordVar(varinfo)) {
             _vertCoordVars.push_back(varName);
             _auxCoordinateVars.push_back(varName);
-        } else if (_IsTimeCoordVar(varinfo)) {
+        //
+        // Only support CF "Coordinate" variables as time coord variables
+        //
+        } else if (_IsCoordinateVar(varinfo) && _IsTimeCoordVar(varinfo)) {
             _timeCoordVars.push_back(varName);
             _auxCoordinateVars.push_back(varName);
         }

diff --git a/lib/vdc/NetCDFCollection.cpp b/lib/vdc/NetCDFCollection.cpp
@@ -1746,6 +1746,7 @@ int NetCDFCollection::TimeVaryingVar::Insert(const NetCDFSimple *netcdf, const N
             space_dim_names.erase(space_dim_names.begin());
         }
     }
+
     if (!time_varying) {
         key = "constant";
     } else if (file_org == 1 || file_org == 2) {

diff --git a/lib/vdc/VDCNetCDF.cpp b/lib/vdc/VDCNetCDF.cpp
@@ -978,7 +978,10 @@ int VDCNetCDF::CopyVar(DC &dc, size_t ts, string varname, int srclod, int dstlod
     if (fdr < 0) return (fdr);
 
     int fdw = OpenVariableWrite(ts, varname, dstlod);
-    if (fdw < 0) return (fdw);
+    if (fdw < 0) {
+        dc.CloseVariable(fdr);
+        return (fdw);
+    }
 
     if (varInfo.GetXType() == FLOAT || varInfo.GetXType() == DOUBLE) {
         size_t bufsize = vproduct(buffer_dims);