Update gsd/develop-chem from gsl/develop, bug fixes for uninitialized variables

CMakeLists.txt

@@ -72,7 +72,7 @@ set(TYPEDEFS $ENV{CCPP_TYPEDEFS})
 if(TYPEDEFS)
   message(STATUS "Got CCPP TYPEDEFS from environment variable: ${TYPEDEFS}")
 else(TYPEDEFS)
-  include(./CCPP_TYPEDEFS.cmake)
+  include(${CMAKE_CURRENT_BINARY_DIR}/CCPP_TYPEDEFS.cmake)
   message(STATUS "Got CCPP TYPEDEFS from cmakefile include file: ${TYPEDEFS}")
 endif(TYPEDEFS)
 
@@ -88,7 +88,7 @@ set(SCHEMES $ENV{CCPP_SCHEMES})
 if(SCHEMES)
   message(STATUS "Got CCPP SCHEMES from environment variable: ${SCHEMES}")
 else(SCHEMES)
-  include(./CCPP_SCHEMES.cmake)
+  include(${CMAKE_CURRENT_BINARY_DIR}/CCPP_SCHEMES.cmake)
   message(STATUS "Got CCPP SCHEMES from cmakefile include file: ${SCHEMES}")
 endif(SCHEMES)
 
@@ -97,7 +97,7 @@ set(CAPS $ENV{CCPP_CAPS})
 if(CAPS)
   message(STATUS "Got CCPP CAPS from environment variable: ${CAPS}")
 else(CAPS)
-  include(./CCPP_CAPS.cmake)
+  include(${CMAKE_CURRENT_BINARY_DIR}/CCPP_CAPS.cmake)
   message(STATUS "Got CCPP CAPS from cmakefile include file: ${CAPS}")
 endif(CAPS)
 
@@ -163,28 +163,6 @@ if (${CMAKE_Fortran_COMPILER_ID} STREQUAL "GNU")
 elseif (${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
   # Adjust settings for bit-for-bit reproducibility of NEMSfv3gfs
   if (PROJECT STREQUAL "CCPP-FV3")
-    SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/physics/module_bfmicrophysics.f
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/sflx.f
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/sfc_diff.f
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/sfc_diag.f
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/module_nst_model.f90
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/calpreciptype.f90
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/mersenne_twister.f
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/module_nst_water_prop.f90
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/aer_cloud.F
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/wv_saturation.F
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/cldwat2m_micro.F
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/surface_perturbation.F90
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/radiation_aerosols.f
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/cu_gf_deep.F90
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/cu_gf_sh.F90
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/module_bl_mynn.F90
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/module_MYNNPBL_wrapper.F90
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/module_MYNNSFC_wrapper.F90
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/module_mp_thompson_make_number_concentrations.F90
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/module_SF_JSFC.F90
-                                ${CMAKE_CURRENT_SOURCE_DIR}/physics/module_BL_MYJPBL.F90
-                                PROPERTIES COMPILE_FLAGS "-r8 -ftz")
 
     if (${CMAKE_CURRENT_SOURCE_DIR}/physics/module_sf_mynn.F90 IN_LIST SCHEMES)
       # Reduce optimization for module_sf_mynn.F90 (to avoid an apparent compiler bug with Intel 18 on Hera)
@@ -202,7 +180,7 @@ elseif (${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
       string(REPLACE "-xCORE-AVX2" "-xCORE-AVX-I"
              CMAKE_Fortran_FLAGS_LOPT1
              "${CMAKE_Fortran_FLAGS_LOPT1}")
-      string(REPLACE "-axSSE4.2,AVX,CORE-AVX2,CORE-AVX512" "-axSSE4.2,AVX,CORE-AVX-I"
+      string(REPLACE "-axSSE4.2,CORE-AVX2" "-axSSE4.2,CORE-AVX-I"
              CMAKE_Fortran_FLAGS_LOPT1
              "${CMAKE_Fortran_FLAGS_LOPT1}")
       SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/physics/radiation_aerosols.f

README.md

@@ -15,4 +15,6 @@ For the use of CCPP with its Single Column Model, see the [Single Column Model U
 
 For the use of CCPP with NOAA's Unified Forecast System (UFS), see the [UFS Medium-Range Application User's Guide](https://ufs-mrweather-app.readthedocs.io/en/latest/) and the [UFS Weather Model User's Guide](https://ufs-weather-model.readthedocs.io/en/latest/).
 
+The Apache license will be in effect unless superseded by an existing license in specific files.
+
 Questions can be directed to the [CCPP Help Desk](mailto:gmtb-help@ucar.edu). When using the CCPP with NOAA's UFS, questions can be posted in the [UFS Weather Model](https://forums.ufscommunity.org/forum/ufs-weather-model) section of the [UFS Forum](https://forums.ufscommunity.org/)

gsdchem/gsd_chem_dust_wrapper.F90

@@ -128,6 +128,9 @@ subroutine gsd_chem_dust_wrapper_run(im, kte, kme, ktau, dt, garea, land,   &
     dust_opt          = dust_opt_in
     dust_calcdrag     = dust_calcdrag_in
 
+    ! -- initialize dust emissions
+    emis_dust = 0._kind_phys
+
     ! -- set domain
     ide=im 
     ime=im
@@ -178,7 +181,7 @@ subroutine gsd_chem_dust_wrapper_run(im, kte, kme, ktau, dt, garea, land,   &
         dust_gamma = afwa_gamma
         call gocart_dust_afwa_driver(ktau,dt,rri,t_phy,moist,u_phy,     &
           v_phy,chem,rho_phy,dz8w,smois,u10,v10,p8w,erod,ivgtyp,isltyp, &
-          vegfrac,xland,xlat,xlong,gsw,dxy,g,emis_dust,srce_dust,    &
+          vegfrac,xland,xlat,xlong,gsw,dxy,g,emis_dust,srce_dust,       &
           dusthelp,ust,znt,clayf,sandf,                                 &
           num_emis_dust,num_moist,num_chem,nsoil,                       &
           ids,ide, jds,jde, kds,kde,                                    &
@@ -189,7 +192,7 @@ subroutine gsd_chem_dust_wrapper_run(im, kte, kme, ktau, dt, garea, land,   &
        dust_alpha    = dust_alpha_in  !fengsha_alpha
        dust_gamma    = dust_gamma_in  !fengsha_gamma
        call gocart_dust_fengsha_driver(dt,chem,rho_phy,smois,p8w,ssm,   &
-            isltyp,vegfrac,snowh,xland,dxy,g,emis_dust,ust,znt,      &
+            isltyp,vegfrac,snowh,xland,dxy,g,emis_dust,ust,znt,         &
             clayf,sandf,rdrag,uthr,                                     &
             num_emis_dust,num_moist,num_chem,nsoil,                     &
             random_factor,                                              &
@@ -202,12 +205,16 @@ subroutine gsd_chem_dust_wrapper_run(im, kte, kme, ktau, dt, garea, land,   &
         dust_gamma = gocart_gamma
         call gocart_dust_driver(chem_opt,ktau,dt,rri,t_phy,moist,u_phy, &
           v_phy,chem,rho_phy,dz8w,smois,u10,v10,p8w,erod,ivgtyp,isltyp, &
-          vegfrac,xland,xlat,xlong,gsw,dxy,g,emis_dust,srce_dust,    &
+          vegfrac,xland,xlat,xlong,gsw,dxy,g,emis_dust,srce_dust,       &
           dusthelp,num_emis_dust,num_moist,num_chem,nsoil,              &
           current_month,                                                &
           ids,ide, jds,jde, kds,kde,                                    &
           ims,ime, jms,jme, kms,kme,                                    &
           its,ite, jts,jte, kts,kte)
+      case default
+        errmsg = 'Logic error in gsd_chem_dust_wrapper_run: invalid dust_opt'
+        errflg = 1
+        return
        !store_arrays = .true.
     end select
 

physics/GFS_DCNV_generic.F90

@@ -169,10 +169,10 @@ subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, qdiag3d, ras, cs
               dt3dt(i,k) = dt3dt(i,k) + (gt0(i,k)-save_t(i,k)) * frain
               du3dt(i,k) = du3dt(i,k) + (gu0(i,k)-save_u(i,k)) * frain
               dv3dt(i,k) = dv3dt(i,k) + (gv0(i,k)-save_v(i,k)) * frain
-
-!             upd_mf(i,k)  = upd_mf(i,k)  + ud_mf(i,k) * (con_g*frain)
-!             dwn_mf(i,k)  = dwn_mf(i,k)  + dd_mf(i,k) * (con_g*frain)
-!             det_mf(i,k)  = det_mf(i,k)  + dt_mf(i,k) * (con_g*frain)
+              ! convective mass fluxes
+              upd_mf(i,k)  = upd_mf(i,k)  + ud_mf(i,k) * (con_g*frain)
+              dwn_mf(i,k)  = dwn_mf(i,k)  + dd_mf(i,k) * (con_g*frain)
+              det_mf(i,k)  = det_mf(i,k)  + dt_mf(i,k) * (con_g*frain)
             enddo
           enddo
           if(qdiag3d) then