Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions components.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ GMAO_Shared:
GMAOpyobs:
local: ./src/Shared/@GMAO_Shared/@GMAO_pyobs
remote: ../GMAOpyobs.git
tag: v1.7.0
tag: v1.8.0
develop: develop

AeroML:
local: ./src/Shared/@AeroML
remote: ../AeroML.git
tag: v1.5.1
tag: v1.6.0
develop: develop
sparse: ./config/AeroML.sparse

Expand Down Expand Up @@ -86,13 +86,13 @@ FMS:
GEOSana_GridComp:
local: ./src/Components/@GEOSana_GridComp
remote: ../GEOSana_GridComp.git
tag: v5.45.5
tag: v5.45.5.1
develop: develop

mksi:
local: ./src/Components/@GEOSana_GridComp/GEOSaana_GridComp/GSI_GridComp/@mksi
remote: ../GEOS_mksi.git
tag: v5.44.2
tag: v5.44.3
develop: develop

GEOSgcm_GridComp:
Expand Down
3 changes: 3 additions & 0 deletions src/Applications/GAAS_App/obs.rc
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ INSIDE # Exclude data which are inside these boxes
# AERONET is passive
# 1 323 323 45 45 -90 +90 -180 +180 0 2100 -180 +180

# VIIRS DT Land and Ocean
# 1 341 342 45 45 -90 +90 -180 +180 0 2100 -180 +180

# ----- ------- ------- ---------- ---------- ----------- ------------
# BoxId kx kt lat lon lev time

Expand Down
6 changes: 3 additions & 3 deletions src/Applications/GEOSdas_App/GEOSdas.csm
Original file line number Diff line number Diff line change
Expand Up @@ -4455,13 +4455,13 @@ endif
if ($aod_obs == mod04_land_nnr) sed -i "s/#___TERRA___//" $ana_rc
if ($aod_obs == myd04_land_nnr) sed -i "s/#___AQUA___//" $ana_rc

if ($aod_obs == vn20aerdt_002_flk) then
if ($aod_obs == vn20aerdt_002_flk || $aod_obs == vn20aerdt_022_flk) then
setenv VIIRS_L2_HDF 1
sed -i "s/#___NOAA20DT_NRT___//" $ana_rc
endif
if ($aod_obs == vn20aerdb_002_flk) then
if ($aod_obs == vn20aerdb_002_flk ) then
setenv VIIRS_L2_HDF 1
sed -i "s/#___NOAA20DB_NRT___//" $ana_rc
sed -i "s/#___NOAA20DB_NRT___//" $ana_rc
endif

set dtype = `$FVROOT/bin/aod_data.py aod_type $aod_obs $AERO_OBSDBRC`
Expand Down
2 changes: 1 addition & 1 deletion src/Applications/GEOSdas_App/jedi/jedi_run.csh
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ foreach fn (`ls *tlapse.txt`)
/bin/mv $fn $pfx.$BYYYYYMMDDTHH0000Z.tlapse.txt # time tag as current as
# if JEDI output these
end
tar cvf $FVWORK/$EXPID.jedi_vbc.${nymdb}_${hhb}z.tar *satbias*nc4 *aircraft*csv *.txt
tar cvf $FVWORK/$EXPID.jedi_vbc.${nymdb}_${hhb}z.tar *satbias*nc4 *aircraft*cov *.txt *.acftbias
cd -

# If here, likely successful
Expand Down
6 changes: 4 additions & 2 deletions src/Applications/GEOSdas_App/jedi/jedi_set.csh
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ end
# If so, retrieve IODA files from existig ru
# In adjoint case, IODA files are from same exp
if ( $JEDI_RUN_ANASA || $JEDI_RUN_ADANA || $JEDI_OBS_OPT == 1 ) then
setenv NYMD $nymdb # initial date of current cycle
setenv NHMS $nhmsb # initial time of current cycle
setenv NYMDB $nymdb # initial date of current cycle
setenv NHMSB $nhmsb # initial time of current cycle
setenv ACQWORK $FVWORK
vED -env $FVHOME/run/jedi/jedi_acquire_ioda.j -o jedi_acquire_ioda.j
if ( $BATCH_SUBCMD == "sbatch" ) then
Expand Down Expand Up @@ -320,6 +320,8 @@ if ( $acft ) then
echo "WARNING: No aircraft bias files where found ..."
endif
else
set acftbias_in = `ls aircraft_temperature.*.acftbias`
set ttag = `echo $acftbias_in | cut -d. -f2`
if ( -e aircraft_temperature.$ttag.acftbias && \
! -e aircraft_temperature.$ttag.acftbias_cov ) then
ln -sf aircraft_temperature.$ttag.acftbias aircraft_temperature.$ttag.acftbias_cov
Expand Down
Loading