Update to use unitClip

Author: Alomir

src/sipnet/depeffects.c

@@ -8,15 +8,15 @@
 #include "state.h"
 
 double getClippedWaterFrac(double water, double whc) {
-  return fmin(fmax(water / whc, 0.0), 1.0);
+  return unitClip(water / whc);
 }
 
 double calcAnaerobicIndex(double water, double whc) {
   double f_whc = getClippedWaterFrac(water, whc);
   double f_a = params.fAnoxia;
 
   // Anaerobic index (oxygen limitation proxy)
-  return fmin(fmax((f_whc - f_a) / (1 - f_a), 0), 1);
+  return unitClip((f_whc - f_a) / (1 - f_a));
 }
 
 double calcRespMoistEffect(double water, double whc) {
@@ -45,7 +45,7 @@ double calcRespMoistEffect(double water, double whc) {
       // at intermediate moisture, reduced under saturated/anoxic conditions
 
       // Aerobic water availability (dry limitation)
-      double D_aer = fmin(fmax(f_whc / params.fAnoxia, 0), 1);
+      double D_aer = unitClip(f_whc / params.fAnoxia);
       // Anaerobic index (oxygen limitation proxy)
       double A = calcAnaerobicIndex(water, whc);
       // Uni-modal moisture response

src/sipnet/limitations.c

@@ -41,8 +41,7 @@ void checkLeafOnLimitation(double *leafOnFlux) {
       nLimiter = availableN / leafOnNDemand;
     }
   }
-  double limitation = fmin(cLimiter, nLimiter);
-  limitation = fmax(fmin(limitation, 1.0), 0.0);
+  double limitation = unitClip(fmin(cLimiter, nLimiter));
 
   if (limitation < 1) {
     *leafOnFlux *= limitation;

src/sipnet/nitrogen.c

@@ -59,9 +59,8 @@ static void calcNPoolFluxes(void) {
                        fluxes.coarseRootLoss / params.woodCN;
   // saturationFraction capped between zero and one
   double saturationFraction =
-      (ctx.carbonSaturation)
-          ? (fmin(1.0, fmax(0.0, envi.soilC / params.soilCSaturation)))
-          : 0.0;
+      ctx.carbonSaturation ? unitClip(envi.soilC / params.soilCSaturation)
+                           : 0.0;
 
   // litter
   // The litter org N flux is determined by the carbon fluxes from wood and leaf

src/sipnet/sipnet.c

@@ -1660,9 +1660,8 @@ void updatePoolsForSoil(void) {
     // pool below saturation level, all inputs will be directed to envi.litterC
     // pool while envi.soilC is above saturation level
     double saturationFraction =
-        (ctx.carbonSaturation)
-            ? (fmin(1.0, fmax(0.0, envi.soilC / params.soilCSaturation)))
-            : 0.0;
+        ctx.carbonSaturation ? unitClip(envi.soilC / params.soilCSaturation)
+                             : 0.0;
     // :: from [2], litter model description
     envi.litterC += (fluxes.woodLitter + fluxes.leafLitter +
                      (soilInputs * saturationFraction) - fluxes.litterToSoil -

tests/sipnet/test_modeling/testCarbonSaturation.c

@@ -60,14 +60,10 @@ int checkLitter(double pool) {
 }
 
 void calcCSaturation(double *expSoilC, double *expLitterC) {
-  double saturationFraction;
   double soilInputs =
       fluxes.coarseRootLoss + fluxes.fineRootLoss + fluxes.litterToSoil;
-
-  saturationFraction =
-      (ctx.carbonSaturation)
-          ? (fmin(1.0, fmax(0.0, *expSoilC / params.soilCSaturation)))
-          : 0.0;
+  double saturationFraction =
+      ctx.carbonSaturation ? unitClip(*expSoilC / params.soilCSaturation) : 0.0;
 
   *expLitterC += soilInputs * saturationFraction * climate->length;