update 3D

DATA/PROJECT/Ravone/Ravone.ini

@@ -12,10 +12,6 @@ is_utc=true
 name=Ravone
 dem=../../DEM/DEM_Ravone.flt
 meteo_points=../../METEOPOINT/ER_June2018_hourly.db
-soil_map=../../SOIL/soilMap_ER_2002.flt
-db_soil=../../SOIL/soil_ER_2002.db
-meteo_grid=
-load_grid_data_at_start=false
 
 [settings]
 parameters_file=./SETTINGS/parameters.ini

DATA/PROJECT/Ravone/SETTINGS/parameters.ini

@@ -48,6 +48,8 @@ order=1
 stddev_threshold=50
 table=point_properties
 use_for_spatial_quality_control=true
+fitting_parameters=-200, -24, 300, 0.002, -0.01, -0.01, 5000, 44, 1000, 0.007, 0.0015, 0.0015
+fitting_function=free_triple_piecewise
 
 [quality]
 delta_temperature_suspect=26

bin/CRITERIA3D/criteria3DProject.cpp

@@ -624,29 +624,6 @@ bool Crit3DProject::writeCriteria3DParameters()
 }
 
 
-bool Crit3DProject::loadLandUseMap(QString fileName)
-{
-    if (fileName == "")
-    {
-        logError("Missing land use map filename");
-        return false;
-    }
-
-    landUseMapFileName = fileName;
-    fileName = getCompleteFileName(fileName, PATH_GEO);
-
-    std::string errorStr;
-    if (! gis::openRaster(fileName.toStdString(), &landUseMap, gisSettings.utmZone, errorStr))
-    {
-        logError("Load land use map failed: " + fileName + "\n" + QString::fromStdString(errorStr));
-        return false;
-    }
-
-    logInfo("Land use map = " + fileName);
-    return true;
-}
-
-
 bool Crit3DProject::check3DProject()
 {
     if (!DEM.isLoaded || !meteoPointsLoaded)

bin/CRITERIA3D/criteria3DProject.h

@@ -81,8 +81,6 @@
         bool loadCriteria3DParameters();
         bool writeCriteria3DParameters();
 
-        bool loadLandUseMap(QString fileName);
-
         double getSoilVar(int soilIndex, int layerIndex, soil::soilVariable myVar);
         double* getSoilVarProfile(int row, int col, soil::soilVariable myVar);
 

bin/CRITERIA3D/shared/project3D.cpp

@@ -283,7 +283,7 @@ bool Project3D::initialize3DModel()
     // set computation depth
     if (waterFluxesParameters.computeOnlySurface)
     {
-        computationSoilDepth = 0;
+        computationSoilDepth = 0.;
     }
     else
     {
@@ -393,26 +393,47 @@ bool Project3D::initialize3DModel()
 }
 
 
-bool Project3D::loadSoilMap(QString fileName)
+bool Project3D::loadLandUseMap(const QString &fileName)
+{
+    if (fileName == "")
+    {
+        logError("Missing land use map filename");
+        return false;
+    }
+
+    landUseMapFileName = getCompleteFileName(fileName, PATH_GEO);
+
+    std::string errorStr;
+    if (! gis::openRaster(landUseMapFileName.toStdString(), &landUseMap, gisSettings.utmZone, errorStr))
+    {
+        logError("Load land use map failed: " + landUseMapFileName + "\n" + QString::fromStdString(errorStr));
+        return false;
+    }
+
+    logInfo("Land use map = " + landUseMapFileName);
+    return true;
+}
+
+
+bool Project3D::loadSoilMap(const QString &fileName)
 {
     if (fileName.isEmpty())
     {
         logError("Missing soil map");
         return false;
     }
 
-    fileName = getCompleteFileName(fileName, PATH_GEO);
+    soilMapFileName = getCompleteFileName(fileName, PATH_GEO);
 
     std::string errorStr;
-    if (! gis::openRaster(fileName.toStdString(), &soilMap, gisSettings.utmZone, errorStr))
+    if (! gis::openRaster(soilMapFileName.toStdString(), &soilMap, gisSettings.utmZone, errorStr))
     {
-        logError("Loading soil map failed: " + fileName + "\n" + QString::fromStdString(errorStr));
+        logError("Loading soil map failed: " + soilMapFileName + "\n" + QString::fromStdString(errorStr));
         return false;
     }
 
     gis::updateMinMaxRasterGrid(&(soilMap));
 
-    soilMapFileName = fileName;
     logInfo("Soil map = " + soilMapFileName);
 
     return true;
@@ -437,6 +458,8 @@ bool Project3D::setSoilIndexMap()
         return false;
     }
 
+    logInfo("Set soil index...");
+
     double x, y;
     soilIndexMap.initializeGrid(*(DEM.header));
     soilIndexList.clear();
@@ -970,22 +993,21 @@ void Project3D::runModel(double totalTimeStep, bool isRestart)
 
 // ----------------------------------------- CROP and LAND USE -----------------------------------
 
-bool Project3D::loadCropDatabase(QString fileName)
+bool Project3D::loadCropDatabase(const QString &fileName)
 {
     if (fileName == "")
     {
-        logError("Missing Crop DB filename");
+        logError("Missing Crop DB fileName");
         return false;
     }
 
-    cropDbFileName = fileName;
-    fileName = getCompleteFileName(fileName, PATH_SOIL);
+    cropDbFileName = getCompleteFileName(fileName, PATH_SOIL);
 
     QSqlDatabase dbCrop;
     dbCrop = QSqlDatabase::addDatabase("QSQLITE", QUuid::createUuid().toString());
-    dbCrop.setDatabaseName(fileName);
+    dbCrop.setDatabaseName(cropDbFileName);
 
-    if (!dbCrop.open())
+    if (! dbCrop.open())
     {
        logError("Connection with crop database fail");
        return false;
@@ -1012,7 +1034,7 @@ bool Project3D::loadCropDatabase(QString fileName)
         }
     }
 
-    logInfo("Crop/landUse database = " + fileName);
+    logInfo("Crop/landUse database = " + cropDbFileName);
     return true;
 }
 
@@ -1067,18 +1089,17 @@ int Project3D::getLandUnitIndexRowCol(int row, int col)
 
 // ------------------------------------ SOIL --------------------------------------
 
-bool Project3D::loadSoilDatabase(QString fileName)
+bool Project3D::loadSoilDatabase(const QString &fileName)
 {
     if (fileName == "")
     {
-        errorString = "Missing Soil DB filename";
+        errorString = "Missing Soil DB fileName";
         return false;
     }
 
-    soilDbFileName = fileName;
-    fileName = getCompleteFileName(fileName, PATH_SOIL);
+    soilDbFileName = getCompleteFileName(fileName, PATH_SOIL);
 
-    if (! loadAllSoils(fileName, soilList, texturalClassList, geotechnicsClassList, fittingOptions, errorString))
+    if (! loadAllSoils(soilDbFileName, soilList, texturalClassList, geotechnicsClassList, fittingOptions, errorString))
     {
         return false;
     }
@@ -1088,7 +1109,7 @@ bool Project3D::loadSoilDatabase(QString fileName)
     }
     nrSoils = unsigned(soilList.size());
 
-    logInfo("Soil database = " + fileName);
+    logInfo("Soil database = " + soilDbFileName);
     return true;
 }
 

bin/CRITERIA3D/shared/project3D.h

@@ -148,9 +148,10 @@
         bool setSoilIndexMap();
         bool initialize3DModel();
 
-        bool loadSoilDatabase(QString dbName);
-        bool loadCropDatabase(QString dbName);
-        bool loadSoilMap(QString fileName);
+        bool loadLandUseMap(const QString &fileName);
+        bool loadSoilDatabase(const QString &dbName);
+        bool loadCropDatabase(const QString &dbName);
+        bool loadSoilMap(const QString &fileName);
 
         void setProgressionFactor();
 

bin/VINE3D/mainWindow.cpp

@@ -655,7 +655,7 @@ void MainWindow::on_actionShow_boundary_triggered()
 
 void MainWindow::on_actionVine3D_InitializeWaterBalance_triggered()
 {
-    if (myProject.initializeWaterBalance3D())
+    if (myProject.initialize3DModel())
     {
         myProject.outputWaterBalanceMaps = new Crit3DWaterBalanceMaps(myProject.DEM);
         QMessageBox::information(nullptr, "", "3D water fluxes initialized.");

bin/VINE3D/modelCore.cpp

@@ -260,7 +260,8 @@ bool modelDailyCycle(bool isInitialState, Crit3DDate myDate, int nrHours,
             return false;
 
         // 3D soil water balance
-        myProject->computeWaterBalance3D(3600);
+        bool isRestart = false;
+        myProject->runModel(3600, isRestart);
 
         if (myCurrentTime == myFirstTime)
         {

bin/VINE3D/vine3DProject.cpp

@@ -94,20 +94,21 @@ bool Vine3DProject::openVine3DDatabase(QString fileName)
 {
     if (fileName == "")
     {
-        errorString = "Missing VINE3D DataBase filename\nSet field 'db_vine3d' in the .ini settings file.";
+        errorString = "VINE3D database fileName missing.\nSet the 'db_vine3d' field in the .ini settings file.";
         return false;
     }
 
+    dbVine3DFileName = getCompleteFileName(fileName, "");
     dbVine3D = QSqlDatabase::addDatabase("QSQLITE", QUuid::createUuid().toString());
-    dbVine3D.setDatabaseName(getCompleteFileName(fileName, ""));
+    dbVine3D.setDatabaseName(dbVine3DFileName);
 
     if (! dbVine3D.open())
     {
-       errorString = "Connection with database fail";
+       errorString = "Connection with database fail.";
        return false;
     }
 
-    logInfo("VINE3D database = " + fileName);
+    logInfo("VINE3D database = " + dbVine3DFileName);
     return true;
 }
 
@@ -148,7 +149,15 @@ bool Vine3DProject::loadVine3DProject(QString projectFileName)
     }
 
     waterFluxesParameters.computeOnlySurface = false;
-    waterFluxesParameters.computeAllSoilDepth = true;
+    if (computationSoilDepth > 0)
+    {
+        waterFluxesParameters.imposedComputationDepth = computationSoilDepth;
+        waterFluxesParameters.computeAllSoilDepth = false;
+    }
+    else
+    {
+        waterFluxesParameters.computeAllSoilDepth = true;
+    }
 
     // vine database
     if (! openVine3DDatabase(dbVine3DFileName))
@@ -164,6 +173,9 @@ bool Vine3DProject::loadVine3DProject(QString projectFileName)
         dbVine3D.close();
     }
 
+    // crop DB is not mandatory
+    loadCropDatabase(cropDbFileName);
+
     if (! loadSoilMap(soilMapFileName))
     {
         logError();
@@ -176,7 +188,7 @@ bool Vine3DProject::loadVine3DProject(QString projectFileName)
         return false;
     }
 
-    if (! loadFieldMap(landUseMapFileName))
+    if (! loadLandUseMap(landUseMapFileName))
     {
         logError();
         return false;
@@ -188,7 +200,7 @@ bool Vine3DProject::loadVine3DProject(QString projectFileName)
         return false;
     }
 
-    if (! initializeWaterBalance3D())
+    if (! initialize3DModel())
     {
         logError();
         return false;
@@ -441,9 +453,12 @@ bool Vine3DProject::setModelCasesMap()
         return false;
     }
 
+    logInfo ("Set the model case map...");
+
     // set model cases
     int nrModelCases = nrInputCases * nrSoils;
     modelCases.resize(nrModelCases);
+
     for (int i = 0; i < nrInputCases; i++)
     {
         for (int j = 0; j < nrSoils; j++)
@@ -479,33 +494,7 @@ bool Vine3DProject::setModelCasesMap()
         }
     }
 
-    return true;
-}
-
-
-bool Vine3DProject::loadFieldMap(QString mapFileName)
-{
-    logInfo ("Read fields map...");
-
-    QString fileName = getCompleteFileName(mapFileName, PATH_GEO);
-
-    std::string fn = fileName.left(fileName.length()-4).toStdString();
-    gis::Crit3DRasterGrid inputGrid;
-
-    std::string errorStr;
-    if (! gis::readEsriGrid(fn, &(inputGrid), errorStr))
-    {
-        errorString = "Load fields map failed:\n" + mapFileName + "\n" + QString::fromStdString(errorStr);
-        logError();
-        return false;
-    }
-
-    // compute prevailing map
-    landUseMap.initializeGrid(DEM);
-    gis::prevailingMap(inputGrid, &(landUseMap));
-    gis::updateMinMaxRasterGrid(&(landUseMap));
-
-    logInfo ("Field map = " + mapFileName);
+    logInfo ("Nr of model cases: " + QString::number(nrModelCases));
     return true;
 }
 

bin/VINE3D/vine3DProject.h

@@ -110,7 +110,6 @@
         bool setModelCasesMap();
 
         int queryFieldPoint(double x, double y);
-        bool loadFieldMap(QString mapFileName);
 
         bool readFieldQuery(QSqlQuery &myQuery, int &idField, Crit3DLanduse &landuse, int &vineIndex, int &trainingIndex, float &maxLaiGrass,  float &maxIrrigationRate);
         bool setField(int fieldIndex, int fieldId, Crit3DLanduse landuse, int soilIndex, int vineIndex, int trainingIndex,