Merge commit 'f1bf754611e24d34fcd93d0b5ec86e46e1c8c18f'

Author: cate-to

agrolib/criteriaModel/criteria1DCase.cpp

@@ -154,7 +154,7 @@ bool Crit1DCase::initializeNumericalFluxes(std::string &error)
 
     float horizontalConductivityRatio = 10.0;
     soilFluxes3D::setHydraulicProperties(fittingOptions.waterRetentionCurve, MEAN_LOGARITHMIC, horizontalConductivityRatio);
-    soilFluxes3D::setNumericalParameters(60, 3600, 100, 10, 12, 3);
+    soilFluxes3D::setNumericalParameters(60, 3600, 100, 10, 10, 3);
 
     // set soil properties (units of measurement: MKS)
     int soilIndex = 0;

agrolib/gis/color.cpp

@@ -97,6 +97,9 @@ bool Crit3DColorScale::classify()
         nrIntervals = MAXVALUE(_nrKeyColors -1, 1);
         nrStep = _nrColors / nrIntervals;
 
+        _nrColors = nrStep * nrIntervals;
+        color.resize(_nrColors);
+
         for (i = 0; i < nrIntervals; i++)
         {
             dRed = float(keyColor[i+1].red - keyColor[i].red) / float(nrStep);
@@ -120,24 +123,7 @@ bool Crit3DColorScale::classify()
 
 Crit3DColor* Crit3DColorScale::getColor(float value)
 {
-    unsigned int index = 0;
-
-    if (value <= _minimum)
-    {
-        index = 0;
-    }
-    else if (value >= _maximum)
-    {
-        index = _nrColors-1;
-    }
-    else
-    {
-        if (_classification == classificationMethod::EqualInterval)
-        {
-            index = unsigned(float(_nrColors-1) * ((value - _minimum) / (_maximum - _minimum)));
-        }
-    }
-
+    unsigned int index = getColorIndex(value);
     return &color[index];
 }
 
@@ -237,7 +223,7 @@ bool setAnomalyScale(Crit3DColorScale* myScale)
 
 bool setPrecipitationScale(Crit3DColorScale* myScale)
 {
-    myScale->initialize(6, 252);
+    myScale->initialize(6, 256);
 
     myScale->keyColor[0] = Crit3DColor(255, 255, 255);      /*!< white */
     myScale->keyColor[1] = Crit3DColor(0, 0, 255);          /*!< blue */

agrolib/graphics/mapGraphicsRasterUtm.cpp

@@ -370,7 +370,7 @@ bool RasterUtmObject::drawRaster(QPainter* painter)
             // check outliers (transparent)
             if (_rasterPointer->colorScale->isHideOutliers())
             {
-                if (value <= _rasterPointer->colorScale->minimum() || value > _rasterPointer->colorScale->maximum())
+                if (isEqual(value, 0) || value <= _rasterPointer->colorScale->minimum() || value > _rasterPointer->colorScale->maximum())
                     continue;
             }
 

agrolib/mathFunctions/commonConstants.h

@@ -109,7 +109,8 @@
     #define BOUNDARY_SOLUTEFLUX 30
     #define BOUNDARY_NONE 99
 
-    #define RELAXATION 1
+    #define GAUSS_SEIDEL 1
+    #define JACOBI 2
 
     // --------------- heat model -----------------
     #define SAVE_HEATFLUXES_NONE 0

agrolib/meteo/meteo.cpp

@@ -792,7 +792,7 @@ bool setColorScale(meteoVariable variable, Crit3DColorScale *colorScale)
         case snowFall: case snowWaterEquivalent: case snowLiquidWaterContent: case snowMelt:
         case dailyWaterTableDepth:
             setPrecipitationScale(colorScale);
-            if (variable == snowFall || variable == snowWaterEquivalent
+            if (variable == precipitation || variable == snowFall || variable == snowWaterEquivalent
                 || variable == snowLiquidWaterContent || variable == snowMelt)
             {
                 colorScale->setHideOutliers(true);

agrolib/soilFluxes3D/header/parameters.h

@@ -22,7 +22,7 @@
 
         void initialize()
         {
-            numericalSolutionMethod = RELAXATION;
+            numericalSolutionMethod = GAUSS_SEIDEL;
             delta_t_min = 1;
             delta_t_max = 600;
             current_delta_t = delta_t_max;

agrolib/soilFluxes3D/header/solver.h

@@ -11,9 +11,7 @@
 
     double arithmeticMean(double v1, double v2);
 
-    bool GaussSeidelRelaxation (int myApproximation, double myResidualTolerance, int myProcess);
-
-    bool JacobiRelaxation (int approximation, double toleranceThreshold, int process);
+    bool solver(int myApproximation, double myResidualTolerance, int myProcess);
 
 #endif  // SOLVER_H
 

agrolib/soilFluxes3D/header/types.h

@@ -145,7 +145,7 @@
     extern TCrit3Dnode *nodeList;
     extern TmatrixElement **A;
     extern Tculvert myCulvert;
-    extern double *b, *C, *X;
+    extern double *b, *C, *X, *X1;
     extern double *invariantFlux;         // array accessorio per flussi avvettivi e latenti
     extern double Courant;
 

agrolib/soilFluxes3D/heat.cpp

@@ -991,7 +991,7 @@ bool HeatComputation(double timeStep, double timeStepWater)
             return (false);
         }
 
-    GaussSeidelRelaxation(0, myParameters.ResidualTolerance, PROCESS_HEAT);
+    solver(0, myParameters.ResidualTolerance, PROCESS_HEAT);
 
     for (i = 1; i < myStructure.nrNodes; i++)
         nodeList[i].extra->Heat->T = X[i];

agrolib/soilFluxes3D/memory.cpp

@@ -44,10 +44,11 @@ void cleanArrays()
     }
 
     /*! free arrays */
+    if (invariantFlux != nullptr) { free(invariantFlux); invariantFlux = nullptr; }
     if (b != nullptr) { free(b); b = nullptr; }
     if (C != nullptr) { free(C); C = nullptr; }
-    if (invariantFlux != nullptr) { free(invariantFlux); invariantFlux = nullptr; }
     if (X != nullptr) { free(X); X = nullptr; }
+    if (X1 != nullptr) { free(X1); X1 = nullptr; }
 }
 
 
@@ -72,38 +73,49 @@ void cleanNodes()
  */
 int initializeArrays()
 {
-    long i, j, n;
-
     /*! clean previous arrays */
     cleanArrays();
 
-    /*! matrix solver: rows */
+    /*! matrix A: rows */
     A = (TmatrixElement **) calloc(myStructure.nrNodes, sizeof(TmatrixElement *));
 
-    /*! matrix solver: columns */
-    for (i = 0; i < myStructure.nrNodes; i++)
-            A[i] = (TmatrixElement *) calloc(myStructure.maxNrColumns, sizeof(TmatrixElement));
+    /*! matrix A: columns */
+    for (long i = 0; i < myStructure.nrNodes; i++)
+    {
+        A[i] = (TmatrixElement *) calloc(myStructure.maxNrColumns, sizeof(TmatrixElement));
+    }
 
-    /*! initialize matrix solver */
-    for (i = 0; i < myStructure.nrNodes; i++)
-        for (j = 0; j < (myStructure.nrLateralLinks + 2); j++)
+    /*! initialize matrix A */
+    for (long i = 0; i < myStructure.nrNodes; i++)
+    {
+        for (int j = 0; j < myStructure.maxNrColumns; j++)
         {
             A[i][j].index   = NOLINK;
             A[i][j].val     = 0.;
         }
+    }
 
     b = (double *) calloc(myStructure.nrNodes, sizeof(double));
-    for (n = 0; n < myStructure.nrNodes; n++) b[n] = 0.;
+    for (long i = 0; i < myStructure.nrNodes; i++)
+    {
+        b[i] = 0.;
+    }
 
     X = (double *) calloc(myStructure.nrNodes, sizeof(double));
 
-    /*! mass diagonal matrix */
-    C = (double *) calloc(myStructure.nrNodes, sizeof(double));
-    for (n = 0; n < myStructure.nrNodes; n++) C[n] = 0.;
+    if (myParameters.numericalSolutionMethod == JACOBI)
+    {
+        X1 = (double *) calloc(myStructure.nrNodes, sizeof(double));
+    }
 
     /*! mass diagonal matrix */
+    C = (double *) calloc(myStructure.nrNodes, sizeof(double));
     invariantFlux = (double *) calloc(myStructure.nrNodes, sizeof(double));
-    for (n = 0; n < myStructure.nrNodes; n++) invariantFlux[n] = 0.;
+    for (long n = 0; n < myStructure.nrNodes; n++)
+    {
+        C[n] = 0.;
+        invariantFlux[n] = 0.;
+    }
 
     if (A == nullptr)
         return MEMORY_ERROR;