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

Jump to bottom

Move GDASApp to CRTM 2.4 #1773

Merged
merged 5 commits into from
Aug 8, 2023
Merged

Move GDASApp to CRTM 2.4 #1773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d763bb0
Start of changes for crtm 2.4 in gdasapp
CoryMartin-NOAA Aug 4, 2023
7ee5310
Change to CRTM_FIX
CoryMartin-NOAA Aug 4, 2023
ed2f6ff
change to env var template format
CoryMartin-NOAA Aug 4, 2023
08df6fb
Use parse_j2yaml
CoryMartin-NOAA Aug 4, 2023
629894a
update hash of gdasapp
CoryMartin-NOAA Aug 4, 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
2 changes: 1 addition & 1 deletion Externals.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ protocol = git
required = False

[GDASApp]
hash = 7966501
hash = 09757ce
local_path = sorc/gdas.cd
repo_url = https://github.com/NOAA-EMC/GDASApp.git
protocol = git
Expand Down
1 change: 0 additions & 1 deletion parm/config/gfs/config.aeroanl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@ export io_layout_x=@IO_LAYOUT_X@
export io_layout_y=@IO_LAYOUT_Y@

export JEDIEXE=${HOMEgfs}/exec/fv3jedi_var.x
export crtm_VERSION="2.3.0"

echo "END: config.aeroanl"
1 change: 0 additions & 1 deletion parm/config/gfs/config.atmanl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@ export io_layout_x=1
export io_layout_y=1

export JEDIEXE=${HOMEgfs}/exec/fv3jedi_var.x
export crtm_VERSION="2.3.0"

echo "END: config.atmanl"
1 change: 0 additions & 1 deletion parm/config/gfs/config.atmensanl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@ export io_layout_x=1
export io_layout_y=1

export JEDIEXE=${HOMEgfs}/exec/fv3jedi_letkf.x
export crtm_VERSION="2.3.0"

echo "END: config.atmensanl"
22 changes: 11 additions & 11 deletions parm/gdas/aero_crtm_coeff.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
mkdir:
- $(DATA)/crtm/
- {{ DATA }}/crtm/
copy:
- [$(FV3JEDI_FIX)/crtm/$(crtm_VERSION)/AerosolCoeff.bin, $(DATA)/crtm/]
- [$(FV3JEDI_FIX)/crtm/$(crtm_VERSION)/CloudCoeff.bin, $(DATA)/crtm/]
- [$(FV3JEDI_FIX)/crtm/$(crtm_VERSION)/v.viirs-m_npp.SpcCoeff.bin, $(DATA)/crtm/]
- [$(FV3JEDI_FIX)/crtm/$(crtm_VERSION)/v.viirs-m_npp.TauCoeff.bin, $(DATA)/crtm/]
- [$(FV3JEDI_FIX)/crtm/$(crtm_VERSION)/v.viirs-m_j1.SpcCoeff.bin, $(DATA)/crtm/]
- [$(FV3JEDI_FIX)/crtm/$(crtm_VERSION)/v.viirs-m_j1.TauCoeff.bin, $(DATA)/crtm/]
- [$(FV3JEDI_FIX)/crtm/$(crtm_VERSION)/NPOESS.VISice.EmisCoeff.bin, $(DATA)/crtm/]
- [$(FV3JEDI_FIX)/crtm/$(crtm_VERSION)/NPOESS.VISland.EmisCoeff.bin, $(DATA)/crtm/]
- [$(FV3JEDI_FIX)/crtm/$(crtm_VERSION)/NPOESS.VISsnow.EmisCoeff.bin, $(DATA)/crtm/]
- [$(FV3JEDI_FIX)/crtm/$(crtm_VERSION)/NPOESS.VISwater.EmisCoeff.bin, $(DATA)/crtm/]
- [{{ CRTM_FIX }}/AerosolCoeff.bin, {{ DATA }}/crtm/]
- [{{ CRTM_FIX }}/CloudCoeff.bin, {{ DATA }}/crtm/]
- [{{ CRTM_FIX }}/v.viirs-m_npp.SpcCoeff.bin, {{ DATA }}/crtm/]
- [{{ CRTM_FIX }}/v.viirs-m_npp.TauCoeff.bin, {{ DATA }}/crtm/]
- [{{ CRTM_FIX }}/v.viirs-m_j1.SpcCoeff.bin, {{ DATA }}/crtm/]
- [{{ CRTM_FIX }}/v.viirs-m_j1.TauCoeff.bin, {{ DATA }}/crtm/]
- [{{ CRTM_FIX }}/NPOESS.VISice.EmisCoeff.bin, {{ DATA }}/crtm/]
- [{{ CRTM_FIX }}/NPOESS.VISland.EmisCoeff.bin, {{ DATA }}/crtm/]
- [{{ CRTM_FIX }}/NPOESS.VISsnow.EmisCoeff.bin, {{ DATA }}/crtm/]
- [{{ CRTM_FIX }}/NPOESS.VISwater.EmisCoeff.bin, {{ DATA }}/crtm/]
344 changes: 172 additions & 172 deletions parm/gdas/atm_crtm_coeff.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion sorc/checkout.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ if [[ ${checkout_gsi} == "YES" ]]; then
fi

if [[ ${checkout_gdas} == "YES" ]]; then
checkout "gdas.cd" "https://github.com/NOAA-EMC/GDASApp.git" "7966501"; errs=$((errs + $?))
checkout "gdas.cd" "https://github.com/NOAA-EMC/GDASApp.git" "09757ce"; errs=$((errs + $?))
fi

if [[ ${checkout_gsi} == "YES" || ${checkout_gdas} == "YES" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion sorc/link_workflow.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ if [[ -d "${HOMEgfs}/sorc/gdas.cd" ]]; then
cd "${HOMEgfs}/fix" || exit 1
[[ ! -d gdas ]] && mkdir -p gdas
cd gdas || exit 1
for gdas_sub in crtm fv3jedi gsibec; do
for gdas_sub in fv3jedi gsibec; do
if [[ -d "${gdas_sub}" ]]; then
rm -rf "${gdas_sub}"
fi
Expand Down
4 changes: 2 additions & 2 deletions ush/python/pygfs/task/aero_analysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ def initialize(self: Analysis) -> None:
# stage CRTM fix files
crtm_fix_list_path = os.path.join(self.task_config['HOMEgfs'], 'parm', 'gdas', 'aero_crtm_coeff.yaml')
logger.debug(f"Staging CRTM fix files from {crtm_fix_list_path}")
crtm_fix_list = parse_yamltmpl(crtm_fix_list_path, self.task_config)
crtm_fix_list = parse_j2yaml(crtm_fix_list_path, self.task_config)
FileHandler(crtm_fix_list).sync()

# stage fix files
jedi_fix_list_path = os.path.join(self.task_config['HOMEgfs'], 'parm', 'gdas', 'aero_jedi_fix.yaml')
logger.debug(f"Staging JEDI fix files from {jedi_fix_list_path}")
jedi_fix_list = parse_yamltmpl(jedi_fix_list_path, self.task_config)
jedi_fix_list = parse_j2yaml(jedi_fix_list_path, self.task_config)
FileHandler(jedi_fix_list).sync()

# stage berror files
Expand Down
4 changes: 2 additions & 2 deletions ush/python/pygfs/task/atm_analysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ def initialize(self: Analysis) -> None:
# stage CRTM fix files
crtm_fix_list_path = os.path.join(self.task_config.HOMEgfs, 'parm', 'gdas', 'atm_crtm_coeff.yaml')
logger.debug(f"Staging CRTM fix files from {crtm_fix_list_path}")
crtm_fix_list = parse_yamltmpl(crtm_fix_list_path, self.task_config)
crtm_fix_list = parse_j2yaml(crtm_fix_list_path, self.task_config)
FileHandler(crtm_fix_list).sync()

# stage fix files
jedi_fix_list_path = os.path.join(self.task_config.HOMEgfs, 'parm', 'gdas', 'atm_jedi_fix.yaml')
logger.debug(f"Staging JEDI fix files from {jedi_fix_list_path}")
jedi_fix_list = parse_yamltmpl(jedi_fix_list_path, self.task_config)
jedi_fix_list = parse_j2yaml(jedi_fix_list_path, self.task_config)
FileHandler(jedi_fix_list).sync()

# stage berror files
Expand Down
4 changes: 2 additions & 2 deletions ush/python/pygfs/task/atmens_analysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@ def initialize(self: Analysis) -> None:
# stage CRTM fix files
crtm_fix_list_path = os.path.join(self.task_config.HOMEgfs, 'parm', 'gdas', 'atm_crtm_coeff.yaml')
logger.debug(f"Staging CRTM fix files from {crtm_fix_list_path}")
crtm_fix_list = parse_yamltmpl(crtm_fix_list_path, self.task_config)
crtm_fix_list = parse_j2yaml(crtm_fix_list_path, self.task_config)
FileHandler(crtm_fix_list).sync()

# stage fix files
jedi_fix_list_path = os.path.join(self.task_config.HOMEgfs, 'parm', 'gdas', 'atm_jedi_fix.yaml')
logger.debug(f"Staging JEDI fix files from {jedi_fix_list_path}")
jedi_fix_list = parse_yamltmpl(jedi_fix_list_path, self.task_config)
jedi_fix_list = parse_j2yaml(jedi_fix_list_path, self.task_config)
FileHandler(jedi_fix_list).sync()

# stage backgrounds
Expand Down