Fix solar total/flux units for 15min data #160

COMPASS-DOE · May 7, 2024 · f128bcf · f128bcf
1 parent 73a8e18
commit f128bcf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/synoptic/helpers.R b/synoptic/helpers.R
@@ -201,6 +201,11 @@ reset <- function(root = here::here("synoptic/data_TEST")) {
                         full.names = TRUE)
     message("Removing ", length(items), " files in L1_normalize")
     lapply(items, file.remove)
+    items <- list.files(file.path(root, "L1_normalize/"), recursive = TRUE,
+                        include.dirs = TRUE, full.names = TRUE)
+    items <- items[basename(items) != "README.md"]
+    message("Removing ", length(items), " directories in L1_normalize")
+    lapply(items, file.remove)
 
     items <- list.files(file.path(root, "L1/"), recursive = TRUE,
                         include.dirs = FALSE, full.names = TRUE)
@@ -221,7 +226,7 @@ reset <- function(root = here::here("synoptic/data_TEST")) {
     items <- list.files(file.path(root, "L2/"), recursive = TRUE,
                         include.dirs = TRUE, full.names = TRUE)
     items <- items[basename(items) != "README.md"]
-    message("Removing ", length(items), " directories in L1a")
+    message("Removing ", length(items), " directories in L2")
     lapply(items, file.remove)
 
     items <- list.files(file.path(root, "Logs/"), pattern = "(txt|html)$",

diff --git a/synoptic/metadata/L1_metadata/L1_metadata_variables.csv b/synoptic/metadata/L1_metadata/L1_metadata_variables.csv
@@ -34,8 +34,8 @@ WaterLevel,Pressure600,gw_pressure,psi,mbar,x * 68.948,-10,910,Vented pressure c
 WaterLevel,Depth600,gw_depth,,,x * 1,,,
 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
-ClimaVue50_15min,SlrFD_W_Avg,wx_slr_fd15,MJ/m2,MJ/m2,x * 1,,,Average solar flux over 15 minute period
-ClimaVue50_15min,SlrTF_MJ_Tot,wx_slr_tf15,W/m2,W/m2,x * 1,,,Total solar flux in over minute period
+ClimaVue50_15min,SlrFD_W_Avg,wx_slr_fd15,W/m2,MJ/m2,x * 1,,,Average solar flux over 15 minute period
+ClimaVue50_15min,SlrTF_MJ_Tot,wx_slr_tf15,MJ/m2,W/m2,x * 1,,,Total solar flux in over minute period
 ClimaVue50_15min,Rain_mm_Tot,wx_rain15,mm,mm,x * 1,,,Total rain over 15 minute period
 ClimaVue50_15min,WS_ms_S_WVT,wx_windspeed15,m/s,m/s,x * 1,,,Wind speed
 ClimaVue50_15min,WindDir_D1_WVT,wx_winddir15,degrees,degrees,x * 1,0,359,Wind direction