update 1D

ARPA-SIMC · Jun 17, 2024 · 9f49bfe · 9f49bfe
1 parent da2b3a8
commit 9f49bfe
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/DATA/PROJECT/kiwifruit/kiwifruit.ini b/DATA/PROJECT/kiwifruit/kiwifruit.ini
@@ -9,6 +9,7 @@ db_soil="./data/soil_ER_2002.db"
 db_crop="./data/crop.db"
 db_comp_units="./data/units.db"
 db_output="./output/kiwifruit.db"
+save_state = true
 
 [forecast]
 isSeasonalForecast=false

diff --git a/agrolib/criteriaModel/criteria1DProject.cpp b/agrolib/criteriaModel/criteria1DProject.cpp
@@ -1095,7 +1095,7 @@ int Crit1DProject::computeAllUnits()
         }
     }
 
-    int infoStep = compUnitList.size();
+    int infoStep = int(compUnitList.size());
     if (compUnitList.size() >= 20)
     {
         infoStep = int(compUnitList.size() / 20);
@@ -1170,7 +1170,7 @@ int Crit1DProject::computeAllUnits()
                 }
             }
 
-            if ((i+1) % infoStep == 0 && nrUnitsComputed > 0)
+            if ((i+1) % infoStep == 0 && nrUnitsComputed > 20)
             {
                 double percentage = (i+1) * 100.0 / compUnitList.size();
                 logger.writeInfo("..." + QString::number(round(percentage)) + "%");

diff --git a/bin/CRITERIA1D/main.cpp b/bin/CRITERIA1D/main.cpp
@@ -31,7 +31,7 @@ void usage()
 int main(int argc, char *argv[])
 {
     QCoreApplication myApp(argc, argv);
-    std::cout << "CRITERIA-1D agro-hydrological model v1.8.4\n" << std::endl;
+    std::cout << "CRITERIA-1D agro-hydrological model v1.8.5\n" << std::endl;
 
     Crit1DProject myProject;
 
@@ -54,25 +54,29 @@ int main(int argc, char *argv[])
 
         #ifdef TEST
             projectFileName = projectPath + "test/test.ini";
-        #else
-            #ifdef TEST_GEO
-                //projectFileName = projectPath + "INCOLTO/incolto.ini";
-                //projectFileName = "//moses-arpae/CRITERIA1D/PROJECTS/CLARA/iCOLT_2023/seasonalIrriClimate_RO.ini";
-            #else
-                usage();
-                return 1;
-            #endif
+        #endif
+
+        #ifdef TEST_GEO
+            projectFileName = projectPath + "INCOLTO/incolto.ini";
         #endif
 
         #ifdef TEST_FIRSTRUN
+            projectFileName = projectPath + "kiwifruit/kiwifruit.ini";
             myProject.firstSimulationDate = QDate::fromString("1995-01-01", "yyyy-MM-dd");
-            myProject.lastSimulationDate = QDate::fromString("2008-05-31", "yyyy-MM-dd");
+            myProject.lastSimulationDate = QDate::fromString("2001-05-31", "yyyy-MM-dd");
         #endif
 
         #ifdef TEST_RESTART
-            myProject.firstSimulationDate = QDate::fromString("2008-06-01", "yyyy-MM-dd");
+            projectFileName = projectPath + "kiwifruit/kiwifruit_restart.ini";
+            myProject.firstSimulationDate = QDate::fromString("2001-06-01", "yyyy-MM-dd");
             myProject.lastSimulationDate = QDate::fromString("2008-12-31", "yyyy-MM-dd");
         #endif
+
+        if (projectFileName.isEmpty())
+        {
+            usage();
+            return 1;
+        }
     }