fix output time step

ARPA-SIMC · Nov 15, 2023 · f639e0b · f639e0b
1 parent d5f930a
commit f639e0b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/bin/HEAT1D/heat1D.cpp b/bin/HEAT1D/heat1D.cpp
@@ -284,7 +284,7 @@ bool initializeHeat1D(bool useInputSoils)
 }
 
 
-void setSinkSources(double myHourlyPrec, int timeStepSeconds)
+void setSinkSources(double myHourlyPrec)
 {
     for (long i=0; i < myHeat1D.NodesNumber; i++)
     {
@@ -293,7 +293,7 @@ void setSinkSources(double myHourlyPrec, int timeStepSeconds)
         if (myHeat1D.computeWater)
         {
             if (i == 0)
-                soilFluxes3D::setWaterSinkSource(i, (double)myHourlyPrec * myHeat1D.surfaceArea / timeStepSeconds / 1000);
+                soilFluxes3D::setWaterSinkSource(i, myHourlyPrec * myHeat1D.surfaceArea / (3600. * 1000.));
             else
                 soilFluxes3D::setWaterSinkSource(i, 0);
         }
@@ -713,13 +713,13 @@ QString Crit3DOut::getTextOutput(outputGroup outGroup)
 
 bool runHeat1D(double myHourlyTemperature,  double myHourlyRelativeHumidity,
                  double myHourlyWindSpeed, double myHourlyNetIrradiance,
-                 double myHourlyPrec, int timeStepSeconds)
+                 double myHourlyPrec, int maxTimeStepSeconds)
 {
     //double currentRoughness;
     //double surfaceWaterHeight;
     //double roughnessWater = 0.005;
 
-    setSinkSources(myHourlyPrec, timeStepSeconds);
+    setSinkSources(myHourlyPrec);
 
     if (myHeat1D.computeHeat)
     {
@@ -743,9 +743,9 @@ bool runHeat1D(double myHourlyTemperature,  double myHourlyRelativeHumidity,
         soilFluxes3D::setHeatBoundaryRoughness(1, myHeat1D.RoughnessHeat);
     }
 
-    soilFluxes3D::computePeriod(timeStepSeconds);
+    soilFluxes3D::computePeriod(maxTimeStepSeconds);
 
-	return (true);
+    return true;
 }
 
 
diff --git a/bin/HEAT1D/heat1D.h b/bin/HEAT1D/heat1D.h
@@ -96,10 +96,11 @@ void setProcessesHeat(bool computeLatent_, bool computeAdvection_);
 void getOutputAllPeriod(long firstIndex, long lastIndex, Crit3DOut *output, double timeH);
 long getNodesNumber();
 void setSoilHorizonNumber(int myHorizonNumber);
+void setSinkSources(double myHourlyPrec);
 
 bool initializeHeat1D(bool useInputSoils);
 bool runHeat1D(double myHourlyTemperature,  double myHourlyRelativeHumidity,
                  double myHourlyWindSpeed, double myHourlyNetIrradiance,
-                 double myHourlyPrec, int timeStepSeconds);
+                 double myHourlyPrec, int maxTimeStepSeconds);
 
 
diff --git a/bin/HEAT1D/mainwindow.cpp b/bin/HEAT1D/mainwindow.cpp
@@ -125,7 +125,7 @@ void MainWindow::on_pushRunAllPeriod_clicked()
     myPIniHour = ui->lineEditPrecStart->text().toInt();
     myPHours = ui->lineEditPrecHours->text().toInt();
 
-    double outTimeStep = ui->lineEditTimeStep->text().toDouble();
+    double outputTimeStep = ui->lineEditTimeStep->text().toDouble();
 
     int hourFin;
     if (!useInputMeteoData)
@@ -148,7 +148,7 @@ void MainWindow::on_pushRunAllPeriod_clicked()
 
     do
     {
-        myTime = myTime.addSecs(outTimeStep);
+        myTime = myTime.addSecs(outputTimeStep);
 
         if (myTime.secsTo(myRefHour) < 0)
         {
@@ -177,9 +177,9 @@ void MainWindow::on_pushRunAllPeriod_clicked()
                 myP = 0.;
         }
 
-        runHeat1D(myT, myRH, myWS, myNR, myP, outTimeStep);
+        runHeat1D(myT, myRH, myWS, myNR, myP, outputTimeStep);
 
-        totalHours += outTimeStep / 3600;
+        totalHours += outputTimeStep / 3600;
         getOutputAllPeriod(0, getNodesNumber(), &myHeatOutput, totalHours);
 
         ui->prgBar->setValue(indexHour);

diff --git a/bin/HEAT1D/mainwindow.ui b/bin/HEAT1D/mainwindow.ui
@@ -51,7 +51,7 @@
      </rect>
     </property>
     <property name="currentIndex">
-     <number>0</number>
+     <number>1</number>
     </property>
     <widget class="QWidget" name="tab">
      <attribute name="title">