From 1e5a6d3af61eae38a6e431d47548e7a33e54893f Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Fri, 7 Feb 2025 10:06:44 -0500 Subject: [PATCH] remove changes not in ufs/dev PR#225 --- .../Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90 | 1 - .../Interstitials/UFS_SCM_NEPTUNE/dcyc2t3.meta | 16 ---------------- physics/Radiation/RRTMG/rrtmg_sw_post.F90 | 6 ++---- physics/Radiation/RRTMG/rrtmg_sw_post.meta | 8 -------- 4 files changed, 2 insertions(+), 29 deletions(-) diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90 index 37557f533..cdd3d8e2b 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90 +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90 @@ -694,7 +694,6 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling, call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%dlwsfci ', Diag%dlwsfci) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%ulwsfci ', Diag%ulwsfci) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%dswsfci ', Diag%dswsfci) - call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%dswsfcci ', Diag%dswsfcci) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%nswsfci ', Diag%nswsfci) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%uswsfci ', Diag%uswsfci) call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%dusfci ', Diag%dusfci) diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/dcyc2t3.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/dcyc2t3.meta index bf6fb1a47..b2187f0c5 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/dcyc2t3.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/dcyc2t3.meta @@ -191,14 +191,6 @@ type = real kind = kind_phys intent = in -[sfcdswc] - standard_name = surface_downwelling_shortwave_flux_on_radiation_timestep_assuming_clear_sky - long_name = clear sky surface downwelling shortwave flux on radiation time step - units = W m-2 - dimensions = (horizontal_loop_extent) - type = real - kind = kind_phys - intent = in [sfcdlw] standard_name = surface_downwelling_longwave_flux_on_radiation_timestep long_name = total sky surface downwelling longwave flux on radiation time step @@ -523,14 +515,6 @@ type = real kind = kind_phys intent = out -[adjsfcdswc] - standard_name = surface_downwelling_shortwave_flux_assuming_clear_sky - long_name = surface downwelling shortwave flux at current time assuming clear sky - units = W m-2 - dimensions = (horizontal_loop_extent) - type = real - kind = kind_phys - intent = out [adjsfcnsw] standard_name = surface_net_downwelling_shortwave_flux long_name = surface net downwelling shortwave flux at current time diff --git a/physics/Radiation/RRTMG/rrtmg_sw_post.F90 b/physics/Radiation/RRTMG/rrtmg_sw_post.F90 index 8fa9494b8..f39cba71c 100644 --- a/physics/Radiation/RRTMG/rrtmg_sw_post.F90 +++ b/physics/Radiation/RRTMG/rrtmg_sw_post.F90 @@ -14,7 +14,7 @@ subroutine rrtmg_sw_post_run (im, levr, levs, ltp, nday, lm, kd, lsswr, & swhtr, sfcalb1, sfcalb2, sfcalb3, sfcalb4, htswc, htsw0, & nirbmdi, nirdfdi, visbmdi, visdfdi, nirbmui, nirdfui, visbmui,& visdfui, sfcdsw, sfcnsw, htrsw, swhc, scmpsw, sfcfsw, topfsw, & - sfcdswc, errmsg, errflg) + errmsg, errflg) use machine, only: kind_phys use module_radsw_parameters, only: topfsw_type, sfcfsw_type, & @@ -33,8 +33,7 @@ subroutine rrtmg_sw_post_run (im, levr, levs, ltp, nday, lm, kd, lsswr, & visbmdi, visdfdi, & nirbmui, nirdfui, & visbmui, visdfui, & - sfcdsw, sfcnsw, & - sfcdswc + sfcdsw, sfcnsw real(kind=kind_phys), dimension(:,:), intent(inout) :: htrsw, swhc type(cmpfsw_type), dimension(:), intent(inout) :: scmpsw @@ -123,7 +122,6 @@ subroutine rrtmg_sw_post_run (im, levr, levs, ltp, nday, lm, kd, lsswr, & do i=1,im sfcnsw(i) = sfcfsw(i)%dnfxc - sfcfsw(i)%upfxc sfcdsw(i) = sfcfsw(i)%dnfxc - sfcdswc(i)= sfcfsw(i)%dnfx0 enddo endif ! end_if_lsswr diff --git a/physics/Radiation/RRTMG/rrtmg_sw_post.meta b/physics/Radiation/RRTMG/rrtmg_sw_post.meta index 0a48b04d7..9914051ce 100644 --- a/physics/Radiation/RRTMG/rrtmg_sw_post.meta +++ b/physics/Radiation/RRTMG/rrtmg_sw_post.meta @@ -198,14 +198,6 @@ type = real kind = kind_phys intent = inout -[sfcdswc] - standard_name = surface_downwelling_shortwave_flux_on_radiation_timestep_assuming_clear_sky - long_name = clear sky sfc downward sw flux - units = W m-2 - dimensions = (horizontal_loop_extent) - type = real - kind = kind_phys - intent = inout [htrsw] standard_name = tendency_of_air_temperature_due_to_shortwave_heating_on_radiation_timestep long_name = total sky sw heating rate