Changed formulation from u+g to u-g

kyrillh · Jun 28, 2024 · 456044f · 456044f
1 parent 4f7b7e5
commit 456044f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/feddlib/problems/Solver/NonLinearSchwarzSolver/CoarseNonLinearSchwarzOperator_def.hpp b/feddlib/problems/Solver/NonLinearSchwarzSolver/CoarseNonLinearSchwarzOperator_def.hpp
@@ -244,7 +244,7 @@ void CoarseNonLinearSchwarzOperator<SC, LO, GO, NO>::apply(const BlockMultiVecto
     // Set solution_ to be u+P_0*g_0. g_0 is zero on the boundary, simulating P_0 locally
     // x_ corresponds to u and problem_->solution_ corresponds to g_0
     // this = alpha*xTmp + beta*this
-    problem_->solution_->update(ST::one(), *x_, ST::one());
+    problem_->solution_->update(ST::one(), *x_, -ST::one());
 
     // Need to update solution_ within each iteration to assemble at u+P_0*g_0 but update only g_0
     // This is necessary since u is nonzero on the artificial (interface) zero Dirichlet boundary
@@ -301,7 +301,7 @@ void CoarseNonLinearSchwarzOperator<SC, LO, GO, NO>::apply(const BlockMultiVecto
     }
 
     // Set solution_ to g_i
-    problem_->solution_->update(-ST::one(), *x_, ST::one());
+    problem_->solution_->update(ST::one(), *x_, -ST::one());
     totalIters_ += nlIts;
     FEDD::logGreen("Terminated coarse Newton", this->MpiComm_);
 

diff --git a/feddlib/problems/Solver/NonLinearSchwarzSolver/NonLinearH1Operator_def.hpp b/feddlib/problems/Solver/NonLinearSchwarzSolver/NonLinearH1Operator_def.hpp
@@ -43,7 +43,7 @@ void NonLinearH1Operator<SC, LO, GO, NO>::apply(const XMultiVector &x, XMultiVec
         ->apply(*this->XTmp_, *this->gTmp_, one, zero);
     // Set YTmp_ = u - g0
     this->YTmp_->update(one, *this->XTmp_, zero);
-    this->YTmp_->update(one, *this->gTmp_, one);
+    this->YTmp_->update(-one, *this->gTmp_, one);
     // Get overlapping correction g evaluated at u - g0
     // This will build the local Jacobians at v_i = u_0 - P_iT_i(u_0)
     rcp_dynamic_cast<NonLinearOperator<SC, LO, GO, NO>>(this->NonLinearOperatorVector_[0])

diff --git a/feddlib/problems/Solver/NonLinearSchwarzSolver/NonLinearSchwarzOperator_def.hpp b/feddlib/problems/Solver/NonLinearSchwarzSolver/NonLinearSchwarzOperator_def.hpp
@@ -265,7 +265,7 @@ void NonLinearSchwarzOperator<SC, LO, GO, NO>::apply(const BlockMultiVectorPtrFE
 
     // Set solution_ to be u+P_i*g_i. g_i is zero on the boundary, simulating P_i locally
     // this = alpha*xTmp + beta*this
-    problem_->solution_->update(ST::one(), *x_, ST::one());
+    problem_->solution_->update(ST::one(), *x_, -ST::one());
 
     // Need to update solution_ within each iteration to assemble at u+P_i*g_i but update only g_i
     // This is necessary since u is nonzero on the artificial (interface) zero Dirichlet boundary
@@ -304,7 +304,7 @@ void NonLinearSchwarzOperator<SC, LO, GO, NO>::apply(const BlockMultiVectorPtrFE
     }
 
     // Set solution_ to g_i
-    problem_->solution_->update(-ST::one(), *x_, ST::one());
+    problem_->solution_->update(ST::one(), *x_, -ST::one());
     FEDD::logGreen("Terminated inner Newton", this->MpiComm_);
     totalIters_ += nlIts;
 

diff --git a/feddlib/problems/Solver/NonLinearSolver_def.hpp b/feddlib/problems/Solver/NonLinearSolver_def.hpp
@@ -767,7 +767,7 @@ void NonLinearSolver<SC, LO, GO, NO>::solveNonLinearSchwarz(NonLinearProblem_Typ
 
        // Update the current solution
        // solution = alpha * deltaSolution + beta * solution
-       problem.solution_->update(ST::one(), deltaSolution, ST::one());
+       problem.solution_->update(-ST::one(), deltaSolution, ST::one());
        // Compute the residual
        problem.calculateNonLinResidualVec("reverse");
        residual = problem.calculateResidualNorm();