Merge pull request #203 from COMPASS-DOE/v1-1

v1-1

synoptic/data_TEST/Raw/TEMPEST_REDOX_fresh_Redox15_20240731000149_short.dat

@@ -0,0 +1,7 @@
+"TOA5","TEMPEST_REDOX_fresh","CR1000","86614","CR1000.Std.31.03","CPU:COMPASS_Redox_Tempest_2024v1.CR1","14439","Redox15"
+"TIMESTAMP","RECORD","Statname","BattV","RedoxRa(1)","RedoxRa(2)","RedoxRa(3)","RedoxRa(4)","RedoxRa(5)","RedoxRa(6)","RedoxRa(7)","RedoxRa(8)","RedoxRa(9)","RedoxRa(10)","RedoxRa(11)","RedoxRa(12)","RedoxRa(13)","RedoxRa(14)","RedoxRa(15)","RedoxRa(16)","RedoxRa(17)","RedoxRa(18)","RedoxRa(19)","RedoxRa(20)","RedoxRb(1)","RedoxRb(2)","RedoxRb(3)","RedoxRb(4)","RedoxRb(5)","RedoxRb(6)","RedoxRb(7)","RedoxRb(8)","RedoxRb(9)","RedoxRb(10)","RedoxRb(11)","RedoxRb(12)","RedoxRb(13)","RedoxRb(14)","RedoxRb(15)","RedoxRb(16)","RedoxRb(17)","RedoxRb(18)","RedoxRb(19)","RedoxRb(20)"
+"TS","RN","","Volts","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV","mV"
+"","","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp","Smp"
+"2024-06-30 18:30:00",5235,"NAN",11.93,929.1661,573.9766,542.5515,-36.52115,557.8394,537.2856,596.5688,632.9201,643.1121,480.3806,444.7087,508.5783,601.6648,628.3337,642.2627,623.2377,621.5391,599.7963,606.421,650.5861,930.3552,571.7684,542.8912,-31.76491,559.538,542.0419,600.4757,630.542,646.5093,476.3038,445.3882,507.8988,602.8538,629.0132,644.9806,625.9556,625.6158,599.2867,609.8184,647.3587
+"2024-06-30 18:45:00",5236,"NAN",11.93,932.2237,571.5985,543.5707,-35.33209,558.5189,536.9459,597.7579,630.2022,647.1888,475.2846,447.9362,506.3701,603.0237,628.5036,642.9422,623.9172,624.7665,598.777,611.1772,647.6984,934.0922,571.5985,549.0063,-31.93478,559.7079,538.8144,596.5688,631.3913,644.4709,475.4545,448.9554,508.4084,607.1005,629.3529,646.8491,626.8049,623.7473,599.6264,608.2896,649.0574
+"2024-06-30 19:00:00",5237,"NAN",11.93,929.1845,571.6099,547.1487,-34.48345,562.267,538.8251,599.2985,630.3846,644.144,475.1241,445.397,506.8897,604.7344,629.0256,647.7112,624.7789,621.3815,598.6191,606.433,649.0702,929.1845,572.9688,543.2417,-30.06685,558.0203,538.8251,597.0902,631.7435,646.1824,476.4831,446.4163,509.4377,603.885,630.3846,645.1632,626.6475,622.061,599.4684,607.792,650.5991

synoptic/driver.R

@@ -18,7 +18,7 @@ source("helpers.R")
 # Settings ----------------------------------------------------
 
 ROOT <- "./data_TEST"
-VERSION <- "1-0"
+VERSION <- "1-1"
 
 # Log file ----------------------------------------------------
 

synoptic/metadata/L1_metadata/README_v1-1.txt

@@ -32,7 +32,7 @@ DATA STRUCTURE
 —----------------------------------
 Data are organized into {SITE_YEAR} folders, with up to 12 monthly
 comma-separated value (CSV) files in each folder for each plot at that
-site. Sites include CRC (Crane Creek), GCW (GCReW), GWI (Goodiwn
+site. Sites include CRC (Crane Creek), GCW (GCReW), GWI (Goodwin
 Island), MSM (Moneystump Marsh), OWC (Old Woman Creek), PTR (Portage
 River), SWH (Sweet Hall Marsh), and TMP (TEMPEST experiment). See
 site-specific metadata files in each folder.
@@ -56,8 +56,8 @@ change, only that your scripts using L1 data will probably still work.
 
 CHANGELOG
 —----------------------------------
-Version 1-1 released 2024-XX-XX
-* Covers late 2019 through June 2024 for TEMPEST and all synoptic sites
+Version 1-1 released 2024-08-05
+* Covers late 2019 through July 2024 for TEMPEST and all synoptic sites
 * TEMPEST redox data now available starting April 2024
 * Now includes high-frequency (1 and 5 min interval) data from TEMPEST floods
 

synoptic/metadata/design_table.csv

@@ -2465,6 +2465,45 @@ TEMPEST_REDOX_salt,Redox5,"RedoxRb({2,6,10,14,18})",TMP,S,Redox,B,{1:5},F4,,redo
 TEMPEST_REDOX_salt,Redox5,"RedoxRb({3,7,11,15,19})",TMP,S,Redox,B,{1:5},F4,,redox_35cm,
 TEMPEST_REDOX_salt,Redox5,"RedoxRb({4,8,12,16,20})",TMP,S,Redox,B,{1:5},F4,,redox_55cm,
 ,,,,,,,,,,,
+TEMPEST_REDOX_control,Redox15,Format,TMP,C,Redox,A,,,,,
+TEMPEST_REDOX_control,Redox15,RECORD,TMP,C,Redox,A,,,,,
+TEMPEST_REDOX_control,Redox15,Statname,TMP,C,Redox,A,,,,,
+TEMPEST_REDOX_control,Redox15,BattV,TMP,C,Redox,A,,,,,
+TEMPEST_REDOX_control,Redox15,"RedoxRa({1,5,9,13,17})",TMP,C,Redox,A,{1:5},,,,
+TEMPEST_REDOX_control,Redox15,"RedoxRa({2,6,10,14,18})",TMP,C,Redox,A,{1:5},,,,
+TEMPEST_REDOX_control,Redox15,"RedoxRa({3,7,11,15,19})",TMP,C,Redox,A,{1:5},,,,
+TEMPEST_REDOX_control,Redox15,"RedoxRa({4,8,12,16,20})",TMP,C,Redox,A,{1:5},,,,
+TEMPEST_REDOX_control,Redox15,"RedoxRb({1,5,9,13,17})",TMP,C,Redox,B,{1:5},,,,
+TEMPEST_REDOX_control,Redox15,"RedoxRb({2,6,10,14,18})",TMP,C,Redox,B,{1:5},,,,
+TEMPEST_REDOX_control,Redox15,"RedoxRb({3,7,11,15,19})",TMP,C,Redox,B,{1:5},,,,
+TEMPEST_REDOX_control,Redox15,"RedoxRb({4,8,12,16,20})",TMP,C,Redox,B,{1:5},,,,
+,,,,,,,,,,,
+TEMPEST_REDOX_fresh,Redox15,Format,TMP,F,Redox,A,,,,,
+TEMPEST_REDOX_fresh,Redox15,RECORD,TMP,F,Redox,A,,,,,
+TEMPEST_REDOX_fresh,Redox15,Statname,TMP,F,Redox,A,,,,,
+TEMPEST_REDOX_fresh,Redox15,BattV,TMP,F,Redox,A,,,,,
+TEMPEST_REDOX_fresh,Redox15,"RedoxRa({1,5,9,13,17})",TMP,F,Redox,A,{1:5},,,,
+TEMPEST_REDOX_fresh,Redox15,"RedoxRa({2,6,10,14,18})",TMP,F,Redox,A,{1:5},,,,
+TEMPEST_REDOX_fresh,Redox15,"RedoxRa({3,7,11,15,19})",TMP,F,Redox,A,{1:5},,,,
+TEMPEST_REDOX_fresh,Redox15,"RedoxRa({4,8,12,16,20})",TMP,F,Redox,A,{1:5},,,,
+TEMPEST_REDOX_fresh,Redox15,"RedoxRb({1,5,9,13,17})",TMP,F,Redox,B,{1:5},,,,
+TEMPEST_REDOX_fresh,Redox15,"RedoxRb({2,6,10,14,18})",TMP,F,Redox,B,{1:5},,,,
+TEMPEST_REDOX_fresh,Redox15,"RedoxRb({3,7,11,15,19})",TMP,F,Redox,B,{1:5},,,,
+TEMPEST_REDOX_fresh,Redox15,"RedoxRb({4,8,12,16,20})",TMP,F,Redox,B,{1:5},,,,
+,,,,,,,,,,,
+TEMPEST_REDOX_salt,Redox15,Format,TMP,S,Redox,A,,,,,
+TEMPEST_REDOX_salt,Redox15,RECORD,TMP,S,Redox,A,,,,,
+TEMPEST_REDOX_salt,Redox15,Statname,TMP,S,Redox,A,,,,,
+TEMPEST_REDOX_salt,Redox15,BattV,TMP,S,Redox,A,,,,,
+TEMPEST_REDOX_salt,Redox15,"RedoxRa({1,5,9,13,17})",TMP,S,Redox,A,{1:5},,,,
+TEMPEST_REDOX_salt,Redox15,"RedoxRa({2,6,10,14,18})",TMP,S,Redox,A,{1:5},,,,
+TEMPEST_REDOX_salt,Redox15,"RedoxRa({3,7,11,15,19})",TMP,S,Redox,A,{1:5},,,,
+TEMPEST_REDOX_salt,Redox15,"RedoxRa({4,8,12,16,20})",TMP,S,Redox,A,{1:5},,,,
+TEMPEST_REDOX_salt,Redox15,"RedoxRb({1,5,9,13,17})",TMP,S,Redox,B,{1:5},,,,
+TEMPEST_REDOX_salt,Redox15,"RedoxRb({2,6,10,14,18})",TMP,S,Redox,B,{1:5},,,,
+TEMPEST_REDOX_salt,Redox15,"RedoxRb({3,7,11,15,19})",TMP,S,Redox,B,{1:5},,,,
+TEMPEST_REDOX_salt,Redox15,"RedoxRb({4,8,12,16,20})",TMP,S,Redox,B,{1:5},,,,
+,,,,,,,,,,,
 GCREW_MET,GCREW_MET_15min,Format,GCW,W,,,,,,,
 GCREW_MET,GCREW_MET_15min,RECORD,GCW,W,,,,,,,
 GCREW_MET,GCREW_MET_15min,Statname,GCW,W,,,,,,,