Fixed 2273 - Missing values not correctly handled (#2277)

* Fixed 2273 - Missing values not correctly handled * 0-dimensional variables were not being handled correctly by DC::GetVarDimensions
NCAR · Apr 13, 2020 · bf69e4c · bf69e4c
1 parent d89212d
commit bf69e4c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/vdc/DC.cpp b/lib/vdc/DC.cpp
@@ -484,6 +484,7 @@ bool DC::_getDataVarDimensions(
 	if (! status) return(false);
 
 	string mname = var.GetMeshName();
+	if (mname.empty()) return(true);	// 0-d variable
 
 	Mesh mesh;
 	status = GetMesh(mname, mesh);

diff --git a/lib/vdc/DerivedVar.cpp b/lib/vdc/DerivedVar.cpp
@@ -2466,21 +2466,21 @@ int DerivedCoordVarStandardOceanSCoordinate::initialize_missing_values() {
 		SetErrMsg("Invalid variable \"%s\"", _CVar.c_str());
 		return(-1);
 	}
-	if (dataInfo.GetHasMissing()) _CVarMV = dataInfo.GetHasMissing();
+	if (dataInfo.GetHasMissing()) _CVarMV = dataInfo.GetMissingValue();
 
 	status = _dc->GetDataVarInfo(_etaVar, dataInfo);
 	if (! status) {
 		SetErrMsg("Invalid variable \"%s\"", _etaVar.c_str());
 		return(-1);
 	}
-	if (dataInfo.GetHasMissing()) _etaVarMV = dataInfo.GetHasMissing();
+	if (dataInfo.GetHasMissing()) _etaVarMV = dataInfo.GetMissingValue();
 
 	status = _dc->GetDataVarInfo(_depthVar, dataInfo);
 	if (! status) {
 		SetErrMsg("Invalid variable \"%s\"", _depthVar.c_str());
 		return(-1);
 	}
-	if (dataInfo.GetHasMissing()) _depthVarMV = dataInfo.GetHasMissing();
+	if (dataInfo.GetHasMissing()) _depthVarMV = dataInfo.GetMissingValue();
 
 	return(0);
 }