Sm sep252020 old postgfs

atmos_model.F90

@@ -99,13 +99,13 @@ module atmos_model_mod
                               IPD_interstitial => GFS_interstitial
 use IPD_driver,         only: IPD_initialize, IPD_initialize_rst
 use CCPP_driver,        only: CCPP_step, non_uniform_blocks
+
+use stochastic_physics_wrapper_mod, only: stochastic_physics_wrapper
 #else
 use IPD_driver,         only: IPD_initialize, IPD_initialize_rst, IPD_step
 use physics_abstraction_layer, only: time_vary_step, radiation_step1, physics_step1, physics_step2
 #endif
 
-use stochastic_physics_wrapper_mod, only: stochastic_physics_wrapper
-
 use FV3GFS_io_mod,      only: FV3GFS_restart_read, FV3GFS_restart_write, &
                               FV3GFS_IPD_checksum,                       &
                               FV3GFS_diag_register, FV3GFS_diag_output,  &
@@ -291,16 +291,16 @@ subroutine update_atmos_radiation_physics (Atmos)
 #ifdef CCPP
       call CCPP_step (step="time_vary", nblks=Atm_block%nblks, ierr=ierr)
       if (ierr/=0)  call mpp_error(FATAL, 'Call to CCPP time_vary step failed')
+
+!--- call stochastic physics pattern generation / cellular automata
+      call stochastic_physics_wrapper(IPD_Control, IPD_Data, Atm_block, ierr)
+      if (ierr/=0)  call mpp_error(FATAL, 'Call to stochastic_physics_wrapper failed')
+
 #else
       Func1d => time_vary_step
       call IPD_step (IPD_Control, IPD_Data(:), IPD_Diag, IPD_Restart, IPD_func1d=Func1d)
 #endif
 
-!--- call stochastic physics pattern generation / cellular automata
-    call stochastic_physics_wrapper(IPD_Control, IPD_Data, Atm_block, ierr) 
-    if (ierr/=0)  call mpp_error(FATAL, 'Call to stochastic_physics_wrapper failed')
-
-
 !--- if coupled, assign coupled fields
 
       if( IPD_Control%cplflx .or. IPD_Control%cplwav ) then
@@ -625,14 +625,15 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step)
 #ifdef CCPP
    call IPD_initialize (IPD_Control, IPD_Data, IPD_Diag, IPD_Restart, &
                         IPD_Interstitial, commglobal, mpp_npes(), Init_parm)
-#else
-   call IPD_initialize (IPD_Control, IPD_Data, IPD_Diag, IPD_Restart, Init_parm)
-#endif
 
 !--- Initialize stochastic physics pattern generation / cellular automata for first time step
    call stochastic_physics_wrapper(IPD_Control, IPD_Data, Atm_block, ierr)
    if (ierr/=0)  call mpp_error(FATAL, 'Call to stochastic_physics_wrapper failed')
 
+#else
+   call IPD_initialize (IPD_Control, IPD_Data, IPD_Diag, IPD_Restart, Init_parm)
+#endif
+
    Atmos%Diag => IPD_Diag
 
    Atm(mygrid)%flagstruct%do_skeb = IPD_Control%do_skeb

ccpp/driver/CCPP_driver.F90

@@ -93,7 +93,7 @@ subroutine CCPP_step (step, nblks, ierr)
         end do
       end do
 
-   else if (trim(step)=="physics_init") then
+    else if (trim(step)=="physics_init") then
 
       ! Since the physics init steps are independent of the blocking structure,
       ! we can use cdata_domain here. Since we don't use threading on the outside,
@@ -107,7 +107,7 @@ subroutine CCPP_step (step, nblks, ierr)
         return
       end if
 
-   else if (trim(step)=="time_vary") then
+    else if (trim(step)=="time_vary") then
 
       ! Since the time_vary steps only use data structures for all blocks (except the
       ! CCPP-internal variables ccpp_error_flag and ccpp_error_message, which are defined
@@ -123,8 +123,8 @@ subroutine CCPP_step (step, nblks, ierr)
         return
       end if
 
-   ! Radiation and stochastic physics
-   else if (trim(step)=="radiation" .or. trim(step)=="physics" .or. trim(step)=="stochastics") then
+    ! Radiation and stochastic physics
+    else if (trim(step)=="radiation" .or. trim(step)=="physics" .or. trim(step)=="stochastics") then
 
       ! Set number of threads available to physics schemes to one,
       ! because threads are used on the outside for blocking
@@ -162,8 +162,8 @@ subroutine CCPP_step (step, nblks, ierr)
 !$OMP end parallel
       if (ierr/=0) return
 
-   ! Finalize
-   else if (trim(step)=="finalize") then
+    ! Finalize
+    else if (trim(step)=="finalize") then
 
       ! Loop over blocks, don't use threading on the outside but allowing threading
       ! inside the finalization, similar to what is done for the initialization

ccpp/suites/suite_FV3_GFS_2017_couplednsst.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<suite name="FV3_GFS_2017_couplednsst" lib="ccppphys" ver="4">
+  <!-- <init></init> -->
+  <group name="time_vary">
+    <subcycle loop="1">
+      <scheme>GFS_time_vary_pre</scheme>
+      <scheme>GFS_rrtmg_setup</scheme>
+      <scheme>GFS_rad_time_vary</scheme>
+      <scheme>GFS_phys_time_vary</scheme>
+    </subcycle>
+  </group>
+  <group name="radiation">
+    <subcycle loop="1">
+      <scheme>GFS_suite_interstitial_rad_reset</scheme>
+      <scheme>GFS_rrtmg_pre</scheme>
+      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rrtmg_sw</scheme>
+      <scheme>rrtmg_sw_post</scheme>
+      <scheme>rrtmg_lw_pre</scheme>
+      <scheme>rrtmg_lw</scheme>
+      <scheme>rrtmg_lw_post</scheme>
+      <scheme>GFS_rrtmg_post</scheme>
+    </subcycle>
+  </group>
+  <group name="physics">
+    <subcycle loop="1">
+      <scheme>GFS_suite_interstitial_phys_reset</scheme>
+      <scheme>GFS_suite_stateout_reset</scheme>
+      <scheme>get_prs_fv3</scheme>
+      <scheme>GFS_suite_interstitial_1</scheme>
+      <scheme>GFS_surface_generic_pre</scheme>
+      <scheme>GFS_surface_composites_pre</scheme>
+      <scheme>dcyc2t3</scheme>
+      <scheme>GFS_surface_composites_inter</scheme>
+      <scheme>GFS_suite_interstitial_2</scheme>
+    </subcycle>
+    <!-- Surface iteration loop -->
+    <subcycle loop="2">
+      <scheme>sfc_diff</scheme>
+      <scheme>GFS_surface_loop_control_part1</scheme>
+      <scheme>lsm_noah</scheme>
+      <scheme>sfc_nst_pre</scheme>
+      <scheme>sfc_nst</scheme>
+      <scheme>sfc_nst_post</scheme>
+      <scheme>sfc_cice</scheme>
+      <scheme>sfc_sice</scheme>
+      <scheme>GFS_surface_loop_control_part2</scheme>
+    </subcycle>
+    <!-- End of surface iteration loop -->
+    <subcycle loop="1">
+      <scheme>GFS_surface_composites_post</scheme>
+      <scheme>sfc_diag</scheme>
+      <scheme>sfc_diag_post</scheme>
+      <scheme>GFS_surface_generic_post</scheme>
+      <scheme>GFS_PBL_generic_pre</scheme>
+      <scheme>hedmf</scheme>
+      <scheme>GFS_PBL_generic_post</scheme>
+      <scheme>GFS_GWD_generic_pre</scheme>
+      <scheme>cires_ugwp</scheme>
+      <scheme>cires_ugwp_post</scheme>
+      <scheme>GFS_GWD_generic_post</scheme>
+      <scheme>rayleigh_damp</scheme>
+      <scheme>GFS_suite_stateout_update</scheme>
+      <scheme>ozphys</scheme>
+      <scheme>get_phi_fv3</scheme>
+      <scheme>GFS_suite_interstitial_3</scheme>
+      <scheme>GFS_DCNV_generic_pre</scheme>
+      <scheme>samfdeepcnv</scheme>
+      <scheme>GFS_DCNV_generic_post</scheme>
+      <scheme>GFS_SCNV_generic_pre</scheme>
+      <scheme>samfshalcnv</scheme>
+      <scheme>GFS_SCNV_generic_post</scheme>
+      <scheme>GFS_suite_interstitial_4</scheme>
+      <scheme>cnvc90</scheme>
+      <scheme>GFS_MP_generic_pre</scheme>
+      <scheme>zhaocarr_gscond</scheme>
+      <scheme>zhaocarr_precpd</scheme>
+      <scheme>GFS_MP_generic_post</scheme>
+      <scheme>maximum_hourly_diagnostics</scheme>
+    </subcycle>
+  </group>
+  <group name="stochastics">
+    <subcycle loop="1">
+      <scheme>GFS_stochastics</scheme>
+    </subcycle>
+  </group>
+  <!-- <finalize></finalize> -->
+</suite>

ccpp/suites/suite_FV3_GFS_cpld_rasmgshocnsst.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="FV3_GFS_cpld_rasmgshocnsst" lib="ccppphys" ver="3">
+<suite name="FV3_GFS_cpld_rasmgshocnsst" lib="ccppphys" ver="4">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">

gfsphysics/GFS_layer/GFS_physics_driver.F90

@@ -814,8 +814,8 @@ subroutine GFS_physics_driver                                 &
 !     do i=1,im
 !       lprnt = Model%me == 23 .and. i == 25
 !       lprnt = Model%me == 127 .and. i == 11
-!       lprnt = kdt >=  20 .and. abs(grid%xlon(i)*rad2dg-102.65) < 0.101  &
-!                          .and. abs(grid%xlat(i)*rad2dg-0.12) < 0.201
+!       lprnt = kdt >=  20 .and. abs(grid%xlon(i)*rad2dg-295.40) < 0.101  &
+!                          .and. abs(grid%xlat(i)*rad2dg-47.0) < 0.101
 !       lprnt = kdt >=  20 .and. abs(grid%xlon(i)*rad2dg-184.00) < 0.301  &
 !                          .and. abs(grid%xlat(i)*rad2dg-83.23) < 0.301
 !       lprnt = kdt >=   7 .and. abs(grid%xlon(i)*rad2dg-216.20) < 0.101  &
@@ -2183,22 +2183,25 @@ subroutine GFS_physics_driver                                 &
            endif
           if (islmsk(i) == 1) then
             k = 1
-            Sfcprop%tsfcl(i) = tsfc3(i,1)  ! over land
             stress(i)        = stress3(i,1)
 !           Sfcprop%tprcp(i) = tprcp3(i,1)
+            Sfcprop%tsfcl(i) = tsfc3(i,1)  ! over land
             Sfcprop%tsfco(i) = tsfc3(i,1)
             Sfcprop%tisfc(i) = tsfc3(i,1)
+            Sfcprop%tsfc(i)  = tsfc3(i,1)
           elseif (islmsk(i) == 0) then
             k = 3
-            Sfcprop%tsfco(i) = tsfc3(i,3)  ! over lake (and ocean when uncoupled)
             stress(i)        = stress3(i,3)
 !           Sfcprop%tprcp(i) = tprcp3(i,3)
+            Sfcprop%tsfco(i) = tsfc3(i,3)  ! over lake (and ocean when uncoupled)
             Sfcprop%tisfc(i) = tsfc3(i,3)
             Sfcprop%tsfcl(i) = tsfc3(i,3)
+            Sfcprop%tsfc(i)  = tsfc3(i,3)
           else
             k = 2
             stress(i)        = stress3(i,2)
 !           Sfcprop%tprcp(i) = fice(i)*tprcp3(i,2)  + (one-fice(i))*tprcp3(i,3)
+            Sfcprop%tsfc(i)  = tsfc3(i,2)
           endif
           Sfcprop%zorl(i)   = zorl3(i,k)
           cd(i)             = cd3(i,k)
@@ -2219,43 +2222,49 @@ subroutine GFS_physics_driver                                 &
           evap(i)           = evap3(i,k)
           hflx(i)           = hflx3(i,k)
           qss(i)            = qss3(i,k)
-          Sfcprop%tsfc(i)   = tsfc3(i,k)
+!         Sfcprop%tsfc(i)   = tsfc3(i,k)
 
           Sfcprop%zorll(i)  = zorl3(i,1)
           Sfcprop%zorli(i)  = zorl3(i,2)
           Sfcprop%zorlo(i)  = zorl3(i,3)
 
-          if (flag_cice(i)) then
-            if (wet(i) .and. fice(i) > Model%min_seaice) then  ! this was already done for lake ice in sfc_sice
-              txi = fice(i)
-              txo = one - txi
-              evap(i)         = txi * evap3(i,2)   + txo * evap3(i,3)
-              hflx(i)         = txi * hflx3(i,2)   + txo * hflx3(i,3)
-              Sfcprop%tsfc(i) = txi * tsfc3(i,2)   + txo * tsfc3(i,3)
-              stress(i)       = txi  *stress3(i,2) + txo * stress3(i,3)
-              qss(i)          = txi * qss3(i,2)    + txo * qss3(i,3)
-              ep1d(i)         = txi * ep1d3(i,2)   + txo * ep1d3(i,3)
-              Sfcprop%zorl(i) = txi*zorl3(i,2)     + txo*zorl3(i,3)
+          if (k == 2) then
+            if (wet(i)) then
+              Sfcprop%tsfco(i) = tsfc3(i,3)
+            endif
+            if (flag_cice(i)) then
+              if (wet(i) .and. fice(i) > Model%min_seaice) then  ! this was already done for lake ice in sfc_sice
+                txi = fice(i)
+                txo = one - txi
+                evap(i)         = txi * evap3(i,2)   + txo * evap3(i,3)
+                hflx(i)         = txi * hflx3(i,2)   + txo * hflx3(i,3)
+                Sfcprop%tsfc(i) = txi * tsfc3(i,2)   + txo * tsfc3(i,3)
+                stress(i)       = txi  *stress3(i,2) + txo * stress3(i,3)
+                qss(i)          = txi * qss3(i,2)    + txo * qss3(i,3)
+                ep1d(i)         = txi * ep1d3(i,2)   + txo * ep1d3(i,3)
+                Sfcprop%zorl(i) = txi * zorl3(i,2)   + txo * zorl3(i,3)
+              endif
+            elseif (islmsk(i) == 2) then  ! return updated lake ice thickness & concentration to global array
+              Sfcprop%tisfc(i) = tice(i)  ! over lake ice (and sea ice when uncoupled)
+              Sfcprop%tsfc(i)  = tsfc3(i,2)
+              Sfcprop%hice(i)  = zice(i)
+              Sfcprop%fice(i)  = fice(i)  ! fice is fraction of lake area that is frozen
+              Sfcprop%zorl(i)  = fice(i)*zorl3(i,2) + (one-fice(i))*zorl3(i,3)
+            else                          ! this would be over open ocean or land (no ice fraction)
+              Sfcprop%hice(i)  = zero
+              Sfcprop%fice(i)  = zero
+              Sfcprop%tsfc(i)  = Sfcprop%tsfco(i)
+              Sfcprop%tisfc(i) = Sfcprop%tsfc(i)
+              icy(i)           = .false.
+            endif
+            Sfcprop%tsfcl(i) = Sfcprop%tsfc(i)
+            if (.not. wet(i)) then
+              Sfcprop%tsfco(i) =Sfcprop%tsfc(i)
             endif
-          elseif (islmsk(i) == 2) then  ! return updated lake ice thickness & concentration to global array
-            Sfcprop%tisfc(i) = tice(i)  ! over lake ice (and sea ice when uncoupled)
-            Sfcprop%hice(i)  = zice(i)
-            Sfcprop%fice(i)  = fice(i)  ! fice is fraction of lake area that is frozen
-            Sfcprop%zorl(i)  = fice(i)*zorl3(i,2) + (one-fice(i))*zorl3(i,3)
-          else                          ! this would be over open ocean or land (no ice fraction)
-            Sfcprop%hice(i)  = zero
-            Sfcprop%fice(i)  = zero
-            Sfcprop%tisfc(i) = Sfcprop%tsfc(i)
-            icy(i)           = .false.
-          endif
-          Sfcprop%tsfcl(i) = Sfcprop%tsfc(i)
-          if (wet(i)) then
-            Sfcprop%tsfco(i) = tsfc3(i,3)
-          else
-            Sfcprop%tsfco(i) =Sfcprop%tsfc(i)
           endif
           do k=1,Model%kice ! store tiice in stc to reduce output in the nonfrac grid case
-            Sfcprop%stc(i,k) = Sfcprop%tiice(i,k)
+!           Sfcprop%stc(i,k) = Sfcprop%tiice(i,k)
+            Sfcprop%stc(i,k) = stsoil(i,k)
           enddo
         enddo
       endif       ! if (Model%frac_grid)
@@ -5806,6 +5815,7 @@ subroutine GFS_physics_driver                                 &
 !          if (lprnt) write(0,*)' end driver sfcprop%tsfcl=',Sfcprop%tsfcl(ipr),' kdt=',kdt
 !          if (lprnt) write(0,*)' end driver sfcprop%tsfco=',Sfcprop%tsfco(ipr),' kdt=',kdt
 !          if (lprnt) write(0,*)' end driver sfcprop%tisfc=',Sfcprop%tisfc(ipr),' kdt=',kdt
+!          if (lprnt) write(0,*)' end driver sfcprop%tsfc=',Sfcprop%tsfc(ipr),' kdt=',kdt,wet(ipr),icy(ipr),dry(ipr)
 !       endif
 
       return

gfsphysics/GFS_layer/GFS_typedefs.F90

@@ -1550,9 +1550,9 @@ module GFS_typedefs
 #ifdef CCPP
     real (kind=kind_phys), pointer :: TRAIN  (:,:)   => null()  !< accumulated stratiform T tendency (K s-1)
 #endif
-#ifdef CCPP
+!#ifdef CCPP
     real (kind=kind_phys), pointer :: cldfra  (:,:)   => null()  !< instantaneous 3D cloud fraction
-#endif
+!#endif
     !--- MP quantities for 3D diagnositics 
     real (kind=kind_phys), pointer :: refl_10cm(:,:) => null()  !< instantaneous refl_10cm 
 !