diff --git a/.gitmodules b/.gitmodules index d253f6966..c099b219e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,5 +8,5 @@ branch = master [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = master + url = https://github.com/shansun6/ccpp-physics + branch = name_change_20200527 diff --git a/ccpp/physics b/ccpp/physics index e913eed82..b87620d35 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit e913eed8265f6893afba2405e8dd1db195fe3b83 +Subproject commit b87620d35fd60ba01e6e5ef76d5ba5c07b1fc05b diff --git a/gfsphysics/GFS_layer/GFS_typedefs.F90 b/gfsphysics/GFS_layer/GFS_typedefs.F90 index 4dd8739ed..69fcb5286 100644 --- a/gfsphysics/GFS_layer/GFS_typedefs.F90 +++ b/gfsphysics/GFS_layer/GFS_typedefs.F90 @@ -1626,7 +1626,7 @@ module GFS_typedefs real (kind=kind_phys), pointer :: adjsfculw_land(:) => null() !< real (kind=kind_phys), pointer :: adjsfculw_ice(:) => null() !< - real (kind=kind_phys), pointer :: adjsfculw_ocean(:) => null() !< + real (kind=kind_phys), pointer :: adjsfculw_water(:) => null() !< real (kind=kind_phys), pointer :: adjnirbmd(:) => null() !< real (kind=kind_phys), pointer :: adjnirbmu(:) => null() !< real (kind=kind_phys), pointer :: adjnirdfd(:) => null() !< @@ -1641,15 +1641,15 @@ module GFS_typedefs real (kind=kind_phys), pointer :: cd(:) => null() !< real (kind=kind_phys), pointer :: cd_ice(:) => null() !< real (kind=kind_phys), pointer :: cd_land(:) => null() !< - real (kind=kind_phys), pointer :: cd_ocean(:) => null() !< + real (kind=kind_phys), pointer :: cd_water(:) => null() !< real (kind=kind_phys), pointer :: cdq(:) => null() !< real (kind=kind_phys), pointer :: cdq_ice(:) => null() !< real (kind=kind_phys), pointer :: cdq_land(:) => null() !< - real (kind=kind_phys), pointer :: cdq_ocean(:) => null() !< + real (kind=kind_phys), pointer :: cdq_water(:) => null() !< real (kind=kind_phys), pointer :: cf_upi(:,:) => null() !< real (kind=kind_phys), pointer :: chh_ice(:) => null() !< real (kind=kind_phys), pointer :: chh_land(:) => null() !< - real (kind=kind_phys), pointer :: chh_ocean(:) => null() !< + real (kind=kind_phys), pointer :: chh_water(:) => null() !< real (kind=kind_phys), pointer :: clcn(:,:) => null() !< real (kind=kind_phys), pointer :: cldf(:) => null() !< real (kind=kind_phys), pointer :: cldsa(:,:) => null() !< @@ -1662,7 +1662,7 @@ module GFS_typedefs real (kind=kind_phys), pointer :: clx(:,:) => null() !< real (kind=kind_phys), pointer :: cmm_ice(:) => null() !< real (kind=kind_phys), pointer :: cmm_land(:) => null() !< - real (kind=kind_phys), pointer :: cmm_ocean(:) => null() !< + real (kind=kind_phys), pointer :: cmm_water(:) => null() !< real (kind=kind_phys), pointer :: cndm_surf(:) => null() !< real (kind=kind_phys), pointer :: cnv_dqldt(:,:) => null() !< real (kind=kind_phys), pointer :: cnv_fice(:,:) => null() !< @@ -1701,33 +1701,33 @@ module GFS_typedefs real (kind=kind_phys), pointer :: ep1d(:) => null() !< real (kind=kind_phys), pointer :: ep1d_ice(:) => null() !< real (kind=kind_phys), pointer :: ep1d_land(:) => null() !< - real (kind=kind_phys), pointer :: ep1d_ocean(:) => null() !< + real (kind=kind_phys), pointer :: ep1d_water(:) => null() !< real (kind=kind_phys), pointer :: evap(:) => null() !< real (kind=kind_phys), pointer :: evapq(:) => null() !< real (kind=kind_phys), pointer :: evap_ice(:) => null() !< real (kind=kind_phys), pointer :: evap_land(:) => null() !< - real (kind=kind_phys), pointer :: evap_ocean(:) => null() !< + real (kind=kind_phys), pointer :: evap_water(:) => null() !< real (kind=kind_phys), pointer :: evbs(:) => null() !< real (kind=kind_phys), pointer :: evcw(:) => null() !< real (kind=kind_phys), pointer :: faerlw(:,:,:,:) => null() !< real (kind=kind_phys), pointer :: faersw(:,:,:,:) => null() !< real (kind=kind_phys), pointer :: ffhh_ice(:) => null() !< real (kind=kind_phys), pointer :: ffhh_land(:) => null() !< - real (kind=kind_phys), pointer :: ffhh_ocean(:) => null() !< + real (kind=kind_phys), pointer :: ffhh_water(:) => null() !< real (kind=kind_phys), pointer :: fh2(:) => null() !< real (kind=kind_phys), pointer :: fh2_ice(:) => null() !< real (kind=kind_phys), pointer :: fh2_land(:) => null() !< - real (kind=kind_phys), pointer :: fh2_ocean(:) => null() !< + real (kind=kind_phys), pointer :: fh2_water(:) => null() !< logical, pointer :: flag_cice(:) => null() !< logical, pointer :: flag_guess(:) => null() !< logical, pointer :: flag_iter(:) => null() !< real (kind=kind_phys), pointer :: ffmm_ice(:) => null() !< real (kind=kind_phys), pointer :: ffmm_land(:) => null() !< - real (kind=kind_phys), pointer :: ffmm_ocean(:) => null() !< + real (kind=kind_phys), pointer :: ffmm_water(:) => null() !< real (kind=kind_phys), pointer :: fm10(:) => null() !< real (kind=kind_phys), pointer :: fm10_ice(:) => null() !< real (kind=kind_phys), pointer :: fm10_land(:) => null() !< - real (kind=kind_phys), pointer :: fm10_ocean(:) => null() !< + real (kind=kind_phys), pointer :: fm10_water(:) => null() !< real (kind=kind_phys) :: frain !< real (kind=kind_phys), pointer :: frland(:) => null() !< real (kind=kind_phys), pointer :: fscav(:) => null() !< @@ -1735,7 +1735,7 @@ module GFS_typedefs real (kind=kind_phys), pointer :: gabsbdlw(:) => null() !< real (kind=kind_phys), pointer :: gabsbdlw_ice(:) => null() !< real (kind=kind_phys), pointer :: gabsbdlw_land(:) => null() !< - real (kind=kind_phys), pointer :: gabsbdlw_ocean(:) => null() !< + real (kind=kind_phys), pointer :: gabsbdlw_water(:) => null() !< real (kind=kind_phys), pointer :: gamma(:) => null() !< real (kind=kind_phys), pointer :: gamq(:) => null() !< real (kind=kind_phys), pointer :: gamt(:) => null() !< @@ -1743,7 +1743,7 @@ module GFS_typedefs real (kind=kind_phys), pointer :: gflx(:) => null() !< real (kind=kind_phys), pointer :: gflx_ice(:) => null() !< real (kind=kind_phys), pointer :: gflx_land(:) => null() !< - real (kind=kind_phys), pointer :: gflx_ocean(:) => null() !< + real (kind=kind_phys), pointer :: gflx_water(:) => null() !< real (kind=kind_phys), pointer :: graupelmp(:) => null() !< real (kind=kind_phys), pointer :: gwdcu(:,:) => null() !< real (kind=kind_phys), pointer :: gwdcv(:,:) => null() !< @@ -1755,7 +1755,7 @@ module GFS_typedefs real (kind=kind_phys), pointer :: hflxq(:) => null() !< real (kind=kind_phys), pointer :: hflx_ice(:) => null() !< real (kind=kind_phys), pointer :: hflx_land(:) => null() !< - real (kind=kind_phys), pointer :: hflx_ocean(:) => null() !< + real (kind=kind_phys), pointer :: hflx_water(:) => null() !< !--- radiation variables that need to be carried over from radiation to physics real (kind=kind_phys), pointer :: htlwc(:,:) => null() !< real (kind=kind_phys), pointer :: htlw0(:,:) => null() !< @@ -1832,7 +1832,7 @@ module GFS_typedefs real (kind=kind_phys), pointer :: qss(:) => null() !< real (kind=kind_phys), pointer :: qss_ice(:) => null() !< real (kind=kind_phys), pointer :: qss_land(:) => null() !< - real (kind=kind_phys), pointer :: qss_ocean(:) => null() !< + real (kind=kind_phys), pointer :: qss_water(:) => null() !< logical :: radar_reset !< real (kind=kind_phys) :: raddt !< real (kind=kind_phys), pointer :: rainmp(:) => null() !< @@ -1843,7 +1843,7 @@ module GFS_typedefs real (kind=kind_phys), pointer :: rb(:) => null() !< real (kind=kind_phys), pointer :: rb_ice(:) => null() !< real (kind=kind_phys), pointer :: rb_land(:) => null() !< - real (kind=kind_phys), pointer :: rb_ocean(:) => null() !< + real (kind=kind_phys), pointer :: rb_water(:) => null() !< logical :: reset !< real (kind=kind_phys), pointer :: rhc(:,:) => null() !< real (kind=kind_phys), pointer :: runoff(:) => null() !< @@ -1855,7 +1855,7 @@ module GFS_typedefs type (cmpfsw_type), pointer :: scmpsw(:) => null() !< real (kind=kind_phys), pointer :: semis_ice(:) => null() !< real (kind=kind_phys), pointer :: semis_land(:) => null() !< - real (kind=kind_phys), pointer :: semis_ocean(:) => null() !< + real (kind=kind_phys), pointer :: semis_water(:) => null() !< real (kind=kind_phys), pointer :: sfcalb(:,:) => null() !< real (kind=kind_phys), pointer :: sigma(:) => null() !< real (kind=kind_phys), pointer :: sigmaf(:) => null() !< @@ -1866,7 +1866,7 @@ module GFS_typedefs real (kind=kind_phys), pointer :: snowc(:) => null() !< real (kind=kind_phys), pointer :: snowd_ice(:) => null() !< real (kind=kind_phys), pointer :: snowd_land(:) => null() !< - real (kind=kind_phys), pointer :: snowd_ocean(:) => null() !< + real (kind=kind_phys), pointer :: snowd_water(:) => null() !< real (kind=kind_phys), pointer :: snohf(:) => null() !< real (kind=kind_phys), pointer :: snowmp(:) => null() !< real (kind=kind_phys), pointer :: snowmt(:) => null() !< @@ -1874,7 +1874,7 @@ module GFS_typedefs real (kind=kind_phys), pointer :: stress(:) => null() !< real (kind=kind_phys), pointer :: stress_ice(:) => null() !< real (kind=kind_phys), pointer :: stress_land(:) => null() !< - real (kind=kind_phys), pointer :: stress_ocean(:) => null() !< + real (kind=kind_phys), pointer :: stress_water(:) => null() !< real (kind=kind_phys), pointer :: t2mmp(:) => null() !< real (kind=kind_phys), pointer :: theta(:) => null() !< real (kind=kind_phys), pointer :: tice(:) => null() !< @@ -1882,7 +1882,7 @@ module GFS_typedefs real (kind=kind_phys), pointer :: tlyr(:,:) => null() !< real (kind=kind_phys), pointer :: tprcp_ice(:) => null() !< real (kind=kind_phys), pointer :: tprcp_land(:) => null() !< - real (kind=kind_phys), pointer :: tprcp_ocean(:) => null() !< + real (kind=kind_phys), pointer :: tprcp_water(:) => null() !< integer :: tracers_start_index !< integer :: tracers_total !< integer :: tracers_water !< @@ -1892,23 +1892,23 @@ module GFS_typedefs real (kind=kind_phys), pointer :: tsfa(:) => null() !< real (kind=kind_phys), pointer :: tsfc_ice(:) => null() !< real (kind=kind_phys), pointer :: tsfc_land(:) => null() !< - real (kind=kind_phys), pointer :: tsfc_ocean(:) => null() !< + real (kind=kind_phys), pointer :: tsfc_water(:) => null() !< real (kind=kind_phys), pointer :: tsfg(:) => null() !< real (kind=kind_phys), pointer :: tsnow(:) => null() !< real (kind=kind_phys), pointer :: tsurf(:) => null() !< real (kind=kind_phys), pointer :: tsurf_ice(:) => null() !< real (kind=kind_phys), pointer :: tsurf_land(:) => null() !< - real (kind=kind_phys), pointer :: tsurf_ocean(:) => null() !< + real (kind=kind_phys), pointer :: tsurf_water(:) => null() !< real (kind=kind_phys), pointer :: ud_mf(:,:) => null() !< real (kind=kind_phys), pointer :: uustar_ice(:) => null() !< real (kind=kind_phys), pointer :: uustar_land(:) => null() !< - real (kind=kind_phys), pointer :: uustar_ocean(:) => null() !< + real (kind=kind_phys), pointer :: uustar_water(:) => null() !< real (kind=kind_phys), pointer :: vdftra(:,:,:) => null() !< real (kind=kind_phys), pointer :: vegf1d(:) => null() !< integer, pointer :: vegtype(:) => null() !< real (kind=kind_phys), pointer :: w_upi(:,:) => null() !< real (kind=kind_phys), pointer :: wcbmax(:) => null() !< - real (kind=kind_phys), pointer :: weasd_ocean(:) => null() !< + real (kind=kind_phys), pointer :: weasd_water(:) => null() !< real (kind=kind_phys), pointer :: weasd_land(:) => null() !< real (kind=kind_phys), pointer :: weasd_ice(:) => null() !< real (kind=kind_phys), pointer :: wind(:) => null() !< @@ -1921,7 +1921,7 @@ module GFS_typedefs real (kind=kind_phys), pointer :: z01d(:) => null() !< real (kind=kind_phys), pointer :: zorl_ice(:) => null() !< real (kind=kind_phys), pointer :: zorl_land(:) => null() !< - real (kind=kind_phys), pointer :: zorl_ocean(:) => null() !< + real (kind=kind_phys), pointer :: zorl_water(:) => null() !< real (kind=kind_phys), pointer :: zt1d(:) => null() !< real (kind=kind_phys), pointer :: gw_dudt(:,:) => null() !< real (kind=kind_phys), pointer :: gw_dvdt(:,:) => null() !< @@ -5917,7 +5917,7 @@ subroutine interstitial_create (Interstitial, IM, Model) ! Allocate arrays allocate (Interstitial%adjsfculw_land (IM)) allocate (Interstitial%adjsfculw_ice (IM)) - allocate (Interstitial%adjsfculw_ocean (IM)) + allocate (Interstitial%adjsfculw_water (IM)) allocate (Interstitial%adjnirbmd (IM)) allocate (Interstitial%adjnirbmu (IM)) allocate (Interstitial%adjnirdfd (IM)) @@ -5932,14 +5932,14 @@ subroutine interstitial_create (Interstitial, IM, Model) allocate (Interstitial%cd (IM)) allocate (Interstitial%cd_ice (IM)) allocate (Interstitial%cd_land (IM)) - allocate (Interstitial%cd_ocean (IM)) + allocate (Interstitial%cd_water (IM)) allocate (Interstitial%cdq (IM)) allocate (Interstitial%cdq_ice (IM)) allocate (Interstitial%cdq_land (IM)) - allocate (Interstitial%cdq_ocean (IM)) + allocate (Interstitial%cdq_water (IM)) allocate (Interstitial%chh_ice (IM)) allocate (Interstitial%chh_land (IM)) - allocate (Interstitial%chh_ocean (IM)) + allocate (Interstitial%chh_water (IM)) allocate (Interstitial%cldf (IM)) allocate (Interstitial%cldsa (IM,5)) allocate (Interstitial%cldtaulw (IM,Model%levr+LTP)) @@ -5950,7 +5950,7 @@ subroutine interstitial_create (Interstitial, IM, Model) allocate (Interstitial%clx (IM,4)) allocate (Interstitial%cmm_ice (IM)) allocate (Interstitial%cmm_land (IM)) - allocate (Interstitial%cmm_ocean (IM)) + allocate (Interstitial%cmm_water (IM)) allocate (Interstitial%cnvc (IM,Model%levs)) allocate (Interstitial%cnvw (IM,Model%levs)) allocate (Interstitial%ctei_r (IM)) @@ -5983,40 +5983,40 @@ subroutine interstitial_create (Interstitial, IM, Model) allocate (Interstitial%ep1d (IM)) allocate (Interstitial%ep1d_ice (IM)) allocate (Interstitial%ep1d_land (IM)) - allocate (Interstitial%ep1d_ocean (IM)) + allocate (Interstitial%ep1d_water (IM)) allocate (Interstitial%evap (IM)) allocate (Interstitial%evapq (IM)) allocate (Interstitial%evap_ice (IM)) allocate (Interstitial%evap_land (IM)) - allocate (Interstitial%evap_ocean (IM)) + allocate (Interstitial%evap_water (IM)) allocate (Interstitial%evbs (IM)) allocate (Interstitial%evcw (IM)) allocate (Interstitial%faerlw (IM,Model%levr+LTP,NBDLW,NF_AELW)) allocate (Interstitial%faersw (IM,Model%levr+LTP,NBDSW,NF_AESW)) allocate (Interstitial%ffhh_ice (IM)) allocate (Interstitial%ffhh_land (IM)) - allocate (Interstitial%ffhh_ocean (IM)) + allocate (Interstitial%ffhh_water (IM)) allocate (Interstitial%fh2 (IM)) allocate (Interstitial%fh2_ice (IM)) allocate (Interstitial%fh2_land (IM)) - allocate (Interstitial%fh2_ocean (IM)) + allocate (Interstitial%fh2_water (IM)) allocate (Interstitial%flag_cice (IM)) allocate (Interstitial%flag_guess (IM)) allocate (Interstitial%flag_iter (IM)) allocate (Interstitial%ffmm_ice (IM)) allocate (Interstitial%ffmm_land (IM)) - allocate (Interstitial%ffmm_ocean (IM)) + allocate (Interstitial%ffmm_water (IM)) allocate (Interstitial%fm10 (IM)) allocate (Interstitial%fm10_ice (IM)) allocate (Interstitial%fm10_land (IM)) - allocate (Interstitial%fm10_ocean (IM)) + allocate (Interstitial%fm10_water (IM)) allocate (Interstitial%frland (IM)) allocate (Interstitial%fscav (Interstitial%nscav)) allocate (Interstitial%fswtr (Interstitial%nscav)) allocate (Interstitial%gabsbdlw (IM)) allocate (Interstitial%gabsbdlw_ice (IM)) allocate (Interstitial%gabsbdlw_land (IM)) - allocate (Interstitial%gabsbdlw_ocean (IM)) + allocate (Interstitial%gabsbdlw_water (IM)) allocate (Interstitial%gamma (IM)) allocate (Interstitial%gamq (IM)) allocate (Interstitial%gamt (IM)) @@ -6024,7 +6024,7 @@ subroutine interstitial_create (Interstitial, IM, Model) allocate (Interstitial%gflx (IM)) allocate (Interstitial%gflx_ice (IM)) allocate (Interstitial%gflx_land (IM)) - allocate (Interstitial%gflx_ocean (IM)) + allocate (Interstitial%gflx_water (IM)) allocate (Interstitial%gwdcu (IM,Model%levs)) allocate (Interstitial%gwdcv (IM,Model%levs)) allocate (Interstitial%h2o_pres (levh2o)) @@ -6034,7 +6034,7 @@ subroutine interstitial_create (Interstitial, IM, Model) allocate (Interstitial%hflxq (IM)) allocate (Interstitial%hflx_ice (IM)) allocate (Interstitial%hflx_land (IM)) - allocate (Interstitial%hflx_ocean (IM)) + allocate (Interstitial%hflx_water (IM)) allocate (Interstitial%htlwc (IM,Model%levr+LTP)) allocate (Interstitial%htlw0 (IM,Model%levr+LTP)) allocate (Interstitial%htswc (IM,Model%levr+LTP)) @@ -6066,7 +6066,7 @@ subroutine interstitial_create (Interstitial, IM, Model) allocate (Interstitial%qss (IM)) allocate (Interstitial%qss_ice (IM)) allocate (Interstitial%qss_land (IM)) - allocate (Interstitial%qss_ocean (IM)) + allocate (Interstitial%qss_water (IM)) allocate (Interstitial%raincd (IM)) allocate (Interstitial%raincs (IM)) allocate (Interstitial%rainmcadj (IM)) @@ -6074,7 +6074,7 @@ subroutine interstitial_create (Interstitial, IM, Model) allocate (Interstitial%rb (IM)) allocate (Interstitial%rb_ice (IM)) allocate (Interstitial%rb_land (IM)) - allocate (Interstitial%rb_ocean (IM)) + allocate (Interstitial%rb_water (IM)) allocate (Interstitial%rhc (IM,Model%levs)) allocate (Interstitial%runoff (IM)) allocate (Interstitial%save_q (IM,Model%levs,Model%ntrac)) @@ -6085,7 +6085,7 @@ subroutine interstitial_create (Interstitial, IM, Model) allocate (Interstitial%scmpsw (IM)) allocate (Interstitial%semis_ice (IM)) allocate (Interstitial%semis_land (IM)) - allocate (Interstitial%semis_ocean (IM)) + allocate (Interstitial%semis_water (IM)) allocate (Interstitial%sfcalb (IM,NF_ALBD)) allocate (Interstitial%sigma (IM)) allocate (Interstitial%sigmaf (IM)) @@ -6095,43 +6095,43 @@ subroutine interstitial_create (Interstitial, IM, Model) allocate (Interstitial%snowc (IM)) allocate (Interstitial%snowd_ice (IM)) allocate (Interstitial%snowd_land (IM)) - allocate (Interstitial%snowd_ocean (IM)) + allocate (Interstitial%snowd_water (IM)) allocate (Interstitial%snohf (IM)) allocate (Interstitial%snowmt (IM)) allocate (Interstitial%soiltype (IM)) allocate (Interstitial%stress (IM)) allocate (Interstitial%stress_ice (IM)) allocate (Interstitial%stress_land (IM)) - allocate (Interstitial%stress_ocean (IM)) + allocate (Interstitial%stress_water (IM)) allocate (Interstitial%theta (IM)) allocate (Interstitial%tice (IM)) allocate (Interstitial%tlvl (IM,Model%levr+1+LTP)) allocate (Interstitial%tlyr (IM,Model%levr+LTP)) allocate (Interstitial%tprcp_ice (IM)) allocate (Interstitial%tprcp_land (IM)) - allocate (Interstitial%tprcp_ocean (IM)) + allocate (Interstitial%tprcp_water (IM)) allocate (Interstitial%trans (IM)) allocate (Interstitial%tseal (IM)) allocate (Interstitial%tsfa (IM)) allocate (Interstitial%tsfc_ice (IM)) allocate (Interstitial%tsfc_land (IM)) - allocate (Interstitial%tsfc_ocean (IM)) + allocate (Interstitial%tsfc_water (IM)) allocate (Interstitial%tsfg (IM)) allocate (Interstitial%tsurf (IM)) allocate (Interstitial%tsurf_ice (IM)) allocate (Interstitial%tsurf_land (IM)) - allocate (Interstitial%tsurf_ocean (IM)) + allocate (Interstitial%tsurf_water (IM)) allocate (Interstitial%ud_mf (IM,Model%levs)) allocate (Interstitial%uustar_ice (IM)) allocate (Interstitial%uustar_land (IM)) - allocate (Interstitial%uustar_ocean (IM)) + allocate (Interstitial%uustar_water (IM)) 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%wcbmax (IM)) allocate (Interstitial%weasd_ice (IM)) allocate (Interstitial%weasd_land (IM)) - allocate (Interstitial%weasd_ocean (IM)) + allocate (Interstitial%weasd_water (IM)) allocate (Interstitial%wind (IM)) allocate (Interstitial%work1 (IM)) allocate (Interstitial%work2 (IM)) @@ -6142,7 +6142,7 @@ subroutine interstitial_create (Interstitial, IM, Model) allocate (Interstitial%z01d (IM)) allocate (Interstitial%zorl_ice (IM)) allocate (Interstitial%zorl_land (IM)) - allocate (Interstitial%zorl_ocean (IM)) + allocate (Interstitial%zorl_water (IM)) allocate (Interstitial%zt1d (IM)) ! RRTMGP if (Model%do_RRTMGP) then @@ -6569,7 +6569,7 @@ subroutine interstitial_phys_reset (Interstitial, Model) ! Interstitial%adjsfculw_land = clear_val Interstitial%adjsfculw_ice = clear_val - Interstitial%adjsfculw_ocean = clear_val + Interstitial%adjsfculw_water = clear_val Interstitial%adjnirbmd = clear_val Interstitial%adjnirbmu = clear_val Interstitial%adjnirdfd = clear_val @@ -6582,14 +6582,14 @@ subroutine interstitial_phys_reset (Interstitial, Model) Interstitial%cd = clear_val Interstitial%cd_ice = huge Interstitial%cd_land = huge - Interstitial%cd_ocean = huge + Interstitial%cd_water = huge Interstitial%cdq = clear_val Interstitial%cdq_ice = huge Interstitial%cdq_land = huge - Interstitial%cdq_ocean = huge + Interstitial%cdq_water = huge Interstitial%chh_ice = huge Interstitial%chh_land = huge - Interstitial%chh_ocean = huge + Interstitial%chh_water = huge Interstitial%cld1d = clear_val Interstitial%cldf = clear_val Interstitial%clw = clear_val @@ -6597,7 +6597,7 @@ subroutine interstitial_phys_reset (Interstitial, Model) Interstitial%clx = clear_val Interstitial%cmm_ice = huge Interstitial%cmm_land = huge - Interstitial%cmm_ocean = huge + Interstitial%cmm_water = huge Interstitial%cnvc = clear_val Interstitial%cnvw = clear_val Interstitial%ctei_r = clear_val @@ -6627,45 +6627,45 @@ subroutine interstitial_phys_reset (Interstitial, Model) Interstitial%ep1d = clear_val Interstitial%ep1d_ice = huge Interstitial%ep1d_land = huge - Interstitial%ep1d_ocean = huge + Interstitial%ep1d_water = huge Interstitial%evap = clear_val Interstitial%evapq = clear_val Interstitial%evap_ice = huge Interstitial%evap_land = huge - Interstitial%evap_ocean = huge + Interstitial%evap_water = huge Interstitial%evbs = clear_val Interstitial%evcw = clear_val Interstitial%ffhh_ice = huge Interstitial%ffhh_land = huge - Interstitial%ffhh_ocean = huge + Interstitial%ffhh_water = huge Interstitial%fh2 = clear_val Interstitial%fh2_ice = huge Interstitial%fh2_land = huge - Interstitial%fh2_ocean = huge + Interstitial%fh2_water = huge Interstitial%flag_cice = .false. Interstitial%flag_guess = .false. Interstitial%flag_iter = .true. Interstitial%ffmm_ice = huge Interstitial%ffmm_land = huge - Interstitial%ffmm_ocean = huge + Interstitial%ffmm_water = huge Interstitial%fm10 = clear_val Interstitial%fm10_ice = huge Interstitial%fm10_land = huge - Interstitial%fm10_ocean = huge + Interstitial%fm10_water = huge Interstitial%frland = clear_val Interstitial%fscav = clear_val Interstitial%fswtr = clear_val Interstitial%gabsbdlw = clear_val Interstitial%gabsbdlw_ice = clear_val Interstitial%gabsbdlw_land = clear_val - Interstitial%gabsbdlw_ocean = clear_val + Interstitial%gabsbdlw_water = clear_val Interstitial%gamma = clear_val Interstitial%gamq = clear_val Interstitial%gamt = clear_val Interstitial%gflx = clear_val Interstitial%gflx_ice = clear_val Interstitial%gflx_land = clear_val - Interstitial%gflx_ocean = clear_val + Interstitial%gflx_water = clear_val Interstitial%gwdcu = clear_val Interstitial%gwdcv = clear_val Interstitial%hefac = clear_val @@ -6674,7 +6674,7 @@ subroutine interstitial_phys_reset (Interstitial, Model) Interstitial%hflxq = clear_val Interstitial%hflx_ice = huge Interstitial%hflx_land = huge - Interstitial%hflx_ocean = huge + Interstitial%hflx_water = huge Interstitial%dry = .false. Interstitial%icy = .false. Interstitial%lake = .false. @@ -6694,7 +6694,7 @@ subroutine interstitial_phys_reset (Interstitial, Model) Interstitial%qss = clear_val Interstitial%qss_ice = huge Interstitial%qss_land = huge - Interstitial%qss_ocean = huge + Interstitial%qss_water = huge Interstitial%raincd = clear_val Interstitial%raincs = clear_val Interstitial%rainmcadj = clear_val @@ -6702,7 +6702,7 @@ subroutine interstitial_phys_reset (Interstitial, Model) Interstitial%rb = clear_val Interstitial%rb_ice = huge Interstitial%rb_land = huge - Interstitial%rb_ocean = huge + Interstitial%rb_water = huge Interstitial%rhc = clear_val Interstitial%runoff = clear_val Interstitial%save_q = clear_val @@ -6712,7 +6712,7 @@ subroutine interstitial_phys_reset (Interstitial, Model) Interstitial%sbsno = clear_val Interstitial%semis_ice = clear_val Interstitial%semis_land = clear_val - Interstitial%semis_ocean = clear_val + Interstitial%semis_water = clear_val Interstitial%sigma = clear_val Interstitial%sigmaf = clear_val Interstitial%sigmafrac = clear_val @@ -6721,39 +6721,39 @@ subroutine interstitial_phys_reset (Interstitial, Model) Interstitial%snowc = clear_val Interstitial%snowd_ice = huge Interstitial%snowd_land = huge - Interstitial%snowd_ocean = huge + Interstitial%snowd_water = huge Interstitial%snohf = clear_val Interstitial%snowmt = clear_val Interstitial%soiltype = 0 Interstitial%stress = clear_val Interstitial%stress_ice = huge Interstitial%stress_land = huge - Interstitial%stress_ocean = huge + Interstitial%stress_water = huge Interstitial%theta = clear_val Interstitial%tice = clear_val Interstitial%tprcp_ice = huge Interstitial%tprcp_land = huge - Interstitial%tprcp_ocean = huge + Interstitial%tprcp_water = huge Interstitial%trans = clear_val Interstitial%tseal = clear_val Interstitial%tsfc_ice = huge Interstitial%tsfc_land = huge - Interstitial%tsfc_ocean = huge + Interstitial%tsfc_water = huge Interstitial%tsurf = clear_val Interstitial%tsurf_ice = huge Interstitial%tsurf_land = huge - Interstitial%tsurf_ocean = huge + Interstitial%tsurf_water = huge Interstitial%ud_mf = clear_val Interstitial%uustar_ice = huge Interstitial%uustar_land = huge - Interstitial%uustar_ocean = huge + Interstitial%uustar_water = huge Interstitial%vdftra = clear_val Interstitial%vegf1d = clear_val Interstitial%vegtype = 0 Interstitial%wcbmax = clear_val Interstitial%weasd_ice = huge Interstitial%weasd_land = huge - Interstitial%weasd_ocean = huge + Interstitial%weasd_water = huge Interstitial%wind = huge Interstitial%work1 = clear_val Interstitial%work2 = clear_val @@ -6764,7 +6764,7 @@ subroutine interstitial_phys_reset (Interstitial, Model) Interstitial%z01d = clear_val Interstitial%zorl_ice = huge Interstitial%zorl_land = huge - Interstitial%zorl_ocean = huge + Interstitial%zorl_water = huge Interstitial%zt1d = clear_val ! CIRES UGWP v0 Interstitial%gw_dudt = clear_val @@ -6876,7 +6876,7 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno) write (0,*) 'Interstitial_print: values that change' write (0,*) 'sum(Interstitial%adjsfculw_land ) = ', sum(Interstitial%adjsfculw_land ) write (0,*) 'sum(Interstitial%adjsfculw_ice ) = ', sum(Interstitial%adjsfculw_ice ) - write (0,*) 'sum(Interstitial%adjsfculw_ocean ) = ', sum(Interstitial%adjsfculw_ocean ) + write (0,*) 'sum(Interstitial%adjsfculw_water ) = ', sum(Interstitial%adjsfculw_water ) write (0,*) 'sum(Interstitial%adjnirbmd ) = ', sum(Interstitial%adjnirbmd ) write (0,*) 'sum(Interstitial%adjnirbmu ) = ', sum(Interstitial%adjnirbmu ) write (0,*) 'sum(Interstitial%adjnirdfd ) = ', sum(Interstitial%adjnirdfd ) @@ -6891,14 +6891,14 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno) write (0,*) 'sum(Interstitial%cd ) = ', sum(Interstitial%cd ) write (0,*) 'sum(Interstitial%cd_ice ) = ', sum(Interstitial%cd_ice ) write (0,*) 'sum(Interstitial%cd_land ) = ', sum(Interstitial%cd_land ) - write (0,*) 'sum(Interstitial%cd_ocean ) = ', sum(Interstitial%cd_ocean ) + write (0,*) 'sum(Interstitial%cd_water ) = ', sum(Interstitial%cd_water ) write (0,*) 'sum(Interstitial%cdq ) = ', sum(Interstitial%cdq ) 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%cdq_water ) = ', sum(Interstitial%cdq_water ) 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%chh_water ) = ', sum(Interstitial%chh_water ) write (0,*) 'sum(Interstitial%cldf ) = ', sum(Interstitial%cldf ) write (0,*) 'sum(Interstitial%cldsa ) = ', sum(Interstitial%cldsa ) write (0,*) 'sum(Interstitial%cldtaulw ) = ', sum(Interstitial%cldtaulw ) @@ -6909,7 +6909,7 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno) write (0,*) 'sum(Interstitial%clouds ) = ', sum(Interstitial%clouds ) 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%cmm_water ) = ', sum(Interstitial%cmm_water ) 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 ) @@ -6942,33 +6942,33 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno) write (0,*) 'sum(Interstitial%ep1d ) = ', sum(Interstitial%ep1d ) write (0,*) 'sum(Interstitial%ep1d_ice ) = ', sum(Interstitial%ep1d_ice ) write (0,*) 'sum(Interstitial%ep1d_land ) = ', sum(Interstitial%ep1d_land ) - write (0,*) 'sum(Interstitial%ep1d_ocean ) = ', sum(Interstitial%ep1d_ocean ) + write (0,*) 'sum(Interstitial%ep1d_water ) = ', sum(Interstitial%ep1d_water ) write (0,*) 'sum(Interstitial%evap ) = ', sum(Interstitial%evap ) write (0,*) 'sum(Interstitial%evapq ) = ', sum(Interstitial%evapq ) write (0,*) 'sum(Interstitial%evap_ice ) = ', sum(Interstitial%evap_ice ) write (0,*) 'sum(Interstitial%evap_land ) = ', sum(Interstitial%evap_land ) - write (0,*) 'sum(Interstitial%evap_ocean ) = ', sum(Interstitial%evap_ocean ) + write (0,*) 'sum(Interstitial%evap_water ) = ', sum(Interstitial%evap_water ) write (0,*) 'sum(Interstitial%evbs ) = ', sum(Interstitial%evbs ) write (0,*) 'sum(Interstitial%evcw ) = ', sum(Interstitial%evcw ) write (0,*) 'sum(Interstitial%faerlw ) = ', sum(Interstitial%faerlw ) write (0,*) 'sum(Interstitial%faersw ) = ', sum(Interstitial%faersw ) write (0,*) 'sum(Interstitial%ffhh_ice ) = ', sum(Interstitial%ffhh_ice ) write (0,*) 'sum(Interstitial%ffhh_land ) = ', sum(Interstitial%ffhh_land ) - write (0,*) 'sum(Interstitial%ffhh_ocean ) = ', sum(Interstitial%ffhh_ocean ) + write (0,*) 'sum(Interstitial%ffhh_water ) = ', sum(Interstitial%ffhh_water ) write (0,*) 'sum(Interstitial%fh2 ) = ', sum(Interstitial%fh2 ) write (0,*) 'sum(Interstitial%fh2_ice ) = ', sum(Interstitial%fh2_ice ) write (0,*) 'sum(Interstitial%fh2_land ) = ', sum(Interstitial%fh2_land ) - write (0,*) 'sum(Interstitial%fh2_ocean ) = ', sum(Interstitial%fh2_ocean ) + write (0,*) 'sum(Interstitial%fh2_water ) = ', sum(Interstitial%fh2_water ) write (0,*) 'Interstitial%flag_cice(1) = ', Interstitial%flag_cice(1) write (0,*) 'Interstitial%flag_guess(1) = ', Interstitial%flag_guess(1) write (0,*) 'Interstitial%flag_iter(1) = ', Interstitial%flag_iter(1) write (0,*) 'sum(Interstitial%ffmm_ice ) = ', sum(Interstitial%ffmm_ice ) write (0,*) 'sum(Interstitial%ffmm_land ) = ', sum(Interstitial%ffmm_land ) - write (0,*) 'sum(Interstitial%ffmm_ocean ) = ', sum(Interstitial%ffmm_ocean ) + write (0,*) 'sum(Interstitial%ffmm_water ) = ', sum(Interstitial%ffmm_water ) write (0,*) 'sum(Interstitial%fm10 ) = ', sum(Interstitial%fm10 ) write (0,*) 'sum(Interstitial%fm10_ice ) = ', sum(Interstitial%fm10_ice ) write (0,*) 'sum(Interstitial%fm10_land ) = ', sum(Interstitial%fm10_land ) - write (0,*) 'sum(Interstitial%fm10_ocean ) = ', sum(Interstitial%fm10_ocean ) + write (0,*) 'sum(Interstitial%fm10_water ) = ', sum(Interstitial%fm10_water ) write (0,*) 'Interstitial%frain = ', Interstitial%frain write (0,*) 'sum(Interstitial%frland ) = ', sum(Interstitial%frland ) write (0,*) 'sum(Interstitial%fscav ) = ', sum(Interstitial%fscav ) @@ -6976,7 +6976,7 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno) write (0,*) 'sum(Interstitial%gabsbdlw ) = ', sum(Interstitial%gabsbdlw ) write (0,*) 'sum(Interstitial%gabsbdlw_ice ) = ', sum(Interstitial%gabsbdlw_ice ) write (0,*) 'sum(Interstitial%gabsbdlw_land ) = ', sum(Interstitial%gabsbdlw_land ) - write (0,*) 'sum(Interstitial%gabsbdlw_ocean ) = ', sum(Interstitial%gabsbdlw_ocean ) + write (0,*) 'sum(Interstitial%gabsbdlw_water ) = ', sum(Interstitial%gabsbdlw_water ) write (0,*) 'sum(Interstitial%gamma ) = ', sum(Interstitial%gamma ) write (0,*) 'sum(Interstitial%gamq ) = ', sum(Interstitial%gamq ) write (0,*) 'sum(Interstitial%gamt ) = ', sum(Interstitial%gamt ) @@ -6984,7 +6984,7 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno) write (0,*) 'sum(Interstitial%gflx ) = ', sum(Interstitial%gflx ) write (0,*) 'sum(Interstitial%gflx_ice ) = ', sum(Interstitial%gflx_ice ) write (0,*) 'sum(Interstitial%gflx_land ) = ', sum(Interstitial%gflx_land ) - write (0,*) 'sum(Interstitial%gflx_ocean ) = ', sum(Interstitial%gflx_ocean ) + write (0,*) 'sum(Interstitial%gflx_water ) = ', sum(Interstitial%gflx_water ) write (0,*) 'sum(Interstitial%gwdcu ) = ', sum(Interstitial%gwdcu ) write (0,*) 'sum(Interstitial%gwdcv ) = ', sum(Interstitial%gwdcv ) write (0,*) 'sum(Interstitial%hefac ) = ', sum(Interstitial%hefac ) @@ -6993,7 +6993,7 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno) write (0,*) 'sum(Interstitial%hflxq ) = ', sum(Interstitial%hflxq ) write (0,*) 'sum(Interstitial%hflx_ice ) = ', sum(Interstitial%hflx_ice ) write (0,*) 'sum(Interstitial%hflx_land ) = ', sum(Interstitial%hflx_land ) - write (0,*) 'sum(Interstitial%hflx_ocean ) = ', sum(Interstitial%hflx_ocean ) + write (0,*) 'sum(Interstitial%hflx_water ) = ', sum(Interstitial%hflx_water ) write (0,*) 'sum(Interstitial%htlwc ) = ', sum(Interstitial%htlwc ) write (0,*) 'sum(Interstitial%htlw0 ) = ', sum(Interstitial%htlw0 ) write (0,*) 'sum(Interstitial%htswc ) = ', sum(Interstitial%htswc ) @@ -7028,7 +7028,7 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno) write (0,*) 'sum(Interstitial%qss ) = ', sum(Interstitial%qss ) write (0,*) 'sum(Interstitial%qss_ice ) = ', sum(Interstitial%qss_ice ) write (0,*) 'sum(Interstitial%qss_land ) = ', sum(Interstitial%qss_land ) - write (0,*) 'sum(Interstitial%qss_ocean ) = ', sum(Interstitial%qss_ocean ) + write (0,*) 'sum(Interstitial%qss_water ) = ', sum(Interstitial%qss_water ) write (0,*) 'Interstitial%radar_reset = ', Interstitial%radar_reset write (0,*) 'Interstitial%raddt = ', Interstitial%raddt write (0,*) 'sum(Interstitial%raincd ) = ', sum(Interstitial%raincd ) @@ -7038,7 +7038,7 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno) write (0,*) 'sum(Interstitial%rb ) = ', sum(Interstitial%rb ) write (0,*) 'sum(Interstitial%rb_ice ) = ', sum(Interstitial%rb_ice ) write (0,*) 'sum(Interstitial%rb_land ) = ', sum(Interstitial%rb_land ) - write (0,*) 'sum(Interstitial%rb_ocean ) = ', sum(Interstitial%rb_ocean ) + write (0,*) 'sum(Interstitial%rb_water ) = ', sum(Interstitial%rb_water ) write (0,*) 'Interstitial%reset = ', Interstitial%reset write (0,*) 'sum(Interstitial%rhc ) = ', sum(Interstitial%rhc ) write (0,*) 'sum(Interstitial%runoff ) = ', sum(Interstitial%runoff ) @@ -7055,7 +7055,7 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno) write (0,*) 'sum(Interstitial%scmpsw%visdf ) = ', sum(Interstitial%scmpsw%visdf ) write (0,*) 'sum(Interstitial%semis_ice ) = ', sum(Interstitial%semis_ice ) write (0,*) 'sum(Interstitial%semis_land ) = ', sum(Interstitial%semis_land ) - write (0,*) 'sum(Interstitial%semis_ocean ) = ', sum(Interstitial%semis_ocean ) + write (0,*) 'sum(Interstitial%semis_water ) = ', sum(Interstitial%semis_water ) write (0,*) 'sum(Interstitial%sfcalb ) = ', sum(Interstitial%sfcalb ) write (0,*) 'sum(Interstitial%sigma ) = ', sum(Interstitial%sigma ) write (0,*) 'sum(Interstitial%sigmaf ) = ', sum(Interstitial%sigmaf ) @@ -7065,43 +7065,43 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno) write (0,*) 'sum(Interstitial%snowc ) = ', sum(Interstitial%snowc ) write (0,*) 'sum(Interstitial%snowd_ice ) = ', sum(Interstitial%snowd_ice ) write (0,*) 'sum(Interstitial%snowd_land ) = ', sum(Interstitial%snowd_land ) - write (0,*) 'sum(Interstitial%snowd_ocean ) = ', sum(Interstitial%snowd_ocean ) + write (0,*) 'sum(Interstitial%snowd_water ) = ', sum(Interstitial%snowd_water ) write (0,*) 'sum(Interstitial%snohf ) = ', sum(Interstitial%snohf ) write (0,*) 'sum(Interstitial%snowmt ) = ', sum(Interstitial%snowmt ) write (0,*) 'sum(Interstitial%soiltype ) = ', sum(Interstitial%soiltype ) write (0,*) 'sum(Interstitial%stress ) = ', sum(Interstitial%stress ) write (0,*) 'sum(Interstitial%stress_ice ) = ', sum(Interstitial%stress_ice ) write (0,*) 'sum(Interstitial%stress_land ) = ', sum(Interstitial%stress_land ) - write (0,*) 'sum(Interstitial%stress_ocean ) = ', sum(Interstitial%stress_ocean ) + write (0,*) 'sum(Interstitial%stress_water ) = ', sum(Interstitial%stress_water ) write (0,*) 'sum(Interstitial%theta ) = ', sum(Interstitial%theta ) write (0,*) 'sum(Interstitial%tice ) = ', sum(Interstitial%tice ) write (0,*) 'sum(Interstitial%tlvl ) = ', sum(Interstitial%tlvl ) write (0,*) 'sum(Interstitial%tlyr ) = ', sum(Interstitial%tlyr ) write (0,*) 'sum(Interstitial%tprcp_ice ) = ', sum(Interstitial%tprcp_ice ) write (0,*) 'sum(Interstitial%tprcp_land ) = ', sum(Interstitial%tprcp_land ) - write (0,*) 'sum(Interstitial%tprcp_ocean ) = ', sum(Interstitial%tprcp_ocean ) + write (0,*) 'sum(Interstitial%tprcp_water ) = ', sum(Interstitial%tprcp_water ) write (0,*) 'sum(Interstitial%trans ) = ', sum(Interstitial%trans ) write (0,*) 'sum(Interstitial%tseal ) = ', sum(Interstitial%tseal ) write (0,*) 'sum(Interstitial%tsfa ) = ', sum(Interstitial%tsfa ) write (0,*) 'sum(Interstitial%tsfc_ice ) = ', sum(Interstitial%tsfc_ice ) write (0,*) 'sum(Interstitial%tsfc_land ) = ', sum(Interstitial%tsfc_land ) - write (0,*) 'sum(Interstitial%tsfc_ocean ) = ', sum(Interstitial%tsfc_ocean ) + write (0,*) 'sum(Interstitial%tsfc_water ) = ', sum(Interstitial%tsfc_water ) write (0,*) 'sum(Interstitial%tsfg ) = ', sum(Interstitial%tsfg ) write (0,*) 'sum(Interstitial%tsurf ) = ', sum(Interstitial%tsurf ) write (0,*) 'sum(Interstitial%tsurf_ice ) = ', sum(Interstitial%tsurf_ice ) write (0,*) 'sum(Interstitial%tsurf_land ) = ', sum(Interstitial%tsurf_land ) - write (0,*) 'sum(Interstitial%tsurf_ocean ) = ', sum(Interstitial%tsurf_ocean ) + write (0,*) 'sum(Interstitial%tsurf_water ) = ', sum(Interstitial%tsurf_water ) write (0,*) 'sum(Interstitial%ud_mf ) = ', sum(Interstitial%ud_mf ) write (0,*) 'sum(Interstitial%uustar_ice ) = ', sum(Interstitial%uustar_ice ) write (0,*) 'sum(Interstitial%uustar_land ) = ', sum(Interstitial%uustar_land ) - write (0,*) 'sum(Interstitial%uustar_ocean ) = ', sum(Interstitial%uustar_ocean ) + write (0,*) 'sum(Interstitial%uustar_water ) = ', sum(Interstitial%uustar_water ) 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%wcbmax ) = ', sum(Interstitial%wcbmax ) write (0,*) 'sum(Interstitial%weasd_ice ) = ', sum(Interstitial%weasd_ice ) write (0,*) 'sum(Interstitial%weasd_land ) = ', sum(Interstitial%weasd_land ) - write (0,*) 'sum(Interstitial%weasd_ocean ) = ', sum(Interstitial%weasd_ocean ) + write (0,*) 'sum(Interstitial%weasd_water ) = ', sum(Interstitial%weasd_water ) write (0,*) 'sum(Interstitial%wind ) = ', sum(Interstitial%wind ) write (0,*) 'sum(Interstitial%work1 ) = ', sum(Interstitial%work1 ) write (0,*) 'sum(Interstitial%work2 ) = ', sum(Interstitial%work2 ) @@ -7112,7 +7112,7 @@ subroutine interstitial_print(Interstitial, Model, mpirank, omprank, blkno) write (0,*) 'sum(Interstitial%z01d ) = ', sum(Interstitial%z01d ) write (0,*) 'sum(Interstitial%zorl_ice ) = ', sum(Interstitial%zorl_ice ) write (0,*) 'sum(Interstitial%zorl_land ) = ', sum(Interstitial%zorl_land ) - write (0,*) 'sum(Interstitial%zorl_ocean ) = ', sum(Interstitial%zorl_ocean ) + write (0,*) 'sum(Interstitial%zorl_water ) = ', sum(Interstitial%zorl_water ) write (0,*) 'sum(Interstitial%zt1d ) = ', sum(Interstitial%zt1d ) ! CIRES UGWP v0 write (0,*) 'sum(Interstitial%gw_dudt ) = ', sum(Interstitial%gw_dudt ) diff --git a/gfsphysics/GFS_layer/GFS_typedefs.meta b/gfsphysics/GFS_layer/GFS_typedefs.meta index 8acbc3cbb..bf7b9ceee 100644 --- a/gfsphysics/GFS_layer/GFS_typedefs.meta +++ b/gfsphysics/GFS_layer/GFS_typedefs.meta @@ -514,8 +514,8 @@ type = real kind = kind_phys [zorlo] - standard_name = surface_roughness_length_over_ocean - long_name = surface roughness length over ocean + standard_name = surface_roughness_length_over_water + long_name = surface roughness length over water units = cm dimensions = (horizontal_dimension) type = real @@ -3261,8 +3261,8 @@ type = real kind = kind_phys [betas_deep] - standard_name = downdraft_fraction_reaching_surface_over_ocean_deep_convection - long_name = downdraft fraction reaching surface over ocean for deep convection + standard_name = downdraft_fraction_reaching_surface_over_water_deep_convection + long_name = downdraft fraction reaching surface over water for deep convection units = frac dimensions = () type = real @@ -3397,8 +3397,8 @@ type = real kind = kind_phys [sfc_z0_type] - standard_name = flag_for_surface_roughness_option_over_ocean - long_name = surface roughness options over ocean + standard_name = flag_for_surface_roughness_option_over_water + long_name = surface roughness options over water units = flag dimensions = () type = integer @@ -6055,9 +6055,9 @@ dimensions = (horizontal_dimension,vertical_dimension) type = real kind = kind_phys -[adjsfculw_ocean] - standard_name = surface_upwelling_longwave_flux_over_ocean_interstitial - long_name = surface upwelling longwave flux at current time over ocean (temporary use as interstitial) +[adjsfculw_water] + standard_name = surface_upwelling_longwave_flux_over_water_interstitial + long_name = surface upwelling longwave flux at current time over water (temporary use as interstitial) units = W m-2 dimensions = (horizontal_dimension) type = real @@ -6160,9 +6160,9 @@ dimensions = (horizontal_dimension) type = real kind = kind_phys -[cd_ocean] - standard_name = surface_drag_coefficient_for_momentum_in_air_over_ocean - long_name = surface exchange coeff for momentum over ocean +[cd_water] + standard_name = surface_drag_coefficient_for_momentum_in_air_over_water + long_name = surface exchange coeff for momentum over water units = none dimensions = (horizontal_dimension) type = real @@ -6188,9 +6188,9 @@ dimensions = (horizontal_dimension) type = real kind = kind_phys -[cdq_ocean] - standard_name = surface_drag_coefficient_for_heat_and_moisture_in_air_over_ocean - long_name = surface exchange coeff heat & moisture over ocean +[cdq_water] + standard_name = surface_drag_coefficient_for_heat_and_moisture_in_air_over_water + long_name = surface exchange coeff heat & moisture over water units = none dimensions = (horizontal_dimension) type = real @@ -6209,9 +6209,9 @@ dimensions = (horizontal_dimension) type = real kind = kind_phys -[chh_ocean] - standard_name = surface_drag_mass_flux_for_heat_and_moisture_in_air_over_ocean - long_name = thermal exchange coefficient over ocean +[chh_water] + standard_name = surface_drag_mass_flux_for_heat_and_moisture_in_air_over_water + long_name = thermal exchange coefficient over water units = kg m-2 s-1 dimensions = (horizontal_dimension) type = real @@ -6377,9 +6377,9 @@ dimensions = (horizontal_dimension,4) type = real kind = kind_phys -[cmm_ocean] - standard_name = surface_drag_wind_speed_for_momentum_in_air_over_ocean - long_name = momentum exchange coefficient over ocean +[cmm_water] + standard_name = surface_drag_wind_speed_for_momentum_in_air_over_water + long_name = momentum exchange coefficient over water units = m s-1 dimensions = (horizontal_dimension) type = real @@ -6720,9 +6720,9 @@ dimensions = (horizontal_dimension) type = real kind = kind_phys -[semis_ocean] - standard_name = surface_longwave_emissivity_over_ocean_interstitial - long_name = surface lw emissivity in fraction over ocean (temporary use as interstitial) +[semis_water] + standard_name = surface_longwave_emissivity_over_water_interstitial + long_name = surface lw emissivity in fraction over water (temporary use as interstitial) units = frac dimensions = (horizontal_dimension) type = real @@ -6748,9 +6748,9 @@ dimensions = (horizontal_dimension) type = real kind = kind_phys -[ep1d_ocean] - standard_name = surface_upward_potential_latent_heat_flux_over_ocean - long_name = surface upward potential latent heat flux over ocean +[ep1d_water] + standard_name = surface_upward_potential_latent_heat_flux_over_water + long_name = surface upward potential latent heat flux over water units = W m-2 dimensions = (horizontal_dimension) type = real @@ -6783,9 +6783,9 @@ dimensions = (horizontal_dimension) type = real kind = kind_phys -[evap_ocean] - standard_name = kinematic_surface_upward_latent_heat_flux_over_ocean - long_name = kinematic surface upward latent heat flux over ocean +[evap_water] + standard_name = kinematic_surface_upward_latent_heat_flux_over_water + long_name = kinematic surface upward latent heat flux over water units = kg kg-1 m s-1 dimensions = (horizontal_dimension) type = real @@ -6874,9 +6874,9 @@ dimensions = (horizontal_dimension,adjusted_vertical_layer_dimension_for_radiation,number_of_aerosol_bands_for_shortwave_radiation) type = real kind = kind_phys -[ffhh_ocean] - standard_name = Monin_Obukhov_similarity_function_for_heat_over_ocean - long_name = Monin-Obukhov similarity function for heat over ocean +[ffhh_water] + standard_name = Monin_Obukhov_similarity_function_for_heat_over_water + long_name = Monin-Obukhov similarity function for heat over water units = none dimensions = (horizontal_dimension) type = real @@ -6902,9 +6902,9 @@ dimensions = (horizontal_dimension) type = real kind = kind_phys -[fh2_ocean] - standard_name = Monin_Obukhov_similarity_function_for_heat_at_2m_over_ocean - long_name = Monin-Obukhov similarity parameter for heat at 2m over ocean +[fh2_water] + standard_name = Monin_Obukhov_similarity_function_for_heat_at_2m_over_water + long_name = Monin-Obukhov similarity parameter for heat at 2m over water units = none dimensions = (horizontal_dimension) type = real @@ -6941,9 +6941,9 @@ units = flag dimensions = (horizontal_dimension) type = logical -[ffmm_ocean] - standard_name = Monin_Obukhov_similarity_function_for_momentum_over_ocean - long_name = Monin-Obukhov similarity function for momentum over ocean +[ffmm_water] + standard_name = Monin_Obukhov_similarity_function_for_momentum_over_water + long_name = Monin-Obukhov similarity function for momentum over water units = none dimensions = (horizontal_dimension) type = real @@ -6969,9 +6969,9 @@ dimensions = (horizontal_dimension) type = real kind = kind_phys -[fm10_ocean] - standard_name = Monin_Obukhov_similarity_function_for_momentum_at_10m_over_ocean - long_name = Monin-Obukhov similarity parameter for momentum at 10m over ocean +[fm10_water] + standard_name = Monin_Obukhov_similarity_function_for_momentum_at_10m_over_water + long_name = Monin-Obukhov similarity parameter for momentum at 10m over water units = none dimensions = (horizontal_dimension) type = real @@ -7025,9 +7025,9 @@ dimensions = (horizontal_dimension) type = real kind = kind_phys -[gabsbdlw_ocean] - standard_name = surface_downwelling_longwave_flux_absorbed_by_ground_over_ocean - long_name = total sky surface downward longwave flux absorbed by the ground over ocean +[gabsbdlw_water] + standard_name = surface_downwelling_longwave_flux_absorbed_by_ground_over_water + long_name = total sky surface downward longwave flux absorbed by the ground over water units = W m-2 dimensions = (horizontal_dimension) type = real @@ -7144,9 +7144,9 @@ dimensions = (horizontal_dimension) type = real kind = kind_phys -[gflx_ocean] - standard_name = upward_heat_flux_in_soil_over_ocean - long_name = soil heat flux over ocean +[gflx_water] + standard_name = upward_heat_flux_in_soil_over_water + long_name = soil heat flux over water units = W m-2 dimensions = (horizontal_dimension) type = real @@ -7227,9 +7227,9 @@ dimensions = (horizontal_dimension) type = real kind = kind_phys -[hflx_ocean] - standard_name = kinematic_surface_upward_sensible_heat_flux_over_ocean - long_name = kinematic surface upward sensible heat flux over ocean +[hflx_water] + standard_name = kinematic_surface_upward_sensible_heat_flux_over_water + long_name = kinematic surface upward sensible heat flux over water units = K m s-1 dimensions = (horizontal_dimension) type = real @@ -7706,9 +7706,9 @@ dimensions = (horizontal_dimension) type = real kind = kind_phys -[qss_ocean] - standard_name = surface_specific_humidity_over_ocean - long_name = surface air saturation specific humidity over ocean +[qss_water] + standard_name = surface_specific_humidity_over_water + long_name = surface air saturation specific humidity over water units = kg kg-1 dimensions = (horizontal_dimension) type = real @@ -7782,9 +7782,9 @@ dimensions = (horizontal_dimension) type = real kind = kind_phys -[rb_ocean] - standard_name = bulk_richardson_number_at_lowest_model_level_over_ocean - long_name = bulk Richardson number at the surface over ocean +[rb_water] + standard_name = bulk_richardson_number_at_lowest_model_level_over_water + long_name = bulk Richardson number at the surface over water units = none dimensions = (horizontal_dimension) type = real @@ -7960,9 +7960,9 @@ dimensions = (horizontal_dimension) type = real kind = kind_phys -[snowd_ocean] - standard_name = surface_snow_thickness_water_equivalent_over_ocean - long_name = water equivalent snow depth over ocean +[snowd_water] + standard_name = surface_snow_thickness_water_equivalent_over_water + long_name = water equivalent snow depth over water units = mm dimensions = (horizontal_dimension) type = real @@ -8015,9 +8015,9 @@ dimensions = (horizontal_dimension) type = real kind = kind_phys -[stress_ocean] - standard_name = surface_wind_stress_over_ocean - long_name = surface wind stress over ocean +[stress_water] + standard_name = surface_wind_stress_over_water + long_name = surface wind stress over water units = m2 s-2 dimensions = (horizontal_dimension) type = real @@ -8071,9 +8071,9 @@ dimensions = (horizontal_dimension,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys -[tprcp_ocean] - standard_name = nonnegative_lwe_thickness_of_precipitation_amount_on_dynamics_timestep_over_ocean - long_name = total precipitation amount in each time step over ocean +[tprcp_water] + standard_name = nonnegative_lwe_thickness_of_precipitation_amount_on_dynamics_timestep_over_water + long_name = total precipitation amount in each time step over water units = m dimensions = (horizontal_dimension) type = real @@ -8131,9 +8131,9 @@ dimensions = (horizontal_dimension) type = real kind = kind_phys -[tsfc_ocean] - standard_name = surface_skin_temperature_over_ocean_interstitial - long_name = surface skin temperature over ocean (temporary use as interstitial) +[tsfc_water] + standard_name = surface_skin_temperature_over_water_interstitial + long_name = surface skin temperature over water (temporary use as interstitial) units = K dimensions = (horizontal_dimension) type = real @@ -8166,9 +8166,9 @@ dimensions = (horizontal_dimension) type = real kind = kind_phys -[tsurf_ocean] - standard_name = surface_skin_temperature_after_iteration_over_ocean - long_name = surface skin temperature after iteration over ocean +[tsurf_water] + standard_name = surface_skin_temperature_after_iteration_over_water + long_name = surface skin temperature after iteration over water units = K dimensions = (horizontal_dimension) type = real @@ -8200,9 +8200,9 @@ dimensions = (horizontal_dimension,vertical_dimension) type = real kind = kind_phys -[uustar_ocean] - standard_name = surface_friction_velocity_over_ocean - long_name = surface friction velocity over ocean +[uustar_water] + standard_name = surface_friction_velocity_over_water + long_name = surface friction velocity over water units = m s-1 dimensions = (horizontal_dimension) type = real @@ -8255,9 +8255,9 @@ dimensions = (horizontal_dimension) type = real kind = kind_phys -[weasd_ocean] - standard_name = water_equivalent_accumulated_snow_depth_over_ocean - long_name = water equiv of acc snow depth over ocean +[weasd_water] + standard_name = water_equivalent_accumulated_snow_depth_over_water + long_name = water equiv of acc snow depth over water units = mm dimensions = (horizontal_dimension) type = real @@ -8332,9 +8332,9 @@ dimensions = (horizontal_dimension) type = real kind = kind_phys -[zorl_ocean] - standard_name = surface_roughness_length_over_ocean_interstitial - long_name = surface roughness length over ocean (temporary use as interstitial) +[zorl_water] + standard_name = surface_roughness_length_over_water_interstitial + long_name = surface roughness length over water (temporary use as interstitial) units = cm dimensions = (horizontal_dimension) type = real