Add some variables to the Southern Ocean collection

Author: susburrows

src/python/frontend/amwgmaster-new.py

@@ -181,8 +181,13 @@
 # *** 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

src/python/frontend/amwgmaster.py

@@ -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': '7', '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.'