Index: raw2proc/trunk/raw2proc/b1_config_20111112.py =================================================================== --- raw2proc/trunk/raw2proc/b1_config_20111112.py (revision 492) +++ raw2proc/trunk/raw2proc/b1_config_20111112.py (revision 510) @@ -31,4 +31,9 @@ 'references' : 'http://nccoos.org', 'source': 'Buoy CR1000 Datalogger', + # Needed for processing NDBC output + 'ndbc_module' : 'ndbc_41xxx', + 'ndbc_id': '41xxx', + 'ndbc_dir' : '/seacoos/data/nccoos/latest_ndbc', + 'ndbc_missing' : -9999.0, } @@ -48,4 +53,7 @@ # 'latest_dir' : '/seacoos/data/nccoos/latest_v2.0', # 'latest_vars' : ('time','lat','lon','z','atemp', 'baro', 'rh', 'rain', 'psp', 'pir'), + 'ndbc_vars' : ('air_temp', 'air_press', 'rh', 'psp', 'pir'), + 'ndbc_tags' : ('atmp1', 'baro1', 'rrh', 'srad1', 'lwrad'), + 'ndbc_units' : ('degC', 'hPa', '%', 'W m-2', 'W m-2'), 'plot_module': 'plot_cr1000_met', 'plot_names': ('timeseries',), @@ -66,4 +74,7 @@ # 'latest_dir' : '/seacoos/data/nccoos/latest_v2.0', # 'latest_vars' : ('time','lat','lon','z','u', 'v', 'wspd', 'wdir'), + 'ndbc_vars' : ('wspd1', 'wdir1', 'wgust1', 'wspd2', 'wdir2', 'wgust2'), + 'ndbc_tags' : ('wspd1', 'wdir1', 'gust1', 'wspd2', 'wdir2', 'gust2'), + 'ndbc_units' : ('m s-1', 'degrees', 'm s-1', 'm s-1', 'degrees', 'm s-1'), 'plot_module': 'plot_cr1000_wind', 'plot_names': ('timeseries',), @@ -83,4 +94,8 @@ # 'latest_dir' : '/seacoos/data/nccoos/latest_v2.0', # 'latest_vars' : ('time','lat','lon','z','depth', 'wtemp', 'cond', 'salin', 'density'), + 'ndbc_vars' : ('wtemp','depth', 'wtemp', 'salin'), + # wtmp1 tag needed to get into weather obs, others for temp/salin obs + 'ndbc_tags' : ('wtmp1', 'dp001', 'tp001', 'sp001'), + 'ndbc_units' : ('degC', 'm', 'degC', 'psu'), 'plot_module': 'plot_cr1000_ctd', 'plot_names': ('timeseries',), @@ -100,4 +115,7 @@ # 'latest_dir' : '/seacoos/data/nccoos/latest_v2.0', # 'latest_vars' : ('time','lat','lon','z','depth', 'wtemp', 'cond', 'salin', 'density'), + 'ndbc_vars' : ('depth', 'wtemp', 'salin'), + 'ndbc_tags' : ('dp002', 'tp002', 'sp002'), + 'ndbc_units' : ('m', 'degC', 'psu'), 'plot_module': 'plot_cr1000_ctd', 'plot_names': ('timeseries',), Index: raw2proc/trunk/raw2proc/b2_config_20111112.py =================================================================== --- raw2proc/trunk/raw2proc/b2_config_20111112.py (revision 492) +++ raw2proc/trunk/raw2proc/b2_config_20111112.py (revision 510) @@ -31,4 +31,9 @@ 'references' : 'http://nccoos.org', 'source': 'Buoy CR1000 Datalogger', + # Needed for processing NDBC output + 'ndbc_module' : 'ndbc_41yyy', + 'ndbc_id': '41yyy', + 'ndbc_dir' : '/seacoos/data/nccoos/latest_ndbc', + 'ndbc_missing' : -9999.0, } @@ -49,4 +54,7 @@ # 'latest_dir' : '/seacoos/data/nccoos/latest_v2.0', # 'latest_vars' : ('time','lat','lon','z','u', 'v', 'wspd', 'wdir'), + 'ndbc_vars' : ('air_temp', 'air_press', 'rh', 'psp', 'pir'), + 'ndbc_tags' : ('atmp1', 'baro1', 'rrh', 'srad1', 'lwrad'), + 'ndbc_units' : ('degC', 'hPa', '%', 'W m-2', 'W m-2'), 'plot_module': 'plot_cr1000_met', 'plot_names': ('timeseries',), @@ -67,4 +75,7 @@ # 'latest_dir' : '/seacoos/data/nccoos/latest_v2.0', # 'latest_vars' : ('time','lat','lon','z','u', 'v', 'wspd', 'wdir'), + 'ndbc_vars' : ('wspd1', 'wdir1', 'wgust1', 'wspd2', 'wdir2', 'wgust2'), + 'ndbc_tags' : ('wspd1', 'wdir1', 'gust1', 'wspd2', 'wdir2', 'gust2'), + 'ndbc_units' : ('m s-1', 'degrees', 'm s-1', 'm s-1', 'degrees', 'm s-1'), 'plot_module': 'plot_cr1000_wind', 'plot_names': ('timeseries',), @@ -84,4 +95,8 @@ # 'latest_dir' : '/seacoos/data/nccoos/latest_v2.0', # 'latest_vars' : ('time','lat','lon','z','depth', 'wtemp', 'cond', 'salin', 'density'), + 'ndbc_vars' : ('wtemp','depth', 'wtemp', 'salin'), + # wtmp1 tag needed to get into weather obs, others for temp/salin obs + 'ndbc_tags' : ('wtmp1', 'dp001', 'tp001', 'sp001'), + 'ndbc_units' : ('degC', 'm', 'degC', 'psu'), 'plot_module': 'plot_cr1000_ctd', 'plot_names': ('timeseries',), @@ -101,4 +116,7 @@ # 'latest_dir' : '/seacoos/data/nccoos/latest_v2.0', # 'latest_vars' : ('time','lat','lon','z','depth', 'wtemp', 'cond', 'salin', 'density'), + 'ndbc_vars' : ('depth', 'wtemp', 'salin'), + 'ndbc_tags' : ('dp002', 'tp002', 'sp002'), + 'ndbc_units' : ('m', 'degC', 'psu'), 'plot_module': 'plot_cr1000_ctd', 'plot_names': ('timeseries',), Index: raw2proc/trunk/raw2proc/billymitchell_config_20090623.py =================================================================== --- raw2proc/trunk/raw2proc/billymitchell_config_20090623.py (revision 462) +++ (revision ) @@ -1,29 +1,0 @@ -platform_info = { - 'id' : 'billymitchell', - 'location' : 'Billy Mitchell Airfield, Frisco, NC', - 'lat' : 35.231691, # degrees true (-) south, (+) north - 'lon' : -75.622614, # degrees true (-) west, (+) east - 'mvar' : -10.683333, # degrees (-) west, (+) east - 'institution' : 'nccoos', - 'config_start_date' : '2009-06-23 00:00:00', - 'config_end_date' : '2010-09-02 00:00:00', # None or yyyy-mm-dd HH:MM:SS - 'packages' : ('sfas',), - } -sensor_info = { - 'sfas' : { 'id' : 'sodar', - 'description' : 'Wind profile data', - 'raw_dir' : '/seacoos/data/nccoos/level0/' - 'billymitchell/sodar1/mnd', - 'raw_file_glob' : '*.mnd', - 'proc_dir' : '/seacoos/data/nccoos/level1/' - 'billymitchell/sodar1', - 'process_module' : 'proc_scintec_maindata_sfas', - 'utc_offset' : 0, # hours offset to utc - 'min_altitude' : 10, # meters - 'altitude_interval' : 5, # meters - 'num_altitudes' : 39, - 'sensor_elevation' : 0, # meters (runway elev is at 5.2 m) - 'plot_module' : 'billymitchell_sodar_plot', - 'plot_names' : ('timeseries', 'wind_vectors', 'wind_barbs'), - }, - } Index: raw2proc/trunk/raw2proc/billymitchell_config_20090624.py =================================================================== --- (revision ) +++ raw2proc/trunk/raw2proc/billymitchell_config_20090624.py (revision 510) @@ -1,0 +1,27 @@ +platform_info = { + 'id' : 'billymitchell', + 'location' : 'Billy Mitchell Airfield, Frisco, NC', + 'lat' : 35.231691, # degrees true (-) south, (+) north + 'lon' : -75.622614, # degrees true (-) west, (+) east + 'mvar' : -10.683333, # degrees (-) west, (+) east + 'institution' : 'nccoos', + 'config_start_date' : '2009-06-24 14:00:00', + 'config_end_date' : '2010-09-01 10:00:00', # None or yyyy-mm-dd HH:MM:SS + 'packages' : ('sfas',), + } +sensor_info = { + 'sfas' : { 'id' : 'sodar', + 'description' : 'Wind profile data', + 'raw_dir' : '/seacoos/data/nccoos/level0/billymitchell/sodar1/mnd', + 'raw_file_glob' : '*.mnd', + 'proc_dir' : '/seacoos/data/nccoos/level1/billymitchell/sodar1', + 'process_module' : 'proc_scintec_maindata_sfas', + 'utc_offset' : 0, # hours offset to utc + 'min_altitude' : 10, # meters + 'altitude_interval' : 5, # meters + 'num_altitudes' : 39, + 'sensor_elevation' : 0, # meters (runway elev is at 5.2 m) + 'plot_module' : 'billymitchell_sodar_plot', + 'plot_names' : ('timeseries', 'wind_vectors', 'wind_barbs'), + }, + } Index: raw2proc/trunk/raw2proc/billymitchell_config_20110607.py =================================================================== --- raw2proc/trunk/raw2proc/billymitchell_config_20110607.py (revision 462) +++ raw2proc/trunk/raw2proc/billymitchell_config_20110607.py (revision 510) @@ -1,2 +1,5 @@ +# +# Increase number of altitudes to 59 (from 10 - 300 meters) +# platform_info = { 'id' : 'billymitchell', @@ -6,6 +9,6 @@ 'mvar' : -10.783333, # degrees (-) west, (+) east 'institution' : 'nccoos', - 'config_start_date' : '2011-06-07 00:00:00', - 'config_end_date' : '2011-08-26 00:00:00', # None or yyyy-mm-dd HH:MM:SS + 'config_start_date' : '2011-06-07 20:00:00', + 'config_end_date' : '2011-08-25 14:30:00', # None or yyyy-mm-dd HH:MM:SS 'packages' : ('sfas',), } @@ -13,9 +16,7 @@ 'sfas' : { 'id' : 'sodar', 'description' : 'Wind profile data', - 'raw_dir' : '/seacoos/data/nccoos/level0/' - 'billymitchell/sodar1/mnd', + 'raw_dir' : '/seacoos/data/nccoos/level0/billymitchell/sodar1/mnd', 'raw_file_glob' : '*.mnd', - 'proc_dir' : '/seacoos/data/nccoos/level1/' - 'billymitchell/sodar1', + 'proc_dir' : '/seacoos/data/nccoos/level1/billymitchell/sodar1', 'process_module' : 'proc_scintec_maindata_sfas', 'utc_offset' : 0, # hours offset to utc Index: raw2proc/trunk/raw2proc/billymitchell_config_20110914.py =================================================================== --- raw2proc/trunk/raw2proc/billymitchell_config_20110914.py (revision 478) +++ raw2proc/trunk/raw2proc/billymitchell_config_20110914.py (revision 510) @@ -1,2 +1,5 @@ +# +# Increase number of altitudes to 99 (from 10 - 500 meters) +# platform_info = { 'id' : 'billymitchell', @@ -6,6 +9,6 @@ 'mvar' : -10.783333, # degrees (-) west, (+) east 'institution' : 'nccoos', - 'config_start_date' : '2011-09-14 00:00:00', - 'config_end_date' : '2011-10-29 00:00:00', # None or yyyy-mm-dd HH:MM:SS + 'config_start_date' : '2011-09-14 19:00:00', + 'config_end_date' : '2011-10-13 19:30:00', # None or yyyy-mm-dd HH:MM:SS 'packages' : ('sfas',), } @@ -13,9 +16,7 @@ 'sfas' : { 'id' : 'sodar', 'description' : 'Wind profile data', - 'raw_dir' : '/seacoos/data/nccoos/level0/' - 'billymitchell/sodar1/mnd', + 'raw_dir' : '/seacoos/data/nccoos/level0/billymitchell/sodar1/mnd', 'raw_file_glob' : '*.mnd', - 'proc_dir' : '/seacoos/data/nccoos/level1/' - 'billymitchell/sodar1', + 'proc_dir' : '/seacoos/data/nccoos/level1/billymitchell/sodar1', 'process_module' : 'proc_scintec_maindata_sfas', 'utc_offset' : 0, # hours offset to utc Index: raw2proc/trunk/raw2proc/billymitchell_config_20111013.py =================================================================== --- (revision ) +++ raw2proc/trunk/raw2proc/billymitchell_config_20111013.py (revision 510) @@ -1,0 +1,30 @@ +# +# Decrease number of altitudes to 37 (from 15 - 195 meters) +# +platform_info = { + 'id' : 'billymitchell', + 'location' : 'Billy Mitchell Airfield, Frisco, NC', + 'lat' : 35.231691, # degrees true (-) south, (+) north + 'lon' : -75.622614, # degrees true (-) west, (+) east + 'mvar' : -10.783333, # degrees (-) west, (+) east + 'institution' : 'nccoos', + 'config_start_date' : '2011-10-13 21:30:00', + 'config_end_date' : '2011-10-19 19:30:00', # None or yyyy-mm-dd HH:MM:SS + 'packages' : ('sfas',), + } +sensor_info = { + 'sfas' : { 'id' : 'sodar', + 'description' : 'Wind profile data', + 'raw_dir' : '/seacoos/data/nccoos/level0/billymitchell/sodar1/mnd', + 'raw_file_glob' : '*.mnd', + 'proc_dir' : '/seacoos/data/nccoos/level1/billymitchell/sodar1', + 'process_module' : 'proc_scintec_maindata_sfas', + 'utc_offset' : 0, # hours offset to utc + 'min_altitude' : 15, # meters + 'altitude_interval' : 5, # meters + 'num_altitudes' : 37, + 'sensor_elevation' : 0, # meters (runway elev is at 5.2 m) + 'plot_module' : 'billymitchell_sodar_plot', + 'plot_names' : ('timeseries', 'wind_vectors', 'wind_barbs'), + }, + } Index: raw2proc/trunk/raw2proc/billymitchell_config_20111019.py =================================================================== --- (revision ) +++ raw2proc/trunk/raw2proc/billymitchell_config_20111019.py (revision 510) @@ -1,0 +1,30 @@ +# +# Increase number of altitudes to 39 (from 10 - 200 meters) +# +platform_info = { + 'id' : 'billymitchell', + 'location' : 'Billy Mitchell Airfield, Frisco, NC', + 'lat' : 35.231691, # degrees true (-) south, (+) north + 'lon' : -75.622614, # degrees true (-) west, (+) east + 'mvar' : -10.783333, # degrees (-) west, (+) east + 'institution' : 'nccoos', + 'config_start_date' : '2011-10-19 20:30:00', + 'config_end_date' : '2011-10-28 23:30:00', # None or yyyy-mm-dd HH:MM:SS + 'packages' : ('sfas',), + } +sensor_info = { + 'sfas' : { 'id' : 'sodar', + 'description' : 'Wind profile data', + 'raw_dir' : '/seacoos/data/nccoos/level0/billymitchell/sodar1/mnd', + 'raw_file_glob' : '*.mnd', + 'proc_dir' : '/seacoos/data/nccoos/level1/billymitchell/sodar1', + 'process_module' : 'proc_scintec_maindata_sfas', + 'utc_offset' : 0, # hours offset to utc + 'min_altitude' : 10, # meters + 'altitude_interval' : 5, # meters + 'num_altitudes' : 39, + 'sensor_elevation' : 0, # meters (runway elev is at 5.2 m) + 'plot_module' : 'billymitchell_sodar_plot', + 'plot_names' : ('timeseries', 'wind_vectors', 'wind_barbs'), + }, + } Index: raw2proc/trunk/raw2proc/billymitchell_config_20111029.py =================================================================== --- raw2proc/trunk/raw2proc/billymitchell_config_20111029.py (revision 493) +++ raw2proc/trunk/raw2proc/billymitchell_config_20111029.py (revision 510) @@ -1,2 +1,5 @@ +# +# Decrease number of altitudes to 37 (from 15 - 195 meters) +# platform_info = { 'id' : 'billymitchell', @@ -7,5 +10,5 @@ 'institution' : 'nccoos', 'config_start_date' : '2011-10-29 00:30:00', - 'config_end_date' : '2012-04-16 19:00:00', # None or yyyy-mm-dd HH:MM:SS + 'config_end_date' : '2012-04-16 18:30:00', # None or yyyy-mm-dd HH:MM:SS 'packages' : ('sfas',), } @@ -13,9 +16,7 @@ 'sfas' : { 'id' : 'sodar', 'description' : 'Wind profile data', - 'raw_dir' : '/seacoos/data/nccoos/level0/' - 'billymitchell/sodar1/mnd', + 'raw_dir' : '/seacoos/data/nccoos/level0/billymitchell/sodar1/mnd', 'raw_file_glob' : '*.mnd', - 'proc_dir' : '/seacoos/data/nccoos/level1/' - 'billymitchell/sodar1', + 'proc_dir' : '/seacoos/data/nccoos/level1/billymitchell/sodar1', 'process_module' : 'proc_scintec_maindata_sfas', 'utc_offset' : 0, # hours offset to utc Index: raw2proc/trunk/raw2proc/billymitchell_config_20120416.py =================================================================== --- raw2proc/trunk/raw2proc/billymitchell_config_20120416.py (revision 493) +++ raw2proc/trunk/raw2proc/billymitchell_config_20120416.py (revision 510) @@ -1,2 +1,5 @@ +# +# Increase number of altitudes to 39 (from 10 - 200 meters) +# platform_info = { 'id' : 'billymitchell', @@ -6,6 +9,6 @@ 'mvar' : -10.783333, # degrees (-) west, (+) east 'institution' : 'nccoos', - 'config_start_date' : '2012-04-16 19:30:00', - 'config_end_date' : None, # None or yyyy-mm-dd HH:MM:SS + 'config_start_date' : '2012-04-16 20:30:00', + 'config_end_date' : '2012-07-23 12:00:00', # None or yyyy-mm-dd HH:MM:SS 'packages' : ('sfas',), } @@ -13,9 +16,7 @@ 'sfas' : { 'id' : 'sodar', 'description' : 'Wind profile data', - 'raw_dir' : '/seacoos/data/nccoos/level0/' - 'billymitchell/sodar1/mnd', + 'raw_dir' : '/seacoos/data/nccoos/level0/billymitchell/sodar1/mnd', 'raw_file_glob' : '*.mnd', - 'proc_dir' : '/seacoos/data/nccoos/level1/' - 'billymitchell/sodar1', + 'proc_dir' : '/seacoos/data/nccoos/level1/billymitchell/sodar1', 'process_module' : 'proc_scintec_maindata_sfas', 'utc_offset' : 0, # hours offset to utc Index: raw2proc/trunk/raw2proc/billymitchell_config_20130202.py =================================================================== --- (revision ) +++ raw2proc/trunk/raw2proc/billymitchell_config_20130202.py (revision 510) @@ -1,0 +1,30 @@ +# +# Increase sensor elevation by 1 meter (to 1 meter) +# +platform_info = { + 'id' : 'billymitchell', + 'location' : 'Billy Mitchell Airfield, Frisco, NC', + 'lat' : 35.231691, # degrees true (-) south, (+) north + 'lon' : -75.622614, # degrees true (-) west, (+) east + 'mvar' : -10.816667, # degrees (-) west, (+) east + 'institution' : 'nccoos', + 'config_start_date' : '2013-02-02 00:30:00', + 'config_end_date' : None, # None or yyyy-mm-dd HH:MM:SS + 'packages' : ('sfas',), + } +sensor_info = { + 'sfas' : { 'id' : 'sodar', + 'description' : 'Wind profile data', + 'raw_dir' : '/seacoos/data/nccoos/level0/billymitchell/sodar1/mnd', + 'raw_file_glob' : '*.mnd', + 'proc_dir' : '/seacoos/data/nccoos/level1/billymitchell/sodar1', + 'process_module' : 'proc_scintec_maindata_sfas', + 'utc_offset' : 0, # hours offset to utc + 'min_altitude' : 10, # meters + 'altitude_interval' : 5, # meters + 'num_altitudes' : 39, + 'sensor_elevation' : 1, # meters (runway elev is at 5.2 m) + 'plot_module' : 'billymitchell_sodar_plot', + 'plot_names' : ('timeseries', 'wind_vectors', 'wind_barbs'), + }, + } Index: raw2proc/trunk/raw2proc/ouba_config_20100701.py =================================================================== --- raw2proc/trunk/raw2proc/ouba_config_20100701.py (revision 336) +++ raw2proc/trunk/raw2proc/ouba_config_20100701.py (revision 510) @@ -13,5 +13,5 @@ # 'config_start_date' : '2010-07-01 00:00:00', - 'config_end_date' : None, # None or yyyy-mm-dd HH:MM:SS + 'config_end_date' : '2013-10-31 23:00:00', # None or yyyy-mm-dd HH:MM:SS 'packages' : ('hfr', ), } Index: raw2proc/trunk/raw2proc/proc_codar_totals.py =================================================================== --- raw2proc/trunk/raw2proc/proc_codar_totals.py (revision 490) +++ raw2proc/trunk/raw2proc/proc_codar_totals.py (revision 510) @@ -1,4 +1,4 @@ #!/usr/bin/env python -# Last modified: Time-stamp: <2012-05-01 10:39:23 haines> +# Last modified: Time-stamp: <2013-04-30 16:27:48 haines> """ how to parse data, and assert what data and info goes into @@ -67,4 +67,5 @@ yi = numpy.linspace(minlat, maxlat, nlat) xi = numpy.linspace(minlon, maxlon, nlon) + xmesh, ymesh = numpy.meshgrid(xi, yi) data = { @@ -77,5 +78,5 @@ } - sample_dt, ftype, ncol, nrow = (None, None, None, None) + sample_dt, ftype, lluvspec, ncol, nrow = (None, None, None, None, None) # read header that match '%(k): (v)\n' pairs on each line m = re.findall(r'^(%.*):\s*(.*)$', ''.join(lines), re.MULTILINE) @@ -85,8 +86,14 @@ elif k == '%TableType': ftype = v + elif k == '%LLUVSpec': + lluvspec = float(re.split('\s+', v)[0]) elif k == '%TableColumns': ncol = int(v) elif k == '%TableRows': nrow = int(v) + elif k == '%TableEnd': + break + # LLUVSpec 1.17 and greater has two tables bracketed by TableStart and TableEnd + # get out of this search loop after the first table if nrow>2: @@ -112,14 +119,22 @@ vel_mag = d[:,12] vel_dir = d[:,13] - s1 = d[:,14] - s2 = d[:,15] - s3 = d[:,16] - s4 = d[:,17] - s5 = d[:,18] - s6 = d[:,19] + + # ibad = (wu_std_qual==999.) | (wv_std_qual==999.) | (cov_qual==999.) + # wu[ibad] = numpy.nan + # wv[ibad] = numpy.nan + + # SMH -- April 26, 2013 -- commenting out these columns for now until figure out how to handle + # new dynamic form of LLUVSpec 1.17 in TOT4 format, prior versions were static with 6 fields + # will have to use %LLUVSpec header info and second table at bottom of file to get dynamic ncols + # s1 = d[:,14] + # s2 = d[:,15] + # s3 = d[:,16] + # s4 = d[:,17] + # s5 = d[:,18] + # s6 = d[:,19] try: - uim = griddata(lon, lat, wu, xi, yi) - vim = griddata(lon, lat, wv, xi, yi) + uim = griddata(lon, lat, wu, xmesh, ymesh) + vim = griddata(lon, lat, wv, xmesh, ymesh) # returned masked array as an ndarray with masked values filled with fill_value ui = uim.filled(fill_value=numpy.nan) Index: raw2proc/trunk/raw2proc/proc_scintec_maindata_sfas.py =================================================================== --- raw2proc/trunk/raw2proc/proc_scintec_maindata_sfas.py (revision 309) +++ raw2proc/trunk/raw2proc/proc_scintec_maindata_sfas.py (revision 510) @@ -76,7 +76,7 @@ radial = float(radial) data['u'][profile_index][observation_index] = \ - radial * math.sin(theta) + -radial * math.sin(theta) data['v'][profile_index][observation_index] = \ - radial * math.cos(theta) + -radial * math.cos(theta) for variable in profile.variables: @@ -168,14 +168,17 @@ 'long_name': 'East/West Component of Wind', 'standard_name': 'eastward_wind', + 'positive': 'to the east', 'units': 'm s-1', }, 'v': {'short_name' : 'v', 'long_name': 'North/South Component of Wind', - 'standard_name': 'northward_wind', + 'standard_name': 'northward_wind', + 'positive': 'to the north', 'units': 'm s-1', }, 'w': {'short_name' : 'w', 'long_name': 'Vertical Component of Wind', - 'standard_name': 'upward_wind', + 'standard_name': 'upward_wind', + 'positive': 'from the surface', 'units': 'm s-1', }, Index: raw2proc/trunk/raw2proc/raw2proc.py =================================================================== --- raw2proc/trunk/raw2proc/raw2proc.py (revision 492) +++ raw2proc/trunk/raw2proc/raw2proc.py (revision 510) @@ -1,4 +1,4 @@ #!/usr/bin/env python -# Last modified: Time-stamp: <2012-06-01 17:01:51 haines> +# Last modified: Time-stamp: <2013-11-05 16:37:38 haines> """Process raw data to monthly netCDF data files