Merge pull request #458 from climbfuji/update_dtc_develop_from_ncar_m…

…aster_20200606

Update dtc/develop from master 2020/06/06

.github/workflows/basic_checks.yml

@@ -0,0 +1,21 @@
+name: Basic checks for CCPP physics schemes
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: macos-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Init submodules
+      run: git submodule update --init --recursive
+    #- name: Update packages
+    #  run: |
+    #    /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+    #    #brew install autoconf automake coreutils gcc@9 libtool mpich gnu-sed wget
+    #    brew install automake coreutils mpich gnu-sed
+    - name: Check for ASCII encoding
+      run: ./tools/check_encoding.py

CMakeLists.txt

@@ -8,7 +8,7 @@ endif (NOT PROJECT)
 cmake_minimum_required(VERSION 3.0)
 
 project(ccppphys
-        VERSION 3.0.0
+        VERSION 4.0.0
         LANGUAGES C CXX Fortran)
 
 # Use rpaths on MacOSX
@@ -19,7 +19,7 @@ endif(POLICY CMP0042)
 
 #------------------------------------------------------------------------------
 set(PACKAGE "ccpp-physics")
-set(AUTHORS  "Grant J. Firl" "Dom Heinzeller")
+set(AUTHORS "Grant Firl" "Dom Heinzeller" "Man Zhang" "Laurie Carson")
 
 #------------------------------------------------------------------------------
 # Set OpenMP flags for C/C++/Fortran
@@ -58,12 +58,8 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
 endif()
 
 #------------------------------------------------------------------------------
-# By default we want a shared library (unless a static build is requested)
-if(STATIC)
-  option(BUILD_SHARED_LIBS "Build a static library" OFF)
-else(STATIC)
-  option(BUILD_SHARED_LIBS "Build a shared library" ON)
-endif(STATIC)
+# Request a static build
+option(BUILD_SHARED_LIBS "Build a shared library" OFF)
 
 #------------------------------------------------------------------------------
 # Set the sources: physics type definitions
@@ -327,45 +323,18 @@ elseif (${CMAKE_Fortran_COMPILER_ID} STREQUAL "PGI")
 endif (${CMAKE_Fortran_COMPILER_ID} STREQUAL "GNU")
 
 #------------------------------------------------------------------------------
-if(STATIC)
-  add_library(ccppphys STATIC ${SCHEMES} ${SCHEMES_SFX_OPT} ${CAPS})
-  # Generate list of Fortran modules from defined sources
-  foreach(source_f90 ${CAPS})
-      get_filename_component(tmp_source_f90 ${source_f90} NAME)
-      string(REGEX REPLACE ".F90" ".mod" tmp_module_f90 ${tmp_source_f90})
-      string(TOLOWER ${tmp_module_f90} module_f90)
-      list(APPEND MODULES_F90 ${CMAKE_CURRENT_BINARY_DIR}/${module_f90})
-  endforeach()
-else(STATIC)
-  add_library(ccppphys SHARED ${SCHEMES} ${SCHEMES_SFX_OPT} ${CAPS})
-endif(STATIC)
-
-if (NOT STATIC)
-  target_link_libraries(ccppphys LINK_PUBLIC ${LIBS} ${BACIO_LIB4} ${SP_LIBd} ${W3NCO_LIBd})
-endif (NOT STATIC)
+add_library(ccppphys STATIC ${SCHEMES} ${SCHEMES_SFX_OPT} ${CAPS})
+# Generate list of Fortran modules from defined sources
+foreach(source_f90 ${CAPS})
+    get_filename_component(tmp_source_f90 ${source_f90} NAME)
+    string(REGEX REPLACE ".F90" ".mod" tmp_module_f90 ${tmp_source_f90})
+    string(TOLOWER ${tmp_module_f90} module_f90)
+    list(APPEND MODULES_F90 ${CMAKE_CURRENT_BINARY_DIR}/${module_f90})
+endforeach()
 
 set_target_properties(ccppphys PROPERTIES VERSION ${PROJECT_VERSION}
                                      SOVERSION ${PROJECT_VERSION_MAJOR})
 
-# DH* Hack for PGI compiler: rename objects in scheme cap object files for ISO_C compliancy,
-# this is only needed for dynamics builds - static build generates plain Fortran code.
-if (${CMAKE_Fortran_COMPILER_ID} STREQUAL "PGI")
-  if (NOT STATIC)
-  set(CAPOBJS)
-  foreach(cap ${CAPS})
-      string(REPLACE "_cap.F90" "_cap.F90.o" capobj "./${CMAKE_FILES_DIRECTORY}/ccppphys.dir/${cap}")
-      list(APPEND CAPOBJS ${capobj})
-  endforeach(cap)
-
-  add_custom_command(TARGET ccppphys
-                     PRE_LINK
-                     COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/pgifix.py --cmake ${CAPOBJS}
-                     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                     COMMENT "Running pgifix_wrapper.py over all scheme caps")
-  endif (NOT STATIC)
-endif (${CMAKE_Fortran_COMPILER_ID} STREQUAL "PGI")
-# *DH end hack for PGI compiler
-
 if (PROJECT STREQUAL "CCPP-FV3")
   # Define where to install the library
   install(TARGETS ccppphys

physics/GFS_DCNV_generic.F90

@@ -17,8 +17,8 @@ end subroutine GFS_DCNV_generic_pre_finalize
 !! \htmlinclude GFS_DCNV_generic_pre_run.html
 !!
 #endif
-    subroutine GFS_DCNV_generic_pre_run (im, levs, ldiag3d, do_cnvgwd, do_ca, cplchm,&
-                                         isppt_deep, gu0, gv0, gt0, gq0_water_vapor, &
+    subroutine GFS_DCNV_generic_pre_run (im, levs, ldiag3d, do_cnvgwd, cplchm,       &
+                                         gu0, gv0, gt0, gq0_water_vapor,             &
                                          save_u, save_v, save_t, save_qv, ca_deep,   &
                                          dqdti, errmsg, errflg)
 
@@ -27,7 +27,7 @@ subroutine GFS_DCNV_generic_pre_run (im, levs, ldiag3d, do_cnvgwd, do_ca, cplchm
       implicit none
 
       integer, intent(in) :: im, levs
-      logical, intent(in) :: ldiag3d, do_cnvgwd, do_ca, cplchm, isppt_deep
+      logical, intent(in) :: ldiag3d, do_cnvgwd, cplchm
       real(kind=kind_phys), dimension(im,levs), intent(in)    :: gu0
       real(kind=kind_phys), dimension(im,levs), intent(in)    :: gv0
       real(kind=kind_phys), dimension(im,levs), intent(in)    :: gt0
@@ -49,15 +49,7 @@ subroutine GFS_DCNV_generic_pre_run (im, levs, ldiag3d, do_cnvgwd, do_ca, cplchm
       errmsg = ''
       errflg = 0
 
-      if (do_ca) then
-        do k=1,levs
-          do i=1,im
-            gq0_water_vapor(i,k) = gq0_water_vapor(i,k)*(1.0 + ca_deep(i)/500.)
-          enddo
-        enddo
-      endif
-
-      if (ldiag3d .or. isppt_deep) then
+      if (ldiag3d) then
         do k=1,levs
           do i=1,im
             save_t(i,k) = gt0(i,k)
@@ -73,7 +65,7 @@ subroutine GFS_DCNV_generic_pre_run (im, levs, ldiag3d, do_cnvgwd, do_ca, cplchm
         enddo
       endif
 
-      if (ldiag3d .or. cplchm .or. isppt_deep) then
+      if (ldiag3d .or. cplchm) then
         do k=1,levs
           do i=1,im
             save_qv(i,k) = gq0_water_vapor(i,k)
@@ -102,19 +94,19 @@ end subroutine GFS_DCNV_generic_post_finalize
 !> \section arg_table_GFS_DCNV_generic_post_run Argument Table
 !! \htmlinclude GFS_DCNV_generic_post_run.html
 !!
-    subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, ras, cscnv, do_ca,               &
-      isppt_deep, frain, rain1, dtf, cld1d, save_u, save_v, save_t, save_qv, gu0, gv0, gt0,          &
+    subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, ras, cscnv,                      &
+      frain, rain1, dtf, cld1d, save_u, save_v, save_t, save_qv, gu0, gv0, gt0,                      &
       gq0_water_vapor, ud_mf, dd_mf, dt_mf, con_g,  npdf3d, num_p3d, ncnvcld3d,                      &
       rainc, cldwrk, dt3dt, dq3dt, du3dt, dv3dt, upd_mf, dwn_mf, det_mf,                             &
       cnvw, cnvc, cnvw_phy_f3d, cnvc_phy_f3d,                                                        &
-      cape, tconvtend, qconvtend, uconvtend, vconvtend, errmsg, errflg)
+      errmsg, errflg)
 
       use machine,               only: kind_phys
 
       implicit none
 
       integer, intent(in) :: im, levs
-      logical, intent(in) :: lssav, ldiag3d, ras, cscnv, do_ca, isppt_deep
+      logical, intent(in) :: lssav, ldiag3d, ras, cscnv
 
       real(kind=kind_phys), intent(in) :: frain, dtf
       real(kind=kind_phys), dimension(im), intent(in) :: rain1, cld1d
@@ -135,9 +127,6 @@ subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, ras, cscnv, do_c
       ! as long as these do not get used when not allocated (it is still invalid Fortran code, though).
       real(kind=kind_phys), dimension(:,:), intent(inout) :: cnvw_phy_f3d, cnvc_phy_f3d
 
-      real(kind=kind_phys), dimension(im), intent(inout) :: cape
-      real(kind=kind_phys), dimension(im,levs), intent(inout) :: tconvtend, qconvtend, uconvtend, vconvtend
-
       character(len=*), intent(out) :: errmsg
       integer, intent(out) :: errflg
 
@@ -148,11 +137,6 @@ subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, ras, cscnv, do_c
       errflg = 0
 
       if (.not. ras .and. .not. cscnv) then
-        if(do_ca) then
-          do i=1,im
-            cape(i) = cld1d(i)
-          enddo
-        endif
         if (npdf3d == 3 .and. num_p3d == 4) then
           do k=1,levs
             do i=1,im
@@ -198,18 +182,6 @@ subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, ras, cscnv, do_c
 
       endif ! if (lssav)
 
-
-      if (isppt_deep) then
-        do k=1,levs
-          do i=1,im
-            tconvtend(i,k) = gt0(i,k) - save_t(i,k)
-            qconvtend(i,k) = gq0_water_vapor(i,k) - save_qv(i,k)
-            uconvtend(i,k) = gu0(i,k) - save_u(i,k)
-            vconvtend(i,k) = gv0(i,k) - save_v(i,k)
-          enddo
-        enddo
-      endif
-
     end subroutine GFS_DCNV_generic_post_run
 
     end module GFS_DCNV_generic_post