Skip to content

Commit

Permalink
more notes, and fix for CPRNC
Browse files Browse the repository at this point in the history
  • Loading branch information
mahf708 authored Sep 23, 2024
1 parent 09554e7 commit f9ad403
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
14 changes: 13 additions & 1 deletion .github/workflows/eamxx-gh-ci-standalone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,18 @@ jobs:
env:
SHELL: sh
run: |
# get rid of this extra line if we can?
# TODO: get rid of this extra line if we can?
git config --global safe.directory '*'
./components/eamxx/scripts/test-all-scream -m ghci-oci -t ${{ matrix.test }}
# TODO: add logging...
# -
# name: Artifacts
# uses: actions/upload-artifact@v4
# if: ${{ always() }}
# with:
# name: ${{ matrix.test }}
# path: |
# /projects/e3sm/scratch/${{ matrix.test }}*/TestStatus.log
# /projects/e3sm/scratch/${{ matrix.test }}*/bld/*.bldlog.*
# /projects/e3sm/scratch/${{ matrix.test }}*/run/*.log.*
# /projects/e3sm/scratch/${{ matrix.test }}*/run/*.cprnc.out
1 change: 1 addition & 0 deletions components/eamxx/cmake/BuildCprnc.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ macro(BuildCprnc)
# TODO: handle this more carefully and more gracefully in the future
# TODO: For now, it is just a hack to get going...
# find cprnc defined in machine entries
set(CCSM_CPRNC $ENV{CCSM_CPRNC})
if(EXISTS "${CCSM_CPRNC}")
message(STATUS "Path ${CCSM_CPRNC} exists, so we will use it")
set(CPRNC_BINARY ${CCSM_CPRNC} CACHE INTERNAL "")
Expand Down
2 changes: 1 addition & 1 deletion components/eamxx/cmake/machine-files/ghci-oci.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ set(EKAT_MPI_NP_FLAG "-np" CACHE STRING "-np")

# TODO: hack in place to get eamxx to recognize CPRNC
# TODO: See note in BuildCprnc.cmake...
set(CCSM_CPRNC "/usr/local/packages/bin/cprnc")
set(ENV{CCSM_CPRNC} "/usr/local/packages/bin/cprnc")

0 comments on commit f9ad403

Please sign in to comment.