Changeset 218

Timestamp:

01/07/09 18:09:33

Author:

haines

Message:

AVP fixed profiler CDL2 implemented

Files:

• raw2proc/trunk/raw2proc/morgan_config_20080701.py (modified) (2 diffs)
• raw2proc/trunk/raw2proc/proc_avp_ascii_met.py (modified) (3 diffs)
• raw2proc/trunk/raw2proc/proc_avp_ysi_6600_v2.py (deleted)
• raw2proc/trunk/raw2proc/proc_avp_ysi_6600_v2_CDL2.py (added)
• raw2proc/trunk/raw2proc/procutil.py (modified) (4 diffs)
• raw2proc/trunk/raw2proc/raw2proc.py (modified) (2 diffs)
• raw2proc/trunk/raw2proc/stones_config_20080701.py (modified) (2 diffs)

raw2proc/trunk/raw2proc/morgan_config_20080701.py

@@ -2 +2 @@
-            'id' : 'morgan',
-            'location' : 'Morgan Bay, New River, NC',
-
-
-
-
+
+
+
+
+
-            'institution' : 'nccoos',
-            #
@@ -19 +20 @@
-              'raw_file_glob' : '*.dat',
-              'proc_dir' : '/seacoos/data/nccoos/level1/morgan/avp/',
-
+_CDL2
-              'utc_offset' : 5.,     # hours offset to Eastern Standard
-              'bin_size' : 0.1,      # meters
-40,          # for now, water_depth (MSL) divided by bin_siz
-
-
+150,          # max number of samples in profil
+# 
+# 
-              },
-    'met' : { 'id' : 'met',

raw2proc/trunk/raw2proc/proc_avp_ascii_met.py

@@ -1 +1 @@
-#!/usr/bin/env python
-0-01 12:46:26
+1-13 11:55:34
-"""
-how to parse data, and assert what data and info goes into
@@ -244 +244 @@
-        # dimension names use tuple so order of initialization is maintained
-        dim_inits = (
-n
-n
-n
-n
+
+
+
+
-                )
-
@@ -256 +256 @@
-        var_inits = (
-                # coordinate variables
-n
-n
-n
-n
+
+
+
+
-                # data variables
-n
-n
-n
-n
-n
-n
+
+
+
+
+
+
-                )
-

raw2proc/trunk/raw2proc/procutil.py

@@ -1 +1 @@
-#!/usr/bin/env python
-0-23 11:30:48
+2-17 16:49:11
-"""Utilities to help data processing 
-
@@ -289 +289 @@
-    # fn_glob = 'bogue_dspec_plot*'
-
+def addnan(dt, data):
+    # dt to be only 1-dimension and data to be 1- or 2-dimensional
+    
+    from matplotlib.dates import date2num, num2date
+
+    # print dt.shape
+    # print data.shape
+    
+    dn = date2num(dt)
+    delta = numpy.diff(dn)
+    sample_interval = numpy.median(delta)
+    maxdelta = 1.5*sample_interval
+    # print maxdelta
+    igap = (delta > maxdelta).nonzero()[0]
+    ngap = len(igap)
+    if not ngap:
+        return (dt, data)
+    else:
+        # convert sample interval to dt object
+        sample_interval = timedelta(0.5*sample_interval)
+        # for each gap in data create NaN
+        data_insert = [numpy.nan for gap in igap]
+        # for each gap in time create datetime value
+        dt_insert = [dt[gap]+sample_interval for gap in igap]
+        # insert new sample times at indices of the gaps
+        new_dt = numpy.insert(numpy.array(dt), igap+1, dt_insert)
+        # insert NaN data at the indices that match the above times
+        new_data = numpy.insert(numpy.array(data), igap+1, data_insert, axis=0)
+        return (new_dt, new_data)
+
-# unit conversions 
-def meters2feet(meters):
-    """Convert meters to feet: <feet> = <meters>*3.28084 """
-    return meters*3.28084
-
+
+
+
+
-        
-def millibar2inches_Hg(millibar):
@@ -299 +332 @@
-    return millibar*0.0295301
-
-
-def celsius2fahrenheit(celsius):
-    """Convert deg Celsius to deg Fahrenheit: <fahrenheit> = ((1.8*<celsius>)+32) """
-    return (1.8*celsius)+32
-
-
-def millimeters2inches(millimeters):
-    """ Convert millimeter to inches: <inches> = <millimeters>*0.0393700787) """
-    return millimeters*0.0393700787
-
+def inches2millimeters(inches):
+    """ Convert <mm> = <inches>*25.4 """
+    return inches*25.4
-
-def meters_sec2knots(meters_sec):
@@ -314 +348 @@
-    return meters_sec*1.94384449
-
-
-def wind_vector2u(wind_speed, wind_from_direction):
-    """ Convert wind vector to U (east) component: <u> = <wind_speed>*sine(<wind_from_direction>*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: <v> = <wind_speed>*cosine(<wind_from_direction>*pi/180) """
-    return wind_speed*math.cos(wind_from_direction*math.pi/180)
-
-                                                
-def proc2latest(pi, si, yyyy_mm):
-    """Select specific variables and times from current monthly netCDF

raw2proc/trunk/raw2proc/raw2proc.py

@@ -1 +1 @@
-#!/usr/bin/env python
-8-10-23 11:05:43
+9-01-07 17:12:01
-"""Process raw data to monthly netCDF data files
-
@@ -402 +402 @@
-
-            for index, val in enumerate(data['dt']):
-
+=
-                    data['in'][index] = True
-                    

raw2proc/trunk/raw2proc/stones_config_20080701.py

@@ -2 +2 @@
-            'id' : 'stones',
-            'location' : 'Stones Bay, New River, NC',
-
-
-
-
+
+
+
+
+
-            'institution' : 'nccoos',
-            #
@@ -19 +20 @@
-              'raw_file_glob' : '*.dat',
-              'proc_dir' : '/seacoos/data/nccoos/level1/stones/avp',
-
+_CDL2
-              'utc_offset' : 5.,      # hours offset to Eastern Standard
-              'bin_size' : 0.1,      # meters
-40,          # for now, water_depth (MSL) divided by bin_siz
-
-
+150,          # max number of samples in profil
+# 
+# 
-              },
-    'met' : { 'id' : 'met',