From a09df6ce8b31fd6a5c65ebc395a6dba98cd2cd54 Mon Sep 17 00:00:00 2001 From: StasJ Date: Mon, 1 Apr 2024 16:02:50 -0600 Subject: [PATCH 1/2] Fix #3566 --- lib/vdc/Grid.cpp | 1 - lib/vdc/UnstructuredGrid.cpp | 3 ++- lib/vdc/UnstructuredGrid3D.cpp | 14 ++++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/vdc/Grid.cpp b/lib/vdc/Grid.cpp index 0b69ebaf0f..31a9f995c0 100644 --- 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 index 3be9e25d87..5d1c626a82 100644 --- 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 index e6a7c3dbc3..0df0168688 100644 --- 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 &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); } From 90f12022ac6f3da7ac3dc17443bb5a700122ffed Mon Sep 17 00:00:00 2001 From: sgpearse Date: Tue, 2 Apr 2024 08:07:23 -0600 Subject: [PATCH 2/2] fix smoke test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 63bef8ab91..978f5ea39b 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -108,7 +108,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