Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Output folder and generated files
output/
.coverage

# Byte-compiled / optimized / DLL files
__pycache__/
Expand Down Expand Up @@ -45,4 +46,4 @@ build/
seasenselib.egg-info/

# Large data files (hosted externally)
examples/moor/raw/msm76_2018/adcp/DS0218_RDI_000_24289.mat
examples/moor/raw/msm76_2018/adcp/DS0218_RDI_000_24289.mat
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"north_amplitude": "North Amplitude",
"north_velocity": "Northward velocity (m/s)",
"oxygen": "Oxygen",
"par": "Photosynthetically Active Radiation (umol m-2 s-1)",
"pitch": "Pitch angle (degrees)",
"potential_temperature": "Potential Temperature \u03b8 (degC)",
"power_supply_input": "Power supply input voltage (V)",
Expand Down
6 changes: 6 additions & 0 deletions seasenselib/knowledge/pipeline/mapping/mappings_default.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
"CTDALTIMETER",
"ctd_altimeter"
],
"par": [
"par",
"PAR",
"ctd_fluor_par",
"CTDPAR"
],
"battery_voltage": [
"Vbatt",
"BATTV",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,25 @@
"standard_name": "northward_sea_water_velocity",
"units": "m/s"
},
"fluorescence": {
"coverage_content_type": "physicalMeasurement",
"long_name": "Fluorescence",
"measurement_type": "Measured",
"standard_name": "mass_concentration_of_chlorophyll_in_sea_water",
"units": "mg m-3"
},
Comment on lines +78 to +84
"oxygen": {
"coverage_content_type": "physicalMeasurement",
"long_name": "Oxygen",
"standard_name": "volume_fraction_of_oxygen_in_sea_water"
"standard_name": "moles_of_oxygen_per_unit_mass_in_sea_water",
"units": "umol kg-1"
},
"par": {
"coverage_content_type": "physicalMeasurement",
"long_name": "Photosynthetically Active Radiation",
"measurement_type": "Measured",
"standard_name": "downwelling_photosynthetic_photon_flux_in_sea_water",
"units": "umol m-2 s-1"
},
"pitch": {
"long_name": "Pitch angle",
Expand Down Expand Up @@ -125,7 +140,7 @@
"long_name": "Salinity",
"measurement_type": "Derived",
"short_name": "SAL",
"standard_name": "sea_water_salinity"
"standard_name": "sea_water_practical_salinity"
},
"speed_of_sound": {
"long_name": "Speed of sound in sea water",
Expand Down
25 changes: 22 additions & 3 deletions seasenselib/parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
BATTERY_VOLTAGE = 'battery_voltage'
ALTIMETER = 'altimeter'
REDOX_POTENTIAL = 'redox_potential'
PAR = 'par'

# Meta data should use standardized values from https://cfconventions.org/
metadata = {
Expand Down Expand Up @@ -69,9 +70,9 @@
SALINITY: {
'long_name': "Salinity",
'coverage_content_type': 'physicalMeasurement',
'standard_name': 'sea_water_salinity',
'standard_name': 'sea_water_practical_salinity',
'short_name': 'SAL',
'measurement_type': 'Derived',
'measurement_type': 'Derived',
},
TURBIDITY: {
'long_name': "Turbidity",
Expand All @@ -82,8 +83,23 @@
},
OXYGEN: {
'long_name': "Oxygen",
'units': 'umol kg-1',
'coverage_content_type': 'physicalMeasurement',
'standard_name': 'moles_of_oxygen_per_unit_mass_in_sea_water',
},
FLUORESCENCE: {
'long_name': "Fluorescence",
'units': 'mg m-3',
'coverage_content_type': 'physicalMeasurement',
'standard_name': 'volume_fraction_of_oxygen_in_sea_water'
'standard_name': 'mass_concentration_of_chlorophyll_in_sea_water',
'measurement_type': 'Measured',
},
Comment on lines +90 to +96
PAR: {
'long_name': "Photosynthetically Active Radiation",
'units': 'umol m-2 s-1',
'coverage_content_type': 'physicalMeasurement',
'standard_name': 'downwelling_photosynthetic_photon_flux_in_sea_water',
'measurement_type': 'Measured',
},
DEPTH: {
'long_name': 'Depth',
Expand Down Expand Up @@ -304,6 +320,9 @@
ALTIMETER: [
'altM', 'altimeter'
],
PAR: [
'par', 'PAR',
],
DENSITY: [
'sigma-t00', 'sigma-t11',
'sigma-theta00', 'sigma-theta11',
Expand Down
Loading
Loading