Rename CCPP suites to non-meaningful names

.github/workflows/ci_build_scm_ubuntu_22.04.yml

@@ -21,8 +21,7 @@ jobs:
       sp_ROOT:    /home/runner/NCEPLIBS-sp
       w3emc_ROOT: /home/runner/myw3emc
       SCM_ROOT:   /home/runner/work/ccpp-scm/ccpp-scm
-      intel_ROOT: /home/runner/intel
-      suites:     SCM_GFS_v15p2,SCM_GFS_v16,SCM_GFS_v17_p8,SCM_HRRR,SCM_RRFS_v1beta,SCM_RAP,SCM_WoFS_v0,SCM_GFS_v15p2_ps,SCM_GFS_v16_ps,SCM_GFS_v17_p8_ps,SCM_HRRR_ps,SCM_RRFS_v1beta_ps,SCM_RAP_ps,SCM_WoFS_v0_ps
+      suites:     kingfisher,raven,bluebird,bald_eagle,pigeon,albatross,hummingbird,kingfisher_ps,raven_ps,bluebird_ps,bald_eagle_ps,pigeon_ps,albatross_ps,hummingbird_ps
 
     # Workflow steps
     steps:
@@ -57,33 +56,17 @@ jobs:
     #######################################################################################
     # Install FORTRAN dependencies
     #######################################################################################
-    - name: Environment for ifort compiler
-      if: contains(matrix.fortran-compiler, 'ifort')
+    - name: Install openmpi
       run: |
-        echo "CC=icx"   >> $GITHUB_ENV
-        echo "FC=ifort" >> $GITHUB_ENV
-        echo "NFVERSION=v4.4.4" >> $GITHUB_ENV
-
-    - name: Cache Intel compilers
-      id: cache-intel-compilers
-      if: contains(matrix.fortran-compiler, 'ifort')
-      uses: actions/cache@v2
-      with:
-        path: /home/runner/intel
-        key: intel-${{ runner.os }}-compilers-b
-
-    # https://software.intel.com/content/www/us/en/develop/articles/installing-intel-oneapi-toolkits-via-apt.html
-    # List of packages from Docker file at
-    #    https://github.com/intel/oneapi-containers/blob/master/images/docker/hpckit-devel-ubuntu18.04/Dockerfile
-    - name: Install Intel compilers and libraries
-      if: contains(matrix.fortran-compiler, 'ifort') && steps.cache-intel-compilers.outputs.cache-hit != 'true'
-      run: |
-        wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
-        sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
-        sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
-        sudo apt-get update
-        sudo apt-get install intel-hpckit-getting-started intel-oneapi-clck intel-oneapi-common-licensing intel-oneapi-common-vars
-        sudo apt-get install intel-oneapi-dev-utilities  intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic intel-oneapi-compiler-fortran intel-oneapi-itac
+        wget https://github.com/open-mpi/ompi/archive/refs/tags/v4.1.6.tar.gz
+        tar -xvf v4.1.6.tar.gz
+        cd ompi-4.1.6
+        ./autogen.pl
+        ./configure --prefix=/home/runner/ompi-4.1.6
+        make -j4
+        make install
+        echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
+        echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV
 
     - name: Cache bacio library v2.4.1
       id: cache-bacio-fortran
@@ -158,6 +141,11 @@ jobs:
         sudo make install
         export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${NFHOME}/lib
 
+    - name: Environment for openmpi compiler
+      run: |
+        echo "FC=mpif90" >> $GITHUB_ENV
+        echo "CC=mpicc"  >> $GITHUB_ENV
+
     #######################################################################################
     # Build SCM.
     #######################################################################################

.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml

@@ -23,8 +23,8 @@ jobs:
       SCM_ROOT:    /home/runner/work/ccpp-scm/ccpp-scm
       zlib_ROOT:   /home/runner/zlib
       HDF5_ROOT:   /home/runner/hdf5
-      suites:      SCM_GFS_v15p2,SCM_GFS_v16,SCM_GFS_v17_p8,SCM_HRRR,SCM_RRFS_v1beta,SCM_RAP,SCM_WoFS_v0
-      suites_ps:  SCM_GFS_v15p2_ps,SCM_GFS_v16_ps,SCM_GFS_v17_p8_ps,SCM_HRRR_ps,SCM_RRFS_v1beta_ps,SCM_RAP_ps,SCM_WoFS_v0_ps
+      suites:      kingfisher,raven,bluebird,bald_eagle,pigeon,albatross,hummingbird
+      suites_ps:  kingfisher_ps,raven_ps,bluebird_ps,bald_eagle_ps,pigeon_ps,albatross_ps,hummingbird_ps
 
     # Workflow steps
     steps:

.github/workflows/ci_run_scm_DEPHY.yml

@@ -20,7 +20,7 @@ jobs:
       sp_ROOT:    /home/runner/NCEPLIBS-sp
       w3emc_ROOT: /home/runner/myw3emc
       SCM_ROOT:   /home/runner/work/ccpp-scm/ccpp-scm
-      suites:     SCM_GFS_v16,SCM_GFS_v16_ps
+      suites:     raven,raven_ps
 
     # Workflow steps
     steps:
@@ -51,9 +51,22 @@ jobs:
     - name: Update system packages
       run: sudo apt-get update
 
+
     #######################################################################################
     # Install FORTRAN dependencies
     #######################################################################################
+    - name: Install openmpi
+      run: |
+        wget https://github.com/open-mpi/ompi/archive/refs/tags/v4.1.6.tar.gz
+        tar -xvf v4.1.6.tar.gz
+        cd ompi-4.1.6
+        ./autogen.pl
+        ./configure --prefix=/home/runner/ompi-4.1.6
+        make -j4
+        make install
+        echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
+        echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV
+
     - name: Cache bacio library v2.4.1
       id: cache-bacio-fortran
       uses: actions/cache@v3
@@ -128,6 +141,11 @@ jobs:
     #######################################################################################
     # Build SCM. Run DEPHYv1 case.
     #######################################################################################
+    - name: Environment for openmpi compiler
+      run: |
+        echo "FC=mpif90" >> $GITHUB_ENV
+        echo "CC=mpicc"  >> $GITHUB_ENV
+
     - name: Download data for SCM
       run: |
         cd ${SCM_ROOT}

.github/workflows/ci_run_scm_rts.yml

@@ -21,8 +21,8 @@ jobs:
       sp_ROOT:    /home/runner/NCEPLIBS-sp
       w3emc_ROOT: /home/runner/myw3emc
       SCM_ROOT:   /home/runner/work/ccpp-scm/ccpp-scm
-      suites:     SCM_GFS_v15p2,SCM_GFS_v16,SCM_GFS_v17_p8,SCM_HRRR,SCM_RRFS_v1beta,SCM_RAP,SCM_WoFS_v0,SCM_RRFS_v1,SCM_GFS_v17_HR3,SCM_GFS_v17_HR3_RRTMGP
-      suites_ps:  SCM_GFS_v15p2_ps,SCM_GFS_v16_ps,SCM_GFS_v17_p8_ps,SCM_HRRR_ps,SCM_RRFS_v1beta_ps,SCM_RAP_ps,SCM_WoFS_v0_ps,SCM_RRFS_v1_ps,SCM_GFS_v17_HR3_ps,SCM_GFS_v17_HR3_RRTMGP_ps
+      suites:     kingfisher,raven,bluebird,bald_eagle,pigeon,albatross,hummingbird,magpie,robin,warbler
+      suites_ps:  kingfisher_ps,raven_ps,bluebird_ps,bald_eagle_ps,pigeon_ps,albatross_ps,hummingbird_ps,magpie_ps,robin_ps,warbler_ps
       dir_rt:     /home/runner/work/ccpp-scm/ccpp-scm/test/artifact-${{matrix.build-type}}
       dir_bl:     /home/runner/work/ccpp-scm/ccpp-scm/test/BL-${{matrix.build-type}}
 
@@ -59,17 +59,22 @@ jobs:
     #######################################################################################
     # Install FORTRAN dependencies
     #######################################################################################
-    - name: Environment for gfortran compiler
-      if: contains(matrix.fortran-compiler, 'gnu')
-      run: |
-        echo "FC=gfortran-11" >> $GITHUB_ENV
-        echo "CC=gcc-11"      >> $GITHUB_ENV
 
-    - name: Environment for ifort compiler
-      if: contains(matrix.fortran-compiler, 'intel')
+    - name: Install openmpi
       run: |
-        echo "CC=icx"         >> $GITHUB_ENV
-        echo "FC=ifort"       >> $GITHUB_ENV
+        wget https://github.com/open-mpi/ompi/archive/refs/tags/v4.1.6.tar.gz
+        tar -xvf v4.1.6.tar.gz
+        cd ompi-4.1.6
+        ./autogen.pl
+        ./configure --prefix=/home/runner/ompi-4.1.6
+        make -j4
+        make install
+        echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
+        echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV
+
+    #######################################################################################
+    # Install FORTRAN dependencies
+    #######################################################################################
 
     - name: Cache bacio library v2.4.1
       id: cache-bacio-fortran
@@ -142,16 +147,14 @@ jobs:
         sudo make install
         export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${NFHOME}/lib
 
+    - name: Environment for openmpi compiler
+      run: |
+        echo "FC=mpif90" >> $GITHUB_ENV
+        echo "CC=mpicc"  >> $GITHUB_ENV
+
     #######################################################################################
     # Build SCM. Run regression tests.
     #######################################################################################
-    - name: Download data for SCM
-      run: |
-        cd ${SCM_ROOT}
-        ./contrib/get_all_static_data.sh
-        ./contrib/get_thompson_tables.sh
-        ./contrib/get_aerosol_climo.sh
-
     - name: Configure build with CMake (Release)
       if: contains(matrix.build-type, 'Release')
       run: |
@@ -171,6 +174,13 @@ jobs:
         cd ${SCM_ROOT}/scm/bin
         make -j4
 
+    - name: Download data for SCM
+      run: |
+        cd ${SCM_ROOT}
+        ./contrib/get_all_static_data.sh
+        ./contrib/get_thompson_tables.sh
+        ./contrib/get_aerosol_climo.sh
+
     - name: Run SCM RTs
       run: |
         cd ${SCM_ROOT}/scm/bin

.github/workflows/ci_run_scm_ufs_replay.yml

@@ -72,4 +72,4 @@ jobs:
 
     #######################################################################################
     # Done
-    #######################################################################################
+    #######################################################################################

.gitmodules

@@ -1,11 +1,11 @@
 [submodule "ccpp-framework"]
 	path = ccpp/framework
-	url = https://github.com/NCAR/ccpp-framework
-	branch = main
+	url = https://github.com/mkavulich/ccpp-framework
+	branch = feature/suite_names_update
 [submodule "ccpp-physics"]
 	path = ccpp/physics
-	url = https://github.com/NCAR/ccpp-physics
-	branch = main
+	url = https://github.com/grantfirl/ccpp-physics
+	branch = ufs-dev-PR184
 [submodule "CMakeModules"]
 	path = CMakeModules
 	url = https://github.com/noaa-emc/CMakeModules

ccpp/config/ccpp_prebuild_config.py

@@ -33,6 +33,7 @@
 TYPEDEFS_NEW_METADATA = {
     'ccpp_types' : {
         'ccpp_types' : '',
+        'MPI_Comm' : '',
         'ccpp_t' : 'cdata',
         },
     'machine' : {

ccpp/suites/suite_SCM_RAP.xml → ccpp/suites/albatross.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="SCM_RAP" version="1">
+<!--
+DESCRIPTION:
+Suite "albatross" (formerly known as SCM_RAP) was originally developed for research and prototyping of early UFS systems. It was meant to emulate the physics of the Rapid Refresh (RAP) model, though it had some differences from the operational implementation (which was not CCPP-based).
+-->
+<suite name="albatross" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">

ccpp/suites/suite_SCM_RAP_ps.xml → ccpp/suites/albatross_ps.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "albatross" (formerly known as SCM_RAP) was originally developed for research and prototyping of early UFS systems. It was meant to emulate the physics of the Rapid Refresh (RAP) model, though it had some differences from the operational implementation (which was not CCPP-based).
 
-<suite name="SCM_RAP_ps" version="1">
+This is an SCM-specific "prescribed surface" suite file, specifically for experiments over land points which require prescribed surface fluxes. See https://ccpp-scm.readthedocs.io/en/latest/chap_intro.html#limitations for more information.
+-->
+<suite name="albatross_ps" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">

ccpp/suites/alias.json

@@ -0,0 +1,33 @@
+{
+    "HAFS_v0_hwrf_thompson_ps.xml": "sunbird_ps.xml",
+    "HAFS_v0_hwrf_thompson.xml": "sunbird.xml",
+    "SCM_GFS_v15p2_ps.xml": "kingfisher_ps.xml",
+    "SCM_GFS_v15p2.xml": "kingfisher.xml",
+    "SCM_GFS_v16_no_nsst_ps.xml": "nuthatch_ps.xml",
+    "SCM_GFS_v16_no_nsst.xml": "nuthatch.xml",
+    "SCM_GFS_v16_ps.xml": "raven_ps.xml",
+    "SCM_GFS_v16_RRTMGP_ps.xml": "mallard_ps.xml",
+    "SCM_GFS_v16_RRTMGP.xml": "mallard.xml",
+    "SCM_GFS_v16.xml": "raven.xml",
+    "SCM_GFS_v17_HR3_ps.xml": "magpie_ps.xml",
+    "SCM_GFS_v17_HR3_RRTMGP_ps.xml": "robin_ps.xml",
+    "SCM_GFS_v17_HR3_RRTMGP.xml": "robin.xml",
+    "SCM_GFS_v17_HR3.xml": "magpie.xml",
+    "SCM_GFS_v17_p8_c3_ps.xml": "parakeet_ps.xml",
+    "SCM_GFS_v17_p8_c3.xml": "parakeet.xml",
+    "SCM_GFS_v17_p8_ps.xml": "bluebird_ps.xml",
+    "SCM_GFS_v17_p8.xml": "bluebird.xml",
+    "SCM_HRRR_ps.xml": "bald_eagle_ps.xml",
+    "SCM_HRRR.xml": "bald_eagle.xml",
+    "SCM_RAP_ps.xml": "albatross_ps.xml",
+    "SCM_RAP.xml": "albatross.xml",
+    "SCM_RRFS_v1alpha_ps.xml": "towhee_ps.xml",
+    "SCM_RRFS_v1alpha.xml": "towhee.xml",
+    "SCM_RRFS_v1beta_ps.xml": "pigeon_ps.xml",
+    "SCM_RRFS_v1beta.xml": "pigeon.xml",
+    "SCM_RRFS_v1nssl.xml": "crossbill.xml",
+    "SCM_RRFS_v1_ps.xml": "warbler_ps.xml",
+    "SCM_RRFS_v1.xml": "warbler.xml",
+    "SCM_WoFS_v0_ps.xml": "hummingbird_ps.xml",
+    "SCM_WoFS_v0.xml": "hummingbird.xml"
+}

ccpp/suites/suite_SCM_HRRR.xml → ccpp/suites/bald_eagle.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="SCM_HRRR" version="1">
+<!--
+DESCRIPTION:
+Suite "bald_eagle" (formerly known as SCM_HRRR) was originally developed for research and testing for early prototypes of the Rapid Refresh Forecast System (RRFS). It was meant to emulate the physics of the High-Resolution Rapid Refresh (HRRR) model, though it had some differences from the operational implementation (which was not CCPP-based).
+-->
+<suite name="bald_eagle" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">

ccpp/suites/suite_SCM_HRRR_ps.xml → ccpp/suites/bald_eagle_ps.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "bald_eagle" (formerly known as SCM_HRRR) was originally developed for research and testing for early prototypes of the Rapid Refresh Forecast System (RRFS). It was meant to emulate the physics of the High-Resolution Rapid Refresh (HRRR) model, though it had some differences from the operational implementation (which was not CCPP-based).
 
-<suite name="SCM_HRRR_ps" version="1">
+This is an SCM-specific "prescribed surface" suite file, specifically for experiments over land points which require prescribed surface fluxes. See https://ccpp-scm.readthedocs.io/en/latest/chap_intro.html#limitations for more information.
+-->
+<suite name="bald_eagle_ps" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">

ccpp/suites/suite_SCM_GFS_v17_p8.xml → ccpp/suites/bluebird.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="SCM_GFS_v17_p8" version="1">
+<!--
+DESCRIPTION:
+Suite "bluebird" (formerly known as SCM_GFS_v17_p8) was used for testing an early prototype of the Global Forecast System (GFS) version 17 release. While it is similar to the physics used for this prototype (P8), it is not identical, and the eventual operational implementation of GFS version 17 will likely be quite different.
+-->
+<suite name="bluebird" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">

ccpp/suites/suite_SCM_GFS_v17_p8_ps.xml → ccpp/suites/bluebird_ps.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "bluebird" (formerly known as SCM_GFS_v17_p8) was used for testing an early prototype of the Global Forecast System (GFS) version 17 release. While it is similar to the physics used for this prototype (P8), it is not identical, and the eventual operational implementation of GFS version 17 will likely be quite different.
 
-<suite name="SCM_GFS_v17_p8_ps" version="1">
+This is an SCM-specific "prescribed surface" suite file, specifically for experiments over land points which require prescribed surface fluxes. See https://ccpp-scm.readthedocs.io/en/latest/chap_intro.html#limitations for more information.
+-->
+<suite name="bluebird_ps" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">

ccpp/suites/suite_SCM_RRFS_v1nssl.xml → ccpp/suites/crossbill.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="SCM_RRFS_v1nssl" version="1">
+<!--
+DESCRIPTION:
+Suite "crossbill" (formerly known as SCM_RRFS_v1nssl) was originally developed for research and development of early prototypes of the Rapid Refresh Forecast System (RRFS), specifically including the NSSL 2-moment cloud microphysics scheme when it was added to CCPP (see https://github.com/NOAA-EMC/fv3atm/pull/472 and https://github.com/NCAR/ccpp-physics/pull/761).
+-->
+<suite name="crossbill" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">

ccpp/suites/suite_SCM_WoFS_v0.xml → ccpp/suites/hummingbird.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="SCM_WoFS_v0"  version="1">
+<!--
+DESCRIPTION:
+Suite "hummingbird" (formerly known as SCM_WoFS_v0) was used for testing an early prototype of the experimental FV3-based Warn-on-Forecast System (WoFS).
+-->
+<suite name="hummingbird"  version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
@@ -70,4 +73,4 @@
     </subcycle>
   </group>
   <!-- <finalize></finalize> -->
-</suite>
+</suite>

ccpp/suites/suite_SCM_WoFS_v0_ps.xml → ccpp/suites/hummingbird_ps.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "hummingbird" (formerly known as SCM_WoFS_v0) was used for testing an early prototype of the experimental FV3-based Warn-on-Forecast System (WoFS).
 
-<suite name="SCM_WoFS_v0_ps"  version="1">
+This is an SCM-specific "prescribed surface" suite file, specifically for experiments over land points which require prescribed surface fluxes. See https://ccpp-scm.readthedocs.io/en/latest/chap_intro.html#limitations for more information.
+-->
+<suite name="hummingbird_ps"  version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
@@ -51,4 +56,4 @@
     </subcycle>
   </group>
   <!-- <finalize></finalize> -->
-</suite>
+</suite>