Merge branch 'develop' into feature/jstassi/#198/local-acquire-gaas_obs

Merging in latest updates on develop branch from Ricardo.
GEOS-ESM · Aug 23, 2022 · 2de6b97 · 2de6b97
2 parents e6e8fc7 + b117600
commit 2de6b97
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Applications/GAAS_App/ana.rc.tmpl b/src/Applications/GAAS_App/ana.rc.tmpl
@@ -17,8 +17,9 @@ ODS_files::
 
 # Active data (Note: deep blue in MYD04 is passive)
 
-#___AVHRR___${FVWORK}/${EXPID}.patmosx_v05r02_L2a.asc.%y4%m2%d2_%h200z.ods
-#___AVHRR___${FVWORK}/${EXPID}.patmosx_v05r02_L2a.des.%y4%m2%d2_%h200z.ods
+##___AVHRR___${FVWORK}/${EXPID}.patmosx_v05r02_L2a.asc.%y4%m2%d2_%h200z.ods
+##___AVHRR___${FVWORK}/${EXPID}.patmosx_v05r02_L2a.des.%y4%m2%d2_%h200z.ods
+#___AVHRR___${FVWORK}/patmosx.%y4%m2%d2_%h2z.ods
 
 #___TERRA_NRT___${FVWORK}/${EXPID}.MOD04_L2a.land.%y4%m2%d2_%h200z.ods
 #___TERRA_NRT___${FVWORK}/${EXPID}.MOD04_L2a.ocean.%y4%m2%d2_%h200z.ods

diff --git a/src/Applications/GEOSdas_App/GEOSdas.csm b/src/Applications/GEOSdas_App/GEOSdas.csm
@@ -4278,7 +4278,7 @@ endif
         sed -i "s/#___AVHRR___//" $ana_rc
      endif
 
-     if ($aod_obs == patmosx_asc)     sed -i "s/#___AVHRR___//"   $ana_rc
+     if ($aod_obs == patmosx_asc || $aod_obs == patmosx_ods)   sed -i "s/#___AVHRR___//"   $ana_rc
      if ($aod_obs == aeronet_obs)     sed -i "s/#___AERONET___//" $ana_rc
      if ($aod_obs == misr_F12_bright) sed -i "s/#___MISR___//"    $ana_rc
      if ($aod_obs == mod04_land_nnr)  sed -i "s/#___TERRA___//"   $ana_rc