Merge branch 'develop' into feature/ufs-EnsForecasts

JCSDA · Dec 19, 2023 · 272e8b3 · 272e8b3
2 parents 4004a52 + 05fd0a2
commit 272e8b3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/run_ec2_pcluster.yaml b/.github/workflows/run_ec2_pcluster.yaml
@@ -74,7 +74,7 @@ jobs:
           cat <<EOF > setup.sh
           #!/bin/bash
 
-          echo "Loading ufs-bundle environment using spack-stack-1.5.0"
+          echo "Loading ufs-bundle environment using spack-stack-1.5.1"
 
           ulimit -s unlimited
           ulimit -c unlimited
@@ -84,7 +84,7 @@ jobs:
 
           source /opt/intel/oneapi/compiler/2022.1.0/env/vars.sh
 
-          module use /mnt/experiments-efs/skylab-v6/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core
+          module use /mnt/experiments-efs/skylab-v7/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core
           module load stack-intel/2022.1.0
           module load stack-intel-oneapi-mpi/2021.6.0
           module load stack-python/3.10.8
@@ -183,8 +183,8 @@ jobs:
           message_format: '{emoji} *{workflow}* {status_message} for branch {branch} in <{repo_url}|{repo}>'
           footer: ${{ github.event.pull_request.number || github.event_name || 'workflow dispatched manually' }}
           # For testing: only notify user Dom
-          mention_users: 'U02NLGXF5HV'
-          mention_users_when: 'failure,warnings'
+          #mention_users: 'U02NLGXF5HV'
+          #mention_users_when: 'failure,warnings'
           ## Default: notify channel
-          #mention_groups: '!channel'
-          #mention_groups_when: 'failure,warnings'
+          mention_groups: '!channel'
+          mention_groups_when: 'failure,warnings'
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -163,13 +163,13 @@ set_target_properties(mom6 PROPERTIES IMPORTED_LOCATION ${DEPEND_LIB_ROOT}/${CMA
 if(UFS_APP MATCHES "^(ATM)$" OR UFS_APP MATCHES "^(ATMAERO)$" OR UFS_APP MATCHES "^(S2S)$")
   ecbuild_bundle( PROJECT femps         GIT "https://github.com/jcsda-internal/femps.git"         TAG 1.2.0 )
   option(ENABLE_FV3_JEDI_DATA "Obtain fv3-jedi test data from fv3-jedi-data repository (vs tarball)" ON)
-  ecbuild_bundle( PROJECT fv3-jedi      GIT "https://github.com/jcsda-internal/fv3-jedi.git"      BRANCH feature/ufs-EnsForecasts UPDATE )  # updated from develop Dec 05 2023
+  ecbuild_bundle( PROJECT fv3-jedi      GIT "https://github.com/jcsda-internal/fv3-jedi.git"      BRANCH feature/ufs-EnsForecasts UPDATE )  # updated from develop Dec 12 2023
   if(UFS_APP MATCHES "^(S2S)$")
-    ecbuild_bundle( PROJECT soca        GIT "https://github.com/jcsda-internal/soca.git"          BRANCH feature/ufs_dom UPDATE )  # note this has not been updated in a while, there are many merge conflicts that need to be resolved
+    ecbuild_bundle( PROJECT soca        GIT "https://github.com/jcsda-internal/soca.git"          BRANCH feature/ufs_dom UPDATE )  # updated from develop Dec 12 2023
     add_dependencies(soca ufs-weather-model)
   endif()
 elseif(UFS_APP MATCHES "^(NG-GODAS)$")
-  ecbuild_bundle( PROJECT soca     GIT "https://github.com/jcsda-internal/soca.git" BRANCH feature/ufs_dom )  # note this has not been updated in a while, there are many merge conflicts that need to be resolved
+  ecbuild_bundle( PROJECT soca     GIT "https://github.com/jcsda-internal/soca.git" BRANCH feature/ufs_dom UPDATE )  # updated from develop Dec 12 2023
   add_dependencies(soca ufs-weather-model)
 else()
   message(FATAL_ERROR "ufs-bundle unknown UFS_APP ${UFS_APP}")