Merge commit '6edf85e98f79311aaa16a67c0cf3e4f9469bd838'

ARPA-SIMC · Jun 12, 2024 · e8161b4 · e8161b4
2 parents f929b35 + 6edf85e
commit e8161b4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/agrolib/outputPoints/dbOutputPointsHandler.cpp b/agrolib/outputPoints/dbOutputPointsHandler.cpp
@@ -220,7 +220,7 @@ bool Crit3DOutputPointsDbHandler::saveHourlyCriteria3D_Data(const QString &table
             setList += "'" + fieldName + "'=";
 
             int index = i * nrSoilLayers + layer - 1;
-            QString valueStr = QString::number(values[index], 'f', 2);
+            QString valueStr = QString::number(values[index], 'f', 3);
             setList += valueStr;
 
             if (index < (nrValues - 1))

diff --git a/agrolib/soil/soil.cpp b/agrolib/soil/soil.cpp
@@ -752,7 +752,7 @@ namespace soil
     {
         double suctionStress = -waterPotential * getDegreeOfSaturation();    // [kPa]
 
-        double slopeAngle = asin(slope);
+        double slopeAngle = std::max(asin(slope), EPSILON);
         double frictionAngle = horizonPtr->frictionAngle * DEG_TO_RAD;
 
         double tanAngle = tan(slopeAngle);
@@ -780,8 +780,8 @@ namespace soil
         // surface 2%
         if (upperDepth == 0.0) return 0.02;
         // first layer 1%
-        if (upperDepth > 0 && upperDepth < 0.5) return 0.01;
-        // sub-surface 0.5%
+        if (upperDepth > 0 && upperDepth < 0.4) return 0.01;
+        // sub-surface
         return MINIMUM_ORGANIC_MATTER;
     }
 

diff --git a/agrolib/soilWidget/tabHorizons.cpp b/agrolib/soilWidget/tabHorizons.cpp
@@ -334,7 +334,7 @@ bool TabHorizons::checkHorizonData(int horizonNum)
         tableDb->item(horizonNum,5)->setBackground(Qt::red);
     }
 
-    if (dbData->organicMatter != NODATA && (dbData->organicMatter < 0 || dbData->organicMatter > 100))
+    if ( dbData->organicMatter != NODATA && ((dbData->organicMatter < 0) || (dbData->organicMatter > 100)) )
     {
         tableDb->item(horizonNum,6)->setBackground(Qt::red);
     }