added condensation to output - needed for water balance modelling - a…

…nd changed quantitative check target - necessary after no longer using prescribed net radiation which caused a bug
geco-bern · Feb 27, 2024 · 199e55e · 199e55e
1 parent c8b1c11
commit 199e55e
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 deletions.
diff --git a/R/run_pmodel_f_bysite.R b/R/run_pmodel_f_bysite.R
@@ -91,6 +91,7 @@
 #'   \item{\code{netrad}}{Net radiation, in W m\eqn{^{-2}}. WARNING: this is currently ignored as a model forcing. Instead, net radiation is internally calculated by SPLASH.}
 #'   \item{\code{wcont}}{Soil water content, in mm.}
 #'   \item{\code{snow}}{Snow water equivalents, in mm.}
+#'   \item{\code{cond}}{Water input by condensation, in mm d\eqn{^{-1}}}
 #'   } 
 #'   
 #' @details Depending on the input model parameters, it's possible to run the 
@@ -386,7 +387,8 @@ run_pmodel_f_bysite <- function(
           "tsoil", 
           "netrad", 
           "wcont", 
-          "snow")
+          "snow",
+          "cond")
         ) %>%
       as_tibble(.name_repair = "check_unique") %>%
       dplyr::bind_cols(ddf,.)
@@ -410,7 +412,8 @@ run_pmodel_f_bysite <- function(
                   tsoil = NA, 
                   netrad = NA,
                   wcont = NA, 
-                  snow = NA)
+                  snow = NA,
+                  cond = NA)
   }
 
   return(out)

diff --git a/man/run_pmodel_f_bysite.Rd b/man/run_pmodel_f_bysite.Rd
diff --git a/src/biosphere_pmodel.mod.f90 b/src/biosphere_pmodel.mod.f90
@@ -194,6 +194,7 @@ function biosphere_annual() result( out_biosphere )
                                      / myinterface%params_siml%secs_per_tstep                 ! output in W m-2 
         out_biosphere%wcont(doy)   = tile(1)%soil%phy%wcont
         out_biosphere%snow(doy)    = tile(1)%soil%phy%snow
+        out_biosphere%cond(doy)    = tile_fluxes(1)%canopy%dcn
 
         init_daily = .false.
 

diff --git a/src/interface_biosphere_pmodel.mod.f90 b/src/interface_biosphere_pmodel.mod.f90
@@ -69,7 +69,7 @@ module md_interface_pmodel
     real, dimension(ndayyear) :: netrad
     real, dimension(ndayyear) :: wcont
     real, dimension(ndayyear) :: snow
-
+    real, dimension(ndayyear) :: cond
   end type outtype_biosphere
 
 end module md_interface_pmodel
diff --git a/src/sofun_r.f90 b/src/sofun_r.f90
@@ -75,7 +75,7 @@ subroutine pmodel_f(         &
     integer(kind=c_int),  intent(in) :: nt ! number of time steps
     real(kind=c_double),  dimension(9), intent(in) :: par  ! free (calibratable) model parameters
     real(kind=c_double),  dimension(nt,12), intent(in) :: forcing  ! array containing all temporally varying forcing data (rows: time steps; columns: 1=air temperature, 2=rainfall, 3=vpd, 4=ppfd, 5=net radiation, 6=sunshine fraction, 7=snowfall, 8=co2, 9=fapar, 10=patm, 11=tmin, 12=tmax) 
-    real(kind=c_double),  dimension(nt,18), intent(out) :: output
+    real(kind=c_double),  dimension(nt,19), intent(out) :: output
 
     ! local variables
     type(outtype_biosphere) :: out_biosphere  ! holds all the output used for calculating the cost or maximum likelihood function 
@@ -218,6 +218,7 @@ subroutine pmodel_f(         &
         output(idx_start:idx_end,16) = dble(out_biosphere%netrad(:))
         output(idx_start:idx_end,17) = dble(out_biosphere%wcont(:))
         output(idx_start:idx_end,18) = dble(out_biosphere%snow(:))
+        output(idx_start:idx_end,19) = dble(out_biosphere%cond(:))
 
       end if
 

diff --git a/src/wrappersc.c b/src/wrappersc.c
@@ -68,7 +68,7 @@ extern SEXP pmodel_f_C(
 
     // Specify output
     // 2nd agument to allocMatrix is number of rows, 3rd is number of columns
-    SEXP output = PROTECT( allocMatrix(REALSXP, nt, 18) );
+    SEXP output = PROTECT( allocMatrix(REALSXP, nt, 19) );
 
     // Fortran subroutine call
     F77_CALL(pmodel_f)(

diff --git a/tests/testthat/test-quantitative-validation.R b/tests/testthat/test-quantitative-validation.R
@@ -32,7 +32,7 @@ test_that("p-model quantitative check", {
      mean(abs(gpp), na.rm = TRUE)
 
   # test for correctly returned values
-  expect_equal(tolerance, 0.3050983, tolerance = 0.03)
+  expect_equal(tolerance, 0.4201191, tolerance = 0.04)
 })
 
 # test_that("p-model consistency R vs Fortran (rpmodel vs rsofun)", {