diff --git a/.github/workflows/run_mpas.yml b/.github/workflows/run_mpas.yml index 2e998264fb..0bf236fe7f 100644 --- a/.github/workflows/run_mpas.yml +++ b/.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" # -# - List of physics configuration to test. See https://github.com/barlage/mpas_testcase.git +# - List of physics configuration to test. See https://github.com/AndersJensen-NOAA/mpas_testcase.git # - Baseline codebase repository. # - 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 diff --git a/.github/workflows/run_mpas_hrrr.yml b/.github/workflows/run_mpas_hrrr.yml index 2eafc7dd44..643c2bb321 100644 --- a/.github/workflows/run_mpas_hrrr.yml +++ b/.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" # -# - List of physics configuration to test. See https://github.com/barlage/mpas_testcase.git +# - List of physics configuration to test. See https://github.com/AndersJensen-NOAA/mpas_testcase.git # - Baseline codebase repository. # - 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) diff --git a/src/core_atmosphere/CMakeLists.txt b/src/core_atmosphere/CMakeLists.txt index ea4f57448e..8775bd3389 100644 --- a/src/core_atmosphere/CMakeLists.txt +++ b/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) diff --git a/src/core_atmosphere/Registry.xml b/src/core_atmosphere/Registry.xml index d7d7f4bb5f..4c6455ce7c 100644 --- a/src/core_atmosphere/Registry.xml +++ b/src/core_atmosphere/Registry.xml @@ -421,9 +421,10 @@ - - - + + + + @@ -2072,6 +2073,14 @@ + + + + #endif @@ -2463,6 +2472,14 @@ + + + + #endif @@ -2562,6 +2579,15 @@ + + + + + @@ -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'"/> - - - - - - - - @@ -2803,7 +2814,7 @@ + possible_values="`suite',`cld_fraction',`cld_incidence',`cld_fraction_thompson',`cld_fraction_mynn',`cld_tempo'"/> - - - - - - - + @@ -4675,6 +4684,7 @@ #ifdef DO_PHYSICS #include "physics/Registry_noahmp.xml" +#include "physics/Registry_tempo.xml" #include "physics/registry.chemistry.xml" #endif diff --git a/src/core_atmosphere/dynamics/mpas_atm_time_integration.F b/src/core_atmosphere/dynamics/mpas_atm_time_integration.F index 0601020cde..26c0cd0568 100644 --- a/src/core_atmosphere/dynamics/mpas_atm_time_integration.F +++ b/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 diff --git a/src/core_atmosphere/mpas_atm_core.F b/src/core_atmosphere/mpas_atm_core.F index 3f628a0cce..e10171e8c8 100644 --- a/src/core_atmosphere/mpas_atm_core.F +++ b/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 diff --git a/src/core_atmosphere/physics/Makefile b/src/core_atmosphere/physics/Makefile index 2fe1019b08..fa2dd14cb6 100644 --- a/src/core_atmosphere/physics/Makefile +++ b/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 ) diff --git a/src/core_atmosphere/physics/Registry_tempo.xml b/src/core_atmosphere/physics/Registry_tempo.xml new file mode 100644 index 0000000000..72008b59dc --- /dev/null +++ b/src/core_atmosphere/physics/Registry_tempo.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/core_atmosphere/physics/mpas_atmphys_control.F b/src/core_atmosphere/physics/mpas_atmphys_control.F index 7922727ed5..d77135d1be 100644 --- a/src/core_atmosphere/physics/mpas_atmphys_control.F +++ b/src/core_atmosphere/physics/mpas_atmphys_control.F @@ -106,8 +106,9 @@ subroutine physics_namelist_check(configs) config_radt_lw_scheme, & config_radt_sw_scheme, & config_sfclayer_scheme - integer,pointer:: config_mynn_cloudpdf + logical,pointer:: config_tempo_cldfra + integer,pointer:: config_mynn_cloudpdf !----------------------------------------------------------------------------------------------------------------- !call mpas_log_write('') !call mpas_log_write('--- enter subroutine physics_namelist_check:') @@ -122,8 +123,8 @@ subroutine physics_namelist_check(configs) call mpas_pool_get_config(configs,'config_radt_lw_scheme' ,config_radt_lw_scheme ) call mpas_pool_get_config(configs,'config_radt_sw_scheme' ,config_radt_sw_scheme ) call mpas_pool_get_config(configs,'config_sfclayer_scheme' ,config_sfclayer_scheme ) - call mpas_pool_get_config(configs,'config_tempo_cldfra' ,config_tempo_cldfra ) - call mpas_pool_get_config(configs,'config_mynn_cloudpdf' ,config_mynn_cloudpdf ) + call mpas_pool_get_config(configs,'config_tempo_cldfra' ,config_tempo_cldfra ) + call mpas_pool_get_config(configs,'config_mynn_cloudpdf' ,config_mynn_cloudpdf ) call mpas_log_write('') call mpas_log_write('----- Setting up physics suite '''//trim(config_physics_suite)//''' -----') @@ -267,6 +268,7 @@ subroutine physics_namelist_check(configs) config_radt_cld_scheme .eq. 'cld_incidence' .or. & config_radt_cld_scheme .eq. 'cld_fraction' .or. & config_radt_cld_scheme .eq. 'cld_fraction_thompson' .or. & + config_radt_cld_scheme .eq. 'cld_tempo' .or. & config_radt_cld_scheme .eq. 'cld_fraction_mynn')) then write(mpas_err_message,'(A,A20)') 'illegal value for calculation of cloud fraction: ', & @@ -304,12 +306,12 @@ subroutine physics_namelist_check(configs) config_radt_cld_scheme = "cld_tempo" if ((config_pbl_scheme == 'bl_mynn') .and. (config_mynn_cloudpdf .ge. 0)) then write(mpas_err_message,'(A,A20)') & - ' setting config_mynn_cloudpdf to -2 when using tempo prognostic clouds' + ' setting config_mynn_cloudpdf to -2 when using tempo prognostic clouds' call physics_message(mpas_err_message) config_mynn_cloudpdf = -2 endif endif - + !surface-layer scheme: if(.not. (config_sfclayer_scheme .eq. 'off' .or. & config_sfclayer_scheme .eq. 'sf_mynn' .or. & @@ -462,7 +464,6 @@ subroutine physics_tables_init(dminfo,configs) !local variables: character(len=StrKIND),pointer:: config_microp_scheme - logical,pointer:: config_tempo_hailaware logical:: l_qr_acr_qg,l_qr_acr_qs,l_qi_aut_qs,l_freezeH2O !----------------------------------------------------------------------------------------------------------------- @@ -473,37 +474,8 @@ subroutine physics_tables_init(dminfo,configs) call mpas_pool_get_config(configs,'config_microp_scheme',config_microp_scheme) if(config_microp_scheme /= "mp_thompson" .or. & - config_microp_scheme /= "mp_tempo" .or. & config_microp_scheme /= "mp_thompson_aerosols") return - if (config_microp_scheme == "mp_tempo") then - l_qr_acr_qg = .false. - l_qr_acr_qs = .false. - l_qi_aut_qs = .false. - l_freezeH2O = .false. - - ! hailaware scheme needs hailaware table, non hailaware scheme can use either table - call mpas_pool_get_config(configs,'config_tempo_hailaware',config_tempo_hailaware) - if (config_tempo_hailaware) then - inquire(file='MP_TEMPO_HAILAWARE_QRacrQG_DATA.DBL' ,exist=l_qr_acr_qg) - else - inquire(file='MP_TEMPO_HAILAWARE_QRacrQG_DATA.DBL' ,exist=l_qr_acr_qg) - if (.not. l_qr_acr_qg) then - inquire(file='MP_TEMPO_QRacrQG_DATA.DBL' ,exist=l_qr_acr_qg) - endif - endif - inquire(file='MP_TEMPO_QRacrQS_DATA.DBL' ,exist=l_qr_acr_qs) - inquire(file='MP_TEMPO_QIautQS_DATA.DBL' ,exist=l_qi_aut_qs) - inquire(file='MP_TEMPO_freezeH2O_DATA.DBL',exist=l_freezeH2O) - - if(.not. (l_qr_acr_qg .and. l_qr_acr_qs .and. l_qi_aut_qs .and. l_freezeH2O)) then - write(mpas_err_message,'(A)') & - '--- tables to run the TEMPO cloud microphysics do not exist: run build_tables_tempo first.' - call physics_error_fatal(mpas_err_message) - endif - ! call mpas_log_write('l_mp_tables = $l',logicArgs=(/l_mp_tables/)) - else - l_qr_acr_qg = .false. l_qr_acr_qs = .false. l_qi_aut_qs = .false. @@ -527,7 +499,6 @@ subroutine physics_tables_init(dminfo,configs) call physics_error_fatal(mpas_err_message) endif ! call mpas_log_write('l_mp_tables = $l',logicArgs=(/l_mp_tables/)) - endif endif diff --git a/src/core_atmosphere/physics/mpas_atmphys_driver.F b/src/core_atmosphere/physics/mpas_atmphys_driver.F index 2954bb6d68..fe97dd149b 100644 --- a/src/core_atmosphere/physics/mpas_atmphys_driver.F +++ b/src/core_atmosphere/physics/mpas_atmphys_driver.F @@ -237,7 +237,7 @@ subroutine physics_driver(domain,itimestep,xtime_s,exchange_halo_group) call allocate_cloudiness(block%configs) !$OMP PARALLEL DO do thread=1,nThreads - call driver_cloudiness(itimestep,block%configs,mesh,diag_physics,sfc_input, & + call driver_cloudiness(itimestep,block%configs,mesh,state,diag_physics,sfc_input, & cellSolveThreadStart(thread),cellSolveThreadEnd(thread)) end do !$OMP END PARALLEL DO diff --git a/src/core_atmosphere/physics/mpas_atmphys_driver_cloudiness.F b/src/core_atmosphere/physics/mpas_atmphys_driver_cloudiness.F index b33c3bdbef..383c1670ed 100644 --- a/src/core_atmosphere/physics/mpas_atmphys_driver_cloudiness.F +++ b/src/core_atmosphere/physics/mpas_atmphys_driver_cloudiness.F @@ -86,6 +86,10 @@ subroutine allocate_cloudiness(configs) case("cld_fraction_mynn") if(.not.allocated(qibl_p)) allocate(qibl_p(ims:ime,kms:kme,jms:jme)) if(.not.allocated(qcbl_p)) allocate(qcbl_p(ims:ime,kms:kme,jms:jme)) + + case("cld_tempo") + if(.not.allocated(qal_p)) allocate(qal_p(ims:ime,kms:kme,jms:jme)) + if(.not.allocated(qai_p)) allocate(qai_p(ims:ime,kms:kme,jms:jme)) case default end select cld_fraction_select @@ -124,6 +128,10 @@ subroutine deallocate_cloudiness(configs) if(allocated(qibl_p)) deallocate(qibl_p) if(allocated(qcbl_p)) deallocate(qcbl_p) + + case("cld_tempo") + if(allocated(qal_p)) deallocate(qal_p) + if(allocated(qai_p)) deallocate(qai_p) case default end select cld_fraction_select @@ -137,7 +145,7 @@ subroutine deallocate_cloudiness(configs) end subroutine deallocate_cloudiness !================================================================================================================= - subroutine cloudiness_from_MPAS(itimestep,configs,mesh,diag_physics,sfc_input,its,ite) + subroutine cloudiness_from_MPAS(itimestep,configs,mesh,state,diag_physics,sfc_input,its,ite) !================================================================================================================= !input arguments: @@ -147,6 +155,7 @@ subroutine cloudiness_from_MPAS(itimestep,configs,mesh,diag_physics,sfc_input,it !input and inout arguments: type(mpas_pool_type),intent(in) :: configs type(mpas_pool_type),intent(in) :: mesh + type(mpas_pool_type),intent(in) :: state type(mpas_pool_type),intent(in) :: sfc_input !inout arguments: @@ -164,6 +173,10 @@ subroutine cloudiness_from_MPAS(itimestep,configs,mesh,diag_physics,sfc_input,it character(len=StrKIND),pointer:: radt_cld_scheme character(len=StrKIND),pointer:: convection_scheme + integer,pointer:: index_qal, index_qai + real(kind=RKIND),dimension(:,:,:),pointer:: scalars + real(kind=RKIND),dimension(:,:),pointer:: qal, qai + !----------------------------------------------------------------------------------------------------------------- call mpas_pool_get_config(configs,'config_len_disp',len_disp) @@ -235,6 +248,22 @@ subroutine cloudiness_from_MPAS(itimestep,configs,mesh,diag_physics,sfc_input,it enddo enddo + case("cld_tempo") + call mpas_pool_get_array(state,'scalars',scalars) + call mpas_pool_get_dimension(state,'index_qal',index_qal) + call mpas_pool_get_dimension(state,'index_qai',index_qai) + + qal => scalars(index_qal,:,:) + qai => scalars(index_qai,:,:) + do j = jts,jte + do k = kts,kte + do i = its,ite + qal_p(i,k,j) = qal(k,i) + qai_p(i,k,j) = qai(k,i) + cldfrac_p(i,k,j) = max(0., max(qal(k,i), qai(k,i))) ! Avoid negative cldfrac + enddo + enddo + enddo case default end select cld_fraction_select @@ -288,12 +317,13 @@ subroutine cloudiness_to_MPAS(diag_physics,its,ite) end subroutine cloudiness_to_MPAS !================================================================================================================= - subroutine driver_cloudiness(itimestep,configs,mesh,diag_physics,sfc_input,its,ite) + subroutine driver_cloudiness(itimestep,configs,mesh,state,diag_physics,sfc_input,its,ite) !================================================================================================================= !input arguments: type(mpas_pool_type),intent(in) :: configs type(mpas_pool_type),intent(in) :: mesh + type(mpas_pool_type),intent(in) :: state type(mpas_pool_type),intent(in) :: sfc_input integer,intent(in):: its,ite @@ -316,7 +346,7 @@ subroutine driver_cloudiness(itimestep,configs,mesh,diag_physics,sfc_input,its,i call mpas_pool_get_config(configs,'config_convection_scheme',convection_scheme) !copy MPAS arrays to local arrays: - call cloudiness_from_MPAS(itimestep,configs,mesh,diag_physics,sfc_input,its,ite) + call cloudiness_from_MPAS(itimestep,configs,mesh,state,diag_physics,sfc_input,its,ite) cld_fraction_select: select case (trim(radt_cld_scheme)) case("cld_incidence") diff --git a/src/core_atmosphere/physics/mpas_atmphys_driver_microphysics.F b/src/core_atmosphere/physics/mpas_atmphys_driver_microphysics.F index d78d56bec3..6164312422 100644 --- a/src/core_atmosphere/physics/mpas_atmphys_driver_microphysics.F +++ b/src/core_atmosphere/physics/mpas_atmphys_driver_microphysics.F @@ -21,8 +21,8 @@ module mpas_atmphys_driver_microphysics !wrf physics: use module_mp_kessler use module_mp_thompson - use module_mp_tempo,only: tempo_3d_to_1d_driver, tempo_init - ! use module_mp_tempo_utils + use module_mp_tempo_cfgs,only: ty_tempo_cfgs + use module_mp_tempo_driver,only: tempo_init,tempo_run,ty_tempo_driver_diags,tempo_aerosol_surface_emissions use module_mp_wsm6,only: wsm6 use mp_wsm6,only: mp_wsm6_init,refl10cm_wsm6 use module_mp_nssl_2mom @@ -94,7 +94,7 @@ module mpas_atmphys_driver_microphysics !--- initialization option for WSM6 from WRF version 3.8.1. this option could also be set as a namelist parameter. integer,parameter:: hail_opt = 0 - + type(ty_tempo_cfgs) :: tempo_cfgs contains @@ -109,15 +109,17 @@ subroutine allocate_microphysics(configs) !local pointers: character(len=StrKIND),pointer:: microp_scheme character(len=StrKIND),pointer:: nssl_moments - logical,pointer:: config_tempo_hailaware, config_tempo_aerosolaware - logical,pointer:: config_tempo_ml_nc_pbl + logical,pointer:: config_tempo_aerosolaware,config_tempo_hailaware + logical,pointer:: config_tempo_ml_for_bl_nc + logical,pointer:: config_tempo_cldfra !----------------------------------------------------------------------------------------------------------------- call mpas_pool_get_config(configs,'config_microp_scheme',microp_scheme) call mpas_pool_get_config(configs,'config_nssl_moments',nssl_moments) call mpas_pool_get_config(configs,'config_tempo_hailaware',config_tempo_hailaware) call mpas_pool_get_config(configs,'config_tempo_aerosolaware',config_tempo_aerosolaware) - call mpas_pool_get_config(configs,'config_tempo_ml_nc_pbl',config_tempo_ml_nc_pbl) + call mpas_pool_get_config(configs,'config_tempo_ml_for_bl_nc',config_tempo_ml_for_bl_nc) + call mpas_pool_get_config(configs,'config_tempo_cldfra',config_tempo_cldfra) !sounding variables: if(.not.allocated(rho_p) ) allocate(rho_p(ims:ime,kms:kme,jms:jme) ) @@ -206,8 +208,6 @@ subroutine allocate_microphysics(configs) microp2a_select: select case(trim(microp_scheme)) case("mp_tempo") -! if(.not.allocated(ntc_p)) allocate(ntc_p(ims:ime,jms:jme)) -! if(.not.allocated(muc_p)) allocate(muc_p(ims:ime,jms:jme)) if(.not.allocated(ni_p) ) allocate(ni_p(ims:ime,kms:kme,jms:jme)) if(.not.allocated(nr_p) ) allocate(nr_p(ims:ime,kms:kme,jms:jme)) if(.not.allocated(refl10cm_p) ) allocate(refl10cm_p(ims:ime,kms:kme,jms:jme) ) @@ -216,24 +216,37 @@ subroutine allocate_microphysics(configs) if(.not.allocated(max_hail_diameter_sfc_p) ) allocate(max_hail_diameter_sfc_p(ims:ime,jms:jme) ) if(.not.allocated(max_hail_diameter_column_p) ) allocate(max_hail_diameter_column_p(ims:ime,jms:jme) ) - ! Allocate TEMPO options based on config flags insead of adding more nested select cases - ! These flags are associated with appropriate packages in mpas_atmphys_packages.F + if (config_tempo_aerosolaware) then + if(.not.allocated(nifa2d_p)) allocate(nifa2d_p(ims:ime,jms:jme)) + if(.not.allocated(nwfa2d_p)) allocate(nwfa2d_p(ims:ime,jms:jme)) + if(.not.allocated(nc_p) ) allocate(nc_p(ims:ime,kms:kme,jms:jme) ) + if(.not.allocated(nifa_p) ) allocate(nifa_p(ims:ime,kms:kme,jms:jme)) + if(.not.allocated(nwfa_p) ) allocate(nwfa_p(ims:ime,kms:kme,jms:jme)) + endif + if (config_tempo_hailaware) then if(.not.allocated(ng_p) ) allocate(ng_p(ims:ime,kms:kme,jms:jme)) if(.not.allocated(volg_p)) allocate(volg_p(ims:ime,kms:kme,jms:jme)) endif - if (config_tempo_ml_nc_pbl) then - if(.not.allocated(cldfrac_p) ) allocate(cldfrac_p(ims:ime,kms:kme,jms:jme)) - if(.not.allocated(qcbl_p) ) allocate(qcbl_p(ims:ime,kms:kme,jms:jme)) + if (config_tempo_cldfra) then + if(.not.allocated(qal_p)) allocate(qal_p(ims:ime,kms:kme,jms:jme)) + if(.not.allocated(qai_p)) allocate(qai_p(ims:ime,kms:kme,jms:jme)) + if(.not.allocated(precipfrac_p)) allocate(precipfrac_p(ims:ime,kms:kme,jms:jme)) + + if(.not.allocated(rthblten_p)) allocate(rthblten_p(ims:ime,kms:kme,jms:jme)) + if(.not.allocated(rqvblten_p)) allocate(rqvblten_p(ims:ime,kms:kme,jms:jme)) + if(.not.allocated(rqcblten_p)) allocate(rqcblten_p(ims:ime,kms:kme,jms:jme)) + if(.not.allocated(rqiblten_p)) allocate(rqiblten_p(ims:ime,kms:kme,jms:jme)) + if(.not.allocated(rthratenlw_p)) allocate(rthratenlw_p(ims:ime,kms:kme,jms:jme)) + if(.not.allocated(rthratensw_p)) allocate(rthratensw_p(ims:ime,kms:kme,jms:jme)) + if(.not.allocated(hpbl_p)) allocate(hpbl_p(ims:ime,jms:jme)) + if(.not.allocated(xland_p)) allocate(xland_p(ims:ime,jms:jme)) endif - if (config_tempo_aerosolaware) then - if(.not.allocated(nifa2d_p)) allocate(nifa2d_p(ims:ime,jms:jme)) - if(.not.allocated(nwfa2d_p)) allocate(nwfa2d_p(ims:ime,jms:jme)) - if(.not.allocated(nc_p) ) allocate(nc_p(ims:ime,kms:kme,jms:jme) ) - if(.not.allocated(nifa_p) ) allocate(nifa_p(ims:ime,kms:kme,jms:jme)) - if(.not.allocated(nwfa_p) ) allocate(nwfa_p(ims:ime,kms:kme,jms:jme)) + if (config_tempo_ml_for_bl_nc) then + if(.not.allocated(cldfrac_p) ) allocate(cldfrac_p(ims:ime,kms:kme,jms:jme)) + if(.not.allocated(qcbl_p) ) allocate(qcbl_p(ims:ime,kms:kme,jms:jme)) endif case("mp_nssl2m") @@ -275,7 +288,7 @@ subroutine deallocate_microphysics(configs) character(len=StrKIND),pointer:: microp_scheme character(len=StrKIND),pointer:: nssl_moments logical,pointer:: config_tempo_hailaware, config_tempo_aerosolaware - logical,pointer:: config_tempo_ml_nc_pbl + logical,pointer:: config_tempo_ml_for_bl_nc, config_tempo_cldfra !----------------------------------------------------------------------------------------------------------------- @@ -283,7 +296,8 @@ subroutine deallocate_microphysics(configs) call mpas_pool_get_config(configs,'config_nssl_moments',nssl_moments) call mpas_pool_get_config(configs,'config_tempo_hailaware',config_tempo_hailaware) call mpas_pool_get_config(configs,'config_tempo_aerosolaware',config_tempo_aerosolaware) - call mpas_pool_get_config(configs,'config_tempo_ml_nc_pbl',config_tempo_ml_nc_pbl) + call mpas_pool_get_config(configs,'config_tempo_ml_for_bl_nc',config_tempo_ml_for_bl_nc) + call mpas_pool_get_config(configs,'config_tempo_cldfra',config_tempo_cldfra) !sounding variables: if(allocated(rho_p) ) deallocate(rho_p ) @@ -372,8 +386,6 @@ subroutine deallocate_microphysics(configs) microp2a_select: select case(trim(microp_scheme)) case("mp_tempo") -! if(allocated(ntc_p)) deallocate(ntc_p) -! if(allocated(muc_p)) deallocate(muc_p) if(allocated(ni_p) ) deallocate(ni_p ) if(allocated(nr_p) ) deallocate(nr_p ) if(allocated(refl10cm_p) ) deallocate(refl10cm_p ) @@ -382,22 +394,37 @@ subroutine deallocate_microphysics(configs) if(allocated(max_hail_diameter_sfc_p) ) deallocate(max_hail_diameter_sfc_p) if(allocated(max_hail_diameter_column_p) ) deallocate(max_hail_diameter_column_p) + if (config_tempo_aerosolaware) then + if(allocated(nifa2d_p)) deallocate(nifa2d_p) + if(allocated(nwfa2d_p)) deallocate(nwfa2d_p) + if(allocated(nc_p) ) deallocate(nc_p ) + if(allocated(nifa_p) ) deallocate(nifa_p ) + if(allocated(nwfa_p) ) deallocate(nwfa_p ) + endif + if (config_tempo_hailaware) then if(allocated(ng_p) ) deallocate(ng_p ) if(allocated(volg_p) ) deallocate(volg_p ) endif - if (config_tempo_ml_nc_pbl) then - if(allocated(cldfrac_p) ) deallocate(cldfrac_p) - if(allocated(qcbl_p) ) deallocate(qcbl_p) + if (config_tempo_cldfra) then + if(allocated(qal_p)) deallocate(qal_p) + if(allocated(qai_p)) deallocate(qai_p) + if(allocated(precipfrac_p)) deallocate(precipfrac_p) + + if(allocated(rthblten_p)) deallocate(rthblten_p) + if(allocated(rqvblten_p)) deallocate(rqvblten_p) + if(allocated(rqcblten_p)) deallocate(rqcblten_p) + if(allocated(rqiblten_p)) deallocate(rqiblten_p) + if(allocated(rthratenlw_p)) deallocate(rthratenlw_p) + if(allocated(rthratensw_p)) deallocate(rthratensw_p) + if(allocated(hpbl_p)) deallocate(hpbl_p) + if(allocated(xland_p)) deallocate(xland_p) endif - if (config_tempo_aerosolaware) then - if(allocated(nifa2d_p)) deallocate(nifa2d_p) - if(allocated(nwfa2d_p)) deallocate(nwfa2d_p) - if(allocated(nc_p) ) deallocate(nc_p ) - if(allocated(nifa_p) ) deallocate(nifa_p ) - if(allocated(nwfa_p) ) deallocate(nwfa_p ) + if (config_tempo_ml_for_bl_nc) then + if(allocated(cldfrac_p) ) deallocate(cldfrac_p) + if(allocated(qcbl_p) ) deallocate(qcbl_p) endif case("mp_nssl2m") @@ -450,6 +477,7 @@ subroutine init_microphysics(dminfo,configs,mesh,state,time_lev,sfc_input,diag_p logical,pointer:: do_restart character(len=StrKIND),pointer:: microp_scheme logical,pointer:: config_tempo_hailaware, config_tempo_aerosolaware + logical,pointer:: config_tempo_ml_for_bl_nc, config_tempo_cldfra character(len=StrKIND),pointer:: nssl_moments logical :: outputon = .false. @@ -469,6 +497,8 @@ subroutine init_microphysics(dminfo,configs,mesh,state,time_lev,sfc_input,diag_p call mpas_pool_get_config(configs,'config_microp_scheme',microp_scheme) call mpas_pool_get_config(configs,'config_tempo_hailaware',config_tempo_hailaware) call mpas_pool_get_config(configs,'config_tempo_aerosolaware',config_tempo_aerosolaware) + call mpas_pool_get_config(configs,'config_tempo_cldfra',config_tempo_cldfra) + call mpas_pool_get_config(configs,'config_tempo_ml_for_bl_nc',config_tempo_ml_for_bl_nc) call mpas_pool_get_config(configs,'config_nssl_moments',nssl_moments) call mpas_pool_get_config(configs,'config_do_restart' ,do_restart ) @@ -485,8 +515,9 @@ subroutine init_microphysics(dminfo,configs,mesh,state,time_lev,sfc_input,diag_p end select microp2_select case("mp_tempo") - call tempo_init(l_mp_tables=l_mp_tables, & - hail_aware_flag=config_tempo_hailaware, aerosol_aware_flag=config_tempo_aerosolaware) + call tempo_init(aerosolaware_flag=config_tempo_aerosolaware, & + hailaware_flag=config_tempo_hailaware, cldfra_flag=config_tempo_cldfra, & + ml_for_bl_nc_flag=config_tempo_ml_for_bl_nc, tempo_cfgs=tempo_cfgs) if (config_tempo_aerosolaware) then call init_tempo_aerosols_forMPAS(do_restart,dminfo,mesh,state,time_lev,diag_physics) @@ -511,7 +542,7 @@ subroutine init_microphysics(dminfo,configs,mesh,state,time_lev,sfc_input,diag_p end subroutine init_microphysics !================================================================================================================= - subroutine driver_microphysics(configs,mesh,state,time_lev,diag,diag_physics,tend_physics,tend,itimestep,its,ite) + subroutine driver_microphysics(configs,mesh,state,time_lev,sfc_input,diag,diag_physics,tend_physics,tend,itimestep,its,ite) !================================================================================================================= use mpas_constants, only : rvord @@ -525,6 +556,7 @@ subroutine driver_microphysics(configs,mesh,state,time_lev,diag,diag_physics,ten integer,intent(in):: its,ite !inout arguments: type(mpas_pool_type),intent(inout):: state + type(mpas_pool_type),intent(inout):: sfc_input type(mpas_pool_type),intent(inout):: diag type(mpas_pool_type),intent(inout):: diag_physics type(mpas_pool_type),intent(inout):: tend_physics @@ -532,13 +564,11 @@ subroutine driver_microphysics(configs,mesh,state,time_lev,diag,diag_physics,ten !local pointers: character(len=StrKIND),pointer:: microp_scheme - logical,pointer:: config_tempo_aerosolaware,config_tempo_hailaware character(len=StrKIND),pointer:: nssl_moments - integer :: tempo_options - !local variables and arrays: integer:: istep + integer:: i,j,k integer, pointer :: do_diag_dbz logical :: do_diag_dbz_flag @@ -546,6 +576,7 @@ subroutine driver_microphysics(configs,mesh,state,time_lev,diag,diag_physics,ten character(len=StrKIND):: errmsg integer:: errflg + type(ty_tempo_driver_diags) :: tempo_driver_diags !----------------------------------------------------------------------------------------------------------------- !call mpas_log_write('') !call mpas_log_write('---enter subroutine driver_microphysics:') @@ -555,8 +586,6 @@ subroutine driver_microphysics(configs,mesh,state,time_lev,diag,diag_physics,ten errflg = 0 call mpas_pool_get_config(configs,'config_microp_scheme',microp_scheme) - call mpas_pool_get_config(configs,'config_tempo_hailaware',config_tempo_hailaware) - call mpas_pool_get_config(configs,'config_tempo_aerosolaware',config_tempo_aerosolaware) call mpas_pool_get_config(configs,'config_nssl_moments',nssl_moments) call mpas_pool_get_array(diag_physics,'do_diag_dbz',do_diag_dbz) @@ -573,7 +602,7 @@ subroutine driver_microphysics(configs,mesh,state,time_lev,diag,diag_physics,ten call precip_from_MPAS(configs,diag_physics,its,ite) !... initialization of soundings for non-hydrostatic dynamical cores. - call microphysics_from_MPAS(configs,mesh,state,time_lev,diag,diag_physics,tend_physics,its,ite) + call microphysics_from_MPAS(configs,mesh,state,time_lev,sfc_input,diag,diag_physics,tend_physics,its,ite) !... call to different cloud microphysics schemes: microp_select: select case(trim(microp_scheme)) @@ -594,112 +623,62 @@ subroutine driver_microphysics(configs,mesh,state,time_lev,diag,diag_physics,ten call mpas_timer_stop('mp_kessler') case ("mp_tempo") + if (allocated(nwfa_p) .and. allocated(nwfa2d_p)) then + call tempo_aerosol_surface_emissions(dt=dt_microp, nwfa=nwfa_p, nwfa2d=nwfa2d_p, & + ims=ims, ime=ime, jms=jms, jme=jme, kms=kms, kme=kme, kts=kts) + endif + call mpas_timer_start('mp_tempo') - tempo_options = 0 - if (config_tempo_hailaware) tempo_options = tempo_options + 1 - if (config_tempo_aerosolaware) tempo_options = tempo_options + 1 istep = 1 do while (istep .le. n_microp) - - tempo_opts: select case(tempo_options) - case(0) - call tempo_3d_to_1d_driver( & - th = th_p , qv = qv_p , qc = qc_p , & - qr = qr_p , qi = qi_p , qs = qs_p , & - qg = qg_p , ni = ni_p , nr = nr_p , & - !! ng = ng_p , qb = volg_p , & - !! nc = nc_p , nwfa = nwfa_p , nifa = nifa_p , & - !! nwfa2d = nwfa2d_p , nifa2d = nifa2d_p , & - pii = pi_p , p = pres_p , dz = dz_p , & - w = w_p , dt_in = dt_microp , itimestep = itimestep , & - rainnc = rainnc_p , rainncv = rainncv_p , snownc = snownc_p , & - snowncv = snowncv_p , graupelnc = graupelnc_p , graupelncv = graupelncv_p , & - sr = sr_p , rainprod = rainprod_p , evapprod = evapprod_p , & - re_cloud = recloud_p , re_ice = reice_p , re_snow = resnow_p , & - has_reqc = has_reqc , has_reqi = has_reqi , has_reqs = has_reqs , & - !! ntc = ntc_p , muc = muc_p , & - refl_10cm = refl10cm_p , frainnc = frainnc_p , & - ids = ids , ide = ide , jds = jds , jde = jde , kds = kds , kde = kde , & - ims = ims , ime = ime , jms = jms , jme = jme , kms = kms , kme = kme , & - its = its , ite = ite , jts = jts , jte = jte , kts = kts , kte = kte & - ) - case(1) - if (config_tempo_aerosolaware) then - call tempo_3d_to_1d_driver( & - th = th_p , qv = qv_p , qc = qc_p , & - qr = qr_p , qi = qi_p , qs = qs_p , & - qg = qg_p , ni = ni_p , nr = nr_p , & - !! ng = ng_p , qb = volg_p , & - nc = nc_p , nwfa = nwfa_p , nifa = nifa_p , & - nwfa2d = nwfa2d_p , nifa2d = nifa2d_p , & - pii = pi_p , p = pres_p , dz = dz_p , & - w = w_p , dt_in = dt_microp , itimestep = itimestep , & - rainnc = rainnc_p , rainncv = rainncv_p , snownc = snownc_p , & - snowncv = snowncv_p , graupelnc = graupelnc_p , graupelncv = graupelncv_p , & - sr = sr_p , rainprod = rainprod_p , evapprod = evapprod_p , & - re_cloud = recloud_p , re_ice = reice_p , re_snow = resnow_p , & - has_reqc = has_reqc , has_reqi = has_reqi , has_reqs = has_reqs , & - !! ntc = ntc_p , muc = muc_p , & - refl_10cm = refl10cm_p , frainnc = frainnc_p , & - qcbl = qcbl_p , cldfrac = cldfrac_p , & - ids = ids , ide = ide , jds = jds , jde = jde , kds = kds , kde = kde , & - ims = ims , ime = ime , jms = jms , jme = jme , kms = kms , kme = kme , & - its = its , ite = ite , jts = jts , jte = jte , kts = kts , kte = kte & - ) - elseif (config_tempo_hailaware) then - call tempo_3d_to_1d_driver( & - th = th_p , qv = qv_p , qc = qc_p , & - qr = qr_p , qi = qi_p , qs = qs_p , & - qg = qg_p , ni = ni_p , nr = nr_p , & - ng = ng_p , qb = volg_p , & - !! nc = nc_p , nwfa = nwfa_p , nifa = nifa_p , & - !! nwfa2d = nwfa2d_p , nifa2d = nifa2d_p , & - pii = pi_p , p = pres_p , dz = dz_p , & - w = w_p , dt_in = dt_microp , itimestep = itimestep , & - rainnc = rainnc_p , rainncv = rainncv_p , snownc = snownc_p , & - snowncv = snowncv_p , graupelnc = graupelnc_p , graupelncv = graupelncv_p , & - sr = sr_p , rainprod = rainprod_p , evapprod = evapprod_p , & - re_cloud = recloud_p , re_ice = reice_p , re_snow = resnow_p , & - has_reqc = has_reqc , has_reqi = has_reqi , has_reqs = has_reqs , & - !! ntc = ntc_p , muc = muc_p , & - refl_10cm = refl10cm_p , frainnc = frainnc_p , & - !! qcbl = qcbl_p , cldfrac = cldfrac_p , & - ids = ids , ide = ide , jds = jds , jde = jde , kds = kds , kde = kde , & - ims = ims , ime = ime , jms = jms , jme = jme , kms = kms , kme = kme , & - its = its , ite = ite , jts = jts , jte = jte , kts = kts , kte = kte & - ) - else - call physics_error_fatal('driver_microphysics(): TEMPO called with invalid options -- case 1') - endif - case(2) - call tempo_3d_to_1d_driver( & - th = th_p , qv = qv_p , qc = qc_p , & - qr = qr_p , qi = qi_p , qs = qs_p , & - qg = qg_p , ni = ni_p , nr = nr_p , & - ng = ng_p , qb = volg_p , & - nc = nc_p , nwfa = nwfa_p , nifa = nifa_p , & - nwfa2d = nwfa2d_p , nifa2d = nifa2d_p , & - pii = pi_p , p = pres_p , dz = dz_p , & - w = w_p , dt_in = dt_microp , itimestep = itimestep , & - rainnc = rainnc_p , rainncv = rainncv_p , snownc = snownc_p , & - snowncv = snowncv_p , graupelnc = graupelnc_p , graupelncv = graupelncv_p , & - sr = sr_p , rainprod = rainprod_p , evapprod = evapprod_p , & - re_cloud = recloud_p , re_ice = reice_p , re_snow = resnow_p , & - has_reqc = has_reqc , has_reqi = has_reqi , has_reqs = has_reqs , & - !! ntc = ntc_p , muc = muc_p , & - refl_10cm = refl10cm_p , frainnc = frainnc_p , & - max_hail_diameter_sfc = max_hail_diameter_sfc_p , & - max_hail_diameter_column = max_hail_diameter_column_p , & - qcbl = qcbl_p , cldfrac = cldfrac_p , & - ids = ids , ide = ide , jds = jds , jde = jde , kds = kds , kde = kde , & - ims = ims , ime = ime , jms = jms , jme = jme , kms = kms , kme = kme , & - its = its , ite = ite , jts = jts , jte = jte , kts = kts , kte = kte & - ) - case default - call physics_error_fatal('driver_microphysics(): TEMPO called with invalid options -- case default') - end select tempo_opts - + call tempo_run(tempo_cfgs=tempo_cfgs, & + dt = dt_microp , itimestep = itimestep , & + th = th_p , qv = qv_p , qc = qc_p , & + qr = qr_p , qi = qi_p , qs = qs_p , & + qg = qg_p , ni = ni_p , nr = nr_p , & + ng = ng_p , qb = volg_p , w = w_p , & + nc = nc_p , nwfa = nwfa_p , nifa = nifa_p , & + pii = pi_p , p = pres_p , dz = dz_p , & + qc_bl = qcbl_p , qcfrac_bl = cldfrac_p , & + qcfrac = qal_p , qifrac = qai_p , & + thten_bl=rthblten_p , qvten_bl = rqvblten_p , & + qcten_bl=rqcblten_p , qiten_bl = rqiblten_p , & + thten_lwrad=rthratenlw_p, thten_swrad=rthratensw_p , & + hpbl = hpbl_p , xland = xland_p , & + ids = ids , ide = ide , jds = jds , jde = jde , kds = kds , kde = kde , & + ims = ims , ime = ime , jms = jms , jme = jme , kms = kms , kme = kme , & + its = its , ite = ite , jts = jts , jte = jte , kts = kts , kte = kte , & + tempo_diags = tempo_driver_diags) + do j = jts, jte + do i = its, ite + ! precipitation variables are added in case of multiple calls when n_microp > 1 + snowncv_p(i,j) = snowncv_p(i,j) + tempo_driver_diags%ice_liquid_equiv_precip(i,j) + & + tempo_driver_diags%snow_liquid_equiv_precip(i,j) + snownc_p(i,j) = snownc_p(i,j) + tempo_driver_diags%ice_liquid_equiv_precip(i,j) + & + tempo_driver_diags%snow_liquid_equiv_precip(i,j) + graupelncv_p(i,j) = graupelncv_p(i,j) + tempo_driver_diags%graupel_liquid_equiv_precip(i,j) + graupelnc_p(i,j) = graupelnc_p(i,j) + tempo_driver_diags%graupel_liquid_equiv_precip(i,j) + rainncv_p(i,j) = rainncv_p(i,j) + tempo_driver_diags%rain_precip(i,j) + & + tempo_driver_diags%ice_liquid_equiv_precip(i,j) + & + tempo_driver_diags%snow_liquid_equiv_precip(i,j) + & + tempo_driver_diags%graupel_liquid_equiv_precip(i,j) + rainnc_p(i,j) = rainnc_p(i,j) + tempo_driver_diags%rain_precip(i,j) + & + tempo_driver_diags%ice_liquid_equiv_precip(i,j) + & + tempo_driver_diags%snow_liquid_equiv_precip(i,j) + & + tempo_driver_diags%graupel_liquid_equiv_precip(i,j) + sr_p(i,j) = tempo_driver_diags%frozen_fraction(i,j) + frainnc_p(i,j) = frainnc_p(i,j) + tempo_driver_diags%frz_rain_precip(i,j) + max_hail_diameter_sfc_p(i,j) = tempo_driver_diags%max_hail_diameter_sfc(i,j) + max_hail_diameter_column_p(i,j) = tempo_driver_diags%max_hail_diameter_column(i,j) + do k = kts, kte + refl10cm_p(i,k,j) = tempo_driver_diags%refl10cm(i,k,j) + recloud_p(i,k,j) = tempo_driver_diags%re_cloud(i,k,j) + reice_p(i,k,j) = tempo_driver_diags%re_ice(i,k,j) + resnow_p(i,k,j) = tempo_driver_diags%re_snow(i,k,j) + enddo + enddo + enddo istep = istep + 1 enddo call mpas_timer_stop('mp_tempo') diff --git a/src/core_atmosphere/physics/mpas_atmphys_driver_pbl.F b/src/core_atmosphere/physics/mpas_atmphys_driver_pbl.F index 2f0da5914a..c247f2f9a5 100644 --- a/src/core_atmosphere/physics/mpas_atmphys_driver_pbl.F +++ b/src/core_atmosphere/physics/mpas_atmphys_driver_pbl.F @@ -474,7 +474,7 @@ subroutine pbl_from_MPAS(configs,state,mesh,sfc_input,diag_physics,tend_physics, !local pointers: character(len=StrKIND),pointer:: pbl_scheme - + logical,pointer:: config_tempo_cldfra real(kind=RKIND),dimension(:),pointer:: hfx,hpbl,qfx,ust,wspd,xland,znt real(kind=RKIND),dimension(:),pointer:: delta,wstar @@ -491,6 +491,8 @@ subroutine pbl_from_MPAS(configs,state,mesh,sfc_input,diag_physics,tend_physics, real(kind=RKIND),dimension(:,:),pointer:: cldfrac_bl,qc_bl,qi_bl real(kind=RKIND),dimension(:,:),pointer:: edmf_a,edmf_ent,edmf_qc,edmf_qt,edmf_thl,edmf_w real(kind=RKIND),dimension(:,:),pointer:: sub_thl,sub_qv,det_thl,det_qv + real(kind=RKIND),dimension(:,:),pointer :: qal, qai + integer,pointer:: index_qal, index_qai !local pointers for chemistry integer,pointer :: chemistry_start,chemistry_end @@ -509,7 +511,8 @@ subroutine pbl_from_MPAS(configs,state,mesh,sfc_input,diag_physics,tend_physics, !----------------------------------------------------------------------------------------------------------------- call mpas_pool_get_config(configs,'config_pbl_scheme',pbl_scheme) - + call mpas_pool_get_config(configs,'config_tempo_cldfra',config_tempo_cldfra) + call mpas_pool_get_array(diag_physics,'hfx' ,hfx ) call mpas_pool_get_array(diag_physics,'hpbl',hpbl) call mpas_pool_get_array(diag_physics,'qfx' ,qfx ) @@ -753,6 +756,15 @@ subroutine pbl_from_MPAS(configs,state,mesh,sfc_input,diag_physics,tend_physics, call mpas_pool_get_array(diag_physics,'det_thl' ,det_thl ) call mpas_pool_get_array(diag_physics,'det_qv' ,det_qv ) + call mpas_pool_get_array(state,'scalars',scalars) + if (config_tempo_cldfra) then + call mpas_pool_get_dimension(state,'index_qal' ,index_qal ) + call mpas_pool_get_dimension(state,'index_qai' ,index_qai ) + + qal => scalars(index_qal,:,:) + qai => scalars(index_qai,:,:) + endif + do j = jts,jte do i = its,ite dx_p(i,j) = len_disp / meshDensity(i)**0.25 @@ -804,6 +816,16 @@ subroutine pbl_from_MPAS(configs,state,mesh,sfc_input,diag_physics,tend_physics, enddo enddo + if (config_tempo_cldfra) then + do j = jts,jte + do k = kts,kte + do i = its,ite + cldfrabl_p(i,k,j) = max(qal(k,i), qai(k,i)) + enddo + enddo + enddo + endif + do j = jts,jte do i = its,ite maxwidthbl_p(i,j) = 0._RKIND diff --git a/src/core_atmosphere/physics/mpas_atmphys_init_tempo.F b/src/core_atmosphere/physics/mpas_atmphys_init_tempo.F index dac3b2d20a..743dee98d4 100644 --- a/src/core_atmosphere/physics/mpas_atmphys_init_tempo.F +++ b/src/core_atmosphere/physics/mpas_atmphys_init_tempo.F @@ -15,102 +15,19 @@ module mpas_atmphys_init_tempo use mpas_pool_routines use mpas_atmphys_utilities - use module_mp_tempo_params, only: ntb_arc,ntb_arw,ntb_art,ntb_arr,ntb_ark,tnccn_act, & - naCCN1,naCCN0,naIN0,naIN1,nwfa_default,aero_max, & - nc_ml_input, nc_ml_nodes, nc_ml_output, & - nr_ml_input, nr_ml_nodes, nr_ml_output, & - nc_ml_trans_mean, nc_ml_trans_var, & - nc_ml_w00, nc_ml_w01, nc_ml_b00, nc_ml_b01 - use module_mp_tempo_ml, only: MLdata, tempo_save_or_read_ml_data + use module_mp_tempo_params, only: nwfa_default, aero_max, & + naCCN1,naCCN0,naIN0,naIN1 implicit none private - public:: init_tempo_aerosols_forMPAS, tempo_ml_init + public:: init_tempo_aerosols_forMPAS -!MPAS main initialization of the TEMPO parameterization of cloud microphysics with nucleation of cloud -!droplets based on distributions of CCNs and INs (aerosol-aware parameterization). +!MPAS initialization of aerosols for TEMPO parameterization. - contains !================================================================================================================= - subroutine tempo_ml_init(configs) -! Called once to initial data for tempo_ml -!================================================================================================================= - -!input arguments: -type(mpas_pool_type),intent(in):: configs - -!local variables and pointers: - type(MLdata), dimension(2) :: tempo_ml_data - logical,pointer:: config_tempo_ml_nc_pbl,config_tempo_ml_nc,config_tempo_ml_nr - - call mpas_pool_get_config(configs, 'config_tempo_ml_nc_pbl', config_tempo_ml_nc_pbl) - call mpas_pool_get_config(configs, 'config_tempo_ml_nc', config_tempo_ml_nc) - call mpas_pool_get_config(configs, 'config_tempo_ml_nr', config_tempo_ml_nr) - - if(.not. (config_tempo_ml_nc_pbl .or. config_tempo_ml_nc .or. config_tempo_ml_nr)) then - call mpas_log_write('--- All configuration flags for TEMPO ML are false... TEMPO ML will not be used') - return - endif - - if(config_tempo_ml_nc .or. config_tempo_ml_nr) then - call mpas_log_write('--- TEMPO ML for nc and nr prediction not yet working... These flags will be ignored') - endif - - if(config_tempo_ml_nc_pbl) then - call mpas_log_write('--- Using TEMPO ML prediction to give life to the PBL clouds') - endif - - ! Cloud water - tempo_ml_data(1)%input_size = nc_ml_input - tempo_ml_data(1)%node_size = nc_ml_nodes - tempo_ml_data(1)%output_size = nc_ml_output - - if (.not.allocated(tempo_ml_data(1)%transform_mean)) allocate(tempo_ml_data(1)%transform_mean(nc_ml_input)) - if (.not.allocated(tempo_ml_data(1)%transform_var)) allocate(tempo_ml_data(1)%transform_var(nc_ml_input)) - - tempo_ml_data(1)%transform_mean = nc_ml_trans_mean - tempo_ml_data(1)%transform_var = nc_ml_trans_var - - if (.not.allocated(tempo_ml_data(1)%weights00)) allocate(tempo_ml_data(1)%weights00(nc_ml_nodes,nc_ml_input)) - if (.not.allocated(tempo_ml_data(1)%weights01)) allocate(tempo_ml_data(1)%weights01(nc_ml_output,nc_ml_nodes)) - if (.not.allocated(tempo_ml_data(1)%bias00)) allocate(tempo_ml_data(1)%bias00(nc_ml_nodes)) - if (.not.allocated(tempo_ml_data(1)%bias01)) allocate(tempo_ml_data(1)%bias01(nc_ml_output)) - - tempo_ml_data(1)%weights00 = reshape(nc_ml_w00, (/nc_ml_nodes, nc_ml_input/)) - tempo_ml_data(1)%weights01 = reshape(nc_ml_w01, (/nc_ml_output, nc_ml_nodes/)) - tempo_ml_data(1)%bias00 = nc_ml_b00 - tempo_ml_data(1)%bias01 = nc_ml_b01 - - ! Rain water - tempo_ml_data(2)%input_size = nc_ml_input - tempo_ml_data(2)%node_size = nc_ml_nodes - tempo_ml_data(2)%output_size = nc_ml_output - - if (.not.allocated(tempo_ml_data(2)%transform_mean)) allocate(tempo_ml_data(2)%transform_mean(nc_ml_input)) - if (.not.allocated(tempo_ml_data(2)%transform_var)) allocate(tempo_ml_data(2)%transform_var(nc_ml_input)) - - tempo_ml_data(2)%transform_mean = nc_ml_trans_mean - tempo_ml_data(2)%transform_var = nc_ml_trans_var - - if (.not.allocated(tempo_ml_data(2)%weights00)) allocate(tempo_ml_data(2)%weights00(nc_ml_nodes,nc_ml_input)) - if (.not.allocated(tempo_ml_data(2)%weights01)) allocate(tempo_ml_data(2)%weights01(nc_ml_output,nc_ml_nodes)) - if (.not.allocated(tempo_ml_data(2)%bias00)) allocate(tempo_ml_data(2)%bias00(nc_ml_nodes)) - if (.not.allocated(tempo_ml_data(2)%bias01)) allocate(tempo_ml_data(2)%bias01(nc_ml_output)) - - tempo_ml_data(2)%weights00 = reshape(nc_ml_w00, (/nc_ml_nodes, nc_ml_input/)) - tempo_ml_data(2)%weights01 = reshape(nc_ml_w01, (/nc_ml_output, nc_ml_nodes/)) - tempo_ml_data(2)%bias00 = nc_ml_b00 - tempo_ml_data(2)%bias01 = nc_ml_b01 - - ! Save neural network - call tempo_save_or_read_ml_data(ml_data_in=tempo_ml_data) - - end subroutine tempo_ml_init - -!================================================================================================================= - subroutine init_tempo_aerosols_forMPAS(do_restart,dminfo,mesh,state,time_lev,diag_physics) +subroutine init_tempo_aerosols_forMPAS(do_restart,dminfo,mesh,state,time_lev,diag_physics) !================================================================================================================= !input variables: @@ -148,11 +65,6 @@ subroutine init_tempo_aerosols_forMPAS(do_restart,dminfo,mesh,state,time_lev,dia !----------------------------------------------------------------------------------------------------------------- !call mpas_log_write('--- enter subroutine init_tempo_aerosols_forMPAS:') -!... read a static file containing CCN activation of aerosols. The data were created from a parcel model by -!... Feingold & Heymsfield with further changes by Eidhammer and Kriedenweis. - call table_ccnAct(dminfo) - call mpas_log_write('--- end read table_ccnAct:') - !... if do_restart is true, then we do not need to check the initialization of nwfa, nifa, and nwfa2d. If false, ! then, we proceed with the initialization: if(do_restart) return @@ -275,65 +187,6 @@ subroutine init_tempo_aerosols_forMPAS(do_restart,dminfo,mesh,state,time_lev,dia end subroutine init_tempo_aerosols_forMPAS -!================================================================================================================= - subroutine table_ccnAct(dminfo) -!================================================================================================================= - -!input variables: - type(dm_info),intent(in):: dminfo - -!local variables: - logical:: opened - integer:: ccn_unit,i,istat - character(len=StrKIND):: errmess -!----------------------------------------------------------------------------------------------------------------- - - if(.not.allocated(tnccn_act)) allocate(tnccn_act(ntb_arc,ntb_arw,ntb_art,ntb_arr,ntb_ark)) - -!get a unit to open binary file: - istat = -999 - if(dminfo % my_proc_id == IO_NODE) then - do i = 10,99 - inquire(i,opened = opened,iostat=istat) - if(.not. opened ) then - ccn_unit = i - exit - endif - enddo - if(istat /= 0) & - call physics_error_fatal('mpas_atmphys_init_microphysics table_ccnAct: Can not '// & - 'find unused fortran unit to read in lookup table.' ) - endif - -!distribute unit to other processors: - call mpas_dmpar_bcast_int(dminfo,ccn_unit) - -!open binary file: - istat = -999 - if(dminfo % my_proc_id == IO_NODE) then - open(ccn_unit,file='CCN_ACTIVATE_DATA',form='UNFORMATTED',status='OLD',iostat=istat) - if(istat /= 0) then - write(errmess,'(A,I4)') 'mpas_atmphys_init_microphysics table_ccnAct:: '// & - 'error opening CCN_ACTIVATE_DATA on unit', ccn_unit - call physics_error_fatal(errmess) - endif - endif - -!read and broadcast data to all nodes: - istat = -999 - if(dminfo % my_proc_id == IO_NODE) then - read(ccn_unit,iostat=istat) tnccn_act - if(istat /= 0) then - write(errmess,'(A,I4)') 'mpas_atmphys_init_microphysics table_ccnAct:: '// & - 'error reading tnccn_act on unit', ccn_unit - call physics_error_fatal(errmess) - endif - endif - - DM_BCAST_MACRO(tnccn_act) - - end subroutine table_ccnAct - -!================================================================================================================= + !================================================================================================================= end module mpas_atmphys_init_tempo -!================================================================================================================= +!================================================================================================================= \ No newline at end of file diff --git a/src/core_atmosphere/physics/mpas_atmphys_interface.F b/src/core_atmosphere/physics/mpas_atmphys_interface.F index 35d577efab..f29a9f3650 100644 --- a/src/core_atmosphere/physics/mpas_atmphys_interface.F +++ b/src/core_atmosphere/physics/mpas_atmphys_interface.F @@ -640,13 +640,14 @@ subroutine MPAS_to_physics(configs,mesh,state,time_lev,diag,diag_physics,its,ite end subroutine MPAS_to_physics !================================================================================================================= - subroutine microphysics_from_MPAS(configs,mesh,state,time_lev,diag,diag_physics,tend_physics,its,ite) + subroutine microphysics_from_MPAS(configs,mesh,state,time_lev,sfc_input,diag,diag_physics,tend_physics,its,ite) !================================================================================================================= !input variables: type(mpas_pool_type),intent(in):: configs type(mpas_pool_type),intent(in):: mesh type(mpas_pool_type),intent(in):: state + type(mpas_pool_type),intent(in):: sfc_input type(mpas_pool_type),intent(in):: diag type(mpas_pool_type),intent(in):: diag_physics @@ -663,28 +664,33 @@ subroutine microphysics_from_MPAS(configs,mesh,state,time_lev,diag,diag_physics, real(kind=RKIND),dimension(:),pointer :: nifa2d,nwfa2d,nt_c,mu_c !TEMPO/NSSL character(len=StrKIND),pointer:: nssl_moments - logical,pointer:: config_tempo_hailaware, config_tempo_aerosolaware - logical,pointer:: config_tempo_ml_nc_pbl + logical,pointer:: config_tempo_aerosolaware,config_tempo_hailaware + logical,pointer:: config_tempo_ml_for_bl_nc + logical,pointer:: config_tempo_cldfra integer,pointer:: index_qh integer,pointer:: index_zrw,index_zgw,index_zhw integer,pointer:: index_ns,index_ng,index_nh,index_nccn integer,pointer:: index_volg,index_volh - + integer,pointer:: index_qal, index_qai + real(kind=RKIND),dimension(:,:),pointer :: zgrid,w real(kind=RKIND),dimension(:,:),pointer :: zz,exner,pressure_b real(kind=RKIND),dimension(:,:),pointer :: rho_zz,theta_m,pressure_p real(kind=RKIND),dimension(:,:),pointer :: qv,qc,qr,qi,qs,qg real(kind=RKIND),dimension(:,:),pointer :: qh real(kind=RKIND),dimension(:,:),pointer :: nc,ni,nr,nifa,nwfa + real(kind=RKIND),dimension(:,:),pointer :: qal, qai, precipfrac real(kind=RKIND),dimension(:,:),pointer :: ns,ng,nh,nccn real(kind=RKIND),dimension(:,:),pointer :: volg,volh,zrw,zgw,zhw real(kind=RKIND),dimension(:,:),pointer :: rainprod,evapprod real(kind=RKIND),dimension(:,:),pointer :: refl10cm real(kind=RKIND),dimension(:) ,pointer :: max_hail_diameter_sfc, max_hail_diameter_column + real(kind=RKIND),dimension(:) ,pointer :: hpbl,xland real(kind=RKIND),dimension(:,:),pointer :: re_cloud,re_ice,re_snow real(kind=RKIND),dimension(:,:),pointer :: qc_bl, cldfrac_bl real(kind=RKIND),dimension(:,:),pointer :: rthmpten,rqvmpten,rqcmpten,rqrmpten,rqimpten,rqsmpten,rqgmpten real(kind=RKIND),dimension(:,:),pointer :: rncmpten,rnimpten,rnrmpten,rnifampten,rnwfampten + real(kind=RKIND),dimension(:,:),pointer :: rthblten, rqvblten, rqcblten, rqiblten, rthratenlw, rthratensw real(kind=RKIND),dimension(:,:,:),pointer:: scalars !local variables: @@ -696,7 +702,8 @@ subroutine microphysics_from_MPAS(configs,mesh,state,time_lev,diag,diag_physics, call mpas_pool_get_config(configs,'config_nssl_moments',nssl_moments) call mpas_pool_get_config(configs,'config_tempo_hailaware',config_tempo_hailaware) call mpas_pool_get_config(configs,'config_tempo_aerosolaware',config_tempo_aerosolaware) - call mpas_pool_get_config(configs,'config_tempo_ml_nc_pbl',config_tempo_ml_nc_pbl) + call mpas_pool_get_config(configs,'config_tempo_ml_for_bl_nc',config_tempo_ml_for_bl_nc) + call mpas_pool_get_config(configs,'config_tempo_cldfra',config_tempo_cldfra) call mpas_pool_get_array(mesh,'zgrid',zgrid) call mpas_pool_get_array(mesh,'zz' ,zz ) @@ -888,7 +895,7 @@ subroutine microphysics_from_MPAS(configs,mesh,state,time_lev,diag,diag_physics, enddo enddo - if(config_tempo_ml_nc_pbl) then + if(config_tempo_ml_for_bl_nc) then call mpas_pool_get_array(diag_physics,'qc_bl',qc_bl) call mpas_pool_get_array(diag_physics,'cldfrac_bl',cldfrac_bl) do j = jts, jte @@ -943,6 +950,51 @@ subroutine microphysics_from_MPAS(configs,mesh,state,time_lev,diag,diag_physics, enddo endif + if (config_tempo_cldfra) then + call mpas_pool_get_dimension(state,'index_qal' ,index_qal ) + call mpas_pool_get_dimension(state,'index_qai' ,index_qai ) + call mpas_pool_get_array(diag_physics,'precipfrac', precipfrac) + call mpas_pool_get_array(tend_physics,'rthblten',rthblten) + call mpas_pool_get_array(tend_physics,'rqvblten',rqvblten) + call mpas_pool_get_array(tend_physics,'rqcblten',rqcblten) + call mpas_pool_get_array(tend_physics,'rqiblten',rqiblten) + call mpas_pool_get_array(tend_physics,'rthratenlw',rthratenlw) + call mpas_pool_get_array(tend_physics,'rthratensw',rthratensw) + call mpas_pool_get_array(diag_physics,'hpbl', hpbl) + call mpas_pool_get_array(sfc_input,'xland', xland) +! call mpas_pool_get_array(diag_physics,'qc_bl',qc_bl) +! call mpas_pool_get_array(diag_physics,'cldfrac_bl',cldfrac_bl) + + qal => scalars(index_qal,:,:) + qai => scalars(index_qai,:,:) + + do j = jts, jte + do k = kts, kte + do i = its, ite + qal_p(i,k,j) = qal(k,i) + qai_p(i,k,j) = qai(k,i) + + precipfrac_p(i,k,j) = precipfrac(k,i) + rthblten_p(i,k,j) = rthblten(k,i) + rqvblten_p(i,k,j) = rqvblten(k,i) + rqcblten_p(i,k,j) = rqcblten(k,i) + rqiblten_p(i,k,j) = rqiblten(k,i) + rthratenlw_p(i,k,j) = rthratenlw(k,i) + rthratensw_p(i,k,j) = rthratensw(k,i) +! qcbl_p(i,k,j) = qc_bl(k,i) +! cldfrac_p(i,k,j) = cldfrac_bl(k,i) + enddo + enddo + enddo + + do j = jts, jte + do i = its, ite + hpbl_p(i,j) = hpbl(i) + xland_p(i,j) = xland(i) + enddo + enddo + endif + case("mp_nssl2m") call mpas_pool_get_dimension(state,'index_ni',index_ni) call mpas_pool_get_dimension(state,'index_nr',index_nr) @@ -1151,8 +1203,10 @@ subroutine microphysics_to_MPAS(configs,mesh,state,time_lev,diag,diag_physics,te character(len=StrKIND),pointer:: mp_scheme character(len=StrKIND),pointer:: nssl_moments logical,pointer:: config_tempo_hailaware, config_tempo_aerosolaware + logical,pointer:: config_tempo_cldfra integer,pointer:: index_qv,index_qc,index_qr,index_qi,index_qs,index_qg integer,pointer:: index_nc,index_ni,index_nr,index_nifa,index_nwfa + integer,pointer:: index_qal, index_qai !TEMPO/NSSL integer,pointer:: index_qh integer,pointer:: index_zrw,index_zgw,index_zhw @@ -1169,6 +1223,7 @@ subroutine microphysics_to_MPAS(configs,mesh,state,time_lev,diag,diag_physics,te real(kind=RKIND),dimension(:,:),pointer :: qv,qc,qr,qi,qs,qg real(kind=RKIND),dimension(:,:),pointer :: qh real(kind=RKIND),dimension(:,:),pointer :: nc,ni,nr,nifa,nwfa + real(kind=RKIND),dimension(:,:),pointer :: qal, qai, precipfrac real(kind=RKIND),dimension(:,:),pointer :: ns,ng,nh,nccn real(kind=RKIND),dimension(:,:),pointer :: volg,volh,zrw,zgw,zhw real(kind=RKIND),dimension(:) ,pointer :: max_hail_diameter_sfc, max_hail_diameter_column @@ -1189,6 +1244,7 @@ subroutine microphysics_to_MPAS(configs,mesh,state,time_lev,diag,diag_physics,te call mpas_pool_get_config(configs,'config_nssl_moments',nssl_moments) call mpas_pool_get_config(configs,'config_tempo_hailaware',config_tempo_hailaware) call mpas_pool_get_config(configs,'config_tempo_aerosolaware',config_tempo_aerosolaware) + call mpas_pool_get_config(configs,'config_tempo_cldfra',config_tempo_cldfra) call mpas_pool_get_array(mesh,'zz' ,zz ) call mpas_pool_get_array(mesh,'zgrid',zgrid) @@ -1449,6 +1505,25 @@ subroutine microphysics_to_MPAS(configs,mesh,state,time_lev,diag,diag_physics,te enddo endif + if (config_tempo_cldfra) then + call mpas_pool_get_dimension(state,'index_qal' ,index_qal ) + call mpas_pool_get_dimension(state,'index_qai' ,index_qai ) + call mpas_pool_get_array(diag_physics,'precipfrac' ,precipfrac ) + + qal => scalars(index_qal,:,:) + qai => scalars(index_qai,:,:) + + do j = jts, jte + do k = kts, kte + do i = its, ite + qal(k,i) = qal_p(i,k,j) + qai(k,i) = qai_p(i,k,j) + precipfrac(k,i) = precipfrac_p(i,k,j) + enddo + enddo + enddo + endif + case("mp_nssl2m") call mpas_pool_get_dimension(state,'index_ni' ,index_ni ) call mpas_pool_get_dimension(state,'index_nc' ,index_nc ) diff --git a/src/core_atmosphere/physics/mpas_atmphys_packages.F b/src/core_atmosphere/physics/mpas_atmphys_packages.F index e1a9513669..0b315afe62 100644 --- a/src/core_atmosphere/physics/mpas_atmphys_packages.F +++ b/src/core_atmosphere/physics/mpas_atmphys_packages.F @@ -41,9 +41,9 @@ function atmphys_setup_packages(configs,streamInfo,packages,iocontext) result(ie character(len=StrKIND),pointer:: config_lsm_scheme character(len=StrKIND),pointer:: config_smoke_scheme character(len=StrKIND),pointer:: config_dust_scheme - logical,pointer:: config_tempo_hailaware, config_tempo_aerosolaware + logical,pointer:: config_tempo_aerosolaware,config_tempo_hailaware,config_tempo_cldfra logical,pointer:: mp_kessler_in,mp_thompson_in,mp_thompson_aers_in,mp_wsm6_in,mp_nssl2m_in,nssl3m_in - logical,pointer:: mp_tempo_in, tempo_hailaware_in, tempo_aerosolaware_in + logical,pointer:: mp_tempo_in,tempo_hailaware_in,tempo_aerosolaware_in,tempo_cldfra_in logical,pointer:: cu_grell_freitas_in,cu_grell_freitas_li_in,cu_kain_fritsch_in,cu_ntiedtke_in logical,pointer:: bl_mynn_in,bl_mynnedmf_in,bl_ysu_in,bl_myj_in logical,pointer:: lsm_noah_in,lsm_ruc_in @@ -66,8 +66,9 @@ function atmphys_setup_packages(configs,streamInfo,packages,iocontext) result(ie call mpas_pool_get_config(configs,'config_microp_scheme',config_microp_scheme) call mpas_pool_get_config(configs,'config_nssl_moments',config_nssl_moments) - call mpas_pool_get_config(configs,'config_tempo_hailaware',config_tempo_hailaware) call mpas_pool_get_config(configs,'config_tempo_aerosolaware',config_tempo_aerosolaware) + call mpas_pool_get_config(configs,'config_tempo_hailaware',config_tempo_hailaware) + call mpas_pool_get_config(configs,'config_tempo_cldfra',config_tempo_cldfra) nullify(mp_kessler_in) call mpas_pool_get_package(packages,'mp_kessler_inActive',mp_kessler_in) @@ -86,6 +87,9 @@ function atmphys_setup_packages(configs,streamInfo,packages,iocontext) result(ie nullify(tempo_hailaware_in) call mpas_pool_get_package(packages,'tempo_hailaware_inActive',tempo_hailaware_in) + + nullify(tempo_cldfra_in) + call mpas_pool_get_package(packages,'tempo_cldfra_inActive',tempo_cldfra_in) nullify(mp_wsm6_in) call mpas_pool_get_package(packages,'mp_wsm6_inActive',mp_wsm6_in) @@ -115,6 +119,7 @@ function atmphys_setup_packages(configs,streamInfo,packages,iocontext) result(ie mp_tempo_in = .false. tempo_aerosolaware_in = .false. tempo_hailaware_in = .false. + tempo_cldfra_in = .false. mp_wsm6_in = .false. mp_nssl2m_in = .false. nssl3m_in = .false. @@ -129,12 +134,9 @@ function atmphys_setup_packages(configs,streamInfo,packages,iocontext) result(ie mp_wsm6_in = .true. elseif(config_microp_scheme == 'mp_tempo') then mp_tempo_in = .true. - if (config_tempo_aerosolaware) then - tempo_aerosolaware_in = .true. - endif - if (config_tempo_hailaware) then - tempo_hailaware_in = .true. - endif + if (config_tempo_aerosolaware) tempo_aerosolaware_in = .true. + if (config_tempo_hailaware) tempo_hailaware_in = .true. + if (config_tempo_cldfra) tempo_cldfra_in = .true. elseif(config_microp_scheme == 'mp_nssl2m') then mp_nssl2m_in = .true. IF ( config_nssl_moments == 'nssl3m' ) THEN @@ -148,6 +150,7 @@ function atmphys_setup_packages(configs,streamInfo,packages,iocontext) result(ie call mpas_log_write(' mp_tempo_in = $l', logicArgs=(/mp_tempo_in/)) call mpas_log_write(' tempo_aerosolaware_in = $l', logicArgs=(/tempo_aerosolaware_in/)) call mpas_log_write(' tempo_hailaware_in = $l', logicArgs=(/tempo_hailaware_in/)) + call mpas_log_write(' tempo_cldfra_in = $l', logicArgs=(/tempo_cldfra_in/)) call mpas_log_write(' mp_wsm6_in = $l', logicArgs=(/mp_wsm6_in/)) call mpas_log_write(' mp_nssl2m_in = $l', logicArgs=(/mp_nssl2m_in/)) call mpas_log_write(' nssl3m_in = $l', logicArgs=(/nssl3m_in/)) diff --git a/src/core_atmosphere/physics/mpas_atmphys_todynamics.F b/src/core_atmosphere/physics/mpas_atmphys_todynamics.F index 4cc141bca5..155bbbaab6 100644 --- a/src/core_atmosphere/physics/mpas_atmphys_todynamics.F +++ b/src/core_atmosphere/physics/mpas_atmphys_todynamics.F @@ -89,7 +89,7 @@ subroutine physics_get_tend(block,mesh,state,diag,tend,tend_physics,configs,rk_s radt_lw_scheme, & radt_sw_scheme - logical,pointer::tempo_aerosolaware + logical,pointer::config_tempo_aerosolaware integer:: i,iCell,k,n integer,pointer:: index_qv,index_qc,index_qr,index_qi,index_qs integer,pointer:: index_nc,index_ni,index_nifa,index_nwfa @@ -127,7 +127,7 @@ subroutine physics_get_tend(block,mesh,state,diag,tend,tend_physics,configs,rk_s call mpas_pool_get_config(configs,'config_pbl_scheme' ,pbl_scheme ) call mpas_pool_get_config(configs,'config_radt_lw_scheme' ,radt_lw_scheme ) call mpas_pool_get_config(configs,'config_radt_sw_scheme' ,radt_sw_scheme ) - call mpas_pool_get_config(configs,'config_tempo_aerosolaware',tempo_aerosolaware) + call mpas_pool_get_config(configs,'config_tempo_aerosolaware',config_tempo_aerosolaware) call mpas_pool_get_array(state,'theta_m' ,theta_m,1) call mpas_pool_get_array(state,'scalars' ,scalars,1) @@ -211,7 +211,7 @@ subroutine physics_get_tend(block,mesh,state,diag,tend,tend_physics,configs,rk_s call physics_get_tend_work( & block,mesh,nCells,nEdges,nCellsSolve,nEdgesSolve,rk_step,dynamics_substep, & pbl_scheme,convection_scheme,microp_scheme,radt_lw_scheme,radt_sw_scheme, & - tempo_aerosolaware,index_qv,index_qc,index_qr,index_qi,index_qs, & + config_tempo_aerosolaware,index_qv,index_qc,index_qr,index_qi,index_qs, & index_nc,index_ni,index_nifa,index_nwfa, & mass,mass_edge,theta_m,scalars, & rublten,rvblten,rthblten,rqvblten,rqcblten,rqiblten,rqsblten, & @@ -251,7 +251,7 @@ end subroutine physics_get_tend subroutine physics_get_tend_work( & block,mesh,nCells,nEdges,nCellsSolve,nEdgesSolve,rk_step,dynamics_substep, & pbl_scheme,convection_scheme,microp_scheme,radt_lw_scheme,radt_sw_scheme, & - tempo_aerosolaware,index_qv,index_qc,index_qr,index_qi,index_qs, & + config_tempo_aerosolaware,index_qv,index_qc,index_qr,index_qi,index_qs, & index_nc,index_ni,index_nifa,index_nwfa, & mass,mass_edge,theta_m,scalars, & rublten,rvblten,rthblten,rqvblten,rqcblten,rqiblten,rqsblten, & @@ -273,7 +273,7 @@ subroutine physics_get_tend_work( & character(len=StrKIND),intent(in):: pbl_scheme character(len=StrKIND),intent(in):: radt_lw_scheme character(len=StrKIND),intent(in):: radt_sw_scheme - logical,intent(in):: tempo_aerosolaware + logical,intent(in):: config_tempo_aerosolaware integer,intent(in):: nCells,nEdges,nCellsSolve,nEdgesSolve integer,intent(in):: rk_step,dynamics_substep @@ -369,7 +369,7 @@ subroutine physics_get_tend_work( & enddo endif - if((trim(microp_scheme) == 'mp_tempo') .and. (tempo_aerosolaware)) then + if((trim(microp_scheme) == 'mp_tempo') .and. (config_tempo_aerosolaware)) then do i = 1, nCellsSolve do k = 1, nVertLevels tend_scalars(index_nc,k,i) = tend_scalars(index_nc,k,i) + rncblten(k,i)*mass(k,i) @@ -397,7 +397,7 @@ subroutine physics_get_tend_work( & enddo endif - if((trim(microp_scheme) == 'mp_tempo') .and. (tempo_aerosolaware)) then + if((trim(microp_scheme) == 'mp_tempo') .and. (config_tempo_aerosolaware)) then do i = 1, nCellsSolve do k = 1, nVertLevels tend_scalars(index_nc,k,i) = tend_scalars(index_nc,k,i) + rncblten(k,i)*mass(k,i) diff --git a/src/core_atmosphere/physics/mpas_atmphys_vars.F b/src/core_atmosphere/physics/mpas_atmphys_vars.F index b379086243..1dd3862585 100644 --- a/src/core_atmosphere/physics/mpas_atmphys_vars.F +++ b/src/core_atmosphere/physics/mpas_atmphys_vars.F @@ -300,7 +300,10 @@ module mpas_atmphys_vars e_ant_in_p, e_bb_in_p, e_bio_in_p, e_vol_in_p real(kind=RKIND),dimension(:,:,:,:),allocatable:: & e_ant_out_p, e_bb_out_p, e_bio_out_p, e_dust_out_p, e_ss_out_p, e_vol_out_p - + + real(kind=RKIND),dimension(:,:,:),allocatable:: & + qal_p, qai_p, precipfrac_p + !... arrays located at w (vertical velocity) points, or at interface between layers: real(kind=RKIND),dimension(:,:,:),allocatable:: & w_p, &!vertical velocity [m/s] diff --git a/src/core_atmosphere/physics/physics_noaa/TEMPO b/src/core_atmosphere/physics/physics_noaa/TEMPO index f325c9d778..0251402e03 160000 --- a/src/core_atmosphere/physics/physics_noaa/TEMPO +++ b/src/core_atmosphere/physics/physics_noaa/TEMPO @@ -1 +1 @@ -Subproject commit f325c9d778ca34ecb781ed92757791749a373a52 +Subproject commit 0251402e03855d41edc4cbfcaf09894ff72e592e diff --git a/src/core_atmosphere/utils/Makefile b/src/core_atmosphere/utils/Makefile index cf4e2fd172..ede5830d5a 100644 --- a/src/core_atmosphere/utils/Makefile +++ b/src/core_atmosphere/utils/Makefile @@ -4,27 +4,15 @@ ifdef PHYSICS UTILS = build_tables endif -all: $(UTILS) build_tables_tempo +all: $(UTILS) build_tables: build_tables.o atmphys_build_tables_thompson.o $(LINKER) $(LDFLAGS) -o build_tables build_tables.o atmphys_build_tables_thompson.o -L../../framework -L../physics -lphys -lframework $(LIBS) -L../../external/esmf_time_f90 -lesmf_time mv build_tables ../../.. -build_tables_tempo: build_tables_tempo.o atmphys_build_tables_tempo.o - $(LINKER) $(LDFLAGS) -o build_tables_tempo build_tables_tempo.o atmphys_build_tables_tempo.o -L../../framework -L../physics -lphys -lframework $(LIBS) -L../../external/esmf_time_f90 -lesmf_time - mv build_tables_tempo ../../.. - build_tables.o: \ atmphys_build_tables_thompson.o -build_tables_tempo.o: \ - atmphys_build_tables_tempo.o - -atmphys_build_tables_tempo.o: \ - ../physics/physics_noaa/TEMPO/module_mp_tempo.o \ - ../physics/physics_noaa/TEMPO/module_mp_tempo_utils.o \ - ../physics/physics_noaa/TEMPO/module_mp_tempo_params.o - clean: $(RM) ../../../build_tables $(RM) *.o *.mod *.f90 diff --git a/src/core_init_atmosphere/Registry.xml b/src/core_init_atmosphere/Registry.xml index d850b94cae..8177dcb3a0 100644 --- a/src/core_init_atmosphere/Registry.xml +++ b/src/core_init_atmosphere/Registry.xml @@ -325,11 +325,6 @@ description="Whether to interpolate first-guess fields from intermediate file" possible_values="true or false"/> - - - - - + + @@ -1233,7 +1227,7 @@ description="Graupel mixing ratio"/> + description="Hail mixing ratio"/> @@ -1250,6 +1244,9 @@ + + @@ -1301,7 +1298,7 @@ - - + - + diff --git a/src/core_init_atmosphere/mpas_init_atm_cases.F b/src/core_init_atmosphere/mpas_init_atm_cases.F index cfc893e38e..d1c8868a5d 100644 --- a/src/core_init_atmosphere/mpas_init_atm_cases.F +++ b/src/core_init_atmosphere/mpas_init_atm_cases.F @@ -70,7 +70,6 @@ subroutine init_atm_setup_case(domain, stream_manager) logical, pointer :: config_native_gwd_static logical, pointer :: config_native_gwd_gsl_static logical, pointer :: config_met_interp - logical, pointer :: config_aerosol_climo logical, pointer :: config_blend_bdy_terrain character (len=StrKIND), pointer :: config_start_time character (len=StrKIND), pointer :: config_met_prefix @@ -232,7 +231,6 @@ subroutine init_atm_setup_case(domain, stream_manager) call mpas_pool_get_config(block_ptr % configs, 'config_native_gwd_static', config_native_gwd_static) call mpas_pool_get_config(block_ptr % configs, 'config_native_gwd_gsl_static', config_native_gwd_gsl_static) call mpas_pool_get_config(block_ptr % configs, 'config_met_interp', config_met_interp) - call mpas_pool_get_config(block_ptr % configs, 'config_aerosol_climo', config_aerosol_climo) call mpas_pool_get_config(block_ptr % configs, 'config_blend_bdy_terrain', config_blend_bdy_terrain) call mpas_pool_get_subpool(block_ptr % structs, 'mesh', mesh) @@ -397,8 +395,6 @@ subroutine init_atm_setup_case(domain, stream_manager) call mpas_pool_get_dimension(block_ptr % dimensions, 'nEdges', nEdges) call mpas_pool_get_dimension(block_ptr % dimensions, 'nVertLevels', nVertLevels) - call mpas_pool_get_config(block_ptr % configs, 'config_aerosol_climo', config_aerosol_climo) - call mpas_get_time(curr_time, dateTimeString=timeString) xtime = timeString ! Set field valid time, xtime, to the current time in the time loop time_since_start = curr_time - start_time