Changeset 211

Timestamp:

10/01/08 12:50:11

Author:

haines

Message:

corrected lon to negative for (longitude W) in config files; corrected misspelled field in all proc_*.py

Files:

• raw2proc/trunk/raw2proc/jpier_config_20050425.py (modified) (1 diff)
• raw2proc/trunk/raw2proc/jpier_config_20080411.py (modified) (1 diff)
• raw2proc/trunk/raw2proc/jpier_config_20080722.py (modified) (1 diff)
• raw2proc/trunk/raw2proc/morgan_config_20080701.py (modified) (1 diff)
• raw2proc/trunk/raw2proc/proc_avp_ascii_met.py (modified) (5 diffs)
• raw2proc/trunk/raw2proc/proc_avp_ysi_6600_v2.py (modified) (2 diffs)
• raw2proc/trunk/raw2proc/proc_jpier_ascii_met.py (modified) (3 diffs)
• raw2proc/trunk/raw2proc/proc_nortek_wds_dw.py (modified) (2 diffs)
• raw2proc/trunk/raw2proc/proc_nortek_wpa_adcp.py (modified) (2 diffs)
• raw2proc/trunk/raw2proc/proc_rdi_dspec_dw.py (modified) (2 diffs)
• raw2proc/trunk/raw2proc/proc_rdi_logdata_adcp.py (modified) (2 diffs)
• raw2proc/trunk/raw2proc/proc_rdi_logdata_dw.py (modified) (2 diffs)
• raw2proc/trunk/raw2proc/raw2proc.py (modified) (3 diffs)
• raw2proc/trunk/raw2proc/stones_config_20080701.py (modified) (1 diff)

raw2proc/trunk/raw2proc/jpier_config_20050425.py

@@ -3 +3 @@
-            'location' : 'Jennettes Pier, Nags Head, NC',
-            'lat' : 35.9101,         # degrees true (-) south, (+) north
-
+-
-            'mvar' : -10.83333,      # degrees (-) west, (+) east        
-            'institution' : 'nccoos',

raw2proc/trunk/raw2proc/jpier_config_20080411.py

@@ -3 +3 @@
-            'location' : 'Jennettes Pier, Nags Head, NC',
-            'lat' : 35.9101,         # degrees true (-) south, (+) north
-
+-
-            'mvar' : -10.83333,      # degrees (-) west, (+) east        
-            'institution' : 'nccoos',

raw2proc/trunk/raw2proc/jpier_config_20080722.py

@@ -3 +3 @@
-            'location' : 'Jennettes Pier, Nags Head, NC',
-            'lat' : 35.9101,         # degrees true (-) south, (+) north
-
+-
-            'mvar' : -10.83333,      # degrees (-) west, (+) east        
-            'institution' : 'nccoos',

raw2proc/trunk/raw2proc/morgan_config_20080701.py

@@ -3 +3 @@
-            'location' : 'Morgan Bay, New River, NC',
-            'lat' : 34.7037,         # degrees true (-) south, (+) north
-
+-
-            'mvar' : -9.42,          # degrees (-) west, (+) east
-            'water_depth': 4.0,      # nominal depth in meters (should be MSL)

raw2proc/trunk/raw2proc/proc_avp_ascii_met.py

@@ -1 +1 @@
-#!/usr/bin/env python
-09-25 12:57:53
+10-01 12:46:26
-"""
-how to parse data, and assert what data and info goes into
@@ -130 +130 @@
-        global_atts = { 
-                'title' : title_str,
-
+i
-                'institution_url' : 'http://nccoos.org',
-                'institution_dods_url' : 'http://nccoos.org',
@@ -200 +200 @@
-                          'standard_name': 'wind_speed',
-                          'units': 'm s-1',
-yes
+no
-                          'z' : sensor_info['anemometer_height'],
-                          },
@@ -223 +223 @@
-                       'reference': 'relative to True East (?)',
-                       'units': 'm s-1',
-yes
+no
-                       'z' : sensor_info['anemometer_height'],
-                       },
@@ -231 +231 @@
-                       'reference': 'relative to True North (?)',
-                       'units': 'm s-1',
-yes
+no
-                       'z' : sensor_info['anemometer_height'],
-                       },

raw2proc/trunk/raw2proc/proc_avp_ysi_6600_v2.py

@@ -1 +1 @@
-#!/usr/bin/env python
-09-24 14:19:32
+10-01 12:46:41
-"""
-how to parse data, and assert what data and info goes into
@@ -217 +217 @@
-    global_atts = { 
-        'title' : title_str,
-
+i
-        'institution_url' : 'http://nccoos.unc.edu',
-        'institution_dods_url' : 'http://nccoos.unc.edu',

raw2proc/trunk/raw2proc/proc_jpier_ascii_met.py

@@ -1 +1 @@
-#!/usr/bin/env python
-09-25 12:58:11
+10-01 12:45:54
-"""
-how to parse data, and assert what data and info goes into
@@ -128 +128 @@
-        global_atts = { 
-                'title' : title_str,
-
+i
-                'institution_url' : 'http://nccoos.org',
-                'institution_dods_url' : 'http://nccoos.org',
@@ -219 +219 @@
-                                                'standard_name': 'wind_speed',
-                                                'units': 'm s-1',
-?
+no
-                                                },
-                'wdir' :        {'short_name': 'wdir',

raw2proc/trunk/raw2proc/proc_nortek_wds_dw.py

@@ -1 +1 @@
-#!/usr/bin/env python
-09-24 14:19:00
+10-01 12:47:05
-"""
-how to parse data, and assert what data and info goes into
@@ -402 +402 @@
-    global_atts = { 
-        'title' : title_str,
-
+i
-        'institution_url' : 'http://nccoos.unc.edu',
-        'institution_dods_url' : 'http://nccoos.unc.edu',

raw2proc/trunk/raw2proc/proc_nortek_wpa_adcp.py

@@ -1 +1 @@
-#!/usr/bin/env python
-09-24 14:18:52
+10-01 12:47:16
-"""
-how to parse data, and assert what data and info goes into
@@ -226 +226 @@
-    global_atts = { 
-        'title' : title_str,
-
+i
-        'institution_url' : 'http://nccoos.unc.edu',
-        'institution_dods_url' : 'http://nccoos.unc.edu',

raw2proc/trunk/raw2proc/proc_rdi_dspec_dw.py

@@ -1 +1 @@
-#!/usr/bin/env python
-09-24 14:18:40
+10-01 12:47:26
-"""
-how to parse data, and assert what data and info goes into
@@ -324 +324 @@
-    global_atts = { 
-        'title' : title_str,
-
+i
-        'institution_url' : 'http://nccoos.unc.edu',
-        'institution_dods_url' : 'http://nccoos.unc.edu',

raw2proc/trunk/raw2proc/proc_rdi_logdata_adcp.py

@@ -1 +1 @@
-#!/usr/bin/env python
-09-24 14:18:3
+10-01 12:47:4
-"""
-how to parse data, and assert what data and info goes into
@@ -147 +147 @@
-    global_atts = { 
-        'title' : title_str,
-
+i
-        'institution_url' : 'http://nccoos.unc.edu',
-        'institution_dods_url' : 'http://nccoos.unc.edu',

raw2proc/trunk/raw2proc/proc_rdi_logdata_dw.py

@@ -1 +1 @@
-#!/usr/bin/env python
-09-24 14:18:2
+10-01 12:47:5
-"""
-how to parse data, and assert what data and info goes into
@@ -110 +110 @@
-    global_atts = { 
-        'title' : title_str,
-
+i
-        'institution_url' : 'http://nccoos.unc.edu',
-        'institution_dods_url' : 'http://nccoos.unc.edu',

raw2proc/trunk/raw2proc/raw2proc.py

@@ -1 +1 @@
-#!/usr/bin/env python
-25 14:07:27
+30 17:40:58
-"""Process raw data to monthly netCDF data files
-
@@ -453 +453 @@
-    global_atts, var_atts, dim_inits, var_inits, var_data = d
-    list_of_record_vars = nc_find_record_vars(ifn)
+
-    # find unlimited dimension (a dimension length of zero) and set to length of dt
-
+
+
+
-    dim_inits = list(dim_inits)
+    for j in range(len(dees)):
+        for i in range(len(dim_inits)):
+            if dim_inits[i][0]==dees[j][0]:  # 'ntime'
+                dim_inits[i] = (dees[j][1], dim_inits[i][1])
-    for i in range(len(dim_inits)):
-        if dim_inits[i][1]==0:
-dim_inits[i][0]
+'time'
-    dim_inits = tuple(dim_inits)
+    # print dim_inits
+
+    # replace name of dependent dimension names with speificied names for CDL v2.0 in variables
+    # e.g. ntime for time
+    var_inits = list(var_inits)
+    for j in range(len(dees)):
+        for i in range(len(var_inits)):
+            v = list(var_inits[i])
+            dl = list(v[2])
+            for k in range(len(dl)):
+                if dl[k]==dees[j][0]:
+                    dl[k]=dees[j][1] # 'time'
+            var_inits[i]=(v[0], v[1], tuple(dl))
+    var_inits = tuple(var_inits)
+    # print var_inits
+                                
-    # subset data
-    varNames = [vn for vn, vt, vd in var_inits]
@@ -474 +497 @@
-    ofn = os.path.join(si['latest_dir'], si['latest_filename'])
-    d = (global_atts, var_atts, dim_inits, var_inits, var_data)
-
-    print dim_inits
-    
-    nc_create(ofn, d)

raw2proc/trunk/raw2proc/stones_config_20080701.py

@@ -3 +3 @@
-            'location' : 'Stones Bay, New River, NC',
-            'lat' : 34.5962,         # degrees true (-) south, (+) north
-
+-
-            'mvar' : -9.38,          # degrees (-) west, (+) east
-            'water_depth': 4.0,      # nominal depth in meters (should be MSL)