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.

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

Add more user defined parameters for the marine DA #1235

Merged
merged 4 commits into from
Jan 12, 2023
Merged

Add more user defined parameters for the marine DA #1235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1c3a46
bump options
guillaumevernieres Jan 11, 2023
c68b129
Merge branch 'develop' into feature/bump-params
guillaumevernieres Jan 11, 2023
b115412
wrong default obs list
guillaumevernieres Jan 11, 2023
2fa500b
fixed convoluted condition
guillaumevernieres Jan 11, 2023
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
13 changes: 10 additions & 3 deletions parm/config/config.ocnanal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@
[[ -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@
export SOCA_VARS=tocn,socn,ssh
export SABER_BLOCKS_YAML=@SABER_BLOCKS_YAML@
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question: What happens if SOCA_INPUT_FIX_DIR is not defined in the environment? A similar question for NICAS_RESOL and NCICAS_GRID_SIZE? OBS_LIST above provides a default in case SOCA_OBS_LIST is not defined (zero length).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RussTreadon-NOAA , they have to be defined in the setup_expt.py yaml of the g-w here parm/config/yaml/defaults.yaml. We host a default obs list yaml in parm, so pointing to that seems appropriate if nothing else is provided. At least that was my logic!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK. I was just wondering why we check to see if OBS_LIST is defined while we don't do so for other variables. Seems the answer is that we have defaults in parm/config/yaml/defults.yaml and so it is not necessary to provide defaults in parm/config/config.ocnanal. I don't know if the g-w team or NCO has preferences where / how we define variable defaults.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RussTreadon-NOAA , that OBS_LIST is a temporary solution, we'll have to construct the list differently at run time since it certainly is going to be cycle dependent.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it. No need for me to get hung up on this since it's likely to change in the future.

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"
4 changes: 4 additions & 0 deletions parm/config/yaml/defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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