Fixed #2285 (#2286)

NCAR · Apr 21, 2020 · da1cb4d · da1cb4d
1 parent 00ac696
commit da1cb4d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 32 deletions.
diff --git a/lib/vdc/DC.cpp b/lib/vdc/DC.cpp
@@ -484,43 +484,45 @@ 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);
-	if (! status) return(false);
 
-	vector <string> dimnames;
-	if (mesh.GetMeshType() == Mesh::STRUCTURED) {
-		 dimnames = mesh.GetDimNames();
-	}
-	else {
-		switch (var.GetSamplingLocation()) {
-		case Mesh::NODE:
-			dimnames.push_back(mesh.GetNodeDimName()); 
-			break;
-		case Mesh::EDGE:
-			dimnames.push_back(mesh.GetEdgeDimName()); 
-			break;
-		case Mesh::FACE:
-			dimnames.push_back(mesh.GetFaceDimName()); 
-			break;
-		case Mesh::VOLUME:
-			VAssert(0 && "VOLUME cells not supported");
-			break;
+	if (! mname.empty()) {;	// 0-d variable
+		Mesh mesh;
+		status = GetMesh(mname, mesh);
+		if (! status) return(false);
+
+		vector <string> dimnames;
+		if (mesh.GetMeshType() == Mesh::STRUCTURED) {
+			 dimnames = mesh.GetDimNames();
 		}
-		if (mesh.GetMeshType() == Mesh::UNSTRUC_LAYERED) {
-			dimnames.push_back(mesh.GetLayersDimName());
+		else {
+			switch (var.GetSamplingLocation()) {
+			case Mesh::NODE:
+				dimnames.push_back(mesh.GetNodeDimName()); 
+				break;
+			case Mesh::EDGE:
+				dimnames.push_back(mesh.GetEdgeDimName()); 
+				break;
+			case Mesh::FACE:
+				dimnames.push_back(mesh.GetFaceDimName()); 
+				break;
+			case Mesh::VOLUME:
+				VAssert(0 && "VOLUME cells not supported");
+				break;
+			}
+			if (mesh.GetMeshType() == Mesh::UNSTRUC_LAYERED) {
+				dimnames.push_back(mesh.GetLayersDimName());
+			}
 		}
-	}
 
-	for (int i=0; i<dimnames.size(); i++) {
-		Dimension dim;
+		for (int i=0; i<dimnames.size(); i++) {
+			Dimension dim;
 
-		status = GetDimension(dimnames[i], dim);
-		if (! status) return(false);
+			status = GetDimension(dimnames[i], dim);
+			if (! status) return(false);
 
-		dimensions.push_back(dim);
+			dimensions.push_back(dim);
+		}
 	}
 
 	// we're done if time dim isn't wanted

diff --git a/lib/vdc/DCCF.cpp b/lib/vdc/DCCF.cpp
@@ -480,11 +480,11 @@ int DCCF::_InitHorizontalCoordinates(
 ) {
 
     //
-    // Get names of data variables  in the CF data set that have 2 or 3
+    // Get names of data variables  in the CF data set that have 1 to 3
     // spatial dimensions
     //
     vector <string> dvars;
-    for (int i=2; i<4; i++) {
+    for (int i=1; i<4; i++) {
         vector <string> v = ncdfc->GetDataVariableNames(i,true);
         dvars.insert(dvars.end(), v.begin(), v.end());
     }