Merge pull request ufs-community#11 from AndersJensen-NOAA/ncar_merge_v2

Fixing more merge conflicts

Author: jderrico-noaa

src/core_atmosphere/Registry.xml

@@ -2677,7 +2677,7 @@
                      description="maximum diagnosed 10 cm radar reflectivity at 1 km AGL since last output time"
                      packages="mp_thompson_in;mp_thompson_aers_in;mp_wsm6_in;mp_nssl2m_in;mp_tempo_in"/>
 
-		<var name="do_diag_dbz" type="logical" dimensions="" units = ""
+		<var name="do_diag_dbz" type="integer" dimensions="" units = ""
 		    description="flag for whether to compute refelctivity at every time step for use in computing output-time-max 1km reflectivity"/>
 
                 <var name="i_rainnc" type="integer" dimensions="nCells Time" units="unitless"

src/core_atmosphere/diagnostics/mpas_convective_diagnostics.F

@@ -59,7 +59,7 @@ module mpas_convective_diagnostics
     logical :: is_needed_prec_acc_nc
     logical :: is_needed_snow_acc_nc
     logical :: do_any_uh, do_any_diags
-    logical,pointer :: do_diag_dbz
+    integer,pointer :: do_diag_dbz
 
     contains
 
@@ -123,9 +123,9 @@ subroutine convective_diagnostics_setup(all_pools, simulation_clock)
         is_needed_snow_acc_nc = .false.
         do_any_uh = .false.
         do_any_diags = .false.
-        do_diag_dbz = .false.
+        do_diag_dbz = 0
         if (mpas_stream_inclusion_count('refl10cm_1km_max', direction=MPAS_STREAM_OUTPUT) > 0) then
-            do_diag_dbz = .true.
+            do_diag_dbz = 1
         endif
         ! - UH Variables
         if (mpas_stream_inclusion_count('updraft_helicity_max', direction=MPAS_STREAM_OUTPUT) > 0) then

src/core_atmosphere/physics/mpas_atmphys_control.F

@@ -177,6 +177,7 @@ subroutine physics_namelist_check(configs)
            config_microp_scheme .eq. 'mp_kessler'           .or. &
            config_microp_scheme .eq. 'mp_thompson'          .or. &
            config_microp_scheme .eq. 'mp_thompson_aerosols' .or. &
+           config_microp_scheme .eq. 'mp_tempo' .or. &
            config_microp_scheme .eq. 'mp_nssl2m'  .or. &
            config_microp_scheme .eq. 'mp_wsm6')) then
 
@@ -401,19 +402,6 @@ subroutine physics_registry_init(mesh,configs,sfc_input)
              dzs(9,iCell) = 0.70_RKIND
         enddo
 
-       case("sf_ruc")
-         do iCell = 1,nCells
-             dzs(1,iCell) = 0.005_RKIND
-             dzs(2,iCell) = 0.025_RKIND
-             dzs(3,iCell) = 0.045_RKIND
-             dzs(4,iCell) = 0.13_RKIND
-             dzs(5,iCell) = 0.25_RKIND
-             dzs(6,iCell) = 0.35_RKIND
-             dzs(7,iCell) = 0.50_RKIND
-             dzs(8,iCell) = 1.00_RKIND
-             dzs(9,iCell) = 0.70_RKIND
-        enddo
-
        case default
 
     end select lsm_select
@@ -445,6 +433,7 @@ 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
 
     l_qr_acr_qg = .false.

src/core_atmosphere/physics/mpas_atmphys_driver.F

@@ -278,7 +278,7 @@ subroutine physics_driver(domain,itimestep,xtime_s)
     if(config_oml1d) call driver_oml1d(block%configs,mesh,diag,diag_physics,sfc_input)
 
     !call to land-surface scheme:
-   if(config_lsm_scheme .eq. 'sf_noah' .or. config_lsm_scheme .eq. 'sf_ruc') then
+    if(config_lsm_scheme .eq. 'sf_noah' .or. config_lsm_scheme .eq. 'sf_ruc') then
        call allocate_lsm(config_lsm_scheme)
 !$OMP PARALLEL DO
           do thread=1,nThreads
@@ -297,14 +297,12 @@ subroutine physics_driver(domain,itimestep,xtime_s)
 !$OMP END PARALLEL DO
        call deallocate_seaice(config_lsm_scheme)
 
-       elseif(config_lsm_scheme == 'sf_noahmp') then
-          do thread=1,nThreads
-             call driver_lsm_noahmp(block%configs,mesh,state,time_lev,diag,diag_physics,   &
-                                    diag_physics_noahmp,output_noahmp,sfc_input,itimestep, &
-                                    cellSolveThreadStart(thread),cellSolveThreadEnd(thread))
-          enddo
-       endif
-
+    elseif(config_lsm_scheme == 'sf_noahmp') then
+       do thread=1,nThreads
+          call driver_lsm_noahmp(block%configs,mesh,state,time_lev,diag,diag_physics,   &
+               diag_physics_noahmp,output_noahmp,sfc_input,itimestep, &
+               cellSolveThreadStart(thread),cellSolveThreadEnd(thread))
+       enddo
     endif
 
     !call to pbl schemes:

src/core_atmosphere/physics/mpas_atmphys_driver_microphysics.F

@@ -20,7 +20,7 @@ module mpas_atmphys_driver_microphysics
 !wrf physics:
  use module_mp_kessler
  use module_mp_thompson
- use module_mp_tempo
+ use module_mp_tempo,only: tempo_3d_to_1d_driver
  ! use module_mp_tempo_utils
  use module_mp_wsm6,only: wsm6
  use mp_wsm6,only: mp_wsm6_init,refl10cm_wsm6
@@ -108,7 +108,7 @@ subroutine allocate_microphysics(configs)
 !local pointers:
  character(len=StrKIND),pointer:: microp_scheme
  character(len=StrKIND),pointer:: nssl_moments
- logical,pointer:: thompson_hail_aware
+ logical,pointer:: tempo_hailaware
 
 !-----------------------------------------------------------------------------------------------------------------
 
@@ -182,7 +182,7 @@ subroutine allocate_microphysics(configs)
                 if (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))
-                   if(.not.allocated(refl10cm_1km_p)  ) allocate(refl10cm_p(ims:ime,jms:jme) )
+                   if(.not.allocated(refl10cm_1km_p)  ) allocate(refl10cm_1km_p(ims:ime,jms:jme) )
                 endif
 
              case default
@@ -199,7 +199,7 @@ subroutine allocate_microphysics(configs)
           if(.not.allocated(nccn_p) ) allocate(nccn_p(ims:ime,kms:kme,jms:jme))
           if(.not.allocated(volg_p)) allocate(volg_p(ims:ime,kms:kme,jms:jme))
           if(.not.allocated(volh_p)) allocate(volh_p(ims:ime,kms:kme,jms:jme))
-          if(.not.allocated(refl10cm_1km_p)  ) allocate(refl10cm_p(ims:ime,jms:jme) )
+          if(.not.allocated(refl10cm_1km_p)  ) allocate(refl10cm_1km_p(ims:ime,jms:jme) )
 
           if (nssl_moments == "nssl3m") then
             if(.not.allocated(zrw_p) ) allocate(zrw_p(ims:ime,kms:kme,jms:jme))
@@ -225,7 +225,7 @@ subroutine deallocate_microphysics(configs)
 !local pointers:
  character(len=StrKIND),pointer:: microp_scheme
  character(len=StrKIND),pointer:: nssl_moments
- logical,pointer:: thompson_hail_aware
+ logical,pointer:: tempo_hailaware
 
 !-----------------------------------------------------------------------------------------------------------------
 
@@ -348,7 +348,7 @@ subroutine init_microphysics(dminfo,configs,mesh,state,time_lev,sfc_input,diag_p
 !inout arguments:
  type(mpas_pool_type),intent(inout):: diag_physics
  type(mpas_pool_type),intent(inout):: state
- type(mpas_pool_type),intent(in):: diag
+! type(mpas_pool_type),intent(in):: diag
 
 !local pointer:
  logical,pointer:: do_restart
@@ -428,19 +428,18 @@ subroutine driver_microphysics(configs,mesh,state,time_lev,diag,diag_physics,ten
 
 !local pointers:
  character(len=StrKIND),pointer:: microp_scheme
- logical,pointer:: thompson_aerosol_aware,thompson_hail_aware
-  character(len=StrKIND),pointer:: nssl_moments
+ logical,pointer:: thompson_aerosol_aware,tempo_hailaware
+ character(len=StrKIND),pointer:: nssl_moments
 
 !local variables and arrays:
  integer:: istep
- logical, pointer :: do_diag_dbz
+ integer, pointer :: do_diag_dbz
+ logical :: do_diag_dbz_flag
 
 !CCPP-compliant flags:
  character(len=StrKIND):: errmsg
  integer:: errflg
 
- call mpas_pool_get_array(diag_physics,'do_diag_dbz',do_diag_dbz)
-
 !-----------------------------------------------------------------------------------------------------------------
 !call mpas_log_write('')
 !call mpas_log_write('---enter subroutine driver_microphysics:')
@@ -452,6 +451,10 @@ subroutine driver_microphysics(configs,mesh,state,time_lev,diag,diag_physics,ten
  call mpas_pool_get_config(configs,'config_microp_scheme',microp_scheme)
  call mpas_pool_get_config(configs,'config_tempo_hailaware',tempo_hailaware)
  call mpas_pool_get_config(configs,'config_nssl_moments',nssl_moments)
+ call mpas_pool_get_array(diag_physics,'do_diag_dbz',do_diag_dbz)
+
+ do_diag_dbz_flag = .false.
+ if (do_diag_dbz == 1) do_diag_dbz_flag = .true.
 
 !... allocation of microphysics arrays:
 !$OMP MASTER
@@ -646,7 +649,7 @@ subroutine driver_microphysics(configs,mesh,state,time_lev,diag,diag_physics,ten
                   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     , &
-                  diagflag  = l_diags     , dbz        = refl10cm_p   , diag_dbz   = do_diag_dbz  , &
+                  diagflag  = l_diags     , dbz        = refl10cm_p   , diag_dbz   = do_diag_dbz_flag  , &
                   ntmul      = n_microp   , ntcnt      = 1            , lastloop   = .true.       , &
                   refl_diagnostic = refl10cm_1km_p                                                , &
                   ids = ids , ide = ide , jds = jds , jde = jde , kds = kds , kde = kde           , &
@@ -668,7 +671,7 @@ subroutine driver_microphysics(configs,mesh,state,time_lev,diag,diag_physics,ten
                   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     , &
-                  diagflag  = l_diags     , dbz        = refl10cm_p   , diag_dbz   = do_diag_dbz  , &
+                  diagflag  = l_diags     , dbz        = refl10cm_p   , diag_dbz   = do_diag_dbz_flag  , &
                   ntmul      = n_microp   , ntcnt      = 1            , lastloop   = .true.       , &
                   refl_diagnostic = refl10cm_1km_p                                                , &
                   ids = ids , ide = ide , jds = jds , jde = jde , kds = kds , kde = kde           , &
@@ -705,7 +708,7 @@ subroutine driver_microphysics(configs,mesh,state,time_lev,diag,diag_physics,ten
 
  end if
 
- if (do_diag_dbz) then
+ if (do_diag_dbz_flag) then
     if(trim(microp_scheme) == "mp_wsm6"     .or. &
        trim(microp_scheme) == "mp_tempo" .or. &
        trim(microp_scheme) == "mp_nssl2m"   ) then

src/core_atmosphere/physics/mpas_atmphys_driver_seaice.F

@@ -33,7 +33,7 @@ module mpas_atmphys_driver_seaice
 !urban physics: MPAS does not plan to run the urban physics option.
  integer,parameter:: sf_urban_physics = 0 !activate urban canopy model (=0: no urban canopy)
 
- integer :: targetcell= 0 !99975 !81442 !107619
+ integer :: targetcell_= 0 !99975 !81442 !107619
 
 !MPAS driver for parameterization of surface processes over seaice points.
 !Laura D. Fowler (laura@ucar.edu) / 2024-03-13.
@@ -415,7 +415,7 @@ subroutine seaice_from_MPAS(configs,mesh,diag_physics,sfc_input,its,ite)
        if (lsm_scheme == 'sf_ruc') then
            dew_p(i,j) = dew(i)
            sfcevp_p(i,j) = sfcevp(i)
-           if (globalcells(i)==targetcell) then
+           if (globalcells(i)==targetcell_) then
               print *,'from MPAS '
               print *,'globalcells(i),cqs_p,cqs2_p,chs_p,chs2_p',globalcells(i),cqs_p(i,j),cqs2_p(i,j),chs_p(i,j),chs2_p(i,j)
               print *,'flqc(i),mavail(i),rho_p(i,kts,j)',flqc(i),mavail(i),rho_p(i,kts,j)
@@ -581,7 +581,7 @@ subroutine seaice_to_MPAS(configs,mesh,diag_physics,sfc_input,its,ite)
        call mpas_log_write('--- call subroutine sfcdiags_ruclsm:')
        do j = jts,jte
           do i = its,ite
-             if (globalcells(i)==targetcell) then
+             if (globalcells(i)==targetcell_) then
                 print *,' before call to sfcdiags_ruclsm'
                 print *,'globalcells(i),cqs_p,cqs2_p,chs_p,chs2_p',globalcells(i),cqs_p(i,j),cqs2_p(i,j),chs_p(i,j),chs2_p(i,j)
              endif

src/core_atmosphere/physics/mpas_atmphys_finalize.F

@@ -50,6 +50,7 @@ subroutine atmphys_finalize(configs)
     call sf_noahmp_deallocate
 
  if(trim(config_microp_scheme) == 'mp_thompson'         .or. &
+    trim(config_microp_scheme) == 'mp_tempo'            .or. &
     trim(config_microp_scheme) == 'mp_thompson_aerosols') then
     call mp_thompson_deallocate
  endif

src/core_atmosphere/physics/mpas_atmphys_init.F

@@ -364,7 +364,7 @@ subroutine physics_init(dminfo,clock,configs,mesh,diag,tend,state,time_lev,diag_
 
 !initialization of cloud microphysics processes:
  if(config_microp_scheme .ne. 'off') &
-    call microphysics_init(dminfo,configs,mesh,sfc_input,diag,diag_physics,state)
+    call init_microphysics(dminfo,configs,mesh,state,time_lev,sfc_input,diag_physics)
 
 !initialization of PBL processes:
  if(config_pbl_scheme .ne. 'off') call init_pbl(configs)

src/core_atmosphere/physics/mpas_atmphys_init_microphysics.F

@@ -15,7 +15,7 @@ module mpas_atmphys_init_microphysics
  use mpas_pool_routines
 
  use mpas_atmphys_utilities
- use module_mp_thompson_params, only: Nt_c_l, Nt_c_o, aero_max, nwfa_default
+ use module_mp_tempo_params !, only: Nt_c_l, Nt_c_o, aero_max, nwfa_default
 !use module_mp_thompson, only: is_aerosol_aware,naCCN0,naCCN1,naIN0,naIN1,ntb_arc,ntb_arw,ntb_art,ntb_arr, &
 !                              ntb_ark,tnccn_act
 
@@ -184,7 +184,7 @@ subroutine init_thompson_aerosols_forMPAS(do_restart,dminfo,mesh,state,time_lev,
 !-----------------------------------------------------------------------------------------------------------------
 !call mpas_log_write('--- enter subroutine init_thompson_aerosols_forMPAS:')
 
- is_aerosol_aware = .true.
+! is_aerosol_aware = .true.
 
 !... 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.

src/core_atmosphere/physics/mpas_atmphys_manager.F

@@ -690,6 +690,7 @@ subroutine physics_run_init(configs,mesh,state,clock,stream_manager)
  dt_microp = dt_dyn
  n_microp  = 1
  if(trim(config_microp_scheme)=='mp_thompson' .or. &
+    trim(config_microp_scheme)=='mp_tempo'    .or. &
     trim(config_microp_scheme)=='mp_thompson_aerosols') then
     dt_microp = 90._RKIND
     n_microp  = max(nint(dt_dyn/dt_microp),1)
@@ -759,6 +760,7 @@ subroutine physics_run_init(configs,mesh,state,clock,stream_manager)
  has_reqs = 0
  if(config_microp_re) then
     if(trim(config_microp_scheme)=='mp_thompson'          .or. &
+       trim(config_microp_scheme)=='mp_tempo'             .or. &
        trim(config_microp_scheme)=='mp_thompson_aerosols' .or. &
        trim(config_microp_scheme)=='mp_wsm6' .or. trim(config_microp_scheme)=='mp_nssl2m') then
        if(trim(config_radt_lw_scheme)=='rrtmg_lw' .and. trim(config_radt_sw_scheme)=='rrtmg_sw') then