TEMPO v3 with Prognostic Cloud Fraction

.github/workflows/run_mpas.yml

@@ -22,7 +22,7 @@ on: [push, pull_request, workflow_dispatch]
 # - The test build/run configurations matrix is described below.
 # - This script uses a matrix run configuration with exclusions to achieve the desired "run list"
 #
-# <physics> - List of physics configuration to test. See https://github.com/barlage/mpas_testcase.git
+# <physics> - List of physics configuration to test. See https://github.com/AndersJensen-NOAA/mpas_testcase.git
 # <repo>    - Baseline codebase repository.
 # <branch>  - Baseline codebase repository branch.
 #
@@ -285,7 +285,7 @@ jobs:
     - name: Download MPAS testing repository with runtime configurations.
       run: |
         cd ${mpas_run_ROOT}
-        git clone --recursive --branch main https://github.com/barlage/mpas_testcase.git
+        git clone --recursive --branch main https://github.com/AndersJensen-NOAA/mpas_testcase.git
 
     - name: Cache Thompson MP tables
       id: cache-thompson-data

.github/workflows/run_mpas_hrrr.yml

@@ -22,7 +22,7 @@ on: [push, pull_request, workflow_dispatch]
 # - The test build/run configurations matrix is described below.
 # - This script uses a matrix run configuration with exclusions to achieve the desired "run list"
 #
-# <physics> - List of physics configuration to test. See https://github.com/barlage/mpas_testcase.git
+# <physics> - List of physics configuration to test. See https://github.com/AndersJensen-NOAA/mpas_testcase.git
 # <repo>    - Baseline codebase repository.
 # <branch>  - Baseline codebase repository branch.
 #
@@ -288,20 +288,17 @@ jobs:
     - name: Download MPAS testing repository with runtime configurations.
       run: |
         cd ${mpas_run_ROOT}
-        git clone --recursive --branch main https://github.com/barlage/mpas_testcase.git
+        git clone --recursive --branch main https://github.com/AndersJensen-NOAA/mpas_testcase.git
 
-    - name: Cache TEMPO MP tables
-      id: cache-tempo-data
-      uses: actions/cache@v4
-      with:
-        path: /home/runner/tempo
-        key: cache-tempo-data-key
+    - name: Download MPAS testing repository with runtime configurations for baselines.
+      run: |
+        cd ${mpas_run_ROOT}
+        git clone --recursive --branch main https://github.com/barlage/mpas_testcase.git mpas_testcase_bl
 
     - name: Download TEMPO MP tables
-      if: steps.cache-tempo-data.outputs.cache-hit != 'true'
       run: |
         cd ${runner_ROOT} && mkdir tempo && cd tempo
-        wget -q -e robots=off -nH --cut-dirs N -nc -r -lX --accept-regex='_tempo_v3' -A '*' -R 'catalog*' -I /thredds/fileServer/,/thredds/catalog/ \
+        wget -q -e robots=off -nH --cut-dirs N -nc -r -lX -A '*' -R 'catalog*' -I /thredds/fileServer/,/thredds/catalog/ \
         https://gsl.noaa.gov/thredds/catalog/${mpdata_dir}/catalog.html
         mv thredds/fileServer/${mpdata_dir}/* .
         rm -rf thredds
@@ -328,7 +325,7 @@ jobs:
     - name: Create and populate run directory (baselines)
       run: |
         cd ${mpas_run_ROOT} && mkdir run_bl && cd run_bl
-        cp ${mpas_run_ROOT}/mpas_testcase/run_case/case_files/${nml_version}/${domain}/${{matrix.ic_source}}.${yyyy}${mm}${dd}${hh}/${{env.physics}}/* .
+        cp ${mpas_run_ROOT}/mpas_testcase_bl/run_case/case_files/${nml_version}/${domain}/${{matrix.ic_source}}.${yyyy}${mm}${dd}${hh}/${{env.physics}}/* .
         ln -sf ${mpas_bl_ROOT}/src/core_atmosphere/physics/physics_wrf/files/*.TBL .
         ln -sf ${mpas_bl_ROOT}/src/core_atmosphere/physics/physics_wrf/files/*.DBL .
         ln -sf ${mpas_bl_ROOT}/src/core_atmosphere/physics/physics_wrf/files/*DATA .
@@ -368,6 +365,7 @@ jobs:
         ln -sf ${mpas_rt_ROOT}/MPAS-Model/atmosphere_model atmosphere_model
         ln -sf ${mpas_run_ROOT}/run_data/${{steps.set_vars.outputs.ugwp_file}} mpas.ugwp_oro_data.nc
         ln -sf ${runner_ROOT}/tempo/* .
+        ln -sf ${mpas_rt_ROOT}/MPAS-Model/src/core_atmosphere/physics/physics_noaa/TEMPO/tables/ccn_activate.bin .
         ln -sf ${runner_ROOT}/ugw/ugwp_limb_tau.nc .
 
     - name: Link lateral boundary condition file for regional MPAS (feature)

src/core_atmosphere/CMakeLists.txt

@@ -217,13 +217,17 @@ else()
 endif()
 
 set(ATMOSPHERE_CORE_PHYSICS_TEMPO_SOURCES
-    module_mp_tempo_main.F90
-    module_mp_tempo_params.F90
-    module_mp_tempo_utils.F90
-    module_mp_tempo_ml.F90
-    drivers/mpas/module_mp_tempo.F90
+    src/module_mp_tempo_cfgs.F90
+    src/module_mp_tempo_params.F90
+    src/module_mp_tempo_ml.F90
+    src/module_mp_tempo_utils.F90
+    src/module_mp_tempo_diags.F90
+    src/module_mp_tempo_aerosols.F90
+    src/module_mp_tempo_main.F90
+    src/module_mp_tempo_driver.F90
 )
 list(TRANSFORM ATMOSPHERE_CORE_PHYSICS_TEMPO_SOURCES PREPEND physics/physics_noaa/TEMPO/)
+set_source_files_properties(physics/physics_noaa/TEMPO/src/module_mp_tempo_params.F90 PROPERTIES COMPILE_OPTIONS "-Dtempo_mpas")
 
 set(ATMOSPHERE_CORE_PHYSICS_MYNN-EDMF_DIR ${CMAKE_CURRENT_SOURCE_DIR}/physics/physics_noaa/MYNN-EDMF)
 

src/core_atmosphere/Registry.xml

@@ -421,9 +421,10 @@
                 <package name="mp_kessler_in" description="parameterization of kessler microphysics."/>
                 <package name="mp_thompson_in" description="parameterization of Thompson cloud microphysics."/>
                 <package name="mp_thompson_aers_in" description="parameterization of aerosol-aware Thompson cloud microphysics."/>
-		<package name="mp_tempo_in" description="parameterization of TEMPO cloud microphysics."/>
-		<package name="tempo_aerosolaware_in" description="variables for TEMPO with aerosol-aware microphysics."/>
-		<package name="tempo_hailaware_in" description="variables for TEMPO hail-aware microphysics."/>
+                <package name="mp_tempo_in" description="parameterization of TEMPO cloud microphysics."/>
+                <package name="tempo_aerosolaware_in" description="variables for TEMPO with aerosol-aware microphysics."/>
+                <package name="tempo_hailaware_in" description="variables for TEMPO hail-aware microphysics."/>
+		      <package name="tempo_cldfra_in" description="variables for TEMPO prognostic cloud fraction microphysics."/>
                 <package name="mp_wsm6_in" description="parameterization of WSM6 cloud microphysics."/>
                 <package name="mp_nssl2m_in" description="parameterization of NSSL 2-moment microphysics."/>
                 <package name="nssl3m_in" description="variables for NSSL 3-moment microphysics."/>
@@ -2072,6 +2073,14 @@
                         <var name="nwfa" array_group="number" units="nb kg^{-1}"
                              description="Water-friendly aerosol number concentration"
                              packages="mp_thompson_aers_in;tempo_aerosolaware_in"/>
+
+                        <var name="qal" array_group="passive" units=""
+                             description="Prognostic cloud liquid fraction"
+                             packages="tempo_cldfra_in"/>
+
+                        <var name="qai" array_group="passive" units=""
+                             description="Prognostic cloud ice fraction"
+                             packages="tempo_cldfra_in"/>			
                 </var_array>
 #endif
 
@@ -2463,6 +2472,14 @@
                         <var name="tend_nwfa" name_in_code="nwfa" array_group="number" units="nb m^{-3} s^{-1}"
                              description="Tendency of water-friendly aerosol number concentration multiplied by dry air density divided by d(zeta)/dz"
                              packages="mp_thompson_aers_in;tempo_aerosolaware_in"/>
+
+                        <var name="tend_qal" name_in_code="qal" array_group="passive" units=""
+                             description="Tendency of prognostic cloud liquid fraction multiplied by dry air density divided by d(zeta)/dz"
+                             packages="tempo_cldfra_in"/>
+
+                        <var name="tend_qai" name_in_code="qai" array_group="passive" units=""
+                             description="Tendency of prognostic cloud ice fraction multiplied by dry air density divided by d(zeta)/dz"
+                             packages="tempo_cldfra_in"/>
                 </var_array>
 #endif
         </var_struct>
@@ -2562,6 +2579,15 @@
                         <var name="lbc_nwfa" name_in_code="nwfa" array_group="number" packages="mp_thompson_aers_in;tempo_aerosolaware_in"
                              units="m^{-3} s^{-1}"
                              description="Lateral boundary tendency of water-friendly aerosol number concentration"/>
+
+			          <var name="lbc_qal" name_in_code="qal" array_group="passive" packages="tempo_cldfra_in"
+                             units=""
+                             description="Lateral boundary tendency of prognostic cloud liquid fraction"/>
+
+                        <var name="lbc_qai" name_in_code="qai" array_group="passive" packages="tempo_cldfra_in"
+                             units=""
+                             description="Lateral boundary tendency of prognostic cloud ice fraction"/>
+
                 </var_array>
         </var_struct>
 
@@ -2725,28 +2751,13 @@
                      description="configuration for cloud microphysics schemes"
                      possible_values="`suite',`mp_wsm6',`mp_tempo',`mp_thompson',`mp_thompson_aerosols', `mp_kessler',`mp_nssl2m',`off'"/>
 
-		<nml_option name="config_tempo_hailaware" type="logical" default_value="false" in_defaults="false"
-		     units="-"
-                     description="Logical flag to turn on/off prognostic graupel number concentration and rime density"
-                     possible_values=".true. or .false."/>
-
-		<nml_option name="config_tempo_cldfra" type="logical" default_value="false" in_defaults="false"
-		     units="-"
-                     description="Logical flag to turn on/off prognostic cloud fraction"
-                     possible_values=".true. or .false."/>
-
-		<nml_option name="config_tempo_ml_nc_pbl" type="logical" default_value="false" in_defaults="false"
-		     units="-"
-                     description="Logical flag to turn on/off ML prediction of boundary layer cloud number concentrations"
-                     possible_values=".true. or .false."/>
-
-		<nml_option name="config_tempo_ml_nc" type="logical" default_value="false" in_defaults="false"
-		     units="-"
+               <nml_option name="config_tempo_ml_nc" type="logical" default_value="false" in_defaults="false"
+		           units="-"
                      description="Logical flag to turn on/off ML prediction of microphysics cloud number concentrations"
                      possible_values=".true. or .false."/>
 
-		<nml_option name="config_tempo_ml_nr" type="logical" default_value="false" in_defaults="false"
-		     units="-"
+               <nml_option name="config_tempo_ml_nr" type="logical" default_value="false" in_defaults="false"
+		           units="-"
                      description="Logical flag to turn on/off ML prediction of microphysics rain number concentrations"
                      possible_values=".true. or .false."/>
 
@@ -2803,7 +2814,7 @@
                 <nml_option name="config_radt_cld_scheme" type="character" default_value="suite" in_defaults="false"
                      units="-"
                      description="configuration for calculation of horizontal cloud fraction"
-                     possible_values="`suite',`cld_fraction',`cld_incidence',`cld_fraction_thompson',`cld_fraction_mynn'"/>
+                     possible_values="`suite',`cld_fraction',`cld_incidence',`cld_fraction_thompson',`cld_fraction_mynn',`cld_tempo'"/>
 
                 <nml_option name="config_radt_lw_scheme" type="character" default_value="suite" in_defaults="false"
                      units="-"
@@ -2947,11 +2958,6 @@
                      description="configuration for spp boundary layer"
                      possible_values="`0: off',`1: activated'"/>
 
-		<nml_option name="config_tempo_aerosolaware" type="logical" default_value="true" in_defaults="false"
-                     units="-"
-                     description="Logical flag to turn on/off prognostic cloud droplet and aerosol number concentrations"
-                     possible_values=".true. or .false."/>
-
                 <nml_option name="config_bucket_radt" type="real" default_value="1.0e9" in_defaults="false"
                      units="-"
                      description="threshold above which accumulated radiation diagnostics are reset"
@@ -3018,20 +3024,20 @@
                 <!-- ... PARAMETERIZATION OF CLOUD MICROPHYSICS:                                                        -->
                 <!-- ================================================================================================== -->
 
-		<var name="max_hail_diameter_sfc" type="real" dimensions="nCells Time" units="mm"
-                     description="Maximum hail diameter at the surface"
+          <var name="max_hail_diameter_sfc" type="real" dimensions="nCells Time" units="mm"
+                     description="Instantaneous maximum hail diameter at the surface"
                      packages="mp_tempo_in"/>
 
-		<var name="max_hail_diameter_column" type="real" dimensions="nCells Time" units="mm"
-                     description="Maximum hail diameter in the vertical column"
+          <var name="max_hail_diameter_column" type="real" dimensions="nCells Time" units="mm"
+                     description="Instantaneous maximum hail diameter in the vertical column"
                      packages="mp_tempo_in"/>
 
-		<var name="max_hail_diameter_column_acc" type="real" dimensions="nCells Time" units="mm"
-                     description="Maximum hail diameter in the vertical column accumulated over diagnostic output"
+          <var name="max_hail_diameter_sfc_acc" type="real" dimensions="nCells Time" units="mm"
+                     description="Maximum hail diameter at the surface during the diagnostic output time window"
                      packages="mp_tempo_in"/>
-
-		<var name="max_hail_diameter_sfc_acc" type="real" dimensions="nCells Time" units="mm"
-                     description="Maximum hail diameter at the surface accumulated over diagnostic output"
+          
+          <var name="max_hail_diameter_column_acc" type="real" dimensions="nCells Time" units="mm"
+                     description="Maximum hail diameter in the vertical column during the diagnostic output time window"
                      packages="mp_tempo_in"/>
 
 		<var name="do_diag_dbz" type="integer" dimensions="" units = ""
@@ -3127,6 +3133,9 @@
                 <var name="precipw" type="real" dimensions="nCells Time" units="kg m^{-2}"
                      description="precipitable water"/>
 
+                <var name="precipfrac" type="real" dimensions="nVertLevels nCells Time" units=""
+                     description="rain/snow precipitation fraction"
+                     packages="tempo_cldfra_in"/>
 
                 <!-- ================================================================================================== -->
                 <!-- ... PARAMETERIZATION OF CONVECTION:                                                                -->
@@ -4675,6 +4684,7 @@
 
 #ifdef DO_PHYSICS
 #include "physics/Registry_noahmp.xml"
+#include "physics/Registry_tempo.xml"
 #include "physics/registry.chemistry.xml"
 #endif
 </registry>

src/core_atmosphere/dynamics/mpas_atm_time_integration.F

@@ -860,6 +860,7 @@ subroutine atm_srk3(domain, dt, itimestep, exchange_halo_group)
       character(len=StrKIND), pointer :: config_IAU_option
 
       type (mpas_pool_type), pointer :: state
+      type (mpas_pool_type), pointer :: sfc_input      
       type (mpas_pool_type), pointer :: diag
       type (mpas_pool_type), pointer :: diag_physics
       type (mpas_pool_type), pointer :: mesh
@@ -906,6 +907,7 @@ subroutine atm_srk3(domain, dt, itimestep, exchange_halo_group)
       !
       call mpas_pool_get_subpool(block % structs, 'state', state)
       call mpas_pool_get_subpool(block % structs, 'mesh', mesh)
+      call mpas_pool_get_subpool(block % structs, 'sfc_input', sfc_input)      
       call mpas_pool_get_subpool(block % structs, 'diag', diag)
       call mpas_pool_get_subpool(block % structs, 'tend', tend)
       call mpas_pool_get_subpool(block % structs, 'tend_physics', tend_physics)
@@ -1656,7 +1658,7 @@ subroutine atm_srk3(domain, dt, itimestep, exchange_halo_group)
         call mpas_timer_start('microphysics')
 !$OMP PARALLEL DO
         do thread=1,nThreads
-           call driver_microphysics ( block % configs, mesh, state, 2, diag, diag_physics, tend_physics, tend, itimestep, &
+           call driver_microphysics ( block % configs, mesh, state, 2, sfc_input, diag, diag_physics, tend_physics, tend, itimestep, &
                                       cellSolveThreadStart(thread), cellSolveThreadEnd(thread))
         end do
 !$OMP END PARALLEL DO

src/core_atmosphere/mpas_atm_core.F

@@ -588,7 +588,6 @@ subroutine atm_mpas_init_block(dminfo, stream_manager, block, mesh, dt)
          !initialization of all physics:
          call physics_init(dminfo, stream_manager, clock, block % configs, mesh, diag, tend, state, 1,       &
                            diag_physics, diag_physics_noahmp, ngw_input, atm_input, sfc_input, output_noahmp)
-         call tempo_ml_init(block % configs)
       endif
 #endif
 

src/core_atmosphere/physics/Makefile

@@ -65,7 +65,7 @@ core_physics_mmm: core_physics_init
 	(cd physics_mmm; $(MAKE) -f Makefile.mpas all)
 
 core_microphysics: core_physics_init core_physics_mmm
-	(cd physics_noaa/TEMPO; cp ./drivers/mpas/module_mp_tempo.F90 .; $(MAKE) all COREDEF="$(COREDEF)")
+	(cd physics_noaa/TEMPO; $(MAKE) -f Makefile.mpas)
 
 core_SMOKE: core_physics_init
 	(cd physics_noaa/SMOKE; cp ./MPAS/Makefile .; cp ./MPAS/mpas_smoke_wrapper.F90 .; $(MAKE) all)
@@ -286,7 +286,7 @@ clean:
 	( cd physics_noahmp/drivers/mpas; $(MAKE) clean )
 	( cd physics_noahmp/src; $(MAKE) clean )
 	( cd physics_noahmp/utility; $(MAKE) clean )
-	( if [ -d physics_noaa/TEMPO ]; then cd physics_noaa/TEMPO; $(MAKE) clean; fi )
+	( if [ -d physics_noaa/TEMPO ]; then cd physics_noaa/TEMPO; $(MAKE) -f Makefile.mpas clean; fi )
 	( if [ -d physics_noaa/UGWP ]; then cd physics_noaa/UGWP; $(MAKE) clean; fi )
 	( if [ -d physics_noaa/RUCLSM ]; then cd physics_noaa/RUCLSM; $(MAKE) -f MPAS/Makefile clean; fi )
 	( if [ -d physics_noaa/MYNN-EDMF ]; then cd physics_noaa/MYNN-EDMF; cp ./MPAS/Makefile .; $(MAKE) clean; fi )

src/core_atmosphere/physics/Registry_tempo.xml

@@ -0,0 +1,28 @@
+<!-- ========================================================================================================= -->
+<!-- ARRAYS SPECIFIC TO TEMPO:                                                                                 -->
+<!-- ========================================================================================================= -->
+
+  <nml_record name="physics_mp_tempo" in_defaults="true">
+
+    <nml_option name="config_tempo_aerosolaware" type="logical" default_value="true" in_defaults="false"
+      units="-"
+      description="Logical flag to turn on/off prognostic cloud droplet and aerosol number concentrations"
+      possible_values=".true. or .false."/>
+
+    <nml_option name="config_tempo_hailaware" type="logical" default_value="true" in_defaults="false"
+      units="-"
+      description="Logical flag to turn on/off prognostic graupel number concentration and rime density"
+      possible_values=".true. or .false."/>
+
+    <nml_option name="config_tempo_ml_for_bl_nc" type="logical" default_value="false" in_defaults="false"
+      units="-"
+      description="Logical flag to turn on/off ML prediction of boundary layer cloud number concentrations"
+      possible_values=".true. or .false."/>
+
+    <nml_option name="config_tempo_cldfra" type="logical" default_value="false" in_defaults="false"
+      units="-"
+      description="Logical flag to turn on/off prognostic cloud fraction"
+      possible_values=".true. or .false."/>
+  </nml_record>
+
+<!-- ========================================================================================================= -->