SPCT is now of type "byte" (instead of "char") and uses CF variable a…

…ttributes "flag_meanings" and "flag_values" (instead of "spectra_method_meanings" and "spectra_method_values") to better describe its content.
aodn · Apr 12, 2017 · 307037a · 307037a
1 parent d228ae1
commit 307037a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/IMOS/imosParameters.txt b/IMOS/imosParameters.txt
@@ -105,7 +105,7 @@ SLC2,                1, moles_of_silicate_per_unit_mass_in_sea_water,
 SNR1,                0, signal_noise_ratio_from_acoustic_beam_1,                                                  decibel,       ,              ,                                  A, 999999.0, 0.0,      150.0,    float
 SNR2,                0, signal_noise_ratio_from_acoustic_beam_2,                                                  decibel,       ,              ,                                  A, 999999.0, 0.0,      150.0,    float
 SNR3,                0, signal_noise_ratio_from_acoustic_beam_3,                                                  decibel,       ,              ,                                  A, 999999.0, 0.0,      150.0,    float
-SPCT,                0, awac_spectra_calculation_method,                                                          ,              ,              ,                                  ,          , ,         ,         char
+SPCT,                0, awac_spectra_calculation_method,                                                          ,              ,              ,                                  ,          , ,         ,         byte
 SPEC_CNDC,           0, sea_water_specific_electrical_conductivity,                                               S m-1,         ,              ,                                  C, 999999.0, 0.0,      50000.0,  float
 SRAD,                1, isotropic_shortwave_radiance_in_air,                                                      W m-1 sr-1,    ,              ,                                  F, 999999.0, ,         ,         float
 SSDS,                0, sea_surface_wave_directional_spread,                                                      degree,        clockwise,     true north,                        W, 999999.0, 0.0,      360.0,    float

diff --git a/NetCDF/template/spct_attributes.txt b/NetCDF/template/spct_attributes.txt
@@ -21,5 +21,5 @@ N, accuracy                  =
 N, precision                 = 
 N, resolution                = 
 S, cell_methods              = 
-S, spectra_method_values     = 0 1 3
-S, spectra_method_meanings   = Pressure Velocity Acoustic_Surface_Tracking
+S, flag_values               = 0 1 3 9
+S, flag_meanings             = Pressure Velocity Acoustic_Surface_Tracking Unknown
diff --git a/Parser/readAWACWaveAscii.m b/Parser/readAWACWaveAscii.m
@@ -230,7 +230,7 @@
     waveData.Temperature(iHeader) = header(:,17);
     clear header iHeader;
 
-    waveData.SpectraType            = num2str(zeros(nTime, 1, 'uint16'));
+    waveData.SpectraType            = 9*ones(nTime, 1, 'uint8');
     waveData.SignificantHeight      = nan(nTime, 1);
     waveData.MeanZeroCrossingPeriod = nan(nTime, 1);
     waveData.PeakPeriod             = nan(nTime, 1);
@@ -240,7 +240,7 @@
     waveData.MeanPressure           = nan(nTime, 1);
     waveData.UnidirectivityIndex    = nan(nTime, 1);
 
-    waveData.SpectraType(iWave)            = num2str(wave(:,7));
+    waveData.SpectraType(iWave)            = wave(:,7);
     waveData.SignificantHeight(iWave)      = wave(:,8);
     waveData.PeakPeriod(iWave)             = wave(:,14);
     waveData.MeanZeroCrossingPeriod(iWave) = wave(:,15);