Merge branch 'main' of https://github.com/NCAR/ccpp-scm into feature/containerized_ci

Author: dustinswales

.github/workflows/ci_run_scm_DEPHY.yml

@@ -66,7 +66,7 @@ jobs:
     #######################################################################################
     - name: Cache bacio library v2.4.1
       id: cache-bacio-fortran
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: /home/runner/bacio
         key: cache-bacio-fortran-${{matrix.fortran-compiler}}-${{matrix.build-type}}-key
@@ -83,7 +83,7 @@ jobs:
 
     - name: Cache SP-library v2.3.3
       id: cache-sp-fortran
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: /home/runner/NCEPLIBS-sp
         key: cache-sp-fortran-${{matrix.fortran-compiler}}-${{matrix.build-type}}-key
@@ -100,7 +100,7 @@ jobs:
 
     - name: Cache w3emc library v2.9.2
       id: cache-w3emc-fortran
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: /home/runner/myw3emc
         key: cache-w3emc-fortran-${{matrix.fortran-compiler}}-${{matrix.build-type}}-key

.github/workflows/ci_run_scm_ufs_replay.yml

@@ -32,7 +32,7 @@ jobs:
       run: sudo apt-get update
 
     - name: Cache conda
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ~/conda_pkgs_dir
         key: conda-pkgs
@@ -52,7 +52,7 @@ jobs:
     #######################################################################################
 
     - name: Cache UWM regression test output.
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ${dir_rt_cache}
         key: ufs-rt-files
@@ -61,15 +61,15 @@ jobs:
       run: |
         if test ! -d "${dir_rt_cache}"; then
           mkdir -p ${dir_rt_cache} && cd ${dir_rt_cache}
-          wget https://dtcenter.ucar.edu/ccpp/rt/ufs_rts_scmreplay_ci.tar
-          tar -xvf ufs_rts_scmreplay_ci.tar
-          ls ${dir_rt_cache}
+          wget -q https://github.com/NCAR/ccpp-scm/releases/download/v7.0.1/ufs_rts_scmreplay_ci.tar.gz
+          tar -xvf ufs_rts_scmreplay_ci.tar.gz
+          ls ${dir_rt_cache}/data_new
         fi
 
     - name: Create UFS-replay case.
       run: |
         cd ${SCM_ROOT}/scm/etc/scripts/
-        ./UFS_forcing_ensemble_generator.py -d ${dir_rt_cache}/ --C_RES 192 -dt 360  -n control_c192 -lons 300 -lats 34 -sc
+        ./UFS_forcing_ensemble_generator.py -d ${dir_rt_cache}/data_new --C_RES 192 -dt 360  -n control_c192 -lons 99.844 -lats 36.749 -sc
 
     #######################################################################################
     # Done

.gitmodules

@@ -1,7 +1,7 @@
 [submodule "ccpp-framework"]
 	path = ccpp/framework
 	url = https://github.com/NCAR/ccpp-framework
-	branch = main
+	branch = develop
 [submodule "ccpp-physics"]
 	path = ccpp/physics
 	url = https://github.com/NCAR/ccpp-physics

ccpp/framework

@@ -87,7 +87,7 @@ def main():
 
     ###########################################################################
     #
-    # Set longitude/latitude 
+    # Set longitude/latitude
     #
     ###########################################################################
     if (args.nensmembers):
@@ -144,7 +144,7 @@ def main():
         print("  Using -tile [] -is [] -js []      (e.g. -tile 5 -is 5 6 7 -js 40 40 40)")
         exit()
     # end if
-    
+
     ###########################################################################
     #
     # Create SCM case configuration (etc/case_config) file.
@@ -190,7 +190,7 @@ def main():
 
             # What is the surface type? (get from SCM input file)
             dataset  = xr.open_dataset(file_scminput)
-            sfc_type = int(np.round_(dataset.slmsk.values[0]))
+            sfc_type = int(np.round(dataset.slmsk.values[0]))
 
             # Create case_config file(s)
             fileOUT = "../../etc/case_config/"+case_name+".nml"
@@ -210,7 +210,7 @@ def main():
 
             # Add case to dictionary to be used by run_scm.py
             run_list.append({"case": case_name, "suite": args.suite})
-            
+
             #
             count = count + 1
         # end if

scm/etc/scripts/UFS_forcing_ensemble_generator.py

@@ -2758,7 +2758,7 @@
 [ccpp-table-properties]
   name = CCPP_typedefs
   type = module
-  relative_path = ../../ccpp/physics/physics
+  dependencies_path = ../../ccpp/physics/physics
   dependencies = hooks/machine.F,photochem/module_ozphys.F90
   dependencies = Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f
 

scm/src/CCPP_typedefs.meta

@@ -10618,7 +10618,7 @@
 [ccpp-table-properties]
   name = GFS_typedefs
   type = module
-  relative_path = ../../ccpp/physics/physics
+  dependencies_path = ../../ccpp/physics/physics
   dependencies = hooks/machine.F,hooks/physcons.F90
   dependencies = Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f
   dependencies = MP/TEMPO/TEMPO/module_mp_tempo_params.F90