From 796f6525d1f516445c7a94b6abd30d9300c8b7f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miquel=20De=20C=C3=A1ceres?= <miquelcaceres@gmail.com>
Date: Tue, 12 Nov 2024 19:39:04 +0100
Subject: [PATCH] minor modification to solve issue #7: compilation under
 Alpine Linux

---
 src/inner_sperry.cpp           | 7 ++++---
 src/inner_sperry.h             | 2 +-
 src/transpiration_advanced.cpp | 6 ++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/inner_sperry.cpp b/src/inner_sperry.cpp
index 35a40b901..d95206311 100644
--- a/src/inner_sperry.cpp
+++ b/src/inner_sperry.cpp
@@ -13,7 +13,8 @@ List initSperryNetwork(int c,
                        DataFrame internalWater, DataFrame paramsTranspiration, DataFrame paramsWaterStorage,
                        NumericVector VCroot_kmax, NumericVector VGrhizo_kmax,
                        NumericVector psiSoil, NumericVector VG_n, NumericVector VG_alpha,
-                       double sapFluidityDay = 1.0, List control = NULL) {
+                       List control,
+                       double sapFluidityDay = 1.0) {
   
   NumericVector VCstem_kmax = Rcpp::as<Rcpp::NumericVector>(paramsTranspiration["VCstem_kmax"]);
   NumericVector VCleaf_kmax = Rcpp::as<Rcpp::NumericVector>(paramsTranspiration["VCleaf_kmax"]);
@@ -73,8 +74,8 @@ List initSperryNetworks(List x) {
     networks[c] = initSperryNetwork(c, 
                                     internalWater, paramsTranspiration, paramsWaterStorage,
                                     VCroot_kmax(c,_), VGrhizo_kmax(c,_),
-                                    psiSoil, VG_n, VG_alpha, 1.0, 
-                                    control);
+                                    psiSoil, VG_n, VG_alpha, 
+                                    control, 1.0);
   }
   networks.attr("names") = above.attr("row.names");
   return(networks);
diff --git a/src/inner_sperry.h b/src/inner_sperry.h
index a936be3a7..56d1ae8a8 100644
--- a/src/inner_sperry.h
+++ b/src/inner_sperry.h
@@ -9,7 +9,7 @@ List initSperryNetwork(int c,
                        DataFrame internalWater, DataFrame paramsTranspiration, DataFrame paramsWaterStorage,
                        NumericVector VCroot_kmax, NumericVector VGrhizo_kmax,
                        NumericVector psiSoil, NumericVector VG_n, NumericVector VG_alpha,
-                       double sapFluidityDay = 1.0, List control = NULL);
+                       List control, double sapFluidityDay = 1.0);
 
 List profitMaximization2(List supplyFunction, int initialPos,
                          double Catm, double Patm, double Tair, double vpa, double u, 
diff --git a/src/transpiration_advanced.cpp b/src/transpiration_advanced.cpp
index a4f4436be..65e697586 100644
--- a/src/transpiration_advanced.cpp
+++ b/src/transpiration_advanced.cpp
@@ -627,7 +627,8 @@ void transpirationAdvanced(List transpOutput, List x, NumericVector meteovec,
                                     internalWater, paramsTranspiration, paramsWaterStorage,
                                     VCroot_kmaxc, VGrhizo_kmaxc,
                                     psic, VG_nc, VG_alphac,
-                                    sapFluidityDay, control);
+                                    control,
+                                    sapFluidityDay);
         hydraulicNetwork[c] = HN;
         supply[c] = supplyFunctionNetwork(HN, 0.0, 0.001); 
       } else if(transpirationMode == "Sureau") {
@@ -696,7 +697,8 @@ void transpirationAdvanced(List transpOutput, List x, NumericVector meteovec,
                                     internalWater, paramsTranspiration, paramsWaterStorage,
                                     VCroot_kmaxc, VGrhizo_kmaxc,
                                     psic, VG_nc, VG_alphac,
-                                    sapFluidityDay, control);
+                                    control, 
+                                    sapFluidityDay);
         hydraulicNetwork[c] = HN;
         supply[c] = supplyFunctionNetwork(HN, 0.0, 0.001); 
       } else if(transpirationMode == "Sureau") {