Skip to content

Update UFS WM to include CCPP-v6 + fixes for CI/CD #791

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
mark-a-potts merged 5 commits into from
Jun 10, 2022
Merged

Update UFS WM to include CCPP-v6 + fixes for CI/CD #791

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2f8d78
added version to miniconda for jet
mark-a-potts Jun 8, 2022
c4da479
removed lndp_each_step
mark-a-potts Jun 8, 2022
39fbecf
fix for ci/cd testing on hera
mark-a-potts Jun 8, 2022
576f074
removed outdated documentation for LSM_SPP_EACH_STEP
mark-a-potts Jun 10, 2022
d71a243
Merge branch 'release/public-v2' into feature/hera-fix
mark-a-potts Jun 10, 2022
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 modulefiles/tasks/jet/miniconda_regional_workflow
View file
Open in desktop
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 load miniconda3/4.5.12

setenv SRW_ENV regional_workflow
1 change: 0 additions & 1 deletion ush/config_defaults.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1910,7 +1910,6 @@ 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_EACH_STEP="true" #Sets lndp_each_step=.true.
#
Comment thread
mark-a-potts marked this conversation as resolved.
#-----------------------------------------------------------------------
#
Expand Down
1 change: 0 additions & 1 deletion ush/config_defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1909,7 +1909,6 @@ LSM_SPP_LSCALE: [ "150000", "150000", "150000", "150000", "150000", "150000", "1
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_EACH_STEP: "TRUE" #Sets lndp_each_step=.true.
#
#-----------------------------------------------------------------------
#
Expand Down
1 change: 0 additions & 1 deletion ush/generate_FV3LAM_wflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,6 @@ def generate_FV3LAM_wflow():
'n_var_spp': N_VAR_SPP,
'n_var_lndp': N_VAR_LNDP,
'lndp_type': LNDP_TYPE,
'lndp_each_step': LSM_SPP_EACH_STEP,
'fhcyc': FHCYC_LSM_SPP_OR_NOT
}
#
Expand Down
1 change: 0 additions & 1 deletion ush/generate_FV3LAM_wflow.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,6 @@ settings="\
'n_var_spp': ${N_VAR_SPP},
'n_var_lndp': ${N_VAR_LNDP},
'lndp_type': ${LNDP_TYPE},
'lndp_each_step': ${LSM_SPP_EACH_STEP},
'fhcyc': ${FHCYC_LSM_SPP_OR_NOT},
}"
#
Expand Down
4 changes: 3 additions & 1 deletion ush/machine/hera.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ function file_location() {
case ${external_model} in

"FV3GFS")
location='/scratch1/NCEPDEV/rstprod/com/gfs/prod/gfs.${yyyymmdd}/${hh}/atmos'
# use this location if you have access to rstprod
# location='/scratch1/NCEPDEV/rstprod/com/gfs/prod/gfs.${yyyymmdd}/${hh}/atmos'
location='/scratch2/BMC/det/UFS_SRW_app/develop/model_data/FV3GFS/grib2/${yyyymmdd}'
;;

esac
Expand Down