Merge commit '776b0c13732b314c1fdddfbbe2e073c6e280e05a'

ARPA-SIMC · Aug 13, 2024 · 62daf8c · 62daf8c
2 parents 8588902 + 776b0c1
commit 62daf8c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/agrolib/snow/snow.cpp b/agrolib/snow/snow.cpp
@@ -89,7 +89,7 @@ void Crit3DSnow::initialize()
 }
 
 
-void Crit3DSnow::setInputData(double temp, double prec, double relHum, double windInt, double globalRad,
+void Crit3DSnow::setSnowInputData(double temp, double prec, double relHum, double windInt, double globalRad,
                               double beamRad, double transmissivity, double clearSkyTransmissivity, double waterContent)
 {
     _airT = temp;
@@ -100,7 +100,7 @@ void Crit3DSnow::setInputData(double temp, double prec, double relHum, double wi
     _beamRadiation = beamRad;
     _transmissivity = transmissivity;
     _clearSkyTransmissivity = clearSkyTransmissivity;
-    _surfaceWaterContent = std::max(waterContent, 0.0);
+    _surfaceWaterContent = std::max(waterContent, 0.0);     // [mm]
 }
 
 
@@ -328,7 +328,7 @@ void Crit3DSnow::computeSnowBrooksModel()
     QPrecipS = (HEAT_CAPACITY_SNOW / 1000.) * (_precSnow / 1000.) * (std::min(0., _airT) - prevSurfaceTemp);
     QPrecip = QPrecipW + QPrecipS;
 
-    // temperatura dell'acqua: almeno 1 grado
+    // temperatura dell'acqua superficiale: almeno 1 grado
     QWaterHeat = (HEAT_CAPACITY_WATER / 1000.) * (_surfaceWaterContent / 1000.)
                  * (std::max(1., (prevSurfaceTemp + _airT) / 2.) - prevSurfaceTemp);
 

diff --git a/agrolib/snow/snow.h b/agrolib/snow/snow.h
@@ -51,7 +51,7 @@
 
         void initialize();
 
-        void setInputData(double temp, double prec, double relHum, double windInt, double globalRad,
+        void setSnowInputData(double temp, double prec, double relHum, double windInt, double globalRad,
                           double beamRad, double transmissivity, double clearSkyTransmissivity, double waterContent);
 
         bool checkValidPoint();