Skip to content

Commit

Permalink
Working in place.
Browse files Browse the repository at this point in the history
  • Loading branch information
ledm committed May 13, 2024
1 parent 1c3fe27 commit 88b922d
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 7 deletions.
9 changes: 9 additions & 0 deletions bgcval2/bgcvaltools/pftnames.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,16 @@ def makeLongNameDict():

lnd['AtlanticSubtropicSalinity'] = 'Atlantic Subtropic Salinity'
lnd['SubtropicNorthAtlantic'] = 'Subtropic North Atlantic'

lnd['Surfaceto100m'] = 'Surface-to-100m'
lnd['Surfaceto200m'] = 'Surface-to-200m'
lnd['Surfaceto300m'] = 'Surface-to-300m'
lnd['Surfaceto400m'] = 'Surface-to-400m'
lnd['Surfaceto500m'] = 'Surface-to-500m'
lnd['Surfaceto600m'] = 'Surface-to-600m'
lnd['Surfaceto700m'] = 'Surface-to-700m'
lnd['Surfaceto800m'] = 'Surface-to-800m'
lnd['Surfaceto2000m'] = 'Surface-to-2000m'

lnd['TotalHeatFlux'] = "Global Total Heat Flux"
lnd['HeatFlux'] = "Heat Flux"
Expand Down
15 changes: 8 additions & 7 deletions bgcval2/timeseries/timeseriesTools.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,15 +204,16 @@ def getHorizontalSlice(nc, coords, details, layer, data=''):
return ApplyDepthSlice(data, k_surf) - ApplyDepthSlice(data, k_low)

elif layer in [
'Surface to 100m', 'Surface to 300m', 'Surface to 700m', 'Surfaceto800m',
'Surface to 2000m'
'Surfaceto100m', 'Surfaceto300m', 'Surfaceto700m',
'Surfaceto500m', 'Surfaceto800m',
'Surfaceto2000m'
]:
if layer == 'Surface to 100m': z = 100.
if layer == 'Surface to 300m': z = 300.
if layer == 'Surface to 500m': z = 500.
if layer == 'Surface to 700m': z = 700.
if layer == 'Surfaceto100m': z = 100.
if layer == 'Surfaceto300m': z = 300.
if layer == 'Surfaceto500m': z = 500.
if layer == 'Surfaceto700m': z = 700.
if layer == 'Surfaceto800m': z = 800.
if layer == 'Surface to 2000m': z = 2000.
if layer == 'Surfaceto2000m': z = 2000.

k_surf = bvt.getORCAdepth(0.,
nc.variables[coords['z']][:],
Expand Down

0 comments on commit 88b922d

Please sign in to comment.