update 1D

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

Hide file tree

Showing 3 changed files with 5 additions and 5 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();
+                    waterContent = myCase.soilLayers[i].getVolumetricWaterContent() * myCase.soilLayers[i].soilFraction;
                     maxWaterContent = MAXVALUE(waterContent, maxWaterContent);
                 }
                 else

diff --git a/criteriaModel/criteria1DCase.cpp b/criteriaModel/criteria1DCase.cpp
@@ -683,7 +683,7 @@ double Crit1DCase::getTotalWaterContent()
  */
 double Crit1DCase::getVolumetricWaterContent(double computationDepth)
 {
-    computationDepth /= 100;        // [cm] --> [m]
+    computationDepth /= 100.;        // [cm] --> [m]
 
     if (computationDepth <= 0 || computationDepth > mySoil.totalDepth)
         return NODATA;

diff --git a/soil/soil.cpp b/soil/soil.cpp
@@ -235,8 +235,8 @@ namespace soil
         critical = FC;
 
         // hygroscopic humidity
-        double hygroscopicHumidity = -2000;                                                     // [kPa]
-        double volWaterContentHH = soil::thetaFromSignPsi(hygroscopicHumidity, *horizonPtr);    // [m3 m-3]
+        double hygroHumPotential = -2000;                                                       // [kPa]
+        double volWaterContentHH = soil::thetaFromSignPsi(hygroHumPotential, *horizonPtr);      // [m3 m-3]
         HH = volWaterContentHH * soilFraction * thickness * 1000.;                              // [mm]
 
         return true;
@@ -715,7 +715,7 @@ namespace soil
 
 
     /*!
-     * \brief return current volumetric water content [-]
+     * \brief return current volumetric water content (soil fraction) [-]
      */
     double Crit1DLayer::getVolumetricWaterContent()
     {