Skip to content

Commit 8d6a637

Browse files
committed
Add some geotraces particulate names
* Added some new GEOTRACES total particulate names in volume units: * Fe_TP_CONC_BOTTLE [NMOL/L] * Si_TP_CONC_BOTTLE [NMOL/L] * P_TP_CONC_BOTTLE [NMOL/L] * Mn_TP_CONC_BOTTLE [NMOL/L] * Added volume [NMOL/L] unit variant of Al_TP_CONC_BOTTLE
1 parent a71a463 commit 8d6a637

4 files changed

Lines changed: 173 additions & 12 deletions

File tree

CHANGELOG

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ v2026.05.0 (2026-05-28)
33
Parameter Changes
44
-----------------
55
* Add TCARBN_ERROR as the uncertainty name for TCARBN [UMOL/KG]
6+
* Added some new GEOTRACES total particulate names in volume units:
7+
* Fe_TP_CONC_BOTTLE [NMOL/L]
8+
* Si_TP_CONC_BOTTLE [NMOL/L]
9+
* P_TP_CONC_BOTTLE [NMOL/L]
10+
* Mn_TP_CONC_BOTTLE [NMOL/L]
11+
* Added volume [NMOL/L] unit variant of Al_TP_CONC_BOTTLE
12+
613

714
API Changes
815
-----------
@@ -345,7 +352,7 @@ Parameter Changes
345352
* FLUORO [VOLTS] for CTDFLUOR [VOLTS]
346353
* CHLORA [MG/M**3] for CHLORA [UG/L]
347354
* PPHYTN [MG/M**3] for PPHYTN [UG/L]
348-
* PPHYTN [MG/M^] for PPHYTN [UG/L]
355+
* PPHYTN [MG/M^] for PPHYTN [UG/L]
349356
* PCO2_TMP [DEG C] for PCO2TMP [DEG C]
350357
* DELHE3 [%] for DELHE3 [PERCNT]
351358
* BEDFORT [NUM] for BIONBR
@@ -361,8 +368,8 @@ Parameter Changes
361368
* CTDSAL [PSS-68] for CTDSAL [PSS-78]
362369
* CTDTHETA [DEG C] for THETA [DEG C]
363370
* CTDCDOMFRAW [0-5VDC] for CTDCDOM [VOLTS]
364-
* CTDCDOMFRAW [VDC] for CTDCDOM [VOLTS]
365-
* CTDCDOMFRAW [V] for CTDCDOM [VOLTS]
371+
* CTDCDOMFRAW [VDC] for CTDCDOM [VOLTS]
372+
* CTDCDOMFRAW [V] for CTDCDOM [VOLTS]
366373
* SALNTY [ISS78] for SALNTY [PSS-78]
367374
* CTDSAL [ISS78] for CTDSAL [PSS-78]
368375
* BTMDEPTH [METERS] for DEPTH [PSS-78]
@@ -490,8 +497,8 @@ API Changes
490497
v0.1.13 (2021-08-12)
491498
====================
492499

493-
This release focused mostly on code maintainability.
494-
Lots of tests written for the public API interface and a whole bunch of improvements to the type hints.
500+
This release focused mostly on code maintainability.
501+
Lots of tests written for the public API interface and a whole bunch of improvements to the type hints.
495502
The scaffold for docs has been set up, though content is still being written.
496503

497504
Parameter Changes
@@ -526,8 +533,8 @@ Parameter Changes
526533

527534
API Changes
528535
-----------
529-
* A ``WHPName.strfex()`` method was added which formats values passed into it according to the values of ``WHPName.data_type``, ``WHPName.field_width``, and ``WHPName.numeric_precision``.
530-
It will convert NaNs, and anything resulting in an empty string to ``-999``.
536+
* A ``WHPName.strfex()`` method was added which formats values passed into it according to the values of ``WHPName.data_type``, ``WHPName.field_width``, and ``WHPName.numeric_precision``.
537+
It will convert NaNs, and anything resulting in an empty string to ``-999``.
531538
The method name was inspired by the datetime method ``strftime``.
532539

533540
v0.1.11 (2021-05-27)
@@ -542,7 +549,7 @@ Parameter Changes
542549

543550
API Changes
544551
-----------
545-
* the output of ``WHPNames.legacy_json`` is now guaranteed to be ordered in "preferred" GO-SHIP order rather than database order.
552+
* the output of ``WHPNames.legacy_json`` is now guaranteed to be ordered in "preferred" GO-SHIP order rather than database order.
546553
The order may change between releasees as the preferred parameter order of GO-SHIP evolves and as new parameters are added.
547554

548555
v0.1.10 (2021-03-15)
@@ -568,9 +575,9 @@ None
568575

569576
API Changes
570577
-----------
571-
* WHPNames now has a property ``groups`` with a named tuple containing collections of parameters with the scopes of ``cruise``, ``profile``, and ``sample``.
572-
As of release, there were no "cruise" level parameter names in the database.
573-
"profile" scoped parameters can/should be in exchange CTD headers.
578+
* WHPNames now has a property ``groups`` with a named tuple containing collections of parameters with the scopes of ``cruise``, ``profile``, and ``sample``.
579+
As of release, there were no "cruise" level parameter names in the database.
580+
"profile" scoped parameters can/should be in exchange CTD headers.
574581
"sample" scoped params must have their values appear in the data block of an exchange file.
575582

576583
v0.1.8 (2021-01-06)
@@ -582,4 +589,4 @@ Parameter Changes
582589

583590
API Changes
584591
-----------
585-
* The dict returned by ``WHPName.get_nc_attrs()`` will now include a ``"C_format"`` key if the parameter has both a ``field_width`` and ``numeric_precision``
592+
* The dict returned by ``WHPName.get_nc_attrs()`` will now include a ``"C_format"`` key if the parameter has both a ``field_width`` and ``numeric_precision``

src/cchdo/params/_whp_names.py

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10183,6 +10183,151 @@
1018310183
emission_wavelength=None,
1018410184
nc_group=None,
1018510185
),
10186+
WHPNameDC(
10187+
whp_name='Fe_TP_CONC_BOTTLE',
10188+
dtype='decimal',
10189+
in_erddap=False,
10190+
whp_unit='NMOL/L',
10191+
nc_name='fe_tp_conc_bottle_l',
10192+
flag_w='woce_discrete',
10193+
cf_name=None,
10194+
numeric_min=None,
10195+
numeric_max=None,
10196+
numeric_precision=2,
10197+
field_width=9,
10198+
description='Concentration of total particulate iron determined by filtration from a water sampling bottle',
10199+
note='For maximum data reusability, we decided to use GEOTRACES naming conventions',
10200+
warning=None,
10201+
error_name=None,
10202+
cf_unit='nmol/l',
10203+
reference_scale=None,
10204+
whp_number=None,
10205+
scope='sample',
10206+
analytical_temperature_name=None,
10207+
analytical_temperature_units=None,
10208+
rank=918.0,
10209+
radiation_wavelength=None,
10210+
scattering_angle=None,
10211+
excitation_wavelength=None,
10212+
emission_wavelength=None,
10213+
nc_group=None,
10214+
),
10215+
WHPNameDC(
10216+
whp_name='Si_TP_CONC_BOTTLE',
10217+
dtype='decimal',
10218+
in_erddap=False,
10219+
whp_unit='NMOL/L',
10220+
nc_name='si_tp_conc_bottle',
10221+
flag_w='woce_discrete',
10222+
cf_name=None,
10223+
numeric_min=None,
10224+
numeric_max=None,
10225+
numeric_precision=1,
10226+
field_width=9,
10227+
description='Concentration of total particulate silicon determined by filtration from a water sampling bottle',
10228+
note='For maximum data reusability, we decided to use GEOTRACES naming conventions',
10229+
warning=None,
10230+
error_name=None,
10231+
cf_unit='nmol/l',
10232+
reference_scale=None,
10233+
whp_number=None,
10234+
scope='sample',
10235+
analytical_temperature_name=None,
10236+
analytical_temperature_units=None,
10237+
rank=918.1,
10238+
radiation_wavelength=None,
10239+
scattering_angle=None,
10240+
excitation_wavelength=None,
10241+
emission_wavelength=None,
10242+
nc_group=None,
10243+
),
10244+
WHPNameDC(
10245+
whp_name='Al_TP_CONC_BOTTLE',
10246+
dtype='decimal',
10247+
in_erddap=False,
10248+
whp_unit='NMOL/L',
10249+
nc_name='al_tp_conc_bottle_l',
10250+
flag_w='woce_discrete',
10251+
cf_name=None,
10252+
numeric_min=None,
10253+
numeric_max=None,
10254+
numeric_precision=1,
10255+
field_width=9,
10256+
description='Particulate Aluminum in a discrete bottle sample',
10257+
note='For maximum data reusability, we decided to use GEOTRACES naming conventions',
10258+
warning=None,
10259+
error_name=None,
10260+
cf_unit='nmol/l',
10261+
reference_scale=None,
10262+
whp_number=None,
10263+
scope='sample',
10264+
analytical_temperature_name=None,
10265+
analytical_temperature_units=None,
10266+
rank=916.0,
10267+
radiation_wavelength=None,
10268+
scattering_angle=None,
10269+
excitation_wavelength=None,
10270+
emission_wavelength=None,
10271+
nc_group=None,
10272+
),
10273+
WHPNameDC(
10274+
whp_name='P_TP_CONC_BOTTLE',
10275+
dtype='decimal',
10276+
in_erddap=False,
10277+
whp_unit='NMOL/L',
10278+
nc_name='p_tp_conc_bottle_l',
10279+
flag_w='woce_discrete',
10280+
cf_name=None,
10281+
numeric_min=None,
10282+
numeric_max=None,
10283+
numeric_precision=1,
10284+
field_width=9,
10285+
description='Concentration of total particulate phosphorus determined by filtration from a water sampling bottle',
10286+
note='For maximum data reusability, we decided to use GEOTRACES naming conventions',
10287+
warning=None,
10288+
error_name=None,
10289+
cf_unit='nmol/l',
10290+
reference_scale=None,
10291+
whp_number=None,
10292+
scope='sample',
10293+
analytical_temperature_name=None,
10294+
analytical_temperature_units=None,
10295+
rank=918.2,
10296+
radiation_wavelength=None,
10297+
scattering_angle=None,
10298+
excitation_wavelength=None,
10299+
emission_wavelength=None,
10300+
nc_group=None,
10301+
),
10302+
WHPNameDC(
10303+
whp_name='Mn_TP_CONC_BOTTLE',
10304+
dtype='decimal',
10305+
in_erddap=False,
10306+
whp_unit='NMOL/L',
10307+
nc_name='mn_tp_conc_bottle_l',
10308+
flag_w='woce_discrete',
10309+
cf_name=None,
10310+
numeric_min=None,
10311+
numeric_max=None,
10312+
numeric_precision=2,
10313+
field_width=9,
10314+
description='Concentration of total particulate manganese determined by filtration from a water sampling bottle',
10315+
note='For maximum data reusability, we decided to use GEOTRACES naming conventions',
10316+
warning=None,
10317+
error_name=None,
10318+
cf_unit='nmol/l',
10319+
reference_scale=None,
10320+
whp_number=None,
10321+
scope='sample',
10322+
analytical_temperature_name=None,
10323+
analytical_temperature_units=None,
10324+
rank=918.3,
10325+
radiation_wavelength=None,
10326+
scattering_angle=None,
10327+
excitation_wavelength=None,
10328+
emission_wavelength=None,
10329+
nc_group=None,
10330+
),
1018610331
]
1018710332
for name in names:
1018810333
whp_names[name.key] = name

src/cchdo/params/params.sqlite3

0 Bytes
Binary file not shown.

src/cchdo/params/params.sqlite3.sql

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6016,6 +6016,10 @@ INSERT INTO "ex_params" VALUES('Ba_TP_CONC_BOTTLE',NULL,'Particulate Barium in a
60166016
INSERT INTO "ex_params" VALUES('Ca_TP_CONC_BOTTLE',NULL,'Particulate Calcium in a discrete bottle sample','For maximum data reusability, we decided to use GEOTRACES naming conventions',NULL,'sample','decimal','woce_discrete',0,917.0,0);
60176017
INSERT INTO "ex_params" VALUES('LAB_DEN_TMP',NULL,'The temperature at which the density of a water sample was physically measured',NULL,NULL,'sample','decimal','woce_discrete',1,146.1,0);
60186018
INSERT INTO "ex_params" VALUES('CTDPH',NULL,'The measure of acidity of seawater reported on an unknown scale using an in situ electrode. SDN:P01::PHXXPR01',NULL,'The reporting scale is not known. Use caution when comparing this pH to any other pH, though it is probably reported on the NBS scale','sample','decimal','woce_ctd',0,40.9,0);
6019+
INSERT INTO "ex_params" VALUES('Fe_TP_CONC_BOTTLE',NULL,'Concentration of total particulate iron determined by filtration from a water sampling bottle','For maximum data reusability, we decided to use GEOTRACES naming conventions',NULL,'sample','decimal','woce_discrete',0,918.0,0);
6020+
INSERT INTO "ex_params" VALUES('Si_TP_CONC_BOTTLE',NULL,'Concentration of total particulate silicon determined by filtration from a water sampling bottle','For maximum data reusability, we decided to use GEOTRACES naming conventions',NULL,'sample','decimal','woce_discrete',0,918.1,0);
6021+
INSERT INTO "ex_params" VALUES('P_TP_CONC_BOTTLE',NULL,'Concentration of total particulate phosphorus determined by filtration from a water sampling bottle','For maximum data reusability, we decided to use GEOTRACES naming conventions',NULL,'sample','decimal','woce_discrete',0,918.2,0);
6022+
INSERT INTO "ex_params" VALUES('Mn_TP_CONC_BOTTLE',NULL,'Concentration of total particulate manganese determined by filtration from a water sampling bottle','For maximum data reusability, we decided to use GEOTRACES naming conventions',NULL,'sample','decimal','woce_discrete',0,918.3,0);
60196023
CREATE TABLE ex_units (
60206024
id INTEGER NOT NULL,
60216025
whp_unit VARCHAR,
@@ -6650,4 +6654,9 @@ INSERT INTO "whp_names" VALUES('LAB_DEN_TMP','DEG C','temperature_of_analysis_of
66506654
INSERT INTO "whp_names" VALUES('CTDCDOM','RU','concentration_of_colored_dissolved_organic_matter_in_sea_water','ctd_cdom_ru',NULL,NULL,NULL,NULL,NULL,9,4,NULL,NULL,NULL,NULL,NULL);
66516655
INSERT INTO "whp_names" VALUES('FDOM','RU','concentration_of_colored_dissolved_organic_matter_in_sea_water','fdom_ru',NULL,NULL,NULL,NULL,NULL,9,4,NULL,NULL,NULL,NULL,NULL);
66526656
INSERT INTO "whp_names" VALUES('CTDPH',NULL,NULL,'ctd_ph_unknown_scale',NULL,NULL,NULL,NULL,NULL,9,4,NULL,NULL,NULL,NULL,NULL);
6657+
INSERT INTO "whp_names" VALUES('Fe_TP_CONC_BOTTLE','NMOL/L',NULL,'fe_tp_conc_bottle_l',NULL,NULL,NULL,NULL,NULL,9,2,NULL,NULL,NULL,NULL,NULL);
6658+
INSERT INTO "whp_names" VALUES('Si_TP_CONC_BOTTLE','NMOL/L',NULL,'si_tp_conc_bottle',NULL,NULL,NULL,NULL,NULL,9,1,NULL,NULL,NULL,NULL,NULL);
6659+
INSERT INTO "whp_names" VALUES('Al_TP_CONC_BOTTLE','NMOL/L',NULL,'al_tp_conc_bottle_l',NULL,NULL,NULL,NULL,NULL,9,1,NULL,NULL,NULL,NULL,NULL);
6660+
INSERT INTO "whp_names" VALUES('P_TP_CONC_BOTTLE','NMOL/L',NULL,'p_tp_conc_bottle_l',NULL,NULL,NULL,NULL,NULL,9,1,NULL,NULL,NULL,NULL,NULL);
6661+
INSERT INTO "whp_names" VALUES('Mn_TP_CONC_BOTTLE','NMOL/L',NULL,'mn_tp_conc_bottle_l',NULL,NULL,NULL,NULL,NULL,9,2,NULL,NULL,NULL,NULL,NULL);
66536662
COMMIT;

0 commit comments

Comments
 (0)