Commit 6de23628 authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

Fixes in base problems.

parent 56f1d33d
...@@ -185,15 +185,15 @@ MSG("NavierStokes_Chorin::beginIteration()\n"); ...@@ -185,15 +185,15 @@ MSG("NavierStokes_Chorin::beginIteration()\n");
Flag NavierStokes_Chorin::solvePredictorProb( AdaptInfo *adaptInfo, Flag NavierStokes_Chorin::solvePredictorProb( AdaptInfo *adaptInfo,
Flag toDo, Flag toDo,
bool fixedMatrix) bool fixedMatrix)
{ FUNCNAME("NavierStokes_Chorin::solvePredictorProb()"); {
MSG("NavierStokes_Chorin::solvePredictorProb()\n"); FUNCNAME("NavierStokes_Chorin::solvePredictorProb()");
MSG("NavierStokes_Chorin::solvePredictorProb()\n");
Flag markFlag; Flag markFlag;
if (toDo.isSet(BUILD)) { if (toDo.isSet(BUILD))
predictorProb->getSolver()->setMultipleRhs(fixedMatrix); predictorProb->buildAfterCoarsen(adaptInfo, markFlag, !fixedMatrix, true);
predictorProb->buildAfterCoarsen(adaptInfo, markFlag,!fixedMatrix,true);
}
if (toDo.isSet(SOLVE)) if (toDo.isSet(SOLVE))
predictorProb->solve(adaptInfo); predictorProb->solve(adaptInfo);
...@@ -205,12 +205,12 @@ MSG("NavierStokes_Chorin::solvePredictorProb()\n"); ...@@ -205,12 +205,12 @@ MSG("NavierStokes_Chorin::solvePredictorProb()\n");
Flag NavierStokes_Chorin::solvePressureProb(AdaptInfo *adaptInfo, Flag NavierStokes_Chorin::solvePressureProb(AdaptInfo *adaptInfo,
Flag toDo, Flag toDo,
bool fixedMatrix) bool fixedMatrix)
{ FUNCNAME("NavierStokes_Chorin::solvePressureProb()"); {
FUNCNAME("NavierStokes_Chorin::solvePressureProb()");
Flag markFlag; Flag markFlag;
if (toDo.isSet(BUILD)) { if (toDo.isSet(BUILD)) {
pressureProb->getSolver()->setMultipleRhs(fixedMatrix);
pressureProb->buildAfterCoarsen(adaptInfo, markFlag,!fixedMatrix,true); pressureProb->buildAfterCoarsen(adaptInfo, markFlag,!fixedMatrix,true);
SolverMatrix<Matrix<DOFMatrix*> > solverMatrix; SolverMatrix<Matrix<DOFMatrix*> > solverMatrix;
...@@ -292,18 +292,18 @@ Flag NavierStokes_Chorin::solveCorrectorProb( AdaptInfo *adaptInfo, ...@@ -292,18 +292,18 @@ Flag NavierStokes_Chorin::solveCorrectorProb( AdaptInfo *adaptInfo,
for(int i= 0; i<gradPressure.getSize(); ++i) for(int i= 0; i<gradPressure.getSize(); ++i)
delete gradPressure[i]; delete gradPressure[i];
#else #else
correctorProb->getSolver()->setMultipleRhs(fixedMatrix);
correctorProb->buildAfterCoarsen(adaptInfo, markFlag,!fixedMatrix,true); correctorProb->buildAfterCoarsen(adaptInfo, markFlag,!fixedMatrix,true);
correctorProb->solve(adaptInfo); correctorProb->solve(adaptInfo);
#endif #endif
return markFlag; return markFlag;
}; }
Flag NavierStokes_Chorin::oneIteration( AdaptInfo *adaptInfo, Flag NavierStokes_Chorin::oneIteration( AdaptInfo *adaptInfo,
Flag toDo) Flag toDo)
{ FUNCNAME("NavierStokes_Chorin::oneIteration()"); {
FUNCNAME("NavierStokes_Chorin::oneIteration()");
Flag flag, markFlag; Flag flag, markFlag;
......
...@@ -138,10 +138,8 @@ Flag PhaseFieldCrystal::oneIteration( AdaptInfo *adaptInfo, ...@@ -138,10 +138,8 @@ Flag PhaseFieldCrystal::oneIteration( AdaptInfo *adaptInfo,
#endif #endif
#ifndef NONLIN_PROBLEM #ifndef NONLIN_PROBLEM
if (toDo.isSet(BUILD)) { if (toDo.isSet(BUILD))
prob->getSolver()->setMultipleRhs(false);
prob->buildAfterCoarsen(adaptInfo, markFlag, true, true); prob->buildAfterCoarsen(adaptInfo, markFlag, true, true);
}
#endif #endif
if (toDo.isSet(SOLVE)) { if (toDo.isSet(SOLVE)) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment