From 613e83ddd569b1ab10bfcaf6420e847d0932bdf4 Mon Sep 17 00:00:00 2001 From: Brian Han Date: Thu, 16 May 2024 10:55:19 -0700 Subject: [PATCH] Try Pangea 2 --- .devcontainer/devcontainer.json | 2 +- .github/workflows/ci_tests.yml | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 687e475c169..77ee7d83ef3 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - "GEOS_TPL_TAG": "261-254" + "GEOS_TPL_TAG": "261-272" } }, "runArgs": [ diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index fdf60c1f414..1f46f0dc2a1 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -161,12 +161,13 @@ jobs: # HOST_CONFIG: host-configs/TOTAL/pecan-CPU.cmake # GCP_BUCKET: geosx/Pecan-CPU - # - name: Pangea 2 (centos 7.6, gcc 8.3.0, open-mpi 2.1.5, mkl 2019.3) - # CMAKE_BUILD_TYPE: Release - # DOCKER_REPOSITORY: geosx/pangea2-gcc8.3.0-openmpi2.1.5-mkl2019.3 - # ENABLE_HYPRE: ON - # ENABLE_TRILINOS: OFF - # GCP_BUCKET: geosx/Pangea2 + - name: Pangea 2 (centos 7.6, gcc 8.3.0, open-mpi 2.1.5, mkl 2019.3) + CMAKE_BUILD_TYPE: Release + DOCKER_REPOSITORY: geosx/pangea2-gcc8.3.0-openmpi2.1.5-mkl2019.3 + ENABLE_HYPRE: ON + ENABLE_TRILINOS: OFF + GCP_BUCKET: geosx/Pangea2 + HOST_CONFIG: /spack-generated.cmake # - name: Sherlock CPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10) # CMAKE_BUILD_TYPE: Release