Merge pull request #196 from DrylandEcology/bugfix_issue194_SoilTemp

- Fixed incorrect input data values by now containing fixed code in SOILWAT2 - New tests containing comparison between maximum/minimum/average soil layer temperatures closes issue #194
DrylandEcology · Jul 14, 2022 · a8b45de · a8b45de
2 parents f6e9e09 + 76dab1d
commit a8b45de
Show file tree

Hide file tree

Showing 12 changed files with 65 additions and 1 deletion.
diff --git a/data/sw_exampleData.rda b/data/sw_exampleData.rda
diff --git a/src/SOILWAT2 b/src/SOILWAT2
diff --git a/tests/test_data/Ex1_input.rds b/tests/test_data/Ex1_input.rds
diff --git a/tests/test_data/Ex1_output.rds b/tests/test_data/Ex1_output.rds
diff --git a/tests/test_data/Ex2_input.rds b/tests/test_data/Ex2_input.rds
diff --git a/tests/test_data/Ex3_input.rds b/tests/test_data/Ex3_input.rds
diff --git a/tests/test_data/Ex3_output.rds b/tests/test_data/Ex3_output.rds
diff --git a/tests/test_data/Ex4_input.rds b/tests/test_data/Ex4_input.rds
diff --git a/tests/test_data/Ex4_output.rds b/tests/test_data/Ex4_output.rds
diff --git a/tests/test_data/Ex5_input.rds b/tests/test_data/Ex5_input.rds
diff --git a/tests/test_data/Ex5_output.rds b/tests/test_data/Ex5_output.rds
diff --git a/tests/testthat/test_soil_temperature_fails.R b/tests/testthat/test_soil_temperature_fails.R
@@ -87,3 +87,67 @@ for (it in tests) {
     }
   })
 }
+
+
+
+#--- Check that min <= avg <= max soil temperature ------
+test_that("Check min/avg/max soil temperature", {
+  sw_in <- rSOILWAT2::sw_exampleData
+  n_sl <- nrow(rSOILWAT2::swSoils_Layers(sw_in))
+
+  sw_out <- rSOILWAT2::sw_exec(inputData = sw_in)
+
+  tsoil <- slot(slot(sw_out, sw_out_flags()["sw_soiltemp"]), "Day")
+
+  snow <- slot(slot(sw_out, sw_out_flags()["sw_snow"]), "Day")
+  has_snow <- snow[, "snowdepth_cm"] > 0
+
+  tsurf <- slot(slot(sw_out, sw_out_flags()["sw_temp"]), "Day")
+  var_tsurf_avg <- "surfaceTemp_avg_C"
+  var_tsurf_min <- "surfaceTemp_min_C"
+  var_tsurf_max <- "surfaceTemp_max_C"
+
+
+  #--- Expect that
+  #  - if snow-free: average temperature > minimum temperature
+  #  - if snow covered: average temperature >= minimum temperature
+
+  # soil surface temperature
+  expect_true(
+    all(tsurf[!has_snow, var_tsurf_avg] > tsurf[!has_snow, var_tsurf_min])
+  )
+  expect_true(
+    all(tsurf[has_snow, var_tsurf_avg] >= tsurf[has_snow, var_tsurf_min])
+  )
+
+  # soil temperature at layer depth
+  for (k in seq_len(n_sl)) {
+    var_avg <- paste0("Lyr_", k, "_avg_C")
+    var_min <- paste0("Lyr_", k, "_min_C")
+
+    expect_true(all(tsoil[!has_snow, var_avg] > tsoil[!has_snow, var_min]))
+    expect_true(all(tsoil[has_snow, var_avg] >= tsoil[has_snow, var_min]))
+  }
+
+
+  #--- Expect that
+  #  - if snow-free: average temperature < maximum temperature
+  #  - if snow covered: average temperature <= maximum temperature
+
+  # soil surface temperature
+  expect_true(
+    all(tsurf[!has_snow, var_tsurf_avg] < tsurf[!has_snow, var_tsurf_max])
+  )
+  expect_true(
+    all(tsurf[has_snow, var_tsurf_avg] <= tsurf[has_snow, var_tsurf_max])
+  )
+
+  # soil temperature at layer depth
+  for (k in seq_len(n_sl)) {
+    var_avg <- paste0("Lyr_", k, "_avg_C")
+    var_max <- paste0("Lyr_", k, "_max_C")
+
+    expect_true(all(tsoil[!has_snow, var_avg] < tsoil[!has_snow, var_max]))
+    expect_true(all(tsoil[has_snow, var_avg] <= tsoil[has_snow, var_max]))
+  }
+})
+5 −6		.github/workflows/check_doc.yml
+4 −5		.github/workflows/main_nix.yml
+2 −4		.github/workflows/main_win.yml
+3 −4		SW_Output_get_functions.c