Skip to content
Snippets Groups Projects
Commit 467ed8d4 authored by Elias Pipping's avatar Elias Pipping Committed by Elias Pipping
Browse files

Cleanup

parent 31b7ee33
No related branches found
No related tags found
No related merge requests found
......@@ -25,7 +25,7 @@ template <class MyConvexProblemTypeTEMPLATE> class MyBlockProblem {
typedef typename MyConvexProblemType::LocalVectorType LocalVectorType;
typedef typename MyConvexProblemType::LocalMatrixType LocalMatrixType;
static const int block_size = MyConvexProblemType::block_size;
static int const block_size = MyConvexProblemType::block_size;
/** \brief Solves one local system using a modified gradient method */
class IterateObject;
......@@ -56,27 +56,25 @@ class MyBlockProblem<MyConvexProblemTypeTEMPLATE>::IterateObject {
* \param problem The problem including quadratic part and nonlinear part
*/
IterateObject(const Bisection& bisection, MyConvexProblemType& problem)
: problem(problem), bisection(bisection) {};
: problem(problem), bisection(bisection) {}
public:
/** \brief Set the current iterate */
void setIterate(VectorType& u) {
this->u = u;
return;
};
}
/** \brief Update the i-th block of the current iterate */
void updateIterate(const LocalVectorType& ui, int i) {
u[i] = ui;
return;
};
}
/** \brief Minimize a local problem using a scalar Gauss-Seidel method
/** \brief Minimise a local problem using a modified gradient method
* \param[out] ui The solution
* \param m Block number
* \param ignore Set of degrees of freedom to leave untouched
*
* \return The minimizer of the local functional in the variable ui
*/
void solveLocalProblem(
LocalVectorType& ui, int m,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment