Merge gsl/develop into RRFS_dev

CMakeLists.txt

@@ -6,7 +6,7 @@ project(ccpp_physics
 
 #------------------------------------------------------------------------------
 set(PACKAGE "ccpp-physics")
-set(AUTHORS "Grant Firl" "Dom Heinzeller" "Man Zhang" "Laurie Carson")
+set(AUTHORS "Grant Firl" "Dom Heinzeller" "Man Zhang" "Mike Kavulich" "Chunxi Zhang")
 
 #------------------------------------------------------------------------------
 # Set OpenMP flags for C/C++/Fortran
@@ -20,7 +20,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     message(STATUS "Setting build type to 'Release' as none was specified.")
     set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
     # Set the possible values of build type for cmake-gui
-    set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Bitforbit" "Release" "Coverage")
+    set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "Coverage")
 endif()
 
 #------------------------------------------------------------------------------
@@ -42,6 +42,7 @@ else(TYPEDEFS)
   include(${CMAKE_CURRENT_BINARY_DIR}/CCPP_TYPEDEFS.cmake)
   message(STATUS "Got CCPP TYPEDEFS from cmakefile include file")
 endif(TYPEDEFS)
+list(REMOVE_DUPLICATES TYPEDEFS)
 
 # Generate list of Fortran modules from the CCPP type
 # definitions that need need to be installed
@@ -58,6 +59,7 @@ else(SCHEMES)
   include(${CMAKE_CURRENT_BINARY_DIR}/CCPP_SCHEMES.cmake)
   message(STATUS "Got CCPP SCHEMES from cmakefile include file")
 endif(SCHEMES)
+list(REMOVE_DUPLICATES SCHEMES)
 
 # Set the sources: physics scheme caps
 set(CAPS $ENV{CCPP_CAPS})
@@ -67,6 +69,7 @@ else(CAPS)
   include(${CMAKE_CURRENT_BINARY_DIR}/CCPP_CAPS.cmake)
   message(STATUS "Got CCPP CAPS from cmakefile include file")
 endif(CAPS)
+list(REMOVE_DUPLICATES CAPS)
 
 # Schemes and caps from the CCPP code generator use full paths with symlinks
 # resolved, we need to do the same here for the below logic to work
@@ -117,8 +120,8 @@ set(SCHEMES_OPENMP_OFF ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/mo_
 # List of files that need to be compiled with different precision
 set(SCHEMES_DYNAMICS)
 
-if(${LOCAL_CURRENT_SOURCE_DIR}/physics/gfdl_fv_sat_adj.F90 IN_LIST SCHEMES)
-  list(APPEND SCHEMES_DYNAMICS ${LOCAL_CURRENT_SOURCE_DIR}/physics/gfdl_fv_sat_adj.F90)
+if(${LOCAL_CURRENT_SOURCE_DIR}/physics/fv_sat_adj.F90 IN_LIST SCHEMES)
+  list(APPEND SCHEMES_DYNAMICS ${LOCAL_CURRENT_SOURCE_DIR}/physics/fv_sat_adj.F90)
 endif()
 
 # Remove files that need to be compiled with different precision
@@ -141,18 +144,36 @@ endif()
 SET_PROPERTY(SOURCE ${SCHEMES} ${CAPS}
              APPEND_STRING PROPERTY COMPILE_FLAGS " ${CMAKE_Fortran_FLAGS_PHYSICS} ${OpenMP_Fortran_FLAGS}")
 
-# Reduce optimization for module_sf_mynn.F90 (to avoid an apparent compiler bug with Intel 18 on Hera)
-if(${LOCAL_CURRENT_SOURCE_DIR}/physics/module_sf_mynn.F90 IN_LIST SCHEMES AND
-    (CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "Bitforbit") AND
-    ${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
-  SET_SOURCE_FILES_PROPERTIES(${LOCAL_CURRENT_SOURCE_DIR}/physics/module_sf_mynn.F90
-                              APPEND_STRING PROPERTY COMPILE_FLAGS " ${CMAKE_Fortran_FLAGS_PHYSICS} ${OpenMP_Fortran_FLAGS} -O1")
+# Lower optimization for certain schemes when compiling with Intel in Release mode
+if(CMAKE_BUILD_TYPE STREQUAL "Release" AND ${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
+  # Define a list of schemes that need lower optimization with Intel in Release mode
+  set(SCHEME_NAMES_LOWER_OPTIMIZATION module_sf_mynn.F90)
+  foreach(SCHEME_NAME IN LISTS SCHEME_NAMES_LOWER_OPTIMIZATION)
+    set(SCHEMES_TMP ${SCHEMES})
+    # Need to determine the name of the scheme with its path
+    list(FILTER SCHEMES_TMP INCLUDE REGEX ".*${SCHEME_NAME}$")
+    SET_SOURCE_FILES_PROPERTIES(${SCHEMES_TMP}
+                                APPEND_STRING PROPERTY COMPILE_FLAGS
+                                " ${CMAKE_Fortran_FLAGS_PHYSICS} ${OpenMP_Fortran_FLAGS} -O1")
+  endforeach()
+endif()
+
+# No optimization for certain schemes when compiling with Intel in Release mode
+if(CMAKE_BUILD_TYPE STREQUAL "Release" AND ${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
+  # Define a list of schemes that can't be optimized with Intel in Release mode
+  set(SCHEME_NAMES_NO_OPTIMIZATION GFS_typedefs.F90)
+  foreach(SCHEME_NAME IN LISTS SCHEME_NAMES_NO_OPTIMIZATION)
+    set(SCHEMES_TMP ${SCHEMES})
+    # Need to determine the name of the scheme with its path
+    list(FILTER SCHEMES_TMP INCLUDE REGEX ".*${SCHEME_NAME}$")
+    SET_SOURCE_FILES_PROPERTIES(${SCHEMES_TMP}
+                                APPEND_STRING PROPERTY COMPILE_FLAGS " ${CMAKE_Fortran_FLAGS_PHYSICS} ${OpenMP_Fortran_FLAGS} -O0")
+  endforeach()
 endif()
 
 # Reduce optimization for mo_gas_optics_kernels.F90 (to avoid an apparent compiler bug with Intel 19+)
 if(${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/kernels/mo_gas_optics_kernels.F90 IN_LIST SCHEMES_OPENMP_OFF AND
-    (CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "Bitforbit") AND
-    ${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
+   CMAKE_BUILD_TYPE STREQUAL "Release" AND ${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
   SET_SOURCE_FILES_PROPERTIES(${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/kernels/mo_gas_optics_kernels.F90
                               APPEND_STRING PROPERTY COMPILE_FLAGS " ${CMAKE_Fortran_FLAGS_PHYSICS} -O1")
 endif()

physics/GFS_DCNV_generic.F90 → physics/GFS_DCNV_generic_post.F90

@@ -1,107 +1,10 @@
-!> \file GFS_DCNV_generic.F90
+!> \file GFS_DCNV_generic_post.F90
 !!  Contains code related to deep convective schemes to be used within the GFS physics suite.
 
-      module GFS_DCNV_generic_pre
-
-      contains
-
-      subroutine GFS_DCNV_generic_pre_init ()
-      end subroutine GFS_DCNV_generic_pre_init
-
-      subroutine GFS_DCNV_generic_pre_finalize()
-      end subroutine GFS_DCNV_generic_pre_finalize
-
-!> \brief Interstitial scheme called prior to any deep convective scheme to save state variables for calculating tendencies after the deep convective scheme is executed
-!! \section arg_table_GFS_DCNV_generic_pre_run Argument Table
-!! \htmlinclude GFS_DCNV_generic_pre_run.html
-!!
-    subroutine GFS_DCNV_generic_pre_run (im, levs, ldiag3d, qdiag3d, do_cnvgwd, cplchm,  &
-                                         gu0, gv0, gt0, gq0, nsamftrac, ntqv,            &
-                                         save_u, save_v, save_t, save_q, clw,            &
-                                         ntcw,ntiw,ntclamt,ntrw,ntsw,ntrnc,ntsnc,ntgl,   &
-                                         ntgnc, cscnv, satmedmf, trans_trac, ras, ntrac, &
-                                         dtidx, index_of_process_dcnv, errmsg, errflg)
-
-      use machine, only: kind_phys
-
-      implicit none
-
-      integer, intent(in) :: im, levs, nsamftrac, ntqv, index_of_process_dcnv, dtidx(:,:), &
-           ntcw,ntiw,ntclamt,ntrw,ntsw,ntrnc,ntsnc,ntgl,ntrac,ntgnc
-      logical, intent(in) :: ldiag3d, qdiag3d, do_cnvgwd, cplchm
-      real(kind=kind_phys), dimension(:,:),   intent(in)    :: gu0
-      real(kind=kind_phys), dimension(:,:),   intent(in)    :: gv0
-      real(kind=kind_phys), dimension(:,:),   intent(in)    :: gt0
-      real(kind=kind_phys), dimension(:,:,:), intent(inout) :: gq0
-      real(kind=kind_phys), dimension(:,:),   intent(inout) :: save_u
-      real(kind=kind_phys), dimension(:,:),   intent(inout) :: save_v
-      real(kind=kind_phys), dimension(:,:),   intent(inout) :: save_t
-      real(kind=kind_phys), dimension(:,:,:), intent(inout) :: save_q
-      character(len=*), intent(out) :: errmsg
-      integer, intent(out) :: errflg
-      logical, intent(in) :: cscnv, satmedmf, trans_trac, ras
-      real(kind=kind_phys), parameter :: zero    = 0.0d0
-      real(kind=kind_phys), dimension(:,:,:), intent(in) :: clw
-
-      integer :: i, k, n, tracers
-
-      ! Initialize CCPP error handling variables
-      errmsg = ''
-      errflg = 0
-
-      if (ldiag3d) then
-        do k=1,levs
-          do i=1,im
-            save_t(i,k) = gt0(i,k)
-            save_u(i,k) = gu0(i,k)
-            save_v(i,k) = gv0(i,k)
-          enddo
-        enddo
-      elseif (do_cnvgwd) then
-        do k=1,levs
-          do i=1,im
-            save_t(i,k) = gt0(i,k)
-          enddo
-        enddo
-      endif
-
-      if ((ldiag3d.and.qdiag3d) .or. cplchm) then
-         if (cscnv .or. satmedmf .or. trans_trac .or. ras) then
-            tracers = 2
-            do n=2,ntrac
-               if ( n /= ntcw  .and. n /= ntiw  .and. n /= ntclamt .and. &
-                    n /= ntrw  .and. n /= ntsw  .and. n /= ntrnc   .and. &
-                    n /= ntsnc .and. n /= ntgl  .and. n /= ntgnc) then
-                  tracers = tracers + 1
-                  if(dtidx(100+n,index_of_process_dcnv)>0) then
-                     save_q(:,:,n) = clw(:,:,tracers)
-                  endif
-               endif
-            enddo
-         else
-            do n=2,ntrac
-               if(dtidx(100+n,index_of_process_dcnv)>0) then
-                  save_q(:,:,n) = gq0(:,:,n)
-               endif
-            enddo
-         endif ! end if_ras or cfscnv or samf
-         save_q(:,:,ntqv) = gq0(:,:,ntqv)
-      endif
-
-    end subroutine GFS_DCNV_generic_pre_run
-
-    end module GFS_DCNV_generic_pre
-
     module GFS_DCNV_generic_post
 
     contains
 
-    subroutine GFS_DCNV_generic_post_init ()
-    end subroutine GFS_DCNV_generic_post_init
-
-    subroutine GFS_DCNV_generic_post_finalize ()
-    end subroutine GFS_DCNV_generic_post_finalize
-
 !> \section arg_table_GFS_DCNV_generic_post_run Argument Table
 !! \htmlinclude GFS_DCNV_generic_post_run.html
 !!
@@ -111,7 +14,8 @@ subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, qdiag3d, ras, &
       rainc, cldwrk, upd_mf, dwn_mf, det_mf, dtend, dtidx, index_of_process_dcnv, &
       index_of_temperature, index_of_x_wind, index_of_y_wind, ntqv, gq0, save_q,  &
       cnvw, cnvc, cnvw_phy_f3d, cnvc_phy_f3d, flag_for_dcnv_generic_tend,         &
-      ntcw,ntiw,ntclamt,ntrw,ntsw,ntrnc,ntsnc,ntgl,ntgnc, ntrac,clw,              &
+      ntcw,ntiw,ntclamt,ntrw,ntsw,ntrnc,ntsnc,ntgl,                               &
+      ntgnc, nthl, nthnc, nthv, ntgv, ntrac,clw,                                  &
       satmedmf, trans_trac, errmsg, errflg)
 
 
@@ -140,7 +44,8 @@ subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, qdiag3d, ras, &
       real(kind=kind_phys), dimension(:,:,:), intent(inout) :: dtend
       integer, intent(in) :: dtidx(:,:), index_of_process_dcnv, index_of_temperature, &
            index_of_x_wind, index_of_y_wind, ntqv
-      integer, intent(in) :: ntcw,ntiw,ntclamt,ntrw,ntsw,ntrnc,ntsnc,ntgl,ntrac,ntgnc
+      integer, intent(in) :: ntcw,ntiw,ntclamt,ntrw,ntsw,ntrnc,ntsnc,ntgl,   &
+                             ntgnc, nthl, nthnc, nthv, ntgv, ntrac
       real(kind=kind_phys), dimension(:,:,:), intent(in) :: clw
 
 
@@ -205,7 +110,9 @@ subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, qdiag3d, ras, &
              do n=2,ntrac
                 if ( n /= ntcw  .and. n /= ntiw  .and. n /= ntclamt .and. &
                      n /= ntrw  .and. n /= ntsw  .and. n /= ntrnc   .and. &
-                     n /= ntsnc .and. n /= ntgl  .and. n /= ntgnc) then
+                     n /= ntsnc .and. n /= ntgl  .and. n /= ntgnc   .and. &
+                     n /= nthl  .and. n /= nthnc .and. n /= nthv    .and. &
+                     n /= ntgv ) then
                    tracers = tracers + 1
                    idtend = dtidx(100+n,index_of_process_dcnv)
                    if(idtend>0) then