From 80c673bae559e41609c9060b7823c726afbab469 Mon Sep 17 00:00:00 2001 From: Ricardo Todling Date: Tue, 20 May 2025 20:22:46 -0400 Subject: [PATCH 1/3] Fix for incorrect handling of AOD in fcst mode --- src/Applications/GEOSdas_App/GEOSdas.csm | 27 ++++++++++++++++--- .../NCEP_enkf/scripts/gmao/gcm_ensset_rc.csh | 8 +++++- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/src/Applications/GEOSdas_App/GEOSdas.csm b/src/Applications/GEOSdas_App/GEOSdas.csm index 6e9385d1..9550b9f1 100755 --- a/src/Applications/GEOSdas_App/GEOSdas.csm +++ b/src/Applications/GEOSdas_App/GEOSdas.csm @@ -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 #............................................................................. @@ -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 @@ -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 diff --git a/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/gcm_ensset_rc.csh b/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/gcm_ensset_rc.csh index c39ef5a6..fd06dc1b 100755 --- a/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/gcm_ensset_rc.csh +++ b/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/gcm_ensset_rc.csh @@ -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 From 83321fc3d3e0f6f0a3d1734119d722114eb77832 Mon Sep 17 00:00:00 2001 From: Ricardo Todling Date: Wed, 21 May 2025 14:09:33 -0400 Subject: [PATCH 2/3] adjustment for aerosol output for FP --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index e388607c..c26619a8 100644 --- a/components.yaml +++ b/components.yaml @@ -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: From f1bafae1e266cb1189511622250d409528a2b367 Mon Sep 17 00:00:00 2001 From: Ricardo Todling Date: Wed, 21 May 2025 15:35:17 -0400 Subject: [PATCH 3/3] also fix for atms-npp chn 15 --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index c26619a8..f1792d0a 100644 --- a/components.yaml +++ b/components.yaml @@ -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: