Skip to content

Commit

Permalink
Merge pull request NCAR#217 from grantfirl/fix_surface_init
Browse files Browse the repository at this point in the history
Update initialization of surface related variables
  • Loading branch information
grantfirl authored Dec 8, 2020
2 parents e23d18e + da420db commit 083dd4b
Show file tree
Hide file tree
Showing 15 changed files with 2,589 additions and 1,221 deletions.
4 changes: 4 additions & 0 deletions ccpp/config/ccpp_prebuild_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
'scm/src/gmtb_scm_kinds.F90',
'scm/src/gmtb_scm_type_defs.F90',
'scm/src/gmtb_scm_physical_constants.F90',
'scm/src/gmtb_scm_utils.F90', #no definitions, but gmtb_scm_type_defs.F90 uses a module from this file
'ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90',
'ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90',
'ccpp/physics/physics/rte-rrtmgp/rte/mo_optical_props.F90',
Expand Down Expand Up @@ -110,6 +111,8 @@
# 'ccpp/physics/physics/bl_acm.F90' ,
'ccpp/physics/physics/cires_ugwp.F90' ,
'ccpp/physics/physics/cires_ugwp_post.F90' ,
'ccpp/physics/physics/unified_ugwp.F90' ,
'ccpp/physics/physics/unified_ugwp_post.F90' ,
'ccpp/physics/physics/cnvc90.f' ,
'ccpp/physics/physics/cs_conv.F90' ,
'ccpp/physics/physics/cs_conv_aw_adj.F90' ,
Expand Down Expand Up @@ -155,6 +158,7 @@
'ccpp/physics/physics/ozphys_2015.f' ,
'ccpp/physics/physics/precpd.f' ,
'ccpp/physics/physics/phys_tend.F90' ,
'ccpp/physics/physics/tracer_sanitizer.F90' ,
'ccpp/physics/physics/radlw_main.F90' ,
'ccpp/physics/physics/radsw_main.F90' ,
'ccpp/physics/physics/rascnv.F90' ,
Expand Down
2 changes: 1 addition & 1 deletion ccpp/framework
Submodule framework updated 1 files
+58 −61 scripts/mkstatic.py
2 changes: 1 addition & 1 deletion ccpp/physics
1,014 changes: 733 additions & 281 deletions scm/etc/scripts/UFS_IC_generator.py

Large diffs are not rendered by default.

57 changes: 57 additions & 0 deletions scm/etc/scripts/plot_configs/arm_sgp_summer_1997_A_all_suites.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
gmtb_scm_datasets = output_arm_sgp_summer_1997_A_SCM_GFS_v15p2/output.nc, output_arm_sgp_summer_1997_A_SCM_GFS_v16beta/output.nc, output_arm_sgp_summer_1997_A_SCM_csawmg/output.nc, output_arm_sgp_summer_1997_A_SCM_GSD_v1/output.nc,
gmtb_scm_datasets_labels = GFSv15p2, GFSv16beta, csawmg, GSDv1
plot_dir = plots_arm_sgp_summer_1997_A/
obs_file = ../data/raw_case_input/sgp3hIOPsndgBasedV2.0_ConstrVarAnaX1.c1.19970618.000000.cdf
obs_compare = True
plot_ind_datasets = False
time_series_resample = True

[time_slices]
[[A]]
start = 1997, 6, 26, 23
end = 1997, 6, 30, 23

[time_snapshots]

[plots]
[[profiles_mean]]
vars = qc, qv, T, dT_dt_PBL, dT_dt_conv, dT_dt_micro, dT_dt_lwrad, dT_dt_swrad
vars_labels = 'cloud water mixing ratio ($g$ $kg^{-1}$)', 'specific humidity ($g$ $kg^{-1}$)', 'T (K)', 'PBL tendency (K/day)', 'conv. tendency (K/day)', 'microphysics tendency (K/day)', 'LW tendency (K/day)', 'SW tendency (K/day)'
vert_axis = pres_l
vert_axis_label = 'average pressure (Pa)'
y_inverted = True
y_log = False
y_min_option = min #min, max, val (if val, add y_min = float value)
y_max_option = max #min, max, val (if val, add y_max = float value)
conversion_factor = 1000.0, 1000.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0

[[profiles_mean_multi]]
[[[T_forcing]]]
vars = T_force_tend, dT_dt_PBL, dT_dt_conv, dT_dt_micro, dT_dt_lwrad, dT_dt_swrad
vars_labels = 'force', 'PBL', 'Conv', 'MP', 'LW', 'SW'
x_label = 'K/day'
[[[conv_tendencies]]]
vars = dT_dt_deepconv, dT_dt_shalconv
vars_labels = 'deep', 'shallow'
x_label = 'K/day'

[[profiles_instant]]

[[time_series]]
vars = 'pres_s','lhf','shf','rain'
vars_labels = 'surface pressure (Pa)','latent heat flux ($W$ $m^{-2}$)','sensible heat flux ($W$ $m^{-2}$)','surface rainfall rate ($mm$ $hr{-1}$)'

[[contours]]
vars = qv,
vars_labels = 'Water Vapor ($g$ $kg^{-1}$)',
vert_axis = pres_l
vert_axis_label = 'p (Pa)'
y_inverted = True
y_log = False
y_min_option = val #min, max, val (if val, add y_min = float value)
y_min = 10000.0
y_max_option = val #min, max, val (if val, add y_max = float value)
y_max = 100000.0
x_ticks_num = 10
y_ticks_num = 10
conversion_factor = 1000.0,

This file was deleted.

Loading

0 comments on commit 083dd4b

Please sign in to comment.