Turn CI back on

NCAR · Jan 17, 2025 · 89a16e1 · 89a16e1
1 parent 82d2c95
commit 89a16e1
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 13 deletions.
diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04.yml b/.github/workflows/ci_build_scm_ubuntu_22.04.yml
@@ -10,8 +10,8 @@ jobs:
     strategy:
       matrix:
         fortran-compiler: [gfortran-10, gfortran-11, gfortran-12]
-        build-type:       [Release]#, Debug]
-        py-version:       [3.9.12]
+        build-type:       [Release, Debug]
+        py-version:       [3.7.13, 3.9.12]
 
     # Environmental variables
     env:

diff --git a/.github/workflows/ci_run_scm_DEPHY.yml b/.github/workflows/ci_run_scm_DEPHY.yml
@@ -1,7 +1,6 @@
 name: CI test to run the SCM with DEPHY v1 data
 
-#on: [pull_request,workflow_dispatch]
-on: [workflow_dispatch]
+on: [pull_request,workflow_dispatch]
 
 jobs:
   run-scm-DEPHY:

diff --git a/.github/workflows/ci_run_scm_rts.yml b/.github/workflows/ci_run_scm_rts.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         fortran-compiler: [gfortran-11]
-        build-type:       [Release]#, Debug, SinglePrecision]
+        build-type:       [Release, Debug, SinglePrecision]
         py-version:       [3.9.12]
 
     # Environmental variables

diff --git a/.github/workflows/ci_run_scm_ufs_replay.yml b/.github/workflows/ci_run_scm_ufs_replay.yml
@@ -1,7 +1,6 @@
 name: CI test to create SCM UFS-replay cases from UWM regression tests
 
-#on: [pull_request,workflow_dispatch]
-on: [workflow_dispatch]
+on: [pull_request,workflow_dispatch]
 
 jobs:
   run_scm_ufs_replay:

diff --git a/.github/workflows/ci_scm_ccpp_prebuild.yml b/.github/workflows/ci_scm_ccpp_prebuild.yml
@@ -1,8 +1,7 @@
 # CI test to run SCM ccpp_prebuild script
 name: build
 
-#on: [push, pull_request, workflow_dispatch]
-on: [workflow_dispatch]
+on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build-linux:

diff --git a/ccpp/framework b/ccpp/framework
diff --git a/ccpp/physics b/ccpp/physics
diff --git a/scm/src/GFS_typedefs.meta b/scm/src/GFS_typedefs.meta
@@ -3828,7 +3828,7 @@
   dimensions = ()
   type = logical
 [ntrcaer]
-  standard_name = number_of_aerosol_tracers_MG
+  standard_name = number_of_aerosol_tracers
   long_name = number of aerosol tracers for Morrison Gettelman MP
   units = count
   dimensions = ()
@@ -8106,7 +8106,7 @@
   standard_name = mass_mixing_ratio_of_aerosol_from_gocart_or_merra2
   long_name = mass mixing ratio of aerosol from gocart or merra2
   units = kg kg-1
-  dimensions = (horizontal_dimension,vertical_layer_dimension,number_of_aerosol_tracers_MG)
+  dimensions = (horizontal_dimension,vertical_layer_dimension,number_of_aerosol_tracers)
   type = real
   kind = kind_phys
   active = (flag_for_aerosol_input_MG_radiation)
+5 −9		scripts/ccpp_capgen.py
+1 −5		scripts/metavar.py
+19 −6		scripts/suite_objects.py
+2 −2		physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.meta
+2 −2		physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.meta
+1 −1		physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta
+2 −2		physics/MP/Morrison_Gettelman/m_micro.meta
+2 −2		physics/MP/Thompson/mp_thompson.meta
+1 −1		physics/Radiation/RRTMGP/rrtmgp_aerosol_optics.meta