Skip to content

Auto GitFlow - develop → MAPL-v3 - Fix for incorrect handling of AOD in fcst mode #375

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
mathomp4 merged 4 commits into from
May 22, 2025
Merged

Auto GitFlow - develop → MAPL-v3 - Fix for incorrect handling of AOD in fcst mode #375

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
80c673b
Fix for incorrect handling of AOD in fcst mode
rtodling May 21, 2025
83321fc
adjustment for aerosol output for FP
rtodling May 21, 2025
f1bafae
also fix for atms-npp chn 15
rtodling May 21, 2025
3f70b21
Merge pull request #374 from GEOS-ESM/bugfix/rtodling/handle_aod4fcst
rtodling May 21, 2025
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
4 changes: 2 additions & 2 deletions components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ GEOSana_GridComp:
mksi:
local: ./src/Components/@GEOSana_GridComp/GEOSaana_GridComp/GSI_GridComp/@mksi
remote: ../GEOS_mksi.git
tag: v5.42.4
tag: v5.42.5
develop: develop

GEOSgcm_GridComp:
Expand Down Expand Up @@ -251,7 +251,7 @@ umwm:
GEOSgcm_App:
local: ./src/Applications/@GEOSgcm_App
remote: ../GEOSgcm_App.git
tag: g2.3.8.3
tag: v2.3.8.4
develop: develop

Ocean-LETKF:
Expand Down
27 changes: 24 additions & 3 deletions src/Applications/GEOSdas_App/GEOSdas.csm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1946,6 +1946,17 @@ exit 1

endif

# A bit of a hack to cope with latest handing of GAAS settings
# ------------------------------------------------------------
foreach fn (`ls $EXPID.aod*.$NCSUFFIX`)
set sfx = `echo $fn | cut -d. -f2-`
if ( -e das.$sfx ) then
/bin/rm das.$sfx
else
ln -sf $fn das.$sfx
endif
end

# Last line of GetAODinfo4Fcst_()
\end
#.............................................................................
Expand Down Expand Up @@ -4125,8 +4136,13 @@ endif
cat WSUB_ExtData.tmp | sed -e '/^WSUB_NATURE/ s#ExtData.*#/dev/null#' > WSUB_ExtData.rc
/bin/rm WSUB_ExtData.tmp

# Run bundleParser.py
# Run bundleParser.py (note: needed since ADAS does not set pythonpath)
# -------------------
set this = `which bundleParser.py`
if ($status) then
Call AbnormalExit_( 99 )
endif
/bin/cp $this .
python bundleParser.py
construct_extdata_yaml_list.py $FVWORK/GEOS_ChemGridComp.rc

Expand Down Expand Up @@ -4797,8 +4813,13 @@ endif

cd -

# Run bundleParser.py
#---------------------
# Run bundleParser.py (note: needed since ADAS does not set pythonpath)
#--------------------
set this = `which bundleParser.py`
if ($status) then
Call AbnormalExit_( 99 )
endif
/bin/cp $this .
python bundleParser.py
construct_extdata_yaml_list.py $FVWORK/GEOS_ChemGridComp.rc

Expand Down
8 changes: 7 additions & 1 deletion src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/gcm_ensset_rc.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,8 +380,14 @@ cd $ENSWORK/$member
endif
sed -f sed_file $this_hist > ./HISTORY.rc

# Run bundleParser.py
# Run bundleParser.py (note: needed since ensADAS does not set pythonpath)
# -------------------
set this = `which bundleParser.py`
if ($status) then
echo " ${MYNAME}: cannot find bundleParser.py, aborting ..."
exit 2
endif
/bin/cp $this .
python bundleParser.py
construct_extdata_yaml_list.py ./GEOS_ChemGridComp.rc

Expand Down