Skip to content

Add some variables to the Southern Ocean collection #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
susburrows wants to merge 3 commits into
base: devel
Choose a base branch
from
Open

Add some variables to the Southern Ocean collection #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1e2ebd
Add some variables to the Southern Ocean collection
susburrows Apr 24, 2015
7937d50
Use plot set 5 for FSNS
susburrows Oct 12, 2015
9ae8b12
Use plotset5 for Southern Ocean collection
susburrows Oct 14, 2015
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
7 changes: 6 additions & 1 deletion src/python/frontend/amwgmaster-new.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,16 @@
# *** Collection so (southern ocean) (part of Tier 1B) ***
diags_collection['so'] = {}
diags_collection['so']['desc'] = 'Tier 1B Diagnostics (Southern Ocean)'
diags_collection['so']['seasons'] = ['ANN']
diags_collection['so']['package'] = 'AMWG'
diags_collection['so']['preamble'] = 'Diagnostic plot collection aimed at model evaluation in the Southern Ocean region. See ACME Confluence page: https://acme-climate.atlassian.net/wiki/display/ATM/Tier+1b+metrics%3A+Southern+Ocean+and+Antarctica'
diags_collection['so']['combined'] = True
diags_collection['so']['options'] = {'logo':'no'}
diags_collection['so']['FSNT'] = {'plottype': '5', 'obs':['CERES-EBAF_1'] }
diags_collection['so']['FLNT'] = {'plottype': '5', 'obs':['CERES-EBAF_1'] }
diags_collection['so']['SHFLX'] = {'plottype': '3', 'obs': ['LARYEA_1'], 'regions':['S_Hemisphere_Land']}
diags_collection['so']['QFLX'] = {'plottype': '5', 'obs':['LARYEA_1'], 'regions':['S_Hemisphere_Land']}
diags_collection['so']['FSNS'] = {'plottype': '7', 'obs':['LARYEA_1'] } # ANN, Global assumed
diags_collection['so']['FSNS'] = {'plottype': '5', 'obs':['LARYEA_1'] }
diags_collection['so']['FLDS'] = {'plottype': '3', 'obs':['ISCCP_1'], 'regions':['S_Hemisphere_Land']}
diags_collection['so']['OMEGA'] = {'plottype': '4', 'obs':['ERAI_1'] } # ANN, Global assumed
diags_collection['so']['T'] = {'plottype': '4', 'obs':['ERAI_1'] }
Expand Down
46 changes: 45 additions & 1 deletion src/python/frontend/amwgmaster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
diags_collection['tier1b_so']['regions'] = ['Southern_Extratropics']
diags_collection['tier1b_so']['SHFLX'] = {'plottype': '3', 'obs': ['LARYEA_1'] }
diags_collection['tier1b_so']['QFLX'] = {'plottype': '5', 'obs':['LARYEA_1'] }
diags_collection['tier1b_so']['FSNS'] = {'plottype': '7', 'obs':['LARYEA_1'] }
diags_collection['tier1b_so']['FSNS'] = {'plottype': '5', 'obs':['LARYEA_1'] }
diags_collection['tier1b_so']['FLDS'] = {'plottype': '3', 'obs':['ISCCP_1']}
diags_collection['tier1b_so']['OMEGA'] = {'plottype': '4', 'obs':['ERAI_1'] }
diags_collection['tier1b_so']['T'] = {'plottype': '4', 'obs':['ERAI_1'] }
Expand Down Expand Up @@ -259,6 +259,50 @@
diags_collection['1']['options'] = {'logo':'no'}
diags_collection['1']['regions'] = ['Global', 'Tropics', 'Southern_Extratropics', 'Northern_Extratropics']
diags_collection['1']['tables'] = True
# *** Collection so (southern ocean) (part of Tier 1B) ***
diags_collection['so'] = {}
diags_collection['so']['desc'] = 'Tier 1B Diagnostics (Southern Ocean)'
diags_collection['so']['seasons'] = ['ANN']
diags_collection['so']['package'] = 'AMWG'
diags_collection['so']['preamble'] = 'Diagnostic plot collection aimed at model evaluation in the Southern Ocean region. See ACME Confluence page: https://acme-climate.atlassian.net/wiki/display/ATM/Tier+1b+metrics%3A+Southern+Ocean+and+Antarctica'
diags_collection['so']['combined'] = True
diags_collection['so']['tables'] = True
diags_collection['so']['options'] = {'logo':'no'}
diags_collection['so']['regions'] = ['Southern_Extratropics']
diags_collection['so']['SHFLX'] = {'plottype': '3', 'obs': ['LARYEA_1'] }
diags_collection['so']['QFLX'] = {'plottype': '5', 'obs':['LARYEA_1'] }
diags_collection['so']['FSNS'] = {'plottype': '5', 'obs':['LARYEA_1'] }
diags_collection['so']['FLDS'] = {'plottype': '3', 'obs':['ISCCP_1']}
diags_collection['so']['OMEGA'] = {'plottype': '4', 'obs':['ERAI_1'] }
diags_collection['so']['T'] = {'plottype': '4', 'obs':['ERAI_1'] }
diags_collection['so']['LHFLX'] = {'plottype': '4', 'obs':['WHOI_1'] }
diags_collection['so']['FSNT'] = {'plottype': '5', 'obs':['CERES-EBAF_1'] }
diags_collection['so']['FLNT'] = {'plottype': '5', 'obs':['CERES-EBAF_1'] }
diags_collection['so']['SWCF'] = {'plottype': '5', 'obs':['CERES-EBAF_1'] }
diags_collection['so']['PRECT'] = {'plottype': '5', 'obs':['GPCP_1'] }
diags_collection['so']['TREFHT'] = {'plottype': '5', 'obs':['WILLMOTT_1'] }
diags_collection['so']['LWCF'] = {'plottype': '5', 'obs':['CERES-EBAF_1'] }
diags_collection['so']['AODVIS'] = {'plottype': '5', 'obs':['AOD_550_1'] }
diags_collection['so']['SURF_WIND'] = {'plottype': '6', 'obs':['NCEP_1'] }
diags_collection['so']['STRESS'] = {'plottype': '6', 'obs':['ERS_1'] }
diags_collection['so']['CLDTOT'] = {'plottype': '9', 'obs':['CLOUDSAT_1'] }
# *** Collection topten aka Tier 1A***
diags_collection['topten'] = {}
diags_collection['topten']['combined'] = True
diags_collection['topten']['desc'] = 'Tier 1A Diagnostics'
diags_collection['topten']['package'] = 'AMWG'
diags_collection['topten']['options'] = {'logo':'no'}
diags_collection['topten']['PSL'] = {'plottype': '5', 'obs': ['ERAI_1']}
diags_collection['topten']['STRESS'] = {'plottype': '6', 'obs': ['ERS_1']}
#diags_collection['topten']['SURF_STRESS'] = {'plottype': '6', 'obs': ['ERS_1']}
diags_collection['topten']['TREFHT'] = {'plottype': '5', 'obs': ['WILLMOTT_1']}
diags_collection['topten']['LWCF'] = {'plottype': '5', 'obs': ['CERES-EBAF_1']}
diags_collection['topten']['PRECT'] = {'plottype': '5', 'obs': ['GPCP_1']}
diags_collection['topten']['AODVIS'] = {'plottype': '5', 'obs': ['AOD_550_1']}
diags_collection['topten']['U'] = {'plottype': '5', 'obs': ['ERAI_1']}
diags_collection['topten']['T'] = {'plottype': '4', 'obs': ['ERAI_1']}
diags_collection['topten']['SWCF'] = {'plottype': '5', 'obs': ['CERES-EBAF_1']}
diags_collection['topten']['RELHUM'] = {'plottype': '4', 'obs': ['ERAI_1']}
# *** Collection 2 ***
diags_collection['2'] = {}
diags_collection['2']['desc'] = 'Line plots of annual implied northward transports.'
Expand Down