update 1D

Author: ftomei

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;

soilFluxes3D/solver.cpp

@@ -137,26 +137,12 @@ double GaussSeidelIterationHeat()
 }
 
 
-double GaussSeidelIterationWater(short direction)
+double GaussSeidelIterationWater()
 {
-    long firstIndex, lastIndex;
-
-    if (direction == UP)
-    {
-        firstIndex = 0;
-        lastIndex = myStructure.nrNodes;
-    }
-    else
-    {
-        firstIndex = myStructure.nrNodes -1;
-        lastIndex = -1;
-    }
-
     double currentNorm = 0.;
     double infinityNorm = 0.;
-    long i = firstIndex;
 
-    while (i != lastIndex)
+    for (long i = 0; i < myStructure.nrNodes; i++)
     {
         double newX = b[i];
         short j = 1;
@@ -173,6 +159,7 @@ double GaussSeidelIterationWater(short direction)
         }
 
         currentNorm = fabs(newX - X[i]);
+        X[i] = newX;
 
         // water potential [m]
         double psi = fabs(newX - nodeList[i].z);
@@ -184,10 +171,6 @@ double GaussSeidelIterationWater(short direction)
 
         if (currentNorm > infinityNorm)
             infinityNorm = currentNorm;
-
-        X[i] = newX;
-
-        (direction == UP)? i++ : i--;
     }
 
     return infinityNorm;
@@ -383,7 +366,7 @@ bool solver (int approximation, double toleranceThreshold, int process)
         {
             if (myStructure.nrNodes < 1000)
             {
-                currentNorm = GaussSeidelIterationWater(UP);
+                currentNorm = GaussSeidelIterationWater();
             }
             else
             {