Merge branch 'issue3566' into issue3573_weekly

NCAR · Apr 2, 2024 · 51c42ba · 51c42ba
2 parents 458b178 + 90f1202
commit 51c42ba
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -107,7 +107,7 @@ commands:
           command: |
             if [ -z "$(ls -A /smokeTestData)" ]; then
                 mkdir -p /smokeTestData
-                wget https://vaporawsbucket.s3.us-west-2.amazonaws.com/
+                wget https://vaporawsbucket.s3.us-west-2.amazonaws.com/smokeTestData.tar.gz
                 tar --no-same-owner -xf /root/project/smokeTestData.tar.gz -C /smokeTestData
                 chown -R root:root /smokeTestData
                 chmod -R 777 /smokeTestData

diff --git a/lib/vdc/Grid.cpp b/lib/vdc/Grid.cpp
@@ -137,7 +137,6 @@ size_t Grid::GetNumDimensions(DimsType dims)
         VAssert(dims[i] > 0);
         if (dims[i] > 1) nDims++;
     }
-    nDims = std::max(nDims, (size_t)1); // Otherwise will return 0 dim for single particle
     return (nDims);
 }
 

diff --git a/lib/vdc/UnstructuredGrid.cpp b/lib/vdc/UnstructuredGrid.cpp
@@ -24,7 +24,8 @@ void UnstructuredGrid::_unstructuredGrid(const DimsType &vertexDims, const DimsT
                                          Location location,    // node,face, edge
                                          size_t maxVertexPerFace, size_t maxFacePerVertex, long nodeOffset, long cellOffset)
 {
-    VAssert(GetNumDimensions(vertexDims) == 1 || GetNumDimensions(vertexDims) == 2);
+    // vertexDims can be 0 in the case of a single-particle dataset since vapor considers length 1 topological data-dimensions as not contributing to the grids topological dimension
+    VAssert(GetNumDimensions(vertexDims) == 0 || GetNumDimensions(vertexDims) == 1 || GetNumDimensions(vertexDims) == 2);
     VAssert(GetNumDimensions(vertexDims) == GetNumDimensions(faceDims));
     VAssert((GetNumDimensions(vertexDims) == GetNumDimensions(edgeDims)) || (GetNumDimensions(edgeDims) == 0));
 

diff --git a/lib/vdc/UnstructuredGrid3D.cpp b/lib/vdc/UnstructuredGrid3D.cpp
@@ -27,9 +27,10 @@ UnstructuredGrid3D::UnstructuredGrid3D(const DimsType &vertexDims, const DimsTyp
 : UnstructuredGrid(vertexDims, faceDims, edgeDims, bs, blks, 3, vertexOnFace, faceOnVertex, faceOnFace, location, maxVertexPerFace, maxFacePerVertex, nodeOffset, cellOffset), _xug(xug), _yug(yug),
   _zug(zug)
 {
-    VAssert(xug.GetNumDimensions() == 1);
-    VAssert(yug.GetNumDimensions() == 1);
-    VAssert(zug.GetNumDimensions() == 1);
+    // These can be 0 in the case of a single-particle dataset since vapor considers length 1 topological data-dimensions as not contributing to the grids topological dimension
+    // VAssert(xug.GetNumDimensions() == 1);
+    // VAssert(yug.GetNumDimensions() == 1);
+    // VAssert(zug.GetNumDimensions() == 1);
 
     VAssert(location == NODE);
 }
@@ -42,9 +43,10 @@ UnstructuredGrid3D::UnstructuredGrid3D(const std::vector<size_t> &vertexDims, co
 : UnstructuredGrid(vertexDims, faceDims, edgeDims, bs, blks, 3, vertexOnFace, faceOnVertex, faceOnFace, location, maxVertexPerFace, maxFacePerVertex, nodeOffset, cellOffset), _xug(xug), _yug(yug),
   _zug(zug)
 {
-    VAssert(xug.GetNumDimensions() == 1);
-    VAssert(yug.GetNumDimensions() == 1);
-    VAssert(zug.GetNumDimensions() == 1);
+    // These can be 0 in the case of a single-particle dataset since vapor considers length 1 topological data-dimensions as not contributing to the grids topological dimension
+    // VAssert(xug.GetNumDimensions() == 1);
+    // VAssert(yug.GetNumDimensions() == 1);
+    // VAssert(zug.GetNumDimensions() == 1);
 
     VAssert(location == NODE);
 }