diff --git a/synoptic/L1_normalize.qmd b/synoptic/L1_normalize.qmd index 33443a1..51b50e7 100644 --- a/synoptic/L1_normalize.qmd +++ b/synoptic/L1_normalize.qmd @@ -148,10 +148,11 @@ f <- function(fn, out_dir, design_table) { # At this point, there should be exactly one match for every loggernet variable if(nrow(dat) > old_rows) { + browser() counts <- aggregate(design_link ~ loggernet_variable, data = dat, FUN = function(x) length(unique(x))) counts <- counts[counts$design_link > 1,] - stop("Some loggernet variables have more than one design_link: ", + stop("Some loggernet variables in ", fn, " have more than one design_link: ", paste(counts$loggernet_variable, collapse = ", ")) } diff --git a/synoptic/data_TEST/design_table.csv b/synoptic/data_TEST/design_table.csv index 7071da2..1505ff3 100644 --- a/synoptic/data_TEST/design_table.csv +++ b/synoptic/data_TEST/design_table.csv @@ -1974,8 +1974,8 @@ TMP,PNNL_21,sapflow,Format,,,, TMP,PNNL_21,sapflow,RECORD,,,, TMP,PNNL_21,sapflow,Statname,,,, TMP,PNNL_21,sapflow,BattV_Avg,Logger-TMP-F-21,,voltage, -TMP,PNNL_21,sapflow,DiffVolt_Avg({1:6}),"SF-TMP-F-{F1,F4,F5,F9,F12,F16}",,sapflow_2.5, -TMP,PNNL_21,sapflow,"DiffVolt_Avg({7,9,10,12})","SF-TMP-F-{FD17,FD9,FD20}",,sapflow_5, +TMP,PNNL_21,sapflow,"DiffVolt_Avg({1,2,3,4,5,6,12})","SF-TMP-F-{F1,F4,F5,F9,F12,F16,F20}",,sapflow_2.5, +TMP,PNNL_21,sapflow,"DiffVolt_Avg({7,9,10})","SF-TMP-F-{FD5,FD17,FD9}",,sapflow_5, TMP,PNNL_21,sapflow,"DiffVolt_Avg({8,11,13,14})",,,, TMP,PNNL_21,sapflow,DiffVolt({1:14}),,,, ,,,,,,, @@ -2171,7 +2171,7 @@ TMP,PNNL_32,sapflow,Statname,,,, TMP,PNNL_32,sapflow,BattV_Avg,Logger-TMP-S-32,,voltage, TMP,PNNL_32,sapflow,DiffVolt_Avg({1:7}),"SF-TMP-S-{S1,S4,S7,S8,S11,S18,S20}",,sapflow_2.5, TMP,PNNL_32,sapflow,DiffVolt_Avg(8),SF-TMP-S-SD3,,sapflow_5, -TMP,PNNL_32,sapflow,"DiffVolt_Avg({7,9,10,11,12,13,14})",,,, +TMP,PNNL_32,sapflow,DiffVolt_Avg({9:14}),,,, TMP,PNNL_32,sapflow,DiffVolt({1:14}),,,, ,,,,,,, TMP,PNNL_32,Terosdata,Format,,,, @@ -2228,7 +2228,7 @@ TMP,PNNL_33,sapflow,RECORD,,,, TMP,PNNL_33,sapflow,Statname,,,, TMP,PNNL_33,sapflow,BattV_Avg,Logger-TMP-S-33,,voltage, TMP,PNNL_33,sapflow,"DiffVolt_Avg({1,2,3,4,5,6,12})","SF-TMP-S-{S5,S6,S9,S10,S12,S14,S19}",,sapflow_2.5, -TMP,PNNL_33,sapflow,"DiffVolt_Avg({9,10)","SF-TMP-S-{SD14,SD12}",,sapflow_5, +TMP,PNNL_33,sapflow,"DiffVolt_Avg({9,10})","SF-TMP-S-{SD14,SD12}",,sapflow_5, TMP,PNNL_33,sapflow,"DiffVolt_Avg({7,8,11,13,14})",,,, TMP,PNNL_33,sapflow,DiffVolt({1:14}),,,, ,,,,,,,