Skip to content

Commit

Permalink
Update scripts to work with the latest hashes of UFS_UTILS and UPP (u…
Browse files Browse the repository at this point in the history
…fs-community#775)

* update input namelist of chgres_cube

* update diag_table templates

* update scripts

* back to original

* specify miniconda version on Jet
  • Loading branch information
chan-hoo authored Jun 9, 2022
1 parent dca1617 commit d70f960
Show file tree
Hide file tree
Showing 13 changed files with 12 additions and 14 deletions.
4 changes: 2 additions & 2 deletions modulefiles/tasks/jet/miniconda_regional_workflow
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#%Module
module use -a /contrib/miniconda3/modulefiles
module load miniconda3
module use /contrib/miniconda3/modulefiles
module load miniconda3/4.5.12

setenv SRW_ENV regional_workflow
1 change: 0 additions & 1 deletion scripts/exregional_make_ics.sh
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,6 @@ fi
#
settings="
'config': {
'fix_dir_input_grid': ${FIXgsm},
'fix_dir_target_grid': ${FIXLAM},
'mosaic_file_target_grid': ${FIXLAM}/${CRES}${DOT_OR_USCORE}mosaic.halo$((10#${NH4})).nc,
'orog_dir_target_grid': ${FIXLAM},
Expand Down
1 change: 0 additions & 1 deletion scripts/exregional_make_lbcs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,6 @@ list file has not specified for this external LBC model (EXTRN_MDL_NAME_LBCS):
#
settings="
'config': {
'fix_dir_input_grid': ${FIXgsm},
'fix_dir_target_grid': ${FIXLAM},
'mosaic_file_target_grid': ${FIXLAM}/${CRES}${DOT_OR_USCORE}mosaic.halo$((10#${NH4})).nc,
'orog_dir_target_grid': ${FIXLAM},
Expand Down
2 changes: 1 addition & 1 deletion ush/config_defaults.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1921,7 +1921,7 @@ LSM_SPP_TSCALE=( "21600" "21600" "21600" "21600" "21600" "21600" "21600" )
LSM_SPP_LSCALE=( "150000" "150000" "150000" "150000" "150000" "150000" "150000" )
ISEED_LSM_SPP=( "9" )
LSM_SPP_VAR_LIST=( "smc" "vgf" "alb" "sal" "emi" "zol" "stc" )
LSM_SPP_MAG_LIST=( "0.2" "0.001" "0.001" "0.001" "0.001" "0.001" "0.2" )
LSM_SPP_MAG_LIST=( "0.017" "0.001" "0.001" "0.001" "0.001" "0.001" "0.2" )
LSM_SPP_EACH_STEP="true" #Sets lndp_each_step=.true.
#
#-----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion ush/templates/diag_table.FV3_GFS_2017_gfdlmp
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion ush/templates/diag_table.FV3_GFS_2017_gfdlmp_regional
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion ush/templates/diag_table.FV3_GFS_v15_thompson_mynn_lam3km
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion ush/templates/diag_table.FV3_GFS_v15p2
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion ush/templates/diag_table.FV3_GFS_v16
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion ush/templates/diag_table.FV3_HRRR
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion ush/templates/diag_table.FV3_RRFS_v0
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion ush/templates/diag_table.FV3_RRFS_v1alpha
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion ush/templates/diag_table.FV3_RRFS_v1beta
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
"gfs_phys", "hpbl", "hpbl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lhtfl_ave", "lhtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "shtfl_ave", "shtfl_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwatclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pwat", "pwat", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "soilm", "soilm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_aveclm", "tcdc_aveclm", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d", "all", .false., "none", 2
Expand Down

0 comments on commit d70f960

Please sign in to comment.