Skip to content

Commit

Permalink
Merge pull request #29 from climbfuji/merge_emc_develop_20200311_afte…
Browse files Browse the repository at this point in the history 
…r_moorthi_before_dycore_pr7

dtc/develop: merge emc/develop 2020/03/11 (after Moorthi's commit, before dycore OMP bugfix)
  • Loading branch information
@climbfuji
climbfuji authored Mar 12, 2020
2 parents 1a385e3 + cc085c7 commit e88f2b3
Show file tree
Hide file tree
Showing 69 changed files with 1,760 additions and 942 deletions.
89 changes: 66 additions & 23 deletions atmos_model.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,8 @@ module atmos_model_mod
#endif

real(kind=IPD_kind_phys), parameter :: zero = 0.0_IPD_kind_phys, &
one = 1.0_IPD_kind_phys
one = 1.0_IPD_kind_phys, &
epsln = 1.0e-10_IPD_kind_phys

contains

Expand Down Expand Up @@ -1596,6 +1597,7 @@ subroutine assign_importdata(rc)
real(kind=ESMF_KIND_R4), dimension(:,:), pointer :: datar42d
real(kind=ESMF_KIND_R8), dimension(:,:), pointer :: datar82d
real(kind=IPD_kind_phys), dimension(:,:), pointer :: datar8
real(kind=IPD_kind_phys) :: tem
logical found, isFieldCreated, lcpl_fice
!
!------------------------------------------------------------------------------
Expand Down Expand Up @@ -1663,6 +1665,29 @@ subroutine assign_importdata(rc)
! endif
! endif


! get sea-state dependent surface roughness (if cplwav2atm=true)
!----------------------------
fldname = 'wave_z0_roughness_length'
if (trim(impfield_name) == trim(fldname)) then
findex = QueryFieldList(ImportFieldsList,fldname)
if (importFieldsValid(findex) .and. IPD_control%cplwav2atm) then
!$omp parallel do default(shared) private(i,j,nb,ix)
do j=jsc,jec
do i=isc,iec
nb = Atm_block%blkno(i,j)
ix = Atm_block%ixp(i,j)
if (IPD_Data(nb)%Sfcprop%oceanfrac(ix) > zero) then
tem = 100.0 * max(zero, min(0.1, datar8(i,j)))
IPD_Data(nb)%Coupling%zorlwav_cpl(ix) = tem
IPD_Data(nb)%Sfcprop%zorlo(ix) = tem

endif
enddo
enddo
endif
endif

! get sea ice surface temperature
!--------------------------------
fldname = 'sea_ice_surface_temperature'
Expand All @@ -1674,7 +1699,9 @@ subroutine assign_importdata(rc)
do i=isc,iec
nb = Atm_block%blkno(i,j)
ix = Atm_block%ixp(i,j)
IPD_Data(nb)%Coupling%tisfcin_cpl(ix) = datar8(i,j)
if (IPD_Data(nb)%Sfcprop%oceanfrac(ix) > zero) then
IPD_Data(nb)%Coupling%tisfcin_cpl(ix) = datar8(i,j)
endif
enddo
enddo
endif
Expand Down Expand Up @@ -1718,19 +1745,16 @@ subroutine assign_importdata(rc)
nb = Atm_block%blkno(i,j)
ix = Atm_block%ixp(i,j)
IPD_Data(nb)%Coupling%ficein_cpl(ix) = zero
IPD_Data(nb)%Coupling%slimskin_cpl(ix) = IPD_Data(nb)%Sfcprop%slmsk(ix)
if (IPD_Data(nb)%Sfcprop%oceanfrac(ix) > zero) then
if (datar8(i,j) >= IPD_control%min_seaice*IPD_Data(nb)%Sfcprop%oceanfrac(ix)) then
IPD_Data(nb)%Coupling%ficein_cpl(ix) = max(zero, min(datar8(i,j),one))
! if (IPD_Data(nb)%Sfcprop%oceanfrac(ix) == one) IPD_Data(nb)%Sfcprop%slmsk(ix) = 2. !slmsk=2 crashes in gcycle on partial land points
IPD_Data(nb)%Sfcprop%slmsk(ix) = 2. !slmsk=2 crashes in gcycle on partial land points
IPD_Data(nb)%Coupling%slimskin_cpl(ix) = 4.
else
if (IPD_Data(nb)%Sfcprop%oceanfrac(ix) == one) IPD_Data(nb)%Sfcprop%slmsk(ix) = zero
elseif (abs(one-IPD_Data(nb)%Sfcprop%oceanfrac(ix)) < epsln) then
IPD_Data(nb)%Sfcprop%slmsk(ix) = zero
IPD_Data(nb)%Coupling%slimskin_cpl(ix) = zero
endif
else
IPD_Data(nb)%Sfcprop%slmsk(ix) = one
IPD_Data(nb)%Coupling%slimskin_cpl(ix) = one
endif
enddo
enddo
Expand Down Expand Up @@ -1906,6 +1930,7 @@ subroutine assign_importdata(rc)
IPD_Data(nb)%Sfcprop%hice(ix) = IPD_Data(nb)%Coupling%hicein_cpl(ix)
IPD_Data(nb)%Sfcprop%snowd(ix) = IPD_Data(nb)%Coupling%hsnoin_cpl(ix)
else
IPD_Data(nb)%Sfcprop%tisfc(ix) = IPD_Data(nb)%Coupling%tseain_cpl(ix)
IPD_Data(nb)%Sfcprop%fice(ix) = zero
IPD_Data(nb)%Sfcprop%hice(ix) = zero
IPD_Data(nb)%Sfcprop%snowd(ix) = zero
Expand All @@ -1916,12 +1941,30 @@ subroutine assign_importdata(rc)
IPD_Data(nb)%Coupling%dvsfcin_cpl(ix) = -99999.0 ! ,,
IPD_Data(nb)%Coupling%dtsfcin_cpl(ix) = -99999.0 ! ,,
IPD_Data(nb)%Coupling%ulwsfcin_cpl(ix) = -99999.0 ! ,,
if (IPD_Data(nb)%Sfcprop%oceanfrac(ix) == one) IPD_Data(nb)%Sfcprop%slmsk(ix) = zero ! 100% open water
if (abs(one-IPD_Data(nb)%Sfcprop%oceanfrac(ix)) < epsln) &
IPD_Data(nb)%Coupling%slimskin_cpl(ix) = zero ! 100% open water
endif
endif
enddo
enddo
endif
!
!-------------------------------------------------------------------------------
! do j=jsc,jec
! do i=isc,iec
! nb = Atm_block%blkno(i,j)
! ix = Atm_block%ixp(i,j)
! if (abs(IPD_Data(nb)%Grid%xlon_d(ix)-2.89) < 0.1 .and. &
! abs(IPD_Data(nb)%Grid%xlat_d(ix)+58.99) < 0.1) then
! write(0,*)' in assign tisfc=',IPD_Data(nb)%Sfcprop%tisfc(ix), &
! ' oceanfrac=',IPD_Data(nb)%Sfcprop%oceanfrac(ix),' i=',i,' j=',j,&
! ' tisfcin=',IPD_Data(nb)%Coupling%tisfcin_cpl(ix), &
! ' fice=',IPD_Data(nb)%Sfcprop%fice(ix)
! endif
! enddo
! enddo
!-------------------------------------------------------------------------------
!

rc=0
!
Expand Down Expand Up @@ -2518,7 +2561,7 @@ subroutine setup_exportdata (rc)
exportData(i,j,idx) = DYCORE_Data(nb)%coupling%t_bot(ix)
else
exportData(i,j,idx) = zero
endif
endif
enddo
enddo
endif
Expand All @@ -2536,7 +2579,7 @@ subroutine setup_exportdata (rc)
exportData(i,j,idx) = DYCORE_Data(nb)%coupling%tr_bot(ix,1)
else
exportData(i,j,idx) = zero
endif
endif
enddo
enddo
endif
Expand Down Expand Up @@ -2587,7 +2630,7 @@ subroutine setup_exportdata (rc)
exportData(i,j,idx) = DYCORE_Data(nb)%coupling%p_bot(ix)
else
exportData(i,j,idx) = zero
endif
endif
enddo
enddo
endif
Expand All @@ -2603,8 +2646,8 @@ subroutine setup_exportdata (rc)
if (associated(DYCORE_Data(nb)%coupling%z_bot)) then
exportData(i,j,idx) = DYCORE_Data(nb)%coupling%z_bot(ix)
else
exportData(i,j,idx) = zero
endif
exportData(i,j,idx) = zero
endif
enddo
enddo
endif
Expand All @@ -2623,14 +2666,14 @@ subroutine setup_exportdata (rc)
enddo
enddo
endif
endif !cplflx
endif !cplflx

!---
! Fill the export Fields for ESMF/NUOPC style coupling
call fillExportFields(exportData)

!---
if (IPD_Control%cplflx) then
if (IPD_Control%cplflx) then
! zero out accumulated fields
!$omp parallel do default(shared) private(i,j,nb,ix)
do j=jsc,jec
Expand Down Expand Up @@ -2663,20 +2706,20 @@ subroutine setup_exportdata (rc)

end subroutine setup_exportdata

subroutine addLsmask2grid(fcstgrid, rc)
subroutine addLsmask2grid(fcstGrid, rc)

use ESMF
!
implicit none
type(ESMF_Grid) :: fcstgrid
type(ESMF_Grid) :: fcstGrid
integer, optional, intent(out) :: rc
!
! local vars
integer isc, iec, jsc, jec
integer i, j, nb, ix
! integer CLbnd(2), CUbnd(2), CCount(2), TLbnd(2), TUbnd(2), TCount(2)
type(ESMF_StaggerLoc) :: staggerloc
integer, allocatable :: lsmask(:,:)
integer, allocatable :: lsmask(:,:)
integer(kind=ESMF_KIND_I4), pointer :: maskPtr(:,:)
!
isc = IPD_control%isc
Expand All @@ -2691,16 +2734,16 @@ subroutine addLsmask2grid(fcstgrid, rc)
nb = Atm_block%blkno(i,j)
ix = Atm_block%ixp(i,j)
! use land sea mask: land:1, ocean:0
lsmask(i,j) = floor(IPD_Data(nb)%SfcProp%landfrac(ix))
lsmask(i,j) = floor(one + epsln - IPD_Data(nb)%SfcProp%oceanfrac(ix))
enddo
enddo
!
! Get mask
call ESMF_GridAddItem(fcstgrid, itemflag=ESMF_GRIDITEM_MASK, &
call ESMF_GridAddItem(fcstGrid, itemflag=ESMF_GRIDITEM_MASK, &
staggerloc=ESMF_STAGGERLOC_CENTER, rc=rc)
if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return

! call ESMF_GridGetItemBounds(fcstgrid, itemflag=ESMF_GRIDITEM_MASK, &
! call ESMF_GridGetItemBounds(fcstGrid, itemflag=ESMF_GRIDITEM_MASK, &
! staggerloc=ESMF_STAGGERLOC_CENTER, computationalLBound=ClBnd, &
! computationalUBound=CUbnd, computationalCount=Ccount, &
! totalLBound=TLbnd, totalUBound=TUbnd, totalCount=Tcount, rc=rc)
Expand All @@ -2709,7 +2752,7 @@ subroutine addLsmask2grid(fcstgrid, rc)
! 'TlBnd=',TlBnd,'TUbnd=',TUbnd,'Tcount=',Tcount
! if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return

call ESMF_GridGetItem(fcstgrid, itemflag=ESMF_GRIDITEM_MASK, &
call ESMF_GridGetItem(fcstGrid, itemflag=ESMF_GRIDITEM_MASK, &
staggerloc=ESMF_STAGGERLOC_CENTER,farrayPtr=maskPtr, rc=rc)
! print *,'in set up grid, aft get maskptr, rc=',rc, 'size=',size(maskPtr,1),size(maskPtr,2), &
! 'bound(maskPtr)=', LBOUND(maskPtr,1),LBOUND(maskPtr,2),UBOUND(maskPtr,1),UBOUND(maskPtr,2)
Expand Down
2 changes: 2 additions & 0 deletions ccpp/config/ccpp_prebuild_config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@
'FV3/ccpp/physics/physics/cu_gf_driver.F90' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/cu_gf_driver_post.F90' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/moninedmf.f' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/moninedmf_hafs.f' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/moninshoc.f' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/satmedmfvdif.F' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/satmedmfvdifq.F' : [ 'slow_physics' ],
Expand All @@ -219,6 +220,7 @@
'FV3/ccpp/physics/physics/precpd.f' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/radlw_main.f' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/radsw_main.f' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/rascnv.F90' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/rayleigh_damp.f' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/rrtmg_lw_post.F90' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/rrtmg_lw_pre.F90' : [ 'slow_physics' ],
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 44 files
+6 −7 physics/GFS_DCNV_generic.F90
+0 −18 physics/GFS_DCNV_generic.meta
+12 −21 physics/GFS_MP_generic.F90
+22 −19 physics/GFS_PBL_generic.F90
+1 −0 physics/GFS_SCNV_generic.F90
+1 −1 physics/GFS_phys_time_vary.fv3.F90
+113 −60 physics/GFS_suite_interstitial.F90
+141 −3 physics/GFS_suite_interstitial.meta
+64 −74 physics/GFS_surface_composites.F90
+43 −0 physics/GFS_surface_composites.meta
+25 −29 physics/GFS_surface_generic.F90
+1 −25 physics/GFS_surface_generic.meta
+3 −3 physics/cs_conv.meta
+2 −2 physics/cu_gf_driver.meta
+3 −60 physics/dcyc2.f
+896 −1,041 physics/gcm_shoc.F90
+84 −172 physics/gcm_shoc.meta
+15 −8 physics/gcycle.F90
+1 −1 physics/gfdl_cloud_microphys.meta
+2 −2 physics/gscond.meta
+44 −25 physics/m_micro.F90
+16 −23 physics/m_micro.meta
+39 −39 physics/m_micro_interstitial.F90
+17 −44 physics/m_micro_interstitial.meta
+5 −3 physics/micro_mg2_0.F90
+81 −45 physics/micro_mg3_0.F90
+1 −1 physics/micro_mg_utils.F90
+2 −2 physics/module_MYNNPBL_wrapper.meta
+1 −1 physics/module_MYNNSFC_wrapper.meta
+4 −4 physics/module_MYNNrad_post.meta
+4 −4 physics/module_MYNNrad_pre.meta
+19 −27 physics/moninshoc.f
+1 −25 physics/moninshoc.meta
+3 −3 physics/mp_fer_hires.meta
+4,158 −0 physics/rascnv.F90
+687 −0 physics/rascnv.meta
+2 −2 physics/sascnvn.meta
+3 −6 physics/sfc_cice.f
+0 −8 physics/sfc_cice.meta
+34 −32 physics/sfc_diff.f
+1 −1 physics/sfc_drv_ruc.meta
+3 −3 physics/sfc_nst.f
+2 −2 physics/shalcnv.meta
+171 −170 physics/ugwp_driver_v0.F
1 change: 0 additions & 1 deletion ccpp/suites/suite_FV3_CPT_v0.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>dcyc2t3_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_FV3_GFS_2017.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>dcyc2t3_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
Expand Down
3 changes: 1 addition & 2 deletions ccpp/suites/suite_FV3_GFS_2017_coupled.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>dcyc2t3_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
Expand All @@ -58,7 +57,7 @@
<scheme>GFS_GWD_generic_pre</scheme>
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_FV3_GFS_2017_csawmg.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>dcyc2t3_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_FV3_GFS_2017_csawmgshoc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>dcyc2t3_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_FV3_GFS_2017_gfdlmp.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>dcyc2t3_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_FV3_GFS_2017_gfdlmp_noahmp.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>dcyc2t3_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>dcyc2t3_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional_c768.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>dcyc2t3_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_FV3_GFS_2017_h2ophys.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>dcyc2t3_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_FV3_GFS_2017_myj.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>dcyc2t3_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_FV3_GFS_2017_ntiedtke.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>dcyc2t3_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_FV3_GFS_2017_ozphys_2015.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>dcyc2t3_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_FV3_GFS_2017_sas.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>dcyc2t3_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_FV3_GFS_2017_satmedmf.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>dcyc2t3_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_FV3_GFS_2017_satmedmfq.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>dcyc2t3_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
Expand Down
1 change: 0 additions & 1 deletion ccpp/suites/suite_FV3_GFS_2017_shinhong.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>dcyc2t3_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
Expand Down
Loading

0 comments on commit e88f2b3

Please sign in to comment.