Merge branch 'MPAS-v8.0/ccpp_ntiedtke' into develop (PR #1055)

This merge adds the initial implementation of the CCPP-compliant version of the
New Tiedtke (nTiedtke) convection parameterization.

The initial version of module_cu_ntiedtke.F is split in two separate files:
cu_ntiedtke.F in physics_mmm contains the actual parameterization of the
nTiedtke convection scheme whereas the modified version of module_cu_ntiedtke.F
reduces to a buffer between the parameterization and the MPAS physics driver.

Author: mgduda

src/core_atmosphere/physics/mpas_atmphys_driver_convection.F

@@ -19,7 +19,7 @@ module mpas_atmphys_driver_convection
  use module_cu_gf
  use module_cu_kfeta
  use module_cu_tiedtke
- use module_cu_ntiedtke
+ use module_cu_ntiedtke,only: cu_ntiedtke_driver
 
  implicit none
  private
@@ -435,10 +435,18 @@ subroutine driver_convection(itimestep,configs,mesh,sfc_input,diag_physics,tend_
  real(kind=RKIND):: cudt
  real(kind=RKIND):: cudtacttime
 
+!CCPP-compliant flags:
+ character(len=StrKIND):: errmsg
+ integer:: errflg
+
 !-----------------------------------------------------------------------------------------------------------------
 !call mpas_log_write('')
 !call mpas_log_write('--- enter subroutine driver_convection:')
 
+!initialization of CCPP-compliant flags:
+ errmsg = ' '
+ errflg = 0
+
  call mpas_pool_get_config(configs,'config_gfconv_closure_deep',gfconv_closure_deep)
  call mpas_pool_get_config(configs,'config_gfconv_closure_shallow',gfconv_closure_shallow)
  call mpas_pool_get_config(configs,'config_len_disp'         ,len_disp         )
@@ -569,8 +577,8 @@ subroutine driver_convection(itimestep,configs,mesh,sfc_input,diag_physics,tend_
        call mpas_timer_stop('Tiedtke')
 
     case("cu_ntiedtke")
-       call mpas_timer_start('New_Tiedtke')
-       call cu_ntiedtke( &
+       call mpas_timer_start('cu_ntiedtke')
+       call cu_ntiedtke_driver( &
              pcps      = pres_hyd_p  , p8w         = pres2_hyd_p ,                   &
              t3d       = t_p         , dz8w        = dz_p        ,                   &
              dt        = dt_dyn      , itimestep   = initflag    ,                   &
@@ -588,12 +596,16 @@ subroutine driver_convection(itimestep,configs,mesh,sfc_input,diag_physics,tend_
              f_qs      = f_qs        , rthcuten    = rthcuten_p  ,                   &
              rqvcuten  = rqvcuten_p  , rqccuten    = rqccuten_p  ,                   &
              rqicuten  = rqicuten_p  , rucuten     = rucuten_p   ,                   &
-             rvcuten   = rvcuten_p   ,                                               &
+             rvcuten   = rvcuten_p   , grav        = gravity     ,                   &
+             xlf       = xlf         , xls         = xls         ,                   &
+             xlv       = xlv         , rd          = R_d         ,                   &
+             rv        = R_v         , cp          = cp          ,                   &
+             errmsg    = errmsg      , errflg      = errflg      ,                   &
              ids = ids , ide = ide , jds = jds , jde = jde , kds = kds , kde = kde , &
              ims = ims , ime = ime , jms = jms , jme = jme , kms = kds , kme = kme , &
              its = its , ite = ite , jts = jts , jte = jte , kts = kts , kte = kte   &
                               )
-       call mpas_timer_stop('New_Tiedtke')
+       call mpas_timer_stop('cu_ntiedtke')
 
     case default
 

src/core_atmosphere/physics/physics_mmm/Makefile

@@ -7,7 +7,8 @@ dummy:
 
 OBJS = \
 	bl_gwdo.o \
-	bl_ysu.o
+	bl_ysu.o \
+	cu_ntiedtke.o
 
 physics_mmm: $(OBJS)
 	ar -ru ./../libphys.a $(OBJS)