fix soilFraction

ARPA-SIMC · Dec 19, 2024 · cb08f53 · cb08f53
1 parent 5d2e0e1
commit cb08f53
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/criteria1DWidget/tabWaterContent.cpp b/criteria1DWidget/tabWaterContent.cpp
@@ -153,7 +153,7 @@ void TabWaterContent::computeWaterContent(Crit1DCase &myCase, int firstYear, int
             {
                 if (isVolumetricWaterContent)
                 {
-                    waterContent = myCase.soilLayers[i].getVolumetricWaterContent() * myCase.soilLayers[i].soilFraction;
+                    waterContent = myCase.soilLayers[i].getVolumetricWaterContent();
                     maxWaterContent = MAXVALUE(waterContent, maxWaterContent);
                 }
                 else

diff --git a/criteriaModel/water1D.cpp b/criteriaModel/water1D.cpp
@@ -604,7 +604,7 @@ double getReadilyAvailableWater(const Crit3DCrop &myCrop, const std::vector<soil
     {
         double thetaWP = soil::thetaFromSignPsi(-soil::cmTokPa(myCrop.psiLeaf), *(soilLayers[i].horizonPtr));
         // [mm]
-        double cropWP = thetaWP * soilLayers[i].thickness * soilLayers[i].soilFraction * 1000.0;
+        double cropWP = thetaWP * soilLayers[i].thickness * soilLayers[i].soilFraction * 1000.;
         // [mm]
         double threshold = soilLayers[i].FC - myCrop.fRAW * (soilLayers[i].FC - cropWP);
 

diff --git a/crop/crop.cpp b/crop/crop.cpp
@@ -729,7 +729,7 @@ double Crit3DCrop::computeTranspiration(double maxTranspiration, const std::vect
 
     double thetaWP;                                 // [m3 m-3] volumetric water content at Wilting Point
     double cropWP;                                  // [mm] wilting point specific for crop
-    double waterSurplusThreshold;                        // [mm] water surplus stress threshold
+    double waterSurplusThreshold;                   // [mm] water surplus stress threshold
     double waterScarcityThreshold;                  // [mm] water scarcity stress threshold
     double WSS;                                     // [] water surplus stress
 
@@ -763,7 +763,7 @@ double Crit3DCrop::computeTranspiration(double maxTranspiration, const std::vect
 
         thetaWP = soil::thetaFromSignPsi(-soil::cmTokPa(psiLeaf), *(soilLayers[i].horizonPtr));
         // [mm]
-        cropWP = thetaWP * soilLayers[i].thickness * soilLayers[i].soilFraction * 1000.0;
+        cropWP = thetaWP * soilLayers[i].thickness * soilLayers[i].soilFraction * 1000.;
 
         // [mm]
         waterScarcityThreshold = soilLayers[i].FC - fRAW * (soilLayers[i].FC - cropWP);

diff --git a/soil/soil.cpp b/soil/soil.cpp
@@ -225,16 +225,19 @@ namespace soil
 
         horizonPtr = horizonPointer;
 
+        // [-]
+        soilFraction = horizonPtr->getSoilFraction();
+
         // [mm]
         SAT = horizonPtr->waterContentSAT * thickness * 1000.;
         FC = horizonPtr->waterContentFC * thickness * 1000.;
         WP = horizonPtr->waterContentWP * thickness * 1000.;
         critical = FC;
 
         // hygroscopic humidity
-        double hygroscopicHumidity = -2000;                     // [kPa]
+        double hygroscopicHumidity = -2000;                                                     // [kPa]
         double volWaterContentHH = soil::thetaFromSignPsi(hygroscopicHumidity, *horizonPtr);    // [m3 m-3]
-        HH = volWaterContentHH * horizonPtr->getSoilFraction() * thickness * 1000.;             // [mm]
+        HH = volWaterContentHH * soilFraction * thickness * 1000.;                              // [mm]
 
         return true;
     }
@@ -688,7 +691,7 @@ namespace soil
     double getWaterContentFromPsi(double psi, const Crit1DLayer &layer)
     {
         double theta = soil::thetaFromSignPsi(-psi, *(layer.horizonPtr));
-        return theta * layer.thickness * layer.soilFraction * 1000;
+        return theta * layer.thickness * layer.soilFraction * 1000.;
     }