Skip to content

Commit

Permalink
Merge pull request #40 from GEOS-ESM/develop
Browse files Browse the repository at this point in the history
v1.0.6 release
  • Loading branch information
patricia-nasa authored Sep 15, 2023
2 parents a099e7b + 99d6e17 commit 8ce0867
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 5 deletions.
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Removed

# [v1.0.5] 2026-06-15
# [v1.0.6] 2023-09-08

### Added

- mxd04 and vx04 will write out gridded angstrom exponent if available

### Fixed

### Removed

# [v1.0.5] 2023-06-15

### Added

Expand Down
22 changes: 19 additions & 3 deletions src/pyobs/mxd04.py
Original file line number Diff line number Diff line change
Expand Up @@ -577,9 +577,17 @@ def writeg(self,filename=None,dir='.',expid=None,refine=8,res=None,
'Aerosol Optical Depth (Revised) Obs Count',
'Cloud Fraction' ]

vname = ['tau', 'tau_', 'tau_fine', 'count_tau', 'count_tau_','cloud' ]
vunits = [ '1', '1', '1', '1', '1', '1', ]
kmvar = [ nch, nch, nch, nch, nch, 0 ]
vname = ['tau', 'tau_', 'tau_fine', 'count_tau', 'count_tau_','cloud']
vunits = [ '1', '1', '1', '1', '1', '1' ]
kmvar = [ nch, nch, nch, nch, nch, 0 ]

if hasattr(self,'ae'):
vtitle += ['Angstrom Exponent 440-870',
'Angstrom Exponent 440-870 (Revised)']

vname += ['ae','ae_' ]
vunits += ['1', '1' ]
kmvar += [0, 0 ]

title = 'Gridded MODIS Aerosol Retrievals'
source = 'NASA/GSFC/GMAO GEOS-5 Aerosol Group'
Expand Down Expand Up @@ -618,6 +626,7 @@ def writeg(self,filename=None,dir='.',expid=None,refine=8,res=None,
except:
aod_ = MISSING * ones(aod.shape) # will compress like a charm


# Grid variable and write to file
# -------------------------------
f.write('tau', nymd, nhms,
Expand All @@ -632,6 +641,13 @@ def writeg(self,filename=None,dir='.',expid=None,refine=8,res=None,
binobscnt3d(self.lon,self.lat,aod_,im,jm,MISSING) )
f.write('cloud', nymd, nhms,
binobs2d(self.lon,self.lat,self.cloud,im,jm,MISSING) )
# The AE may not exist
# ----------------------
if hasattr(self,'ae'):
f.write('ae', nymd, nhms,
binobs2d(self.lon,self.lat,self.ae,im,jm,MISSING) )
f.write('ae_', nymd, nhms,
binobs2d(self.lon,self.lat,self.ae_,im,jm,MISSING) )

# try:
# f.close()
Expand Down
17 changes: 16 additions & 1 deletion src/pyobs/vx04.py
Original file line number Diff line number Diff line change
Expand Up @@ -847,6 +847,14 @@ def writeg(self,filename=None,dir='.',expid=None,refine=8,res=None,
vunits = [ '1', '1', '1', '1', '1', '1', ]
kmvar = [ nch, nch, nch, nch, nch, 0 ]

if hasattr(self,'ae'):
vtitle += ['Angstrom Exponent 440-870',
'Angstrom Exponent 440-870 (Revised)']

vname += ['ae','ae_' ]
vunits += ['1', '1' ]
kmvar += [0, 0 ]

title = 'Gridded MODIS Aerosol Retrievals'
source = 'NASA/GSFC/GMAO GEOS-5 Aerosol Group'
contact = '[email protected]'
Expand Down Expand Up @@ -898,7 +906,14 @@ def writeg(self,filename=None,dir='.',expid=None,refine=8,res=None,
binobscnt3d(self.lon,self.lat,aod_,im,jm,MISSING) )
f.write('cloud', nymd, nhms,
binobs2d(self.lon,self.lat,self.cloud,im,jm,MISSING) )

# The AE may not exist
# ----------------------
if hasattr(self,'ae'):
f.write('ae', nymd, nhms,
binobs2d(self.lon,self.lat,self.ae,im,jm,MISSING) )
f.write('ae_', nymd, nhms,
binobs2d(self.lon,self.lat,self.ae_,im,jm,MISSING) )

# try:
# f.close()
# except:
Expand Down

0 comments on commit 8ce0867

Please sign in to comment.