From b2f8d7869028e6ddcf2f5365ec1a3bd1b2ad112e Mon Sep 17 00:00:00 2001 From: Mark A Potts Date: Wed, 8 Jun 2022 12:24:23 +0000 Subject: [PATCH 1/4] added version to miniconda for jet --- modulefiles/tasks/jet/miniconda_regional_workflow | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modulefiles/tasks/jet/miniconda_regional_workflow b/modulefiles/tasks/jet/miniconda_regional_workflow index 011a832c9..1c0c314fc 100644 --- a/modulefiles/tasks/jet/miniconda_regional_workflow +++ b/modulefiles/tasks/jet/miniconda_regional_workflow @@ -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 From c4da4792d6ec82c8692f3445d5970e44855780de Mon Sep 17 00:00:00 2001 From: Mark Potts Date: Wed, 8 Jun 2022 08:14:49 -0600 Subject: [PATCH 2/4] removed lndp_each_step --- ush/config_defaults.sh | 1 - ush/config_defaults.yaml | 1 - ush/generate_FV3LAM_wflow.py | 1 - ush/generate_FV3LAM_wflow.sh | 1 - 4 files changed, 4 deletions(-) diff --git a/ush/config_defaults.sh b/ush/config_defaults.sh index d304d203a..062eb4408 100644 --- a/ush/config_defaults.sh +++ b/ush/config_defaults.sh @@ -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. # #----------------------------------------------------------------------- # diff --git a/ush/config_defaults.yaml b/ush/config_defaults.yaml index 56b89bb11..c16af2a27 100644 --- a/ush/config_defaults.yaml +++ b/ush/config_defaults.yaml @@ -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. # #----------------------------------------------------------------------- # diff --git a/ush/generate_FV3LAM_wflow.py b/ush/generate_FV3LAM_wflow.py index 2391340c4..1c32e9fa9 100755 --- a/ush/generate_FV3LAM_wflow.py +++ b/ush/generate_FV3LAM_wflow.py @@ -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 } # diff --git a/ush/generate_FV3LAM_wflow.sh b/ush/generate_FV3LAM_wflow.sh index 8af7497b0..cf815a242 100755 --- a/ush/generate_FV3LAM_wflow.sh +++ b/ush/generate_FV3LAM_wflow.sh @@ -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}, }" # From 39fbecf660b1006ddde9008076ed7939a41d3606 Mon Sep 17 00:00:00 2001 From: Mark A Potts Date: Wed, 8 Jun 2022 19:45:39 +0000 Subject: [PATCH 3/4] fix for ci/cd testing on hera --- ush/machine/hera.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ush/machine/hera.sh b/ush/machine/hera.sh index 454a1e938..bf587a71e 100644 --- a/ush/machine/hera.sh +++ b/ush/machine/hera.sh @@ -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 From 576f074f1d12111ab37e22c68923d2190627591e Mon Sep 17 00:00:00 2001 From: Mark A Potts Date: Fri, 10 Jun 2022 18:32:12 +0000 Subject: [PATCH 4/4] removed outdated documentation for LSM_SPP_EACH_STEP --- ush/config_defaults.sh | 4 ---- ush/config_defaults.yaml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/ush/config_defaults.sh b/ush/config_defaults.sh index 062eb4408..9269bdc93 100644 --- a/ush/config_defaults.sh +++ b/ush/config_defaults.sh @@ -1889,10 +1889,6 @@ ISEED_SPP=( "4" "5" "6" "7" "8" ) # SPP in LSM schemes is handled in the &nam_sfcperts namelist block # instead of in &nam_sppperts, where all other SPP is implemented. # -# The default perturbation frequency is determined by the fhcyc namelist -# entry. Since that parameter is set to zero in the SRW App, use -# LSM_SPP_EACH_STEP to perturb every time step. -# # Perturbations to soil moisture content (SMC) are only applied at the # first time step. # diff --git a/ush/config_defaults.yaml b/ush/config_defaults.yaml index c16af2a27..e7ed5d0bb 100644 --- a/ush/config_defaults.yaml +++ b/ush/config_defaults.yaml @@ -1888,10 +1888,6 @@ ISEED_SPP: [ "4", "4", "4", "4", "4" ] # SPP in LSM schemes is handled in the &nam_sfcperts namelist block # instead of in &nam_sppperts, where all other SPP is implemented. # -# The default perturbation frequency is determined by the fhcyc namelist -# entry. Since that parameter is set to zero in the SRW App, use -# LSM_SPP_EACH_STEP to perturb every time step. -# # Perturbations to soil moisture content (SMC) are only applied at the # first time step. #