Skip to content

Commit 51fa7d5

Browse files
authored
Merge pull request #44 from GEOS-ESM/feature/wmputman/bin2nc_edge_fix
fix edge issue in bin2nc for merra2 restarts to levels other than 72
2 parents b5f6e68 + f6968e3 commit 51fa7d5

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1717

1818
### Deprecated
1919

20+
## [2.0.5] - 2023-12-11
21+
22+
### Fixed
23+
24+
- Fix issue in `remap_bin2nc.py` for remapping MERRA2 restarts to levels other than 72
25+
2026
## [2.0.4] - 2023-11-17
2127

2228
### Added

pre/remap_restart/bin2nc_merra2_fv.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ variables:
33
long_name: hybrid_sigma_pressure_a
44
units: 'Pa'
55
dimension:
6-
- edges
6+
- edge
77
- short_name: BK
88
long_name: hybrid_sigma_pressure_b
99
units: '1'
1010
dimension:
11-
- edges
11+
- edge
1212
- short_name: U
1313
long_name: eastward_wind
1414
units: 'm s-1'
@@ -34,7 +34,7 @@ variables:
3434
long_name: air_pressure
3535
units: 'Pa'
3636
dimension:
37-
- edges
37+
- edge
3838
- lat
3939
- lon
4040
- short_name: PKZ
@@ -62,5 +62,5 @@ dimensions:
6262
lon: 180
6363
lat: 1080
6464
lev: 72
65-
edges: 73
65+
edge: 73
6666
time: 1

pre/remap_restart/remap_bin2nc.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def writeCVars(coordVars,dimensions):
1717
for v in coordVars:
1818
if v=='time':
1919
coordVars[v][:]=0
20-
elif (v=='lat') | (v=='lon') | (v=='lev') | (v=='edges'):
20+
elif (v=='lat') | (v=='lon') | (v=='lev') | (v=='edge'):
2121
dsize=dimensions[v]
2222
coords=np.arange(1,dsize+1)
2323
coordVars[v][:]=coords
@@ -55,16 +55,16 @@ def writeVar(v, vars, dimensions, bintype, binf):
5555
for i in range(dimensions.get('lev')):
5656
rec = binf.read_reals(dtype=bintype)
5757
var[i,:,:]=rec
58-
elif 'edges' in dims:
59-
for i in range(dimensions.get('edges')):
58+
elif 'edge' in dims:
59+
for i in range(dimensions.get('edge')):
6060
rec = binf.read_reals(dtype=bintype)
6161
var[i,:,:]=rec
6262
else:
6363
rec = binf.read_reals(dtype=bintype)
6464
var[:,:]=rec
6565
# is just lev
6666
else:
67-
if 'edges' in dims:
67+
if 'edge' in dims:
6868
rec = binf.read_reals(dtype=bintype)
6969
var[:]=rec
7070

@@ -90,10 +90,10 @@ def defineDimVars(fid,dims):
9090
setattr(newVar,'positive','down')
9191
setattr(newVar,'formulaTerms','ap: ak b: bk ps: ps p0: p00')
9292
coordVars.update([(d,newVar)])
93-
if d=="edges":
93+
if d=="edge":
9494
newVar=fid.createVariable(d,'f8',d)
9595
setattr(newVar,'units','level')
96-
setattr(newVar,'long_name','sigma_at_layer edges')
96+
setattr(newVar,'long_name','sigma_at_layer edge')
9797
setattr(newVar,'standard_name','atmosphere_hybrid_sigma_pressure_coordinate')
9898
setattr(newVar,'coordinate','eta')
9999
setattr(newVar,'positive','down')

0 commit comments

Comments
 (0)