diff --git a/.github/workflows/DependencyDockerBuild.yaml b/.github/workflows/DependencyDockerBuild.yaml index f9e5ab97e..f5fc7e5b3 100644 --- a/.github/workflows/DependencyDockerBuild.yaml +++ b/.github/workflows/DependencyDockerBuild.yaml @@ -38,7 +38,8 @@ jobs: needs: [ get-timestamp ] strategy: matrix: - arch: [ { runson: ARM64, id: -arm64 }, { runson: ubuntu-latest, id: -amd64 } ] + arch: [ { runson: ubuntu-latest, id: -amd64 } ] + #arch: [ { runson: ARM64, id: -arm64 }, { runson: ubuntu-latest, id: -amd64 } ] compiler: [ { id: -gcc }, { id: -clang } ] indices: [ { index64bit: 0, id: "" }, { index64bit: 1, id: "-index64" } ] include: @@ -87,7 +88,8 @@ jobs: strategy: max-parallel: 1 matrix: - arch: [ { runson: ARM64, id: -arm64 }, { runson: ubuntu-latest, id: -amd64 } ] + arch: [ { runson: ubuntu-latest, id: -amd64 } ] + #arch: [ { runson: ARM64, id: -arm64 }, { runson: ubuntu-latest, id: -amd64 } ] compiler: [ { id: -gcc }, { id: -clang } ] indices: [ { index64bit: 0, id: "" }, { index64bit: 1, id: "-index64" } ] include: diff --git a/.github/workflows/PullRequestWorkflow.yml b/.github/workflows/PullRequestWorkflow.yml index a57710a73..e8d77557b 100644 --- a/.github/workflows/PullRequestWorkflow.yml +++ b/.github/workflows/PullRequestWorkflow.yml @@ -16,7 +16,8 @@ jobs: strategy: fail-fast: false matrix: - arch: [ { runson: ARM64, id: -arm64 }, { runson: ubuntu-latest, id: -amd64 } ] + arch: [ { runson: ubuntu-latest, id: -amd64 } ] + #arch: [ { runson: ARM64, id: -arm64 }, { runson: ubuntu-latest, id: -amd64 } ] compiler: [ { cc: gcc, cxx: g++, id: -gcc }, { cc: clang, cxx: clang++, id: -clang } ] indices: [ { index64bit: 0, id: "" }, { index64bit: 1, id: "-index64" } ] petscConfig: [ arch-ablate-opt ] diff --git a/.github/workflows/RegressionTestWorkflow.yml b/.github/workflows/RegressionTestWorkflow.yml index 9d0229aa4..e65584525 100644 --- a/.github/workflows/RegressionTestWorkflow.yml +++ b/.github/workflows/RegressionTestWorkflow.yml @@ -13,7 +13,8 @@ jobs: strategy: fail-fast: false matrix: - arch: [ { runson: ARM64, id: -arm64 }, { runson: ubuntu-latest, id: -amd64 } ] + arch: [ { runson: ubuntu-latest, id: -amd64 } ] + #arch: [ { runson: ARM64, id: -arm64 }, { runson: ubuntu-latest, id: -amd64 } ] compiler: [ { id: -gcc }, { id: -clang } ] indices: [ { index64bit: 0, id: "" }, { index64bit: 1, id: "-index64" } ] petscConfig: [ arch-ablate-opt ] @@ -51,4 +52,4 @@ jobs: run: | echo Tests unsuccessful! exit 1 - - run: echo All tests Successful! \ No newline at end of file + - run: echo All tests Successful! diff --git a/CMakeLists.txt b/CMakeLists.txt index 4dd25b979..775331587 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.18.4) include(config/petscCompilers.cmake) # Set the project details -project(ablateLibrary VERSION 0.12.32) +project(ablateLibrary VERSION 0.12.33) # Load the Required 3rd Party Libaries pkg_check_modules(PETSc REQUIRED IMPORTED_TARGET GLOBAL PETSc) diff --git a/tests/integrationTests/inputs/compressibleFlow/compressibleSublimationPipeWithExtrude/compressibleSublimationPipeWithExtrude.txt b/tests/integrationTests/inputs/compressibleFlow/compressibleSublimationPipeWithExtrude/compressibleSublimationPipeWithExtrude.txt index 4219fb54a..302ae2280 100644 --- a/tests/integrationTests/inputs/compressibleFlow/compressibleSublimationPipeWithExtrude/compressibleSublimationPipeWithExtrude.txt +++ b/tests/integrationTests/inputs/compressibleFlow/compressibleSublimationPipeWithExtrude/compressibleSublimationPipeWithExtrude.txt @@ -12,7 +12,7 @@ Labels: interiorCells: 1 strata with value/size (1 (1155)) boundaryCells: 1 strata with value/size (1 (387)) boundaryFaces: 1 strata with value/size (1 (64)) - ghost: 2 strata with value/size (2 (24), 1 (50)) + ghost: 2 strata with value/size (1 (50), 2 (24)) flowRegion: 1 strata with value/size (1 (1100)) Timestep: 0000 time = (.*) dt = (.*) z n1e-10 Timestep: 0001 time = (.*) dt = (.*) n1e-10 n1e-09 diff --git a/tests/integrationTests/inputs/domain/dmViewFromOptions.txt b/tests/integrationTests/inputs/domain/dmViewFromOptions.txt index c71240ec6..58c144012 100644 --- a/tests/integrationTests/inputs/domain/dmViewFromOptions.txt +++ b/tests/integrationTests/inputs/domain/dmViewFromOptions.txt @@ -161,10 +161,10 @@ DM Object: (.*) 1 MPI process * Number of 1-cells per rank: 12 Number of 2-cells per rank: 4 Labels: - marker: 4 strata with value/size (4 (5), 2 (5), 1 (5), 3 (5)) - Face Sets: 4 strata with value/size (4 (2), 2 (2), 1 (2), 3 (2)) + marker: 4 strata with value/size (1 (5), 2 (5), 3 (5), 4 (5)) + Face Sets: 4 strata with value/size (1 (2), 2 (2), 3 (2), 4 (2)) depth: 3 strata with value/size (0 (9), 1 (12), 2 (4)) - celltype: 3 strata with value/size (4 (4), 0 (9), 1 (12)) + celltype: 3 strata with value/size (0 (9), 1 (12), 4 (4)) Field velocity: adjacency FEM Field pressure: @@ -178,10 +178,10 @@ DM Object: (.*) 1 MPI process * Number of 1-cells per rank: 12 Number of 2-cells per rank: 4 Labels: - marker: 4 strata with value/size (4 (5), 2 (5), 1 (5), 3 (5)) - Face Sets: 4 strata with value/size (4 (2), 2 (2), 1 (2), 3 (2)) + marker: 4 strata with value/size (1 (5), 2 (5), 3 (5), 4 (5)) + Face Sets: 4 strata with value/size (1 (2), 2 (2), 3 (2), 4 (2)) depth: 3 strata with value/size (0 (9), 1 (12), 2 (4)) - celltype: 3 strata with value/size (4 (4), 0 (9), 1 (12)) + celltype: 3 strata with value/size (0 (9), 1 (12), 4 (4)) Field velocity: adjacency FEM Field pressure: @@ -195,10 +195,10 @@ DM Object: (.*) 1 MPI process * Number of 1-cells per rank: 12 Number of 2-cells per rank: 4 Labels: - marker: 4 strata with value/size (4 (5), 2 (5), 1 (5), 3 (5)) - Face Sets: 4 strata with value/size (4 (2), 2 (2), 1 (2), 3 (2)) + marker: 4 strata with value/size (1 (5), 2 (5), 3 (5), 4 (5)) + Face Sets: 4 strata with value/size (1 (2), 2 (2), 3 (2), 4 (2)) depth: 3 strata with value/size (0 (9), 1 (12), 2 (4)) - celltype: 3 strata with value/size (4 (4), 0 (9), 1 (12)) + celltype: 3 strata with value/size (0 (9), 1 (12), 4 (4)) Field velocity: adjacency FEM Field pressure: diff --git a/tests/integrationTests/inputs/domain/extrudeBoundaryTest.txt b/tests/integrationTests/inputs/domain/extrudeBoundaryTest.txt index 9a2a14b20..42f8383ff 100644 --- a/tests/integrationTests/inputs/domain/extrudeBoundaryTest.txt +++ b/tests/integrationTests/inputs/domain/extrudeBoundaryTest.txt @@ -5,10 +5,10 @@ extrudedMesh in 2 dimensions: Number of 1-cells per rank: 57 Number of 2-cells per rank: 24 Labels: - celltype: 3 strata with value/size (4 (24), 0 (34), 1 (57)) + celltype: 3 strata with value/size (0 (34), 1 (57), 4 (24)) depth: 3 strata with value/size (0 (34), 1 (57), 2 (24)) - marker: 4 strata with value/size (4 (27), 2 (11), 1 (27), 3 (11)) - Face Sets: 4 strata with value/size (4 (12), 2 (4), 1 (12), 3 (4)) + marker: 4 strata with value/size (1 (27), 2 (11), 3 (11), 4 (27)) + Face Sets: 4 strata with value/size (1 (12), 2 (4), 3 (4), 4 (12)) interiorCells: 1 strata with value/size (1 (81)) boundaryCells: 1 strata with value/size (1 (51)) boundaryRegion: 1 strata with value/size (1 (8)) diff --git a/tests/integrationTests/inputs/domain/meshGeneratorAxisymmetric.txt b/tests/integrationTests/inputs/domain/meshGeneratorAxisymmetric.txt index 7f7872373..8b66da909 100644 --- a/tests/integrationTests/inputs/domain/meshGeneratorAxisymmetric.txt +++ b/tests/integrationTests/inputs/domain/meshGeneratorAxisymmetric.txt @@ -6,7 +6,7 @@ exampleAxisymmetricMesh in 3 dimensions: Number of 2-cells per rank: 24200 (23380) Number of 3-cells per rank: 8000 (800) Labels: - celltype: 6 strata with value/size (0 (8241), 7 (7200), 8 (800), 3 (820), 1 (24440), 4 (23380)) + celltype: 6 strata with value/size (0 (8241), 1 (24440), 3 (820), 4 (23380), 7 (7200), 8 (800)) depth: 4 strata with value/size (0 (8241), 1 (24440), 2 (24200), 3 (8000)) boundary: 1 strata with value/size (1 (4762)) upperCap: 1 strata with value/size (1 (801)) diff --git a/tests/unitTests/outputs/domain/dmPlex_NoArguments b/tests/unitTests/outputs/domain/dmPlex_NoArguments index 54e43d87a..dda6c4642 100644 --- a/tests/unitTests/outputs/domain/dmPlex_NoArguments +++ b/tests/unitTests/outputs/domain/dmPlex_NoArguments @@ -5,7 +5,7 @@ box in 2 dimensions: Number of 1-cells per rank: 16 Number of 2-cells per rank: 8 Labels: - celltype: 3 strata with value/size (0 (9), 3 (8), 1 (16)) + celltype: 3 strata with value/size (0 (9), 1 (16), 3 (8)) depth: 3 strata with value/size (0 (9), 1 (16), 2 (8)) marker: 1 strata with value/size (1 (16)) - Face Sets: 1 strata with value/size (1 (8)) + Face Sets: 4 strata with value/size (1 (2), 2 (2), 3 (2), 4 (2))