Updates branch with changes from NOAA-EMC:develop

.github/workflows/GCC.yml

@@ -120,7 +120,7 @@ jobs:
         export CC=mpicc
         export CXX=mpicxx
         export FC=mpif90
-        cmake ${GITHUB_WORKSPACE}/fv3atm -DBUILD_CI_TESTING=ON ${{ matrix.cmake_opts }} ${{ env.gcov_cmake }}
+        cmake ${GITHUB_WORKSPACE}/fv3atm -DBUILD_CI_TESTING=ON -DFV3=ON ${{ matrix.cmake_opts }} ${{ env.gcov_cmake }}
         make -j2
 
     - name: run-tests

.github/workflows/docs.yml

@@ -119,7 +119,7 @@ jobs:
         export CC=mpicc
         export CXX=mpicxx
         export FC=mpif90
-        cmake ${GITHUB_WORKSPACE}/fv3atm -DBUILD_CI_TESTING=ON ${{ matrix.cmake_opts }} -DENABLE_FV3ATM_DOCS=ON ${{ env.gcov_cmake }}
+        cmake ${GITHUB_WORKSPACE}/fv3atm -DBUILD_CI_TESTING=ON -DFV3=ON ${{ matrix.cmake_opts }} -DENABLE_FV3ATM_DOCS=ON ${{ env.gcov_cmake }}
         make doxygen_doc
 
     - name: upload-docs

.gitmodules

@@ -8,8 +8,8 @@
   branch = main
 [submodule "ccpp/physics"]
   path = ccpp/physics
-  url = https://github.com/grantfirl/ccpp-physics
-  branch = feature/rad-fix_gjf
+  url = https://github.com/dustinswales/ccpp-physics
+  branch = feature/rad-fix_djs
 [submodule "upp"]
   path = upp
   url = https://github.com/NOAA-EMC/UPP

ccpp/config/ccpp_prebuild_config.py

@@ -20,6 +20,7 @@
     'physics/physics/Radiation/RRTMG/radsw_param.f',
     'physics/physics/Radiation/RRTMG/radlw_param.f',
     'physics/physics/photochem/module_ozphys.F90',
+    'physics/physics/MP/TEMPO/TEMPO/module_mp_tempo_params.F90',
     'physics/physics/photochem/module_h2ophys.F90',
     'physics/physics/SFC_Models/Land/Noahmp/lnd_iau_mod.F90',
     '../ccpp/data/CCPP_typedefs.F90',
@@ -46,6 +47,10 @@
         'module_ozphys' : '',
         'ty_ozphys'     : '',
         },
+    'module_mp_tempo_params' : {
+        'module_mp_tempo_params' : '',
+        'ty_tempo_cfg'     : '',
+        },
     'module_h2ophys' : {
         'module_h2ophys' : '',
         'ty_h2ophys'     : '',
@@ -162,15 +167,19 @@
     'physics/physics/photochem/module_h2ophys.F90',
     'physics/physics/photochem/module_ozphys.F90',
     'physics/physics/MP/Ferrier_Aligo/mp_fer_hires.F90',
-    'physics/physics/MP/GFDL/gfdl_cloud_microphys.F90',
+    'physics/physics/MP/GFDL/v1_2019/gfdl_cloud_microphys.F90',
     'physics/physics/MP/GFDL/fv_sat_adj.F90',
+    'physics/physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3.F90',
     'physics/physics/MP/Morrison_Gettelman/m_micro.F90',
     'physics/physics/MP/Morrison_Gettelman/m_micro_pre.F90',
     'physics/physics/MP/Morrison_Gettelman/m_micro_post.F90',
     'physics/physics/MP/NSSL/mp_nssl.F90',
     'physics/physics/MP/Thompson/mp_thompson_pre.F90',
     'physics/physics/MP/Thompson/mp_thompson.F90',
     'physics/physics/MP/Thompson/mp_thompson_post.F90',
+    'physics/physics/MP/TEMPO/mp_tempo_pre.F90',
+    'physics/physics/MP/TEMPO/mp_tempo.F90',
+    'physics/physics/MP/TEMPO/mp_tempo_post.F90',
     'physics/physics/MP/Zhao_Carr/zhaocarr_gscond.f',
     'physics/physics/MP/Zhao_Carr/zhaocarr_precpd.f',
     'physics/physics/PBL/HEDMF/hedmf.f',

ccpp/data/CCPP_typedefs.F90

@@ -820,7 +820,7 @@ subroutine gfs_interstitial_create (Interstitial, IM, Model)
 !
     ! Allocate arrays that are conditional on physics choices
     if (Model%imp_physics == Model%imp_physics_gfdl .or. Model%imp_physics == Model%imp_physics_thompson &
-        .or. Model%imp_physics == Model%imp_physics_nssl &
+         .or. Model%imp_physics == Model%imp_physics_tempo .or. Model%imp_physics == Model%imp_physics_nssl &
         ) then
        allocate (Interstitial%graupelmp  (IM))
        allocate (Interstitial%icemp      (IM))
@@ -908,7 +908,8 @@ subroutine gfs_interstitial_setup_tracers(Interstitial, Model)
     ! perform aerosol convective transport and PBL diffusion
     Interstitial%trans_aero = Model%cplchm .and. Model%trans_trac
 
-    if (Model%imp_physics == Model%imp_physics_thompson) then
+    if (Model%imp_physics == Model%imp_physics_thompson .or. &
+         Model%imp_physics == Model%imp_physics_tempo) then
       if (Model%ltaerosol) then
         Interstitial%nvdiff = 12
      else if (Model%mraerosol) then
@@ -961,7 +962,8 @@ subroutine gfs_interstitial_setup_tracers(Interstitial, Model)
       if (Model%imp_physics == Model%imp_physics_wsm6) then
         Interstitial%ntcwx = 2
         Interstitial%ntiwx = 3
-      elseif (Model%imp_physics == Model%imp_physics_thompson) then
+     elseif (Model%imp_physics == Model%imp_physics_thompson .or. &
+          Model%imp_physics == Model%imp_physics_tempo) then
         Interstitial%ntcwx = 2
         Interstitial%ntiwx = 3
         Interstitial%ntrwx = 4
@@ -999,7 +1001,8 @@ subroutine gfs_interstitial_setup_tracers(Interstitial, Model)
         endif
       elseif (Model%imp_physics == Model%imp_physics_gfdl) then
         Interstitial%nvdiff = 7
-      elseif (Model%imp_physics == Model%imp_physics_thompson) then
+     elseif (Model%imp_physics == Model%imp_physics_thompson .or. &
+          Model%imp_physics == Model%imp_physics_tempo) then
         if (Model%ltaerosol) then
           Interstitial%nvdiff = 12
         else if (Model%mraerosol) then
@@ -1421,7 +1424,7 @@ subroutine gfs_interstitial_phys_reset (Interstitial, Model)
 !
     ! Reset fields that are conditional on physics choices
     if (Model%imp_physics == Model%imp_physics_gfdl .or. Model%imp_physics == Model%imp_physics_thompson  &
-        .or. Model%imp_physics == Model%imp_physics_nssl &
+        .or. Model%imp_physics == Model%imp_physics_tempo .or. Model%imp_physics == Model%imp_physics_nssl &
              ) then
        Interstitial%graupelmp = clear_val
        Interstitial%icemp     = clear_val

ccpp/data/CCPP_typedefs.meta

@@ -1128,7 +1128,7 @@
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-  active = (control_for_microphysics_scheme == identifier_for_gfdl_microphysics_scheme .or. control_for_microphysics_scheme == identifier_for_thompson_microphysics_scheme .or. control_for_microphysics_scheme == identifier_for_nssl_microphysics_scheme)
+  active = (control_for_microphysics_scheme == identifier_for_gfdl_microphysics_scheme .or. control_for_microphysics_scheme == identifier_for_thompson_microphysics_scheme .or. control_for_microphysics_scheme == identifier_for_nssl_microphysics_scheme .or. control_for_microphysics_scheme == identifier_for_tempo_microphysics_scheme)
 [gwdcu]
   standard_name = tendency_of_x_wind_due_to_convective_gravity_wave_drag
   long_name = zonal wind tendency due to convective gravity wave drag
@@ -1220,7 +1220,7 @@
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-  active = (control_for_microphysics_scheme == identifier_for_gfdl_microphysics_scheme .or. control_for_microphysics_scheme == identifier_for_thompson_microphysics_scheme .or. control_for_microphysics_scheme == identifier_for_nssl_microphysics_scheme)
+  active = (control_for_microphysics_scheme == identifier_for_gfdl_microphysics_scheme .or. control_for_microphysics_scheme == identifier_for_thompson_microphysics_scheme .or. control_for_microphysics_scheme == identifier_for_nssl_microphysics_scheme .or. control_for_microphysics_scheme == identifier_for_tempo_microphysics_scheme)
 [dry]
   standard_name = flag_nonzero_land_surface_fraction
   long_name = flag indicating presence of some land surface area fraction
@@ -1711,7 +1711,7 @@
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-  active = (control_for_microphysics_scheme == identifier_for_gfdl_microphysics_scheme .or. control_for_microphysics_scheme == identifier_for_thompson_microphysics_scheme .or. control_for_microphysics_scheme == identifier_for_nssl_microphysics_scheme)
+  active = (control_for_microphysics_scheme == identifier_for_gfdl_microphysics_scheme .or. control_for_microphysics_scheme == identifier_for_thompson_microphysics_scheme .or. control_for_microphysics_scheme == identifier_for_nssl_microphysics_scheme .or. control_for_microphysics_scheme == identifier_for_tempo_microphysics_scheme)
 [rainp]
   standard_name = tendency_of_rain_water_mixing_ratio_due_to_microphysics
   long_name = tendency of rain water mixing ratio due to microphysics
@@ -1967,7 +1967,7 @@
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-  active = (control_for_microphysics_scheme == identifier_for_gfdl_microphysics_scheme .or. control_for_microphysics_scheme == identifier_for_thompson_microphysics_scheme .or. control_for_microphysics_scheme == identifier_for_nssl_microphysics_scheme)
+  active = (control_for_microphysics_scheme == identifier_for_gfdl_microphysics_scheme .or. control_for_microphysics_scheme == identifier_for_thompson_microphysics_scheme .or. control_for_microphysics_scheme == identifier_for_nssl_microphysics_scheme .or. control_for_microphysics_scheme == identifier_for_tempo_microphysics_scheme)
 [snowmt]
   standard_name = surface_snow_melt
   long_name = snow melt during timestep