Changeset 507
- Timestamp:
- 04/26/13 18:41:04
- Files:
-
- gliderproc/trunk (modified) (1 prop)
- gliderproc/trunk/extractDbd.m (modified) (1 diff)
- gliderproc/trunk/gliderOptode_Generate_L1_Data.m (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
gliderproc/trunk
- Property svn:ignore changed from BATHYMETRY GLIDER_DATA_LEVEL0 GLIDER_DATA_LEVEL0_CSV GLIDER_DATA_LEVEL1 *.asv *.log *.py *.pyc to BATHYMETRY GLIDER_DATA_LEVEL0 GLIDER_DATA_LEVEL0_CSV GLIDER_DATA_LEVEL1 *.mat *.asv *.log *.py *.pyc
gliderproc/trunk/extractDbd.m
r503 r507 37 37 end 38 38 39 disp(['Extracting ', strGliderName, 'Deployment ', num2str(deploymentNumber)]);39 disp(['Extracting DBDs for ', strGliderName, ' Deployment ', num2str(deploymentNumber)]); 40 40 41 41 % populate arrays for the deployment start and end dates... gliderproc/trunk/gliderOptode_Generate_L1_Data.m
r506 r507 56 56 57 57 % define optode foil calibration coefficients 58 % by glider and deployment58 % and oxygen bounds values by glider and deployment 59 59 switch gliderIndex 60 60 case 1 % Pelagia … … 69 69 C3coef=[-3.96052E-02,7.46930E-04,-1.17804E-05,6.677619E-08]; 70 70 C4coef=[1.61999E-04,-2.37870E-06,3.63223E-08,-1.62194E-10]; 71 lo_oxy = 50; 72 hi_oxy = 2000; 73 lo_sat = 50; 74 hi_sat = 2000; 71 75 case 3 % Deployment 3; 72 76 % replaced foil on 12 March 2012; … … 78 82 C3coef=[-5.26332308E-02,7.15467419E-04,3.31185072E-06,-1.86124024E-07]; 79 83 C4coef=[2.10916841E-04,-1.84087896E-06,-4.28645540E-08,1.11120317E-09]; 84 lo_oxy = 100; 85 hi_oxy = 300; 86 lo_sat = 20; 87 hi_sat = 140; 80 88 end 81 89 case 2 % Ramses all deployments; … … 87 95 C3coef=[-5.99449e-2 1.48326e-3 -2.82110e-5 2.15156e-7]; 88 96 C4coef=[2.43614e-4 -5.26759e-6 1.00064e-7 -7.14320e-10]; 97 lo_oxy = 10; 98 hi_oxy = 250; 99 lo_sat = 20; 100 hi_sat = 100; 89 101 end 90 102 103 disp(['Processing DO for ', strGliderName, ' Deployment ', strDeploymentNumber]); 104 disp(['lo_oxy filter = ', num2str(lo_oxy)]); 105 disp(['hi_oxy filter = ', num2str(hi_oxy)]); 106 disp(['lo_sat filter = ', num2str(lo_sat)]); 107 disp(['hi_sat filter = ', num2str(hi_sat)]); 108 91 109 %*** READ IN EBD DATA **** 92 110 % declare arrays for accumulating data … … 178 196 oxyw_oxygen = oxyw_oxygen(i); 179 197 oxyw_saturation = oxyw_saturation(i); 198 oxyw_temp = oxyw_temp(i); 199 % oxyw_bphase = oxyw_bphase(i); 200 % oxyw_rphase = oxyw_rphase(i); 201 % oxyw_bamp = oxyw_bamp(i); 202 % oxyw_bpot = oxyw_bpot(i); 203 % oxyw_ramp = oxyw_ramp(i); 204 % oxyw_rawtemp = oxyw_rawtemp(i); 205 % oxyw_time = oxyw_time(i); 206 % oxyw_installed = oxyw_installed(i); 207 208 % remove unreasonably low oxygen values from EBD data... 209 i = find(gt(oxyw_oxygen, lo_oxy)); 210 oxyw_oxygen = oxyw_oxygen(i); 211 ptime_ebd = ptime_ebd(i); 212 oxyw_saturation = oxyw_saturation(i); 213 oxyw_dphase = oxyw_dphase(i); 214 oxyw_temp = oxyw_temp(i); 215 % oxyw_bphase = oxyw_bphase(i); 216 % oxyw_rphase = oxyw_rphase(i); 217 % oxyw_bamp = oxyw_bamp(i); 218 % oxyw_bpot = oxyw_bpot(i); 219 % oxyw_ramp = oxyw_ramp(i); 220 % oxyw_rawtemp = oxyw_rawtemp(i); 221 % oxyw_time = oxyw_time(i); 222 % oxyw_installed = oxyw_installed(i); 223 224 % remove unreasonably high oxygen values from EBD data... 225 i = find(lt(oxyw_oxygen, hi_oxy)); 226 oxyw_oxygen = oxyw_oxygen(i); 227 ptime_ebd = ptime_ebd(i); 228 oxyw_saturation = oxyw_saturation(i); 229 oxyw_dphase = oxyw_dphase(i); 230 oxyw_temp = oxyw_temp(i); 231 % oxyw_bphase = oxyw_bphase(i); 232 % oxyw_rphase = oxyw_rphase(i); 233 % oxyw_bamp = oxyw_bamp(i); 234 % oxyw_bpot = oxyw_bpot(i); 235 % oxyw_ramp = oxyw_ramp(i); 236 % oxyw_rawtemp = oxyw_rawtemp(i); 237 % oxyw_time = oxyw_time(i); 238 % oxyw_installed = oxyw_installed(i); 239 240 % remove unreasonably low saturation values from EBD data... 241 i = find(gt(oxyw_saturation, lo_sat)); 242 oxyw_saturation = oxyw_saturation(i); 243 ptime_ebd = ptime_ebd(i); 244 oxyw_oxygen = oxyw_oxygen(i); 245 oxyw_dphase = oxyw_dphase(i); 246 oxyw_temp = oxyw_temp(i); 247 % oxyw_bphase = oxyw_bphase(i); 248 % oxyw_rphase = oxyw_rphase(i); 249 % oxyw_bamp = oxyw_bamp(i); 250 % oxyw_bpot = oxyw_bpot(i); 251 % oxyw_ramp = oxyw_ramp(i); 252 % oxyw_rawtemp = oxyw_rawtemp(i); 253 % oxyw_time = oxyw_time(i); 254 % oxyw_installed = oxyw_installed(i); 255 256 % remove unreasonably high saturation values from EBD data... 257 i = find(lt(oxyw_saturation, hi_sat)); 258 oxyw_saturation = oxyw_saturation(i); 259 ptime_ebd = ptime_ebd(i); 260 oxyw_oxygen = oxyw_oxygen(i); 261 oxyw_dphase = oxyw_dphase(i); 180 262 oxyw_temp = oxyw_temp(i); 181 263 % oxyw_bphase = oxyw_bphase(i);