From e1c3a46aa962402b268b5ca1025f58b653f06bcd Mon Sep 17 00:00:00 2001 From: Guillaume Vernieres Date: Wed, 11 Jan 2023 09:36:50 -0500 Subject: [PATCH 1/3] bump options --- parm/config/config.ocnanal | 13 ++++++++++--- parm/config/yaml/defaults.yaml | 4 ++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/parm/config/config.ocnanal b/parm/config/config.ocnanal index 6a56190584..3110399565 100644 --- a/parm/config/config.ocnanal +++ b/parm/config/config.ocnanal @@ -6,20 +6,27 @@ echo "BEGIN: config.ocnanal" export OBS_YAML_DIR=${HOMEgfs}/sorc/gdas.cd/parm/soca/obs/config -export OBS_YAML=${HOMEgfs}/sorc/gdas.cd/parm/soca/obs/obs_list.yaml -export OBS_LIST=${OBS_YAML_DIR}/obs_list.yaml +export OBS_LIST=@SOCA_OBS_LIST@ +[[ ! -z "${OBS_LIST}" ]] || export OBS_LIST=${OBS_YAML_DIR}/obs_list.yaml +export OBS_YAML=${OBS_LIST} export FV3JEDI_STAGE_YAML=${HOMEgfs}/sorc/gdas.cd/test/soca/testinput/dumy.yaml export SOCA_INPUT_FIX_DIR=@SOCA_INPUT_FIX_DIR@ export SOCA_VARS=tocn,socn,ssh +export SABER_BLOCKS_YAML=@SABER_BLOCKS_YAML@ export SOCA_NINNER=@SOCA_NINNER@ export CASE_ANL=@CASE_ANL@ export DOMAIN_STACK_SIZE=2000000 export JEDI_BIN=${HOMEgfs}/sorc/gdas.cd/build/bin -# TODO: Move the R2D2 configuration to a common space +# R2D2 export R2D2_OBS_DB=shared export R2D2_OBS_DUMP=@R2D2_OBS_DUMP@ export R2D2_OBS_SRC=@R2D2_OBS_SRC@ export R2D2_OBS_WINDOW=24 # TODO: Check if the R2D2 sampling DB window is still needed export COMIN_OBS=@COMIN_OBS@ + +# NICAS +export NICAS_RESOL=@NICAS_RESOL@ +export NICAS_GRID_SIZE=@NICAS_GRID_SIZE@ + echo "END: config.ocnanal" diff --git a/parm/config/yaml/defaults.yaml b/parm/config/yaml/defaults.yaml index b119aee6a8..8289974668 100644 --- a/parm/config/yaml/defaults.yaml +++ b/parm/config/yaml/defaults.yaml @@ -5,7 +5,11 @@ aeroanl: ocnanal: SOCA_INPUT_FIX_DIR: '/scratch2/NCEPDEV/ocean/Guillaume.Vernieres/data/static/72x35x25' CASE_ANL: 'C48' + SOCA_OBS_LIST: '' COMIN_OBS: '/scratch2/NCEPDEV/marineda/r2d2' + SABER_BLOCKS_YAML: '' SOCA_NINNER: 50 R2D2_OBS_SRC: 'gdas_marine' R2D2_OBS_DUMP: 's2s_v1' + NICAS_RESOL: 1 + NICAS_GRID_SIZE: 15000 From b1154120abc6d00f3f0aa318a4cba921f45ef6ab Mon Sep 17 00:00:00 2001 From: Guillaume Vernieres Date: Wed, 11 Jan 2023 10:05:32 -0500 Subject: [PATCH 2/3] wrong default obs list --- parm/config/config.ocnanal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/config/config.ocnanal b/parm/config/config.ocnanal index 3110399565..dacc6292fd 100644 --- a/parm/config/config.ocnanal +++ b/parm/config/config.ocnanal @@ -7,7 +7,7 @@ echo "BEGIN: config.ocnanal" export OBS_YAML_DIR=${HOMEgfs}/sorc/gdas.cd/parm/soca/obs/config export OBS_LIST=@SOCA_OBS_LIST@ -[[ ! -z "${OBS_LIST}" ]] || export OBS_LIST=${OBS_YAML_DIR}/obs_list.yaml +[[ ! -z "${OBS_LIST}" ]] || export OBS_LIST=${HOMEgfs}/sorc/gdas.cd/parm/soca/obs/obs_list.yaml export OBS_YAML=${OBS_LIST} export FV3JEDI_STAGE_YAML=${HOMEgfs}/sorc/gdas.cd/test/soca/testinput/dumy.yaml export SOCA_INPUT_FIX_DIR=@SOCA_INPUT_FIX_DIR@ From 2fa500b891f1f623dbf1421242ecfa04e27576ad Mon Sep 17 00:00:00 2001 From: Guillaume Vernieres Date: Wed, 11 Jan 2023 10:48:50 -0500 Subject: [PATCH 3/3] fixed convoluted condition --- parm/config/config.ocnanal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/config/config.ocnanal b/parm/config/config.ocnanal index dacc6292fd..c8d821b86d 100644 --- a/parm/config/config.ocnanal +++ b/parm/config/config.ocnanal @@ -7,7 +7,7 @@ echo "BEGIN: config.ocnanal" export OBS_YAML_DIR=${HOMEgfs}/sorc/gdas.cd/parm/soca/obs/config export OBS_LIST=@SOCA_OBS_LIST@ -[[ ! -z "${OBS_LIST}" ]] || export OBS_LIST=${HOMEgfs}/sorc/gdas.cd/parm/soca/obs/obs_list.yaml +[[ -n "${OBS_LIST}" ]] || export OBS_LIST=${HOMEgfs}/sorc/gdas.cd/parm/soca/obs/obs_list.yaml export OBS_YAML=${OBS_LIST} export FV3JEDI_STAGE_YAML=${HOMEgfs}/sorc/gdas.cd/test/soca/testinput/dumy.yaml export SOCA_INPUT_FIX_DIR=@SOCA_INPUT_FIX_DIR@