update 1D

Author: ftomei

criteriaModel/criteria1DProject.cpp

@@ -1576,14 +1576,17 @@ bool Crit1DProject::restoreState(QString dbStateToRestoreName, QString &myError)
                 myError = "Invalid NR_LAYER";
                 return false;
             }
+
             // check values
             if (nrLayer > 0)
             {
                 wc = std::min(wc, myCase.soilLayers[unsigned(nrLayer)].SAT);
                 wc = std::max(wc, myCase.soilLayers[unsigned(nrLayer)].HH);
             }
+
             myCase.soilLayers[unsigned(nrLayer)].waterContent = wc;
         }
+
         if (nrLayer == -1)
         {
             myError = "waterContent table: idCase not found";

soil/soil.cpp

@@ -152,6 +152,7 @@ namespace soil
 
         this->fieldCapacity = NODATA;
         this->wiltingPoint = NODATA;
+
         this->waterContentSAT = NODATA;
         this->waterContentFC = NODATA;
         this->waterContentWP = NODATA;
@@ -225,15 +226,15 @@ namespace soil
         horizonPtr = horizonPointer;
 
         // [mm]
-        SAT = horizonPtr->waterContentSAT * thickness * 1000;
-        FC = horizonPtr->waterContentFC * thickness * 1000;
-        WP = horizonPtr->waterContentWP * thickness * 1000;
+        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;
+        HH = volWaterContentHH * horizonPtr->getSoilFraction() * thickness * 1000.;             // [mm]
 
         return true;
     }