update 3D

soilFluxes3D/header/solver.h

@@ -13,5 +13,7 @@
 
     bool GaussSeidelRelaxation (int myApproximation, double myResidualTolerance, int myProcess);
 
+    bool JacobiRelaxation (int approximation, double toleranceThreshold, int process);
+
 #endif  // SOLVER_H
 

soilFluxes3D/solver.cpp

@@ -233,3 +233,39 @@ bool GaussSeidelRelaxation (int approximation, double toleranceThreshold, int pr
 
     return true;
 }
+
+
+bool JacobiRelaxation (int approximation, double toleranceThreshold, int process)
+{
+    double currentNorm = 1.0;
+    double bestNorm = currentNorm;
+
+    int maxIterationsNr = getMaxIterationsNr(approximation);
+    int iteration = 0;
+
+    while ((currentNorm > toleranceThreshold) && (iteration < maxIterationsNr))
+    {
+        if (process == PROCESS_HEAT)
+        {
+            currentNorm = GaussSeidelIterationHeat();
+        }
+        if (process == PROCESS_WATER)
+        {
+            // TODO Jacobi method
+
+            if (currentNorm < bestNorm)
+            {
+                bestNorm = currentNorm;
+            }
+            else if (currentNorm > (bestNorm * 10.0))
+            {
+                // non-convergent system
+                return false;
+            }
+        }
+
+        iteration++;
+    }
+
+    return true;
+}

soilFluxes3D/water.cpp

@@ -201,7 +201,6 @@ double redistribution(long i, TlinkedNode *link, int linkType)
 }
 
 
-
 bool computeFlux(long i, int matrixIndex, TlinkedNode *link, double deltaT, unsigned long myApprox, int linkType)
 {
     if ((*link).index == NOLINK) return false;