test vendored cprnc

E3SM-Project · Jul 21, 2024 · 00bb9a1 · 00bb9a1
1 parent d29f8b6
commit 00bb9a1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/.github/workflows/e3sm-gh-ci-cime-tests.yml b/.github/workflows/e3sm-gh-ci-cime-tests.yml
@@ -36,7 +36,7 @@ jobs:
           - PET_P4.ne4pg2_oQU480.F2010.singularity2_gnu
           - PEM_P4.ne4pg2_oQU480.F2010.singularity2_gnu
     container: 
-      image: ghcr.io/mahf708/e3sm-imgs:v0.0.8
+      image: ghcr.io/mahf708/e3sm-imgs:test
 
     steps:
       - 

diff --git a/.github/workflows/e3sm-gh-ci-w-cime-tests.yml b/.github/workflows/e3sm-gh-ci-w-cime-tests.yml
@@ -28,7 +28,7 @@ jobs:
           - PET_P8.ne4pg2_oQU480.WCYCL2010NS.singularity2_gnu
           - PEM_P8.ne4pg2_oQU480.WCYCL2010NS.singularity2_gnu
     container: 
-      image: ghcr.io/mahf708/e3sm-imgs:v0.0.8
+      image: ghcr.io/mahf708/e3sm-imgs:test
 
     steps:
       - 

diff --git a/cime_config/machines/config_machines.xml b/cime_config/machines/config_machines.xml
@@ -1725,7 +1725,7 @@
     <DIN_LOC_ROOT_CLMFORC>$ENV{HOME}/projects/e3sm/ptclm-data</DIN_LOC_ROOT_CLMFORC>
     <DOUT_S_ROOT>$ENV{HOME}/projects/e3sm/scratch/archive/$CASE</DOUT_S_ROOT>
     <BASELINE_ROOT>$ENV{HOME}/projects/e3sm/baselines/$COMPILER</BASELINE_ROOT>
-    <CCSM_CPRNC>$CCSMROOT/tools/cprnc/build/cprnc</CCSM_CPRNC>
+    <CCSM_CPRNC>/usr/local/packages/bin/cprnc</CCSM_CPRNC>
     <GMAKE>make</GMAKE>
     <GMAKE_J>4</GMAKE_J>
     <TESTS>e3sm_developer</TESTS>
@@ -1747,13 +1747,11 @@
     </environment_variables>
     <environment_variables mpilib="mpi-serial">
       <env name="NETCDF_PATH">/usr/local/packages</env>
-      <env name="NetCDF_C_LIBRARIES">/usr/local/packages</env>
       <env name="PATH">/usr/local/packages/bin:$ENV{PATH}</env>
       <env name="LD_LIBRARY_PATH">/usr/local/packages/lib</env>
     </environment_variables>
     <environment_variables mpilib="!mpi-serial">
       <env name="NETCDF_PATH">/usr/local/packages</env>
-      <env name="NetCDF_C_LIBRARIES">/usr/local/packages</env>
       <env name="PNETCDF_PATH">/usr/local/packages</env>
       <env name="HDF5_ROOT">/usr/local/packages</env>
       <env name="PATH">/usr/local/packages/bin:$ENV{PATH}</env>