diff --git a/scm/src/GFS_typedefs.F90 b/scm/src/GFS_typedefs.F90 index 6981bfc1a..76e9434f1 100644 --- a/scm/src/GFS_typedefs.F90 +++ b/scm/src/GFS_typedefs.F90 @@ -4894,11 +4894,9 @@ subroutine interstitial_create (Interstitial, IM, Model) allocate (Interstitial%cdq_ice (IM)) allocate (Interstitial%cdq_land (IM)) allocate (Interstitial%cdq_ocean (IM)) - allocate (Interstitial%cf_upi (IM,Model%levs)) allocate (Interstitial%chh_ice (IM)) allocate (Interstitial%chh_land (IM)) allocate (Interstitial%chh_ocean (IM)) - allocate (Interstitial%clcn (IM,Model%levs)) allocate (Interstitial%cldf (IM)) allocate (Interstitial%cldsa (IM,5)) allocate (Interstitial%cldtaulw (IM,Model%levr+LTP)) @@ -4910,11 +4908,6 @@ subroutine interstitial_create (Interstitial, IM, Model) allocate (Interstitial%cmm_ice (IM)) allocate (Interstitial%cmm_land (IM)) allocate (Interstitial%cmm_ocean (IM)) - allocate (Interstitial%cnv_dqldt (IM,Model%levs)) - allocate (Interstitial%cnv_fice (IM,Model%levs)) - allocate (Interstitial%cnv_mfd (IM,Model%levs)) - allocate (Interstitial%cnv_ndrop (IM,Model%levs)) - allocate (Interstitial%cnv_nice (IM,Model%levs)) allocate (Interstitial%cnvc (IM,Model%levs)) allocate (Interstitial%cnvw (IM,Model%levs)) allocate (Interstitial%ctei_r (IM)) @@ -5014,8 +5007,6 @@ subroutine interstitial_create (Interstitial, IM, Model) allocate (Interstitial%plvl (IM,Model%levr+1+LTP)) allocate (Interstitial%plyr (IM,Model%levr+LTP)) allocate (Interstitial%prnum (IM,Model%levs)) - allocate (Interstitial%qicn (IM,Model%levs)) - allocate (Interstitial%qlcn (IM,Model%levs)) allocate (Interstitial%qlyr (IM,Model%levr+LTP)) allocate (Interstitial%prcpmp (IM)) allocate (Interstitial%qss (IM)) @@ -5081,7 +5072,6 @@ subroutine interstitial_create (Interstitial, IM, Model) allocate (Interstitial%vdftra (IM,Model%levs,Interstitial%nvdiff)) !GJF first dimension was set as 'IX' in GFS_physics_driver allocate (Interstitial%vegf1d (IM)) allocate (Interstitial%vegtype (IM)) - allocate (Interstitial%w_upi (IM,Model%levs)) allocate (Interstitial%wcbmax (IM)) allocate (Interstitial%weasd_ice (IM)) allocate (Interstitial%weasd_land (IM)) @@ -5111,6 +5101,16 @@ subroutine interstitial_create (Interstitial, IM, Model) allocate (Interstitial%qgl (IM,Model%levs)) allocate (Interstitial%qrn (IM,Model%levs)) allocate (Interstitial%qsnw (IM,Model%levs)) + allocate (Interstitial%qlcn (IM,Model%levs)) + allocate (Interstitial%qicn (IM,Model%levs)) + allocate (Interstitial%w_upi (IM,Model%levs)) + allocate (Interstitial%cf_upi (IM,Model%levs)) + allocate (Interstitial%cnv_mfd (IM,Model%levs)) + allocate (Interstitial%cnv_dqldt (IM,Model%levs)) + allocate (Interstitial%clcn (IM,Model%levs)) + allocate (Interstitial%cnv_fice (IM,Model%levs)) + allocate (Interstitial%cnv_ndrop (IM,Model%levs)) + allocate (Interstitial%cnv_nice (IM,Model%levs)) end if if (Model%do_shoc) then if (.not. associated(Interstitial%qrn)) allocate (Interstitial%qrn (IM,Model%levs)) @@ -5356,11 +5356,9 @@ subroutine interstitial_phys_reset (Interstitial, Model) Interstitial%cdq_ice = huge Interstitial%cdq_land = huge Interstitial%cdq_ocean = huge - Interstitial%cf_upi = clear_val Interstitial%chh_ice = huge Interstitial%chh_land = huge Interstitial%chh_ocean = huge - Interstitial%clcn = clear_val Interstitial%cld1d = clear_val Interstitial%cldf = clear_val Interstitial%clw = clear_val @@ -5369,11 +5367,6 @@ subroutine interstitial_phys_reset (Interstitial, Model) Interstitial%cmm_ice = huge Interstitial%cmm_land = huge Interstitial%cmm_ocean = huge - Interstitial%cnv_dqldt = clear_val - Interstitial%cnv_fice = clear_val - Interstitial%cnv_mfd = clear_val - Interstitial%cnv_ndrop = clear_val - Interstitial%cnv_nice = clear_val Interstitial%cnvc = clear_val Interstitial%cnvw = clear_val Interstitial%ctei_r = clear_val @@ -5461,8 +5454,6 @@ subroutine interstitial_phys_reset (Interstitial, Model) Interstitial%oc = clear_val Interstitial%prcpmp = clear_val Interstitial%prnum = clear_val - Interstitial%qicn = clear_val - Interstitial%qlcn = clear_val Interstitial%qss = clear_val Interstitial%qss_ice = huge Interstitial%qss_land = huge @@ -5520,7 +5511,6 @@ subroutine interstitial_phys_reset (Interstitial, Model) Interstitial%vdftra = clear_val Interstitial%vegf1d = clear_val Interstitial%vegtype = 0 - Interstitial%w_upi = clear_val Interstitial%wcbmax = clear_val Interstitial%weasd_ice = huge Interstitial%weasd_land = huge @@ -5550,6 +5540,16 @@ subroutine interstitial_phys_reset (Interstitial, Model) Interstitial%qgl = clear_val Interstitial%qrn = clear_val Interstitial%qsnw = clear_val + Interstitial%qlcn = clear_val + Interstitial%qicn = clear_val + Interstitial%w_upi = clear_val + Interstitial%cf_upi = clear_val + Interstitial%cnv_mfd = clear_val + Interstitial%cnv_dqldt = clear_val + Interstitial%clcn = clear_val + Interstitial%cnv_fice = clear_val + Interstitial%cnv_ndrop = clear_val + Interstitial%cnv_nice = clear_val end if if (Model%do_shoc) then Interstitial%qrn = clear_val @@ -5615,11 +5615,9 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno) write (0,*) 'sum(Interstitial%cdq_ice ) = ', sum(Interstitial%cdq_ice ) write (0,*) 'sum(Interstitial%cdq_land ) = ', sum(Interstitial%cdq_land ) write (0,*) 'sum(Interstitial%cdq_ocean ) = ', sum(Interstitial%cdq_ocean ) - write (0,*) 'sum(Interstitial%cf_upi ) = ', sum(Interstitial%cf_upi ) write (0,*) 'sum(Interstitial%chh_ice ) = ', sum(Interstitial%chh_ice ) write (0,*) 'sum(Interstitial%chh_land ) = ', sum(Interstitial%chh_land ) write (0,*) 'sum(Interstitial%chh_ocean ) = ', sum(Interstitial%chh_ocean ) - write (0,*) 'sum(Interstitial%clcn ) = ', sum(Interstitial%clcn ) write (0,*) 'sum(Interstitial%cldf ) = ', sum(Interstitial%cldf ) write (0,*) 'sum(Interstitial%cldsa ) = ', sum(Interstitial%cldsa ) write (0,*) 'sum(Interstitial%cldtaulw ) = ', sum(Interstitial%cldtaulw ) @@ -5631,11 +5629,6 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno) write (0,*) 'sum(Interstitial%cmm_ice ) = ', sum(Interstitial%cmm_ice ) write (0,*) 'sum(Interstitial%cmm_land ) = ', sum(Interstitial%cmm_land ) write (0,*) 'sum(Interstitial%cmm_ocean ) = ', sum(Interstitial%cmm_ocean ) - write (0,*) 'sum(Interstitial%cnv_dqldt ) = ', sum(Interstitial%cnv_dqldt ) - write (0,*) 'sum(Interstitial%cnv_fice ) = ', sum(Interstitial%cnv_fice ) - write (0,*) 'sum(Interstitial%cnv_mfd ) = ', sum(Interstitial%cnv_mfd ) - write (0,*) 'sum(Interstitial%cnv_ndrop ) = ', sum(Interstitial%cnv_ndrop ) - write (0,*) 'sum(Interstitial%cnv_nice ) = ', sum(Interstitial%cnv_nice ) write (0,*) 'sum(Interstitial%cnvc ) = ', sum(Interstitial%cnvc ) write (0,*) 'sum(Interstitial%cnvw ) = ', sum(Interstitial%cnvw ) write (0,*) 'sum(Interstitial%ctei_r ) = ', sum(Interstitial%ctei_r ) @@ -5739,8 +5732,6 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno) write (0,*) 'sum(Interstitial%plyr ) = ', sum(Interstitial%plyr ) write (0,*) 'sum(Interstitial%prcpmp ) = ', sum(Interstitial%prcpmp ) write (0,*) 'sum(Interstitial%prnum ) = ', sum(Interstitial%prnum ) - write (0,*) 'sum(Interstitial%qicn ) = ', sum(Interstitial%qicn ) - write (0,*) 'sum(Interstitial%qlcn ) = ', sum(Interstitial%qlcn ) write (0,*) 'sum(Interstitial%qlyr ) = ', sum(Interstitial%qlyr ) write (0,*) 'sum(Interstitial%qss ) = ', sum(Interstitial%qss ) write (0,*) 'sum(Interstitial%qss_ice ) = ', sum(Interstitial%qss_ice ) @@ -5812,7 +5803,6 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno) write (0,*) 'sum(Interstitial%vdftra ) = ', sum(Interstitial%vdftra ) write (0,*) 'sum(Interstitial%vegf1d ) = ', sum(Interstitial%vegf1d ) write (0,*) 'sum(Interstitial%vegtype ) = ', sum(Interstitial%vegtype ) - write (0,*) 'sum(Interstitial%w_upi ) = ', sum(Interstitial%w_upi ) write (0,*) 'sum(Interstitial%wcbmax ) = ', sum(Interstitial%wcbmax ) write (0,*) 'sum(Interstitial%weasd_ice ) = ', sum(Interstitial%weasd_ice ) write (0,*) 'sum(Interstitial%weasd_land ) = ', sum(Interstitial%weasd_land ) @@ -5844,6 +5834,16 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno) write (0,*) 'sum(Interstitial%qgl ) = ', sum(Interstitial%qgl ) write (0,*) 'sum(Interstitial%qrn ) = ', sum(Interstitial%qrn ) write (0,*) 'sum(Interstitial%qsnw ) = ', sum(Interstitial%qsnw ) + write (0,*) 'sum(Interstitial%qlcn ) = ', sum(Interstitial%qlcn ) + write (0,*) 'sum(Interstitial%qicn ) = ', sum(Interstitial%qicn ) + write (0,*) 'sum(Interstitial%w_upi ) = ', sum(Interstitial%w_upi ) + write (0,*) 'sum(Interstitial%cf_upi ) = ', sum(Interstitial%cf_upi ) + write (0,*) 'sum(Interstitial%cnv_mfd ) = ', sum(Interstitial%cnv_mfd ) + write (0,*) 'sum(Interstitial%cnv_dqldt) = ', sum(Interstitial%cnv_dqldt ) + write (0,*) 'sum(Interstitial%clcn ) = ', sum(Interstitial%clcn ) + write (0,*) 'sum(Interstitial%cnv_fice ) = ', sum(Interstitial%cnv_fice ) + write (0,*) 'sum(Interstitial%cnv_ndrop) = ', sum(Interstitial%cnv_ndrop ) + write (0,*) 'sum(Interstitial%cnv_nice ) = ', sum(Interstitial%cnv_nice ) end if if (Model%do_shoc) then write (0,*) 'Interstitial_print: values specific to SHOC'