Skip to content
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.

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

[develop] Use uwtools instead of set_namelist #1054

Merged
Merged
Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
5a9d7a2
Draft replacements in scripts.
christinaholtNOAA Dec 5, 2023
d135c68
Replace calls to set_namelist with uw CLI.
christinaholtNOAA Dec 5, 2023
c4eef3a
WIP
christinaholtNOAA Dec 8, 2023
538c24d
WIP
christinaholtNOAA Dec 8, 2023
819a48d
WIP
christinaholtNOAA Dec 8, 2023
ae106a7
Fix a typo.
christinaholtNOAA Dec 13, 2023
e84f6e2
Merge branch 'develop' into replace_set_namelist
christinaholtNOAA Jan 12, 2024
afe40d2
[develop] Add -n 1 to allow the use of the service partition
MichaelLueken Feb 8, 2024
870b315
Updating and linting.
christinaholtNOAA Feb 8, 2024
8140361
Renaming for PEP8 standard.
christinaholtNOAA Feb 8, 2024
5d314a4
Linting.
christinaholtNOAA Feb 8, 2024
46980b4
Linted.
christinaholtNOAA Feb 8, 2024
f25b5bc
WIP
christinaholtNOAA Feb 8, 2024
2a11275
WIP
christinaholtNOAA Feb 8, 2024
8e1f08c
Merge remote-tracking branch 'origin/develop' into replace_set_namelist
christinaholtNOAA Feb 8, 2024
92010a3
[develop] Add native entry in aqm_prep.yaml for nexus_gfs_sfc
MichaelLueken Feb 8, 2024
a01d2fa
Merge remote-tracking branch 'leuken/bugfix/service_update' into repl…
christinaholtNOAA Feb 8, 2024
6dc364f
hanges for new version and linted ush
christinaholtNOAA Feb 27, 2024
0629b92
Merge branch 'develop' into replace_set_namelist
christinaholtNOAA Feb 27, 2024
1d431e9
WIP
christinaholtNOAA Mar 6, 2024
b7c9bf3
Update CLI args for new uwtools version
christinaholtNOAA Mar 11, 2024
c166a77
Update uwtools version
christinaholtNOAA Mar 12, 2024
ca2a268
Add new linted ush files
christinaholtNOAA Mar 12, 2024
8eedbd2
Remove debugging additions.
christinaholtNOAA Mar 12, 2024
d379eed
Fixing some doc strings in additional linted file.
christinaholtNOAA Mar 12, 2024
aa38beb
Linting tests.
christinaholtNOAA Mar 12, 2024
b866c68
Missed the updated name calls.
christinaholtNOAA Mar 12, 2024
67d827f
Fix unlinted tests and make them pass.
christinaholtNOAA Mar 12, 2024
ea605c0
Changes from Mike K's PR comments.
christinaholtNOAA Mar 14, 2024
1d6cd86
Use stdin instead of temporary files.
christinaholtNOAA Mar 14, 2024
6256f1d
Fixing accidental revert to /bin/bash
christinaholtNOAA Mar 18, 2024
f18f801
Merge branch 'develop' into replace_set_namelist
christinaholtNOAA Mar 18, 2024
6c020cf
[replace_set_namelist] Update Hera spack-stack locations to use Rocky8
MichaelLueken Mar 19, 2024
327de17
Merge pull request #3 from MichaelLueken/replace_set_namelist
christinaholtNOAA Mar 19, 2024
1b12beb
Fix issue with stochastic nml settings.
christinaholtNOAA Mar 19, 2024
ac6fe2d
Update test and lint.
christinaholtNOAA Mar 19, 2024
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: 2 additions & 0 deletions .github/workflows/python_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ jobs:
pylint --ignore-imports=yes tests/test_python/
pylint ush/create_*.py
pylint ush/generate_FV3LAM_wflow.py
pylint ush/set_fv3nml*.py
pylint ush/update_input_nml.py

- name: Run python unittests
run: |
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ channels:
dependencies:
- pylint=2.17*
- pytest=7.2*
- uwtools=1.0.0
- uwtools=2.1*
149 changes: 72 additions & 77 deletions parm/FV3.input.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@
# parm/input.nml.FV3
#
# to obtain the namelist for each physics suite that the SRW App can
# run with. To build a namelist for one of these configurations, use
# the Python helper script
#
# ush/set_namelist.py
#
# and provide this file and the desired section via the -c option.
# run with.


FV3_RRFS_v1beta:
Expand Down Expand Up @@ -83,11 +78,11 @@ FV3_HRRR:
<<: *RRFS_v1beta_phys
cdmbgwd: [3.5, 1.0]
do_mynnsfclay: True
do_sfcperts: !!python/none
do_sfcperts: null
gwd_opt: 3
do_gsl_drag_ss: True
do_gsl_drag_tofd: True
do_gsl_drag_ls_bl: True
do_gsl_drag_ls_bl: True
iaer: 5111
icliq_sw: 2
iovr: 3
Expand All @@ -102,8 +97,8 @@ FV3_HRRR:
mosaic_lu: 0
mosaic_soil: 0
thsfc_loc: False
nst_anl:
nstf_name:
nst_anl: null
nstf_name: null

FV3_RAP:
fv_core_nml:
Expand All @@ -112,7 +107,7 @@ FV3_RAP:
<<: *RRFS_v1beta_phys
cdmbgwd: [3.5, 1.0]
do_mynnsfclay: True
do_sfcperts: !!python/none
do_sfcperts: null
gwd_opt: 3
do_gsl_drag_ss: True
do_gsl_drag_tofd: True
Expand Down Expand Up @@ -140,40 +135,40 @@ FV3_GFS_2017_gfdlmp:
k_split: 6
n_split: 6
nord: 2
nord_zs_filter: !!python/none
nord_zs_filter: null
range_warn: False
vtdm4: 0.075
gfs_physics_nml: &gfs_2017_gfdlmp_phys
avg_max_length: 3600.0
bl_mynn_tkeadvect: !!python/none
bl_mynn_edmf: !!python/none
bl_mynn_edmf_mom: !!python/none
bl_mynn_tkeadvect: null
bl_mynn_edmf: null
bl_mynn_edmf_mom: null
cdmbgwd: [3.5, 0.01]
cplflx: !!python/none
cplflx: null
do_deep: False
do_mynnedmf: !!python/none
do_mynnsfclay: !!python/none
do_mynnedmf: null
do_mynnsfclay: null
fhcyc: 0.0
fhlwr: 3600.0
fhswr: 3600.0
hybedmf: True
icloud_bl: !!python/none
icloud_bl: null
imfdeepcnv: 2
imfshalcnv: 2
imp_physics: 11
lgfdlmprad: True
lheatstrg: !!python/none
lndp_type: !!python/none
lsm: !!python/none
lsoil: !!python/none
lsoil_lsm: !!python/none
ltaerosol: !!python/none
n_var_lndp: !!python/none
lheatstrg: null
lndp_type: null
lsm: null
lsoil: null
lsoil_lsm: null
ltaerosol: null
n_var_lndp: null
oz_phys: True
oz_phys_2015: False
satmedmf: !!python/none
satmedmf: null
shal_cnv: True
ttendlim: !!python/none
ttendlim: null
gfdl_cloud_microphysics_nml: &gfs_gfdl_cloud_mp
c_cracw: 0.8
c_paut: 0.5
Expand Down Expand Up @@ -272,7 +267,7 @@ FV3_GFS_v15p2:
kord_wz: 9
n_split: 8
n_sponge: 30
nord_zs_filter: !!python/none
nord_zs_filter: null
nudge_qv: True
range_warn: False
rf_cutoff: 750.0
Expand All @@ -283,29 +278,29 @@ FV3_GFS_v15p2:
tau_l2v: 225.0
tau_v2l: 150.0
gfs_physics_nml: &gfs_v15_gfs_physics
bl_mynn_edmf: !!python/none
bl_mynn_edmf_mom: !!python/none
bl_mynn_tkeadvect: !!python/none
bl_mynn_edmf: null
bl_mynn_edmf_mom: null
bl_mynn_tkeadvect: null
cnvcld: True
cnvgwd: True
cplflx: !!python/none
cplflx: null
do_myjpbl: False
do_myjsfc: False
do_mynnedmf: !!python/none
do_mynnsfclay: !!python/none
do_mynnedmf: null
do_mynnsfclay: null
do_tofd: False
do_ugwp: False
do_ysu: False
fhcyc: 0.0
fhlwr: 3600.0
fhswr: 3600.0
hybedmf: True
iau_delthrs: !!python/none
iaufhrs: !!python/none
iau_delthrs: null
iaufhrs: null
imfdeepcnv: 2
imfshalcnv: 2
imp_physics: 11
icloud_bl: !!python/none
icloud_bl: null
iopt_alb: 2
iopt_btr: 1
iopt_crs: 1
Expand All @@ -321,28 +316,28 @@ FV3_GFS_v15p2:
iopt_trs: 2
ldiag_ugwp: False
lgfdlmprad: True
lradar: !!python/none
lradar: null
lsm: 1
lsoil: !!python/none
lsoil_lsm: !!python/none
ltaerosol: !!python/none
lsoil: null
lsoil_lsm: null
ltaerosol: null
shal_cnv: True
shinhong: False
ttendlim: !!python/none
ttendlim: null
xkzm_h: 1.0
xkzm_m: 1.0
xkzminv: 0.3
namsfc:
landice: True
ldebug: False
surf_map_nml:
surf_map_nml: null

FV3_GFS_v15_thompson_mynn_lam3km:
atmos_model_nml:
avg_max_length: 3600.0
fv_core_nml:
agrid_vel_rst: True
full_zs_filter: !!python/none
full_zs_filter: null
n_sponge: 9
npz_type: ''
rf_fast: False
Expand Down Expand Up @@ -382,20 +377,20 @@ FV3_GFS_v15_thompson_mynn_lam3km:
iopt_snf: 4
iopt_stc: 1
iopt_tbot: 2
iopt_trs: !!python/none
iopt_trs: null
iovr: 3
ldiag_ugwp: False
lgfdlmprad: False
lsm: 1
lsoil: !!python/none
lsoil_lsm: !!python/none
lsoil: null
lsoil_lsm: null
ltaerosol: False
print_diff_pgr: True
sfclay_compute_flux: !!python/none
sfclay_compute_flux: null
xkzminv: 0.3
xkzm_m: 1.0
xkzm_h: 1.0
surf_map_nml: !!python/none
surf_map_nml: null

FV3_GFS_v16:
cires_ugwp_nml:
Expand All @@ -419,7 +414,7 @@ FV3_GFS_v16:
na_init: 0
nudge_dz: False
res_latlon_dynamics: ''
rf_fast: !!python/none
rf_fast: null
tau: 10.0
gfdl_cloud_microphysics_nml:
<<: *gfs_gfdl_cloud_mp
Expand All @@ -431,10 +426,10 @@ FV3_GFS_v16:
gfs_physics_nml:
<<: *gfs_v15_gfs_physics
cdmbgwd: [4.0, 0.15, 1.0, 1.0]
do_myjpbl: !!python/none
do_myjsfc: !!python/none
do_myjpbl: null
do_myjsfc: null
do_tofd: True
do_ysu: !!python/none
do_ysu: null
hybedmf: False
iaer: 5111
icliq_sw: 2
Expand All @@ -443,23 +438,23 @@ FV3_GFS_v16:
isatmedmf: 1
lgfdlmprad: True
lheatstrg: True
lndp_type: !!python/none
lndp_type: null
lsoil: 4
n_var_lndp: !!python/none
n_var_lndp: null
prautco: [0.00015, 0.00015]
psautco: [0.0008, 0.0005]
satmedmf: True
shinhong: !!python/none
xkzminv: !!python/none
xkzm_m: !!python/none
xkzm_h: !!python/none
shinhong: null
xkzminv: null
xkzm_m: null
xkzm_h: null
mpp_io_nml:
deflate_level: 1
shuffle: 1
namsfc:
landice: True
ldebug: False
surf_map_nml: !!python/none
surf_map_nml: null

FV3_GFS_v17_p8:
cires_ugwp_nml:
Expand All @@ -472,8 +467,8 @@ FV3_GFS_v17_p8:
delt_max: 0.002
dnats: 0
do_sat_adj: False
do_vort_damp: !!python/none
full_zs_filter: !!python/none
do_vort_damp: null
full_zs_filter: null
fv_sg_adj: 450
hord_dp: -5
hord_mt: 5
Expand All @@ -485,10 +480,10 @@ FV3_GFS_v17_p8:
n_sponge: 10
nord: 2
nudge_dz: False
n_zs_filter: !!python/none
n_zs_filter: null
range_warn: True
res_latlon_dynamics: ''
rf_fast: !!python/none
rf_fast: null
tau: 10.0
gfdl_cloud_microphysics_nml:
<<: *gfs_gfdl_cloud_mp
Expand All @@ -510,8 +505,8 @@ FV3_GFS_v17_p8:
do_gsl_drag_ls_bl: False
do_gsl_drag_ss: True
do_gsl_drag_tofd: False
do_myjpbl: !!python/none
do_myjsfc: !!python/none
do_myjpbl: null
do_myjsfc: null
do_mynnedmf: False
do_mynnsfclay: False
do_RRTMGP: False
Expand All @@ -520,7 +515,7 @@ FV3_GFS_v17_p8:
do_ugwp_v0_orog_only: False
do_ugwp_v1: False
do_ugwp_v1_orog_only: False
do_ysu: !!python/none
do_ysu: null
doGP_cldoptics_LUT: False
doGP_lwscat: False
dt_inner: 150
Expand All @@ -529,7 +524,7 @@ FV3_GFS_v17_p8:
hybedmf: False
iaer: 1011
ialb: 2
iau_inc_files: !!python/none
iau_inc_files: null
icloud_bl: 1
icliq_sw: 2
iems: 2
Expand All @@ -542,7 +537,7 @@ FV3_GFS_v17_p8:
iopt_stc: 3
iovr: 3
isatmedmf: 1
ldiag_ugwp: !!python/none
ldiag_ugwp: null
lgfdlmprad: False
lradar: False
lseaspray: True
Expand All @@ -554,7 +549,7 @@ FV3_GFS_v17_p8:
lw_file_gas: rrtmgp-data-lw-g128-210809.nc
min_lakeice: 0.15
min_seaice: 0.15
nsfullradar_diag: !!python/none
nsfullradar_diag: null
prautco: [0.00015, 0.00015]
psautco: [0.0008, 0.0005]
qdiag3d: False
Expand All @@ -565,14 +560,14 @@ FV3_GFS_v17_p8:
rrtmgp_nGptsSW: 112
satmedmf: True
sedi_semi: True
sfclay_compute_flux: !!python/none
shinhong: !!python/none
sfclay_compute_flux: null
shinhong: null
sw_file_clouds: rrtmgp-cloud-optics-coeffs-sw.nc
sw_file_gas: rrtmgp-data-sw-g112-210809.nc
ttendlim: -999
xkzminv: !!python/none
xkzm_m: !!python/none
xkzm_h: !!python/none
xkzminv: null
xkzm_m: null
xkzm_h: null
mpp_io_nml:
deflate_level: 1
shuffle: 1
Expand All @@ -581,5 +576,5 @@ FV3_GFS_v17_p8:
fsics: 0
landice: False
ldebug: False
surf_map_nml: !!python/none
surf_map_nml:

Loading