Skip to content

Adding accumulated GHI and fixing registry units for solar diagnostics package #1610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davegill merged 3 commits into from
Dec 24, 2021
Merged

Adding accumulated GHI and fixing registry units for solar diagnostics package #1610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28791e2
Adding accumulated GHI; updating registry units
twjuliano Dec 20, 2021
5c8f4d4
Cleaning and fixing initialization
twjuliano Dec 21, 2021
e8b12d6
Expanding registry names
twjuliano Dec 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Registry/Registry.EM_COMMON
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3226,7 +3226,7 @@ package icedepth_one seaice_thickness_opt==1 - state:icedept
#Time series options for text output
package notseries process_time_series==0 - -
package tseries process_time_series==1 - state:ts_hour,ts_u,ts_v,ts_q,ts_t,ts_psfc,ts_glw,ts_gsw,ts_hfx,ts_lh,ts_tsk,ts_tslb,ts_clw,ts_rainc,ts_rainnc,ts_u_profile,ts_v_profile,ts_gph_profile,ts_th_profile,ts_p_profile,ts_w_profile
package tseries_add_solar process_time_series==2 - state:ts_hour,ts_u,ts_v,ts_q,ts_t,ts_psfc,ts_glw,ts_gsw,ts_hfx,ts_lh,ts_tsk,ts_tslb,ts_clw,ts_rainc,ts_rainnc,ts_u_profile,ts_v_profile,ts_gph_profile,ts_th_profile,ts_cldfrac2d,ts_wvp,ts_lwp,ts_iwp,ts_swp,ts_lwp_tot,ts_iwp_tot,ts_swp_tot,ts_re_qc,ts_re_qi,ts_re_qs,ts_re_qc_tot,ts_re_qi_tot,ts_re_qs_tot,ts_tau_qc,ts_tau_qi,ts_tau_qs,ts_tau_qc_tot,ts_tau_qi_tot,ts_tau_qs_tot,ts_cbaseht,ts_ctopht,ts_cbaseht_tot,ts_ctopht_tot,ts_clrnidx,ts_p_profile,ts_w_profile,ts_swdown,ts_swddni,ts_swddif,ts_swdownc,ts_swddnic,ts_swdown2,ts_swddni2,ts_swddif2,ts_swdownc2,ts_swddnic2
package tseries_add_solar process_time_series==2 - state:ts_hour,ts_u,ts_v,ts_q,ts_t,ts_psfc,ts_glw,ts_gsw,ts_hfx,ts_lh,ts_tsk,ts_tslb,ts_clw,ts_rainc,ts_rainnc,ts_u_profile,ts_v_profile,ts_gph_profile,ts_th_profile,ts_cldfrac2d,ts_wvp,ts_lwp,ts_iwp,ts_swp,ts_lwp_tot,ts_iwp_tot,ts_swp_tot,ts_re_qc,ts_re_qi,ts_re_qs,ts_re_qc_tot,ts_re_qi_tot,ts_re_qs_tot,ts_tau_qc,ts_tau_qi,ts_tau_qs,ts_tau_qc_tot,ts_tau_qi_tot,ts_tau_qs_tot,ts_cbaseht,ts_ctopht,ts_cbaseht_tot,ts_ctopht_tot,ts_clrnidx,ts_p_profile,ts_w_profile,ts_swdown,ts_swddni,ts_swddif,ts_swdownc,ts_swddnic,ts_swdown2,ts_swddni2,ts_swddif2,ts_swdownc2,ts_swddnic2,ts_ghi_accum

# WRF-HAILCAST
state real HAILCAST_DHAIL1 ij misc 1 - r "HAILCAST_DHAIL1" "WRF-HAILCAST Hail Diameter, 1st rank order" "mm"
Expand Down
50 changes: 26 additions & 24 deletions Registry/registry.solar_fields
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
rconfig integer solar_diagnostics namelist,diags 1 0 - "solar diagnostics: 0=no, 1=yes"

# 3-D arrays used for diagnosed quantities
state real qc_tot ikj dyn_em 1 - - "QC_TOT" "CLOUD WATER MIXING RATIO RES + UNRES" "kg kg-1"
state real qi_tot ikj dyn_em 1 - - "QI_TOT" "ICE MIXING RATIO RES + UNRES" "kg kg-1"
state real qc_tot ikj dyn_em 1 - - "QC_TOT" "CLOUD WATER MIXING RATIO RESOLVED + UNRESOLVED" "kg kg-1"
state real qi_tot ikj dyn_em 1 - - "QI_TOT" "ICE MIXING RATIO RESOLVED + UNRESOLVED" "kg kg-1"

# 2-D arrays that will be filled with diagnosed quantities
state real cldfrac2d ij dyn_em 1 - h "CLDFRAC2D" "2-D MAX CLOUD FRACTION" "%"
Expand All @@ -15,25 +15,26 @@ state real lwp ij dyn_em 1 - h "LWP"
state real iwp ij dyn_em 1 - h "IWP" "ICE CLOUD WATER PATH" "kg m-2"
state real swp ij dyn_em 1 - h "SWP" "SNOW CLOUD WATER PATH" "kg m-2"
state real wp_sum ij dyn_em 1 - h "WP_SUM" "SUM OF LWP+IWP+SWP" "kg m-2"
state real lwp_tot ij dyn_em 1 - h "LWP_TOT" "LIQUID CLOUD WATER PATH RES + UNRES" "kg m-2"
state real iwp_tot ij dyn_em 1 - h "IWP_TOT" "ICE CLOUD WATER PATH RES + UNRES" "kg m-2"
state real wp_tot_sum ij dyn_em 1 - h "WP_TOT_SUM" "SUM OF LWP+IWP+SWP RES + UNRES" "kg m-2"
state real lwp_tot ij dyn_em 1 - h "LWP_TOT" "LIQUID CLOUD WATER PATH RESOLVED + UNRESOLVED" "kg m-2"
state real iwp_tot ij dyn_em 1 - h "IWP_TOT" "ICE CLOUD WATER PATH RESOLVED + UNRESOLVED" "kg m-2"
state real wp_tot_sum ij dyn_em 1 - h "WP_TOT_SUM" "SUM OF LWP+IWP+SWP RESOLVED + UNRESOLVED" "kg m-2"
state real re_qc ij dyn_em 1 - h "RE_QC" "MASS-WEIGHTED LIQUID CLOUD EFFECTIVE RADIUS" "m"
state real re_qi ij dyn_em 1 - h "RE_QI" "MASS-WEIGHTED ICE EFFECTIVE RADIUS" "m"
state real re_qs ij dyn_em 1 - h "RE_QS" "MASS-WEIGHTED SNOW EFFECTIVE RADIUS" "m"
state real re_qc_tot ij dyn_em 1 - h "RE_QC_TOT" "MASS-WEIGHTED LIQUID CLOUD EFFECTIVE RADIUS RES + UNRES" "m"
state real re_qi_tot ij dyn_em 1 - h "RE_QI_TOT" "MASS-WEIGHTED ICE EFFECTIVE RADIUS RES + UNRES" "m"
state real re_qc_tot ij dyn_em 1 - h "RE_QC_TOT" "MASS-WEIGHTED LIQUID CLOUD EFFECTIVE RADIUS RESOLVED + UNRESOLVED" "m"
state real re_qi_tot ij dyn_em 1 - h "RE_QI_TOT" "MASS-WEIGHTED ICE EFFECTIVE RADIUS RESOLVED + UNRESOLVED" "m"
state real tau_qc ij dyn_em 1 - h "TAU_QC" "MASS-WEIGHTED LIQUID CLOUD OPTICAL THICKNESS" " "
state real tau_qi ij dyn_em 1 - h "TAU_QI" "MASS-WEIGHTED ICE OPTICAL THICKNESS" " "
state real tau_qs ij dyn_em 1 - h "TAU_QS" "MASS-WEIGHTED SNOW OPTICAL THICKNESS" " "
state real tau_qc_tot ij dyn_em 1 - h "TAU_QC_TOT" "MASS-WEIGHTED LIQUID CLOUD OPTICAL THICKNESS RES + UNRES" " "
state real tau_qi_tot ij dyn_em 1 - h "TAU_QI_TOT" "MASS-WEIGHTED ICE OPTICAL THICKNESS RES + UNRES" " "
state real cbaseht ij dyn_em 1 - h "CBASEHT" "CLOUD BASE HEIGHT" "m"
state real ctopht ij dyn_em 1 - h "CTOPHT" "CLOUD TOP HEIGHT" "m"
state real cbaseht_tot ij dyn_em 1 - h "CBASEHT_TOT" "CLOUD BASE HEIGHT RES + UNRES" "m"
state real ctopht_tot ij dyn_em 1 - h "CTOPHT_TOT" "CLOUD TOP HEIGHT RES + UNRES" "m"
state real tau_qc_tot ij dyn_em 1 - h "TAU_QC_TOT" "MASS-WEIGHTED LIQUID CLOUD OPTICAL THICKNESS RESOLVED + UNRESOLVED" " "
state real tau_qi_tot ij dyn_em 1 - h "TAU_QI_TOT" "MASS-WEIGHTED ICE OPTICAL THICKNESS RESOLVED + UNRESOLVED" " "
state real cbaseht ij dyn_em 1 - h "CBASEHT" "CLOUD BASE HEIGHT" "m agl"
state real ctopht ij dyn_em 1 - h "CTOPHT" "CLOUD TOP HEIGHT" "m agl"
state real cbaseht_tot ij dyn_em 1 - h "CBASEHT_TOT" "CLOUD BASE HEIGHT RESOLVED + UNRESOLVED" "m agl"
state real ctopht_tot ij dyn_em 1 - h "CTOPHT_TOT" "CLOUD TOP HEIGHT RESOLVED + UNRESOLVED" "m agl"
state real clrnidx ij dyn_em 1 - h "CLRNIDX" "CLEARNESS INDEX" " "
state real sza ij dyn_em 1 - h "SZA" "SOLAR ZENITH ANGLE" "deg"
state real sza ij dyn_em 1 - h "SZA" "SOLAR ZENITH ANGLE" "deg"
state real ghi_accum ij dyn_em 1 - h "GHI_ACCUM" "ACCUMULATED GHI" "J m-2"

# Time series variables
state real ts_cldfrac2d ?! misc - - - "TS_CLDFRAC2D" "2-D MAX CLOUD FRACTION"
Expand All @@ -42,25 +43,26 @@ state real ts_lwp ?! misc - - - "TS_L
state real ts_iwp ?! misc - - - "TS_IWP" "ICE CLOUD WATER PATH"
state real ts_swp ?! misc - - - "TS_SWP" "SNOW CLOUD WATER PATH"
state real ts_wp_sum ?! misc - - - "TS_WP_SUM" "SUM OF LWP+IWP+SWP"
state real ts_lwp_tot ?! misc - - - "TS_LWP_TOT" "LIQUID CLOUD WATER PATH RES + UNRES"
state real ts_iwp_tot ?! misc - - - "TS_IWP_TOT" "ICE CLOUD WATER PATH RES + UNRES"
state real ts_wp_tot_sum ?! misc - - - "TS_WP_TOT_SUM" "SUM OF LWP+IWP+SWP RES + UNRES"
state real ts_lwp_tot ?! misc - - - "TS_LWP_TOT" "LIQUID CLOUD WATER PATH RESOLVED + UNRESOLVED"
state real ts_iwp_tot ?! misc - - - "TS_IWP_TOT" "ICE CLOUD WATER PATH RESOLVED + UNRESOLVED"
state real ts_wp_tot_sum ?! misc - - - "TS_WP_TOT_SUM" "SUM OF LWP+IWP+SWP RESOLVED + UNRESOLVED"
state real ts_re_qc ?! misc - - - "TS_RE_QC" "MASS-WEIGHTED LIQUID CLOUD EFFECTIVE RADIUS"
state real ts_re_qi ?! misc - - - "TS_RE_QI" "MASS-WEIGHTED ICE EFFECTIVE RADIUS"
state real ts_re_qs ?! misc - - - "TS_RE_QS" "MASS-WEIGHTED SNOW EFFECTIVE RADIUS"
state real ts_re_qc_tot ?! misc - - - "TS_RE_QC_TOT" "MASS-WEIGHTED LIQUID CLOUD EFFECTIVE RADIUS RES + UNRES"
state real ts_re_qi_tot ?! misc - - - "TS_RE_QI_TOT" "MASS-WEIGHTED ICE EFFECTIVE RADIUS RES + UNRES"
state real ts_re_qc_tot ?! misc - - - "TS_RE_QC_TOT" "MASS-WEIGHTED LIQUID CLOUD EFFECTIVE RADIUS RESOLVED + UNRESOLVED"
state real ts_re_qi_tot ?! misc - - - "TS_RE_QI_TOT" "MASS-WEIGHTED ICE EFFECTIVE RADIUS RESOLVED + UNRESOLVED"
state real ts_tau_qc ?! misc - - - "TS_TAU_QC" "MASS-WEIGHTED LIQUID CLOUD OPTICAL THICKNESS"
state real ts_tau_qi ?! misc - - - "TS_TAU_QI" "MASS-WEIGHTED ICE OPTICAL THICKNESS"
state real ts_tau_qs ?! misc - - - "TS_TAU_QS" "MASS-WEIGHTED SNOW OPTICAL THICKNESS"
state real ts_tau_qc_tot ?! misc - - - "TS_TAU_QC_TOT" "MASS-WEIGHTED LIQUID CLOUD OPTICAL THICKNESS RES + UNRES"
state real ts_tau_qi_tot ?! misc - - - "TS_TAU_QI_TOT" "MASS-WEIGHTED ICE OPTICAL THICKNESS RES + UNRES"
state real ts_tau_qc_tot ?! misc - - - "TS_TAU_QC_TOT" "MASS-WEIGHTED LIQUID CLOUD OPTICAL THICKNESS RESOLVED + UNRESOLVED"
state real ts_tau_qi_tot ?! misc - - - "TS_TAU_QI_TOT" "MASS-WEIGHTED ICE OPTICAL THICKNESS RESOLVED + UNRESOLVED"
state real ts_cbaseht ?! misc - - - "TS_CBASEHT" "CLOUD BASE HEIGHT"
state real ts_ctopht ?! misc - - - "TS_CTOPHT" "CLOUD TOP HEIGHT"
state real ts_cbaseht_tot ?! misc - - - "TS_CBASEHT_TOT" "CLOUD BASE HEIGHT RES + UNRES"
state real ts_ctopht_tot ?! misc - - - "TS_CTOPHT_TOT" "CLOUD TOP HEIGHT RES + UNRES"
state real ts_cbaseht_tot ?! misc - - - "TS_CBASEHT_TOT" "CLOUD BASE HEIGHT RESOLVED + UNRESOLVED"
state real ts_ctopht_tot ?! misc - - - "TS_CTOPHT_TOT" "CLOUD TOP HEIGHT RESOLVED + UNRESOLVED"
state real ts_clrnidx ?! misc - - - "TS_CLRNIDX" "CLEARNESS INDEX"
state real ts_sza ?! misc - - - "TS_SZA" "SOLAR ZENITH ANGLE"
state real ts_ghi_accum ?! misc - - - "TS_GHI_ACCUM" "ACCUMULATED GHI"
state real ts_swdown ?! misc - - - "TS_SWDOWN" "DOWNWARD SHORT WAVE FLUX AT GROUND SURFACE"
state real ts_swddni ?! misc - - - "TS_SWDDNI" "SHORTWAVE SURFACE DOWNWARD DIRECT NORMAL IRRADIANCE"
state real ts_swddif ?! misc - - - "TS_SWDDIF" "SHORTWAVE SURFACE DOWNWARD DIFFUSE IRRADIANCE"
Expand All @@ -75,4 +77,4 @@ state real ts_swddnic2 ?! misc - - - "TS_S
# Package declarations

package skip_solar_output solar_diagnostics==0 - -
package do_solar_output solar_diagnostics==1 - state:cldfrac2d,wvp,lwp,iwp,swp,wp_sum,lwp_tot,iwp_tot,wp_tot_sum,re_qc,re_qi,re_qs,re_qc_tot,re_qi_tot,tau_qc,tau_qi,tau_qs,tau_qc_tot,tau_qi_tot,cbaseht,ctopht,cbaseht_tot,ctopht_tot,clrnidx,sza
package do_solar_output solar_diagnostics==1 - state:cldfrac2d,wvp,lwp,iwp,swp,wp_sum,lwp_tot,iwp_tot,wp_tot_sum,re_qc,re_qi,re_qs,re_qc_tot,re_qi_tot,tau_qc,tau_qi,tau_qs,tau_qc_tot,tau_qi_tot,cbaseht,ctopht,cbaseht_tot,ctopht_tot,clrnidx,sza,ghi_accum
1 change: 1 addition & 0 deletions dyn_em/start_em.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,6 +1255,7 @@ SUBROUTINE start_domain_em ( grid, allowed_to_read &
,grid%ccn_conc & ! RAS
,grid%QKE &!JOE-for mynn
,grid%pep_pbl & ! EEPS
,grid%ghi_accum & ! Solar diagnostics
,grid%landusef,grid%landusef2,grid%mosaic_cat_index & ! danli mosaic
,grid%TSK_mosaic,grid%TSLB_mosaic,grid%SMOIS_mosaic,grid%SH2O_mosaic & ! danli mosaic
,grid%CANWAT_mosaic,grid%SNOW_mosaic,grid%SNOWH_mosaic,grid%SNOWC_mosaic & ! danli mosaic
Expand Down
9 changes: 7 additions & 2 deletions phys/module_diag_solar.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ MODULE module_diag_solar
! !
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

SUBROUTINE solar_diag (rho, dz8w, ph, phb, cldfrac3d, coszen, swdnb, swdnt, &
SUBROUTINE solar_diag (dt, rho, dz8w, ph, phb, cldfrac3d, coszen, swdnb, swdnt, &
param_first_scalar, p_qc, p_qi, p_qs, qv, qc, qi, qs, &
qc_tot, qi_tot, has_reqc, has_reqi, has_reqs, f_qv, f_qc, f_qi, f_qs, &
re_cloud, re_ice, re_snow, clrnidx, sza, cldfrac2d, wvp2d, lwp2d, iwp2d, swp2d, &
re_cloud, re_ice, re_snow, clrnidx, sza, ghi_accum, cldfrac2d, wvp2d, lwp2d, iwp2d, swp2d, &
wp2d_sum, lwp2d_tot, iwp2d_tot, wp2d_tot_sum, re_cloud_path, re_ice_path, re_snow_path, &
re_cloud_path_tot, re_ice_path_tot, tau_qc, tau_qi, tau_qs, tau_qc_tot, tau_qi_tot, &
cbase, ctop, cbase_tot, ctop_tot, ids, ide, jds, jde, kds, kde, ims, ime, jms, jme, &
Expand All @@ -43,6 +43,7 @@ SUBROUTINE solar_diag (rho, dz8w, ph, phb, cldfrac3d, coszen, swdnb, swdnt, &

IMPLICIT NONE

REAL, INTENT(IN) :: dt
REAL, DIMENSION(ims:ime, jms:jme), INTENT(IN) :: coszen, swdnb, swdnt
REAL, DIMENSION(ims:ime, kms:kme, jms:jme), INTENT(IN) :: ph, phb, cldfrac3d, qv, qc, qi, qs, qc_tot, qi_tot, &
re_cloud, re_ice, re_snow, rho, dz8w
Expand All @@ -51,6 +52,7 @@ SUBROUTINE solar_diag (rho, dz8w, ph, phb, cldfrac3d, coszen, swdnb, swdnt, &
REAL, DIMENSION(ims:ime, jms:jme), INTENT(OUT) :: clrnidx, sza, cldfrac2d, wvp2d, lwp2d, iwp2d, swp2d, wp2d_sum, &
lwp2d_tot, iwp2d_tot, wp2d_tot_sum, re_cloud_path, re_ice_path, re_snow_path, re_cloud_path_tot, re_ice_path_tot, &
tau_qc, tau_qi, tau_qs, tau_qc_tot, tau_qi_tot, cbase, ctop, cbase_tot, ctop_tot
REAL, DIMENSION(ims:ime, jms:jme), INTENT(INOUT) :: ghi_accum
INTEGER, INTENT(IN) :: ids, ide, jds, jde, kds, kde, ims, ime, jms, jme, kms, kme, &
ips, ipe, jps, jpe, kps, kpe, kts, kte, num_tiles
INTEGER, DIMENSION(num_tiles), INTENT(IN) :: i_start, i_end, j_start, j_end
Expand Down Expand Up @@ -88,6 +90,9 @@ SUBROUTINE solar_diag (rho, dz8w, ph, phb, cldfrac3d, coszen, swdnb, swdnt, &
clrnidx(i, j) = MISSING
end if

!!! ACCUMULATED GHI
ghi_accum(i, j) = ghi_accum(i, j) + swdnb(i, j) * dt

!!! 2-D CLOUD FRACTION
cldfrac2d(i, j) = MAXVAL( cldfrac3d(i, kts:kte-1, j) )

Expand Down
7 changes: 4 additions & 3 deletions phys/module_diagnostics_driver.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ SUBROUTINE diagnostics_driver ( grid, config_flags, &
model_config_rec

USE module_streams
USE module_utility, ONLY : WRFU_Time
USE module_utility, ONLY : WRFU_Time

!=============================================================
! USE Association for the Diagnostic Packages
Expand Down Expand Up @@ -1094,7 +1094,8 @@ SUBROUTINE diagnostics_driver ( grid, config_flags, &

SOLAR_FIELDS: IF (config_flags%solar_diagnostics == do_solar_output) THEN
CALL wrf_debug (100 , '--> CALL DIAGNOSTICS PACKAGE: SOLAR_DIAG')
CALL solar_diag ( &

CALL solar_diag (dt=grid%dt, &
rho=grid%rho, dz8w=dz8w, ph=grid%ph_2, phb=grid%phb, &
cldfrac3d=grid%cldfra, coszen=grid%coszen, swdnb=grid%swdnb, &
swdnt=grid%swdnt, param_first_scalar=param_first_scalar, &
Expand All @@ -1116,7 +1117,7 @@ SUBROUTINE diagnostics_driver ( grid, config_flags, &
tau_qc_tot=grid%tau_qc_tot, tau_qi_tot=grid%tau_qi_tot, &
cbase=grid%cbaseht, ctop=grid%ctopht, &
cbase_tot=grid%cbaseht_tot, ctop_tot=grid%ctopht_tot, &
clrnidx=grid%clrnidx, sza=grid%sza, &
clrnidx=grid%clrnidx, sza=grid%sza, ghi_accum=grid%ghi_accum, &
ids=ids, ide=ide, jds=jds, jde=jde, kds=kds, kde=kde, &
ims=ims, ime=ime, jms=jms, jme=jme, kms=kms, kme=kme, &
ips=ips, ipe=ipe, jps=jps, jpe=jpe, kps=kps, kpe=kpe, &
Expand Down
Loading