update 3D

ARPA-SIMC · Jul 30, 2024 · e2ecde6 · e2ecde6
1 parent cd58fa2
commit e2ecde6
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 24 deletions.
diff --git a/DATA/PROJECT/VINE3D_test/DATA/crop_test.db b/DATA/PROJECT/VINE3D_test/DATA/crop_test.db
diff --git a/DATA/PROJECT/VINE3D_test/test.ini → DATA/PROJECT/VINE3D_test/VINE3D_test.ini b/DATA/PROJECT/VINE3D_test/test.ini → DATA/PROJECT/VINE3D_test/VINE3D_test.ini
@@ -6,17 +6,21 @@ time_zone=1
 is_utc=true
 
 [project]
-name=vine3d_test
+name=Monteleone
 dem=./DEM/DEM_test.flt
 meteo_points=./METEOPOINT/test_meteopoints.db
 soil_db=./SOIL/test_soil.db
 soil_map=./GEO/soil_map.flt
 landuse_map=./GEO/land_units.flt
-db_vine3d=./DATA/fields.db
+
+# VINE3D
+vine3d_db=./DATA/fields.db
+# CRITERIA3D
 crop_db=./DATA/crop_test.db
 
 [settings]
 parameters_file=./SETTINGS/parameters.ini
 log_file=./log/test.txt
+
 soil_depth=1.0
 compute_diseases=false
diff --git a/bin/CRITERIA3D/CRITERIA3D.pro b/bin/CRITERIA3D/CRITERIA3D.pro
@@ -84,10 +84,22 @@ CONFIG(debug, debug|release) {
 }
 
 
+HEADERS += \
+    shared/project3D.h \
+    shared/dialogWaterFluxesSettings.h \
+    dialogModelProcesses.h \
+    mainwindow.h \
+    criteria3DProject.h \
+    dialogLoadState.h \
+    dialogSnowSettings.h \
+    geometry.h \
+    glWidget.h \
+    viewer3D.h
+
 SOURCES += \
-    dialogModelProcesses.cpp \
-    dialogWaterFluxesSettings.cpp \
     shared/project3D.cpp \
+    shared/dialogWaterFluxesSettings.cpp \
+    dialogModelProcesses.cpp \
     mainwindow.cpp \
     criteria3DProject.cpp \
     dialogLoadState.cpp \
@@ -98,19 +110,6 @@ SOURCES += \
     viewer3D.cpp
 
 
-HEADERS += \
-    dialogModelProcesses.h \
-    dialogWaterFluxesSettings.h \
-    shared/project3D.h \
-    mainwindow.h \
-    criteria3DProject.h \
-    dialogLoadState.h \
-    dialogSnowSettings.h \
-    geometry.h \
-    glWidget.h \
-    viewer3D.h
-
-
 FORMS += mainwindow.ui
 
 DISTFILES += \

diff --git a/bin/CRITERIA3D/criteria3DProject.cpp b/bin/CRITERIA3D/criteria3DProject.cpp
@@ -976,6 +976,7 @@ bool Crit3DProject::runModelHour(const QString& hourlyOutputPath, bool isRestart
         {
             if (! interpolateAndSaveHourlyMeteo(globalIrradiance, myDateTime, hourlyOutputPath, isSaveOutputRaster()))
                 return false;
+
             qApp->processEvents();
         }
 
@@ -1044,6 +1045,8 @@ bool Crit3DProject::runModelHour(const QString& hourlyOutputPath, bool isRestart
         }
 
         runWaterFluxes3DModel(3600, isRestart);
+
+        qApp->processEvents();
     }
 
     // soil heat

diff --git a/bin/CRITERIA3D/dialogWaterFluxesSettings.cpp → ...IA3D/shared/dialogWaterFluxesSettings.cpp b/bin/CRITERIA3D/dialogWaterFluxesSettings.cpp → ...IA3D/shared/dialogWaterFluxesSettings.cpp
diff --git a/bin/CRITERIA3D/dialogWaterFluxesSettings.h → ...ERIA3D/shared/dialogWaterFluxesSettings.h b/bin/CRITERIA3D/dialogWaterFluxesSettings.h → ...ERIA3D/shared/dialogWaterFluxesSettings.h
diff --git a/bin/CRITERIA3D/shared/project3D.cpp b/bin/CRITERIA3D/shared/project3D.cpp
@@ -257,11 +257,10 @@ bool Project3D::loadProject3DSettings()
 
     projectSettings->endGroup();
 
-    // OUTPUT VARIABLES (optional)
-    QList<QString> depthList;
+    // output variables (optional)
     projectSettings->beginGroup("output");
 
-    depthList = projectSettings->value("waterContent").toStringList();
+    QList<QString> depthList = projectSettings->value("waterContent").toStringList();
     if (! setVariableDepth(depthList, waterContentDepth))
     {
         errorString = "Wrong water content depth in the settings file: " + projectSettings->fileName();
@@ -285,6 +284,8 @@ bool Project3D::loadProject3DSettings()
         errorString = "Wrong factor of safety depth in the settings file: " + projectSettings->fileName();
     }
 
+    projectSettings->endGroup();
+
     return true;
 }
 

diff --git a/bin/VINE3D/mainWindow.cpp b/bin/VINE3D/mainWindow.cpp
@@ -729,3 +729,10 @@ void MainWindow::on_actionShow_model_cases_map_triggered()
     }
 }
 
+
+
+void MainWindow::on_actionCriteria3D_settings_triggered()
+{
+
+}
+
diff --git a/bin/VINE3D/mainWindow.h b/bin/VINE3D/mainWindow.h
@@ -75,6 +75,8 @@
 
         void on_actionShow_model_cases_map_triggered();
 
+        void on_actionCriteria3D_settings_triggered();
+
     protected:
         /*!
          * \brief mouseReleaseEvent call moveCenter

diff --git a/bin/VINE3D/mainWindow.ui b/bin/VINE3D/mainWindow.ui
@@ -1757,7 +1757,7 @@
        <second>0</second>
        <year>1752</year>
        <month>10</month>
-       <day>13</day>
+       <day>12</day>
       </datetime>
      </property>
      <property name="maximumDate">
@@ -2507,7 +2507,7 @@
   </action>
   <action name="actionVine3D_InitializeWaterBalance">
    <property name="text">
-    <string>Initialize 3D</string>
+    <string>Initialize</string>
    </property>
   </action>
   <action name="actionShow_boundary">

diff --git a/bin/VINE3D/vine3DProject.cpp b/bin/VINE3D/vine3DProject.cpp
@@ -77,7 +77,7 @@ void Vine3DProject::loadVine3DSettings()
 {
     projectSettings->beginGroup("project");
 
-        dbVine3DFileName = projectSettings->value("db_vine3d").toString();
+        dbVine3DFileName = projectSettings->value("vine3d_db").toString();
 
     projectSettings->endGroup();
 
@@ -94,7 +94,7 @@ bool Vine3DProject::openVine3DDatabase(QString fileName)
 {
     if (fileName == "")
     {
-        errorString = "VINE3D database fileName missing.\nSet the 'db_vine3d' field in the .ini settings file.";
+        errorString = "VINE3D database fileName missing.\nSet the 'vine3d_db' field in the .ini settings file.";
         return false;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -729,3 +729,10 @@ void MainWindow::on_actionShow_model_cases_map_triggered() @@
         }
     }
+    void MainWindow::on_actionCriteria3D_settings_triggered()
+    {
+    }