Skip to content

Split gw-pressure into vented and unvented #444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bpbond merged 4 commits into from
Jan 24, 2026
Merged

Split gw-pressure into vented and unvented #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c472239
Split gw-pressure into vented and unvented
bpbond Jan 22, 2026
c0b4425
Update qaqc_table.csv
bpbond Jan 22, 2026
e44712d
Use vented pressure for groundwater depth calculation
bpbond Jan 22, 2026
a059b7b
Update release READMEs
bpbond Jan 22, 2026
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
2 changes: 1 addition & 1 deletion pipeline/L2-utils.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ WELL_DIMS <- WELL_DIMS[c("Site", "Plot", "Instrument_ID", "ground_to_sensor_cm")
# exact same dimensions and ordering, since they're linked
# AquaTROLL data from the same site and plot
gw_density <- x$`gw-density`$Value
gw_pressure <- x$`gw-pressure`$Value
gw_pressure <- x$`gw-pressure-vented`$Value

temp <- merge(x$`gw-density`,
WELL_DIMS,
Expand Down
2 changes: 1 addition & 1 deletion pipeline/L2.qmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ for(i in seq_len(nrow(site_rn_table))) {
pl <- site_rn_table$plot[i]
rn <- site_rn_table$research_name[i]
do_mac <- qaqct$do_MAC[match(rn, qaqct$variable)]
stopifnot(!is.na(do_mac))
if(is.na(do_mac)) stop("do_MAC is NA for ", rn)
message("Processing ", si, " ", pl, " ", rn, " do_mac=", do_mac)

# Identify files for this site, plot, and research name, and read
Expand Down
1 change: 1 addition & 0 deletions pipeline/metadata/L1_metadata/readme_files/README_v2-1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ CHANGELOG
—----------------------------------
Version 2-1 release [DATESTAMP]
* DELUGE (DLG) data are here! Well, the TEROS measurements anyway
* `gw-pressure` has been split into two variables: vented and unvented. See metadata
* We now output times of various weather station minima and maxima; as a result, 'Value' may be non-numeric
* TEMPEST AquaTROLL600 pressure is now corrected for atmospheric pressure; see site files
* The `sonde-depth` variable has been removed, as it was unreliable and misleading
Expand Down
2 changes: 1 addition & 1 deletion pipeline/metadata/L2_metadata/derived_variables.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ soil-salinity-10cm,"soil-vwc-10cm, soil-temp-10cm, soil-EC-10cm",ppt,"Salinity c
soil-salinity-15cm,"soil-vwc-15cm, soil-temp-15cm, soil-EC-15cm",ppt,"Salinity calculated based on TEROS VWC, T, and EC; from Machado-Silva and Hilhorst (2000)"
soil-salinity-30cm,"soil-vwc-30cm, soil-temp-30cm, soil-EC-30cm",ppt,"Salinity calculated based on TEROS VWC, T, and EC; from Machado-Silva and Hilhorst (2000)"
soil-salinity-40cm,"soil-vwc-40cm, soil-temp-40cm, soil-EC-40cm",ppt,"Salinity calculated based on TEROS VWC, T, and EC; from Machado-Silva and Hilhorst (2000)"
gw-wl-below-surface,"gw-density, gw-pressure",m,"Water level, where negative values are below the ground surface; see below"
gw-wl-below-surface,"gw-density, gw-pressure-vented",m,"Water level, where negative values are below the ground surface; see below"
1 change: 1 addition & 0 deletions pipeline/metadata/L2_metadata/readme_files/README_v2-1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ CHANGELOG
Version 2-1 release [DATESTAMP]
* The Level 2 data format has been tweaked; in particular see documentation about `Value_MAC`
* DELUGE (DLG) data are here! Well, the TEROS measurements anyway
* `gw-pressure` has been split into two variables: vented and unvented. See metadata
* We now output times of various weather station minima and maxima; as a result, 'Value' may be non-numeric
* TEMPEST AquaTROLL600 pressure is now corrected for atmospheric pressure; see site files
* The `sonde-depth` variable has been removed, as it was unreliable and misleading
Expand Down
70 changes: 35 additions & 35 deletions pipeline/metadata/design_table.csv
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion pipeline/metadata/qaqc_table.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ soil-temp-40cm,,,,3 hours,TRUE,
soil-EC-40cm,,,,3 hours,TRUE,
,,,,,,
gw-salinity,,,,1 hour,TRUE,Too variable; no QAQC
gw-pressure,,,,1 hour,TRUE,Too variable; no QAQC
gw-pressure-vented,,,,1 hour,TRUE,Too variable; no QAQC
gw-pressure-unvented,,,,1 hour,TRUE,Too variable; no QAQC
gw-density,,,,1 hour,TRUE,Too variable; no QAQC
gw-temperature,1 month,MAD,threshold=8,1 hour,TRUE,
,,,,,,
Expand Down
3 changes: 2 additions & 1 deletion pipeline/metadata/variables_metadata.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ WaterLevel,pH_ORP600,gw-ph-orp,mV,mV,x * 1,-1400,1400,Groundwater oxidation-redu
WaterLevel,RDO_concen600,gw-rdo-conc,mg/L,mg/L,x * 1,0,20,Groundwater dissolved oxygen concentration
WaterLevel,RDO_perc_sat600,gw-perc-sat,%,%,x * 1,0,100,Groundwater dissolved oxygen concentration (100% saturation)
WaterLevel,RDO_part_Pressure600,gw-part-pressure,Torr,Torr,x * 1,,,Groundwater dissolved oxygen partial pressure
WaterLevel,Pressure600,gw-pressure,psi,mbar,x * 68.948,-10,910,Vented pressure corrected for barometric pressure
WaterLevel,Pressure200,gw-pressure-unvented,psi,mbar,x * 68.948,990,1500,"Unvented pressure, not corrected for barometric pressure"
WaterLevel,Pressure600,gw-pressure-vented,psi,mbar,x * 68.948,-10,500,"Vented pressure, corrected for barometric pressure"
WaterLevel,Depth600,gw-depth,cm,cm,x * 1,,,Calculated groundwater depth
WaterLevel,Voltage_Ext600A,gw-voltage-ext,V,V,x * 1,,,External battery voltage coming into the Aquatroll
WaterLevel,Battery_Int600A,gw-battery,%,%,x * 1,0,100,Internal battery percentage
Expand Down