Index: raw2proc/trunk/raw2proc/jpier_config_20050425.py =================================================================== --- raw2proc/trunk/raw2proc/jpier_config_20050425.py (revision 112) +++ raw2proc/trunk/raw2proc/jpier_config_20050425.py (revision 144) @@ -13,9 +13,10 @@ sensor_info = { 'met' : { 'id' : 'met', - 'description' : 'Met data', - 'raw_dir' : '/home/haines/data/nccoos/level0/jpier/met/', - 'raw_file_glob' : '*', - 'proc_dir' : '/home/haines/data/nccoos/level1/jpier/met/', - 'process_module' : 'proc_jpier_ascii_met', - }, + 'description' : 'Met data', + 'raw_dir' : '/home/haines/data/nccoos/level0/jpier/met/', + 'utc_offset' : 4, # hours offset to utc + 'raw_file_glob' : '*', + 'proc_dir' : '/home/haines/data/nccoos/level1/jpier/met/', + 'process_module' : 'proc_jpier_ascii_met', + }, } Index: raw2proc/trunk/raw2proc/proc_jpier_ascii_met.py =================================================================== --- raw2proc/trunk/raw2proc/proc_jpier_ascii_met.py (revision 114) +++ raw2proc/trunk/raw2proc/proc_jpier_ascii_met.py (revision 144) @@ -50,5 +50,10 @@ print "... Header row present, skipping ..." del lines[0] - + + + # sort file by fields 0-5 + lines.sort() + + for line in lines: # split line and parse float and integers Index: raw2proc/trunk/raw2proc/procutil.py =================================================================== --- raw2proc/trunk/raw2proc/procutil.py (revision 118) +++ raw2proc/trunk/raw2proc/procutil.py (revision 144) @@ -1,4 +1,4 @@ #!/usr/bin/env python -# Last modified: Time-stamp: <2008-02-19 15:04:00 jcleary> +# Last modified: Time-stamp: <2008-03-25 10:51:00 jcleary> """Utilities to help data processing @@ -16,4 +16,5 @@ from dateutil.tz import tzlocal, tzutc import time +import math def check_configs(): @@ -283,4 +284,33 @@ """Convert meters to feet: = *3.28084 """ return meters*3.28084 + -# +def millibar2inches_Hg(millibar): + """Convert millibars to inches Hg: = *0.0295301 """ + return millibar*0.0295301 + + +def celsius2fahrenheit(celsius): + """Convert deg Celsius to deg Fahrenheit: = ((1.8*)+32) """ + return (1.8*celsius)+32 + + +def millimeters2inches(millimeters): + """ Convert millimeter to inches: = *0.0393700787) """ + return millimeters*0.0393700787 + + +def meters_sec2knots(meters_sec): + """ Convert m/s to knots: = *1.94384449) """ + return meters_sec*1.94384449 + + +def wind_vector2u(wind_speed, wind_from_direction): + """ Convert wind vector to U (east) component: = *sine(*pi/180) """ + return wind_speed*math.sin(wind_from_direction*math.pi/180) + + +def wind_vector2v(wind_speed, wind_from_direction): + """ Convert wind vector to V (north) component: = *cosine(*pi/180) """ + return wind_speed*math.cos(wind_from_direction*math.pi/180) +