Merge pull request #374 from GEOS-ESM/bugfix/rtodling/handle_aod4fcst

Fix for incorrect handling of AOD in fcst mode

Author: rtodling

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:
@@ -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:

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
 

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