Add dependency of ccpp-physics on gocart library

.gitmodules

@@ -4,9 +4,11 @@
 	branch = dev/emc
 [submodule "ccpp/framework"]
 	path = ccpp/framework
-	url = https://github.com/NCAR/ccpp-framework
-	branch = master
+	url = https://github.com/NOAA-GSL/ccpp-framework
+	branch = gsl/develop
 [submodule "ccpp/physics"]
 	path = ccpp/physics
-	url = https://github.com/NCAR/ccpp-physics
-	branch = master
+	#url = https://github.com/NOAA-GSL/ccpp-physics
+	#branch = gsl/develop-chem
+	url = https://github.com/climbfuji/ccpp-physics
+	branch = move_plumrise_to_gocart_repo

CMakeLists.txt

@@ -127,15 +127,21 @@ endif()
 add_subdirectory(ccpp)
 add_subdirectory(ccpp/data)
 add_subdirectory(ccpp/driver)
-add_dependencies(ccppphys   ccpp)
+if(GOCART)
+  add_dependencies(ccppphys ccpp gocart)
+endif()
 add_dependencies(ccppdata   ccpp ccppphys)
 add_dependencies(ccppdriver ccpp ccppphys ccppdata)
 add_dependencies(fv3dycore  ccppdriver ccpp ccppphys ccppdata)
 target_include_directories(fv3dycore PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/ccpp/framework/src
                                              ${CMAKE_CURRENT_BINARY_DIR}/ccpp/physics
                                              ${CMAKE_CURRENT_BINARY_DIR}/ccpp/driver)
+
 target_link_libraries(ccppphys PUBLIC sp::sp_d
                                       w3nco::w3nco_d)
+if(GOCART)
+  target_link_libraries(ccppphys PUBLIC gocart)
+endif()
 
 ###############################################################################
 ### stochastic_physics

atmos_model.F90

@@ -226,6 +226,7 @@ module atmos_model_mod
 
 subroutine update_atmos_radiation_physics (Atmos)
 !-----------------------------------------------------------------------
+  implicit none
   type (atmos_data_type), intent(in) :: Atmos
 !--- local variables---
     integer :: nb, jdat(8), rc, ierr
@@ -358,6 +359,10 @@ subroutine update_atmos_radiation_physics (Atmos)
 
     endif
 
+    ! Per-timestep diagnostics must be after physics but before
+    ! flagging the first timestep.
+    call atmos_timestep_diagnostics(Atmos)
+
     ! Update flag for first time step of time integration
     GFS_control%first_time_step = .false.
 
@@ -366,6 +371,91 @@ end subroutine update_atmos_radiation_physics
 ! </SUBROUTINE>
 
 
+!#######################################################################
+! <SUBROUTINE NAME="atmos_timestep_diagnostics">
+!
+! <OVERVIEW>
+! Calculates per-timestep, domain-wide, diagnostic, information and
+! prints to stdout from master rank. Must be called after physics
+! update but before first_time_step flag is cleared.
+! </OVERVIEW>
+
+!   <TEMPLATE>
+!     call  atmos_timestep_diagnostics (Atmos)
+!   </TEMPLATE>
+
+! <INOUT NAME="Atmos" TYPE="type(atmos_data_type)">
+!   Derived-type variable that contains fields needed by the flux exchange module.
+!   These fields describe the atmospheric grid and are needed to
+!   compute/exchange fluxes with other component models.  All fields in this
+!   variable type are allocated for the global grid (without halo regions).
+! </INOUT>
+subroutine atmos_timestep_diagnostics(Atmos)
+  use mpi
+  implicit none
+  type (atmos_data_type), intent(in) :: Atmos
+!--- local variables---
+    integer :: i, nb, count, ierror
+    ! double precision ensures ranks and sums are not truncated
+    ! regardless of compilation settings
+    double precision :: pdiff, psum, pcount, maxabs, pmaxloc(7), adiff
+    double precision :: sendbuf(2), recvbuf(2), global_average
+
+    if(GFS_control%print_diff_pgr) then
+      if(.not. GFS_control%first_time_step) then
+        pmaxloc = 0.0d0
+        recvbuf = 0.0d0
+        psum = 0.0d0
+        pcount = 0.0d0
+        maxabs = 0.0d0
+
+        ! Put pgr stats in pmaxloc, psum, and pcount:
+        pmaxloc(1) = GFS_Control%tile_num
+        do nb = 1,ATM_block%nblks
+          count = size(GFS_data(nb)%Statein%pgr)
+          do i=1,count
+            pdiff = GFS_data(nb)%Statein%pgr(i)-GFS_data(nb)%Intdiag%old_pgr(i)
+            adiff = abs(pdiff)
+            psum = psum+adiff
+            if(adiff>=maxabs) then
+              maxabs=adiff
+              pmaxloc(2:3)=(/ ATM_block%index(nb)%ii(i), ATM_block%index(nb)%jj(i) /)
+              pmaxloc(4:7)=(/ pdiff, GFS_data(nb)%Statein%pgr(i), &
+                   GFS_data(nb)%Grid%xlat(i), GFS_data(nb)%Grid%xlon(i) /)
+            endif
+          enddo
+          pcount = pcount+count
+        enddo
+
+        ! Sum pgr stats from psum/pcount and convert to hPa/hour global avg:
+        sendbuf(1:2) = (/ psum, pcount /)
+        call MPI_Allreduce(sendbuf,recvbuf,2,MPI_DOUBLE_PRECISION,MPI_SUM,GFS_Control%communicator,ierror)
+        global_average = recvbuf(1)/recvbuf(2) * 36.0d0/GFS_control%dtp
+
+        ! Get the pmaxloc for the global maximum:
+        sendbuf(1:2) = (/ maxabs, dble(GFS_Control%me) /)
+        call MPI_Allreduce(sendbuf,recvbuf,1,MPI_2DOUBLE_PRECISION,MPI_MAXLOC,GFS_Control%communicator,ierror)
+        call MPI_Bcast(pmaxloc,size(pmaxloc),MPI_DOUBLE_PRECISION,nint(recvbuf(2)),GFS_Control%communicator,ierror)
+
+        if(GFS_Control%me == GFS_Control%master) then
+2933      format('At forecast hour ',F9.3,' mean abs pgr change is ',F16.8,' hPa/hr')
+2934      format('  max abs change   ',F15.10,' bar  at  tile=',I0,' i=',I0,' j=',I0)
+2935      format('  pgr at that point',F15.10,' bar      lat=',F12.6,' lon=',F12.6)
+          print 2933, GFS_control%fhour, global_average
+          print 2934, pmaxloc(4)*1d-5, nint(pmaxloc(1:3))
+          print 2935, pmaxloc(5)*1d-5, pmaxloc(6:7)*57.29577951308232d0 ! 180/pi
+        endif
+      endif
+      ! old_pgr is updated every timestep, including the first one where stats aren't printed:
+      do nb = 1,ATM_block%nblks
+        GFS_data(nb)%Intdiag%old_pgr=GFS_data(nb)%Statein%pgr
+      enddo
+    endif
+
+!-----------------------------------------------------------------------
+end subroutine atmos_timestep_diagnostics
+! </SUBROUTINE>
+
 !#######################################################################
 ! <SUBROUTINE NAME="atmos_model_init">
 !
@@ -722,12 +812,14 @@ subroutine atmos_model_exchange_phase_1 (Atmos, rc)
     !--- begin
     if (present(rc)) rc = ESMF_SUCCESS
 
+#if 0
     !--- if coupled, exchange coupled fields
     if( GFS_control%cplchm ) then
       ! -- export fields to chemistry
       call update_atmos_chemistry('export', rc=localrc)
       if (ESMF_LogFoundError(rcToCheck=localrc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__, rcToReturn=rc)) return
     endif
+#endif
 
  end subroutine atmos_model_exchange_phase_1
 ! </SUBROUTINE>
@@ -758,12 +850,14 @@ subroutine atmos_model_exchange_phase_2 (Atmos, rc)
     !--- begin
     if (present(rc)) rc = ESMF_SUCCESS
 
+#if 0
     !--- if coupled, exchange coupled fields
     if( GFS_control%cplchm ) then
       ! -- import fields from chemistry
       call update_atmos_chemistry('import', rc=localrc)
       if (ESMF_LogFoundError(rcToCheck=localrc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__, rcToReturn=rc)) return
     endif
+#endif
 
  end subroutine atmos_model_exchange_phase_2
 ! </SUBROUTINE>

ccpp/config/ccpp_prebuild_config.py

@@ -207,7 +207,19 @@
     'ccpp/physics/physics/GFS_rrtmgp_gfdlmp_pre.F90',
     'ccpp/physics/physics/GFS_rrtmgp_zhaocarr_pre.F90',
     'ccpp/physics/physics/GFS_rrtmgp_cloud_overlap_pre.F90',
-    'ccpp/physics/physics/GFS_rrtmgp_sw_post.F90'
+    'ccpp/physics/physics/GFS_rrtmgp_sw_post.F90',
+    # Chemistry
+    'ccpp/physics/gsdchem/gsd_chem_seas_wrapper.F90',
+    'ccpp/physics/gsdchem/gsd_chem_dust_wrapper.F90',
+    'ccpp/physics/gsdchem/gsd_chem_anthropogenic_wrapper.F90',
+    'ccpp/physics/gsdchem/gsd_chem_plume_wrapper.F90',
+    'ccpp/physics/gsdchem/gsd_chem_dmsemis_wrapper.F90',
+    'ccpp/physics/gsdchem/gsd_chem_gocart_wrapper.F90',
+    'ccpp/physics/gsdchem/gsd_chem_rad_wrapper.F90',
+    'ccpp/physics/gsdchem/gsd_chem_drydep_wrapper.F90',
+    'ccpp/physics/gsdchem/gsd_chem_lsdep_wrapper.F90',
+    'ccpp/physics/gsdchem/gsd_chem_settling_wrapper.F90',
+    'ccpp/physics/gsdchem/gsd_chem_diag_wrapper.F90',
     ]
 
 # Default build dir, relative to current working directory,