Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Backofen, Rainer
amdis
Commits
6de23628
Commit
6de23628
authored
Aug 24, 2012
by
Thomas Witkowski
Browse files
Fixes in base problems.
parent
56f1d33d
Changes
2
Hide whitespace changes
Inline
Side-by-side
extensions/base_problems/NavierStokes_Chorin.cc
View file @
6de23628
...
...
@@ -185,15 +185,15 @@ MSG("NavierStokes_Chorin::beginIteration()\n");
Flag
NavierStokes_Chorin
::
solvePredictorProb
(
AdaptInfo
*
adaptInfo
,
Flag
toDo
,
bool
fixedMatrix
)
{
FUNCNAME
(
"NavierStokes_Chorin::solvePredictorProb()"
);
MSG
(
"NavierStokes_Chorin::solvePredictorProb()
\n
"
);
{
FUNCNAME
(
"NavierStokes_Chorin::solvePredictorProb()"
);
MSG
(
"NavierStokes_Chorin::solvePredictorProb()
\n
"
);
Flag
markFlag
;
if
(
toDo
.
isSet
(
BUILD
))
{
predictorProb
->
getSolver
()
->
setMultipleRhs
(
fixedMatrix
);
predictorProb
->
buildAfterCoarsen
(
adaptInfo
,
markFlag
,
!
fixedMatrix
,
true
);
}
if
(
toDo
.
isSet
(
BUILD
))
predictorProb
->
buildAfterCoarsen
(
adaptInfo
,
markFlag
,
!
fixedMatrix
,
true
);
if
(
toDo
.
isSet
(
SOLVE
))
predictorProb
->
solve
(
adaptInfo
);
...
...
@@ -205,12 +205,12 @@ MSG("NavierStokes_Chorin::solvePredictorProb()\n");
Flag
NavierStokes_Chorin
::
solvePressureProb
(
AdaptInfo
*
adaptInfo
,
Flag
toDo
,
bool
fixedMatrix
)
{
FUNCNAME
(
"NavierStokes_Chorin::solvePressureProb()"
);
{
FUNCNAME
(
"NavierStokes_Chorin::solvePressureProb()"
);
Flag
markFlag
;
if
(
toDo
.
isSet
(
BUILD
))
{
pressureProb
->
getSolver
()
->
setMultipleRhs
(
fixedMatrix
);
pressureProb
->
buildAfterCoarsen
(
adaptInfo
,
markFlag
,
!
fixedMatrix
,
true
);
SolverMatrix
<
Matrix
<
DOFMatrix
*>
>
solverMatrix
;
...
...
@@ -292,18 +292,18 @@ Flag NavierStokes_Chorin::solveCorrectorProb( AdaptInfo *adaptInfo,
for
(
int
i
=
0
;
i
<
gradPressure
.
getSize
();
++
i
)
delete
gradPressure
[
i
];
#else
correctorProb
->
getSolver
()
->
setMultipleRhs
(
fixedMatrix
);
correctorProb
->
buildAfterCoarsen
(
adaptInfo
,
markFlag
,
!
fixedMatrix
,
true
);
correctorProb
->
solve
(
adaptInfo
);
#endif
return
markFlag
;
}
;
}
Flag
NavierStokes_Chorin
::
oneIteration
(
AdaptInfo
*
adaptInfo
,
Flag
toDo
)
{
FUNCNAME
(
"NavierStokes_Chorin::oneIteration()"
);
{
FUNCNAME
(
"NavierStokes_Chorin::oneIteration()"
);
Flag
flag
,
markFlag
;
...
...
extensions/base_problems/PhaseFieldCrystal.cc
View file @
6de23628
...
...
@@ -138,10 +138,8 @@ Flag PhaseFieldCrystal::oneIteration( AdaptInfo *adaptInfo,
#endif
#ifndef NONLIN_PROBLEM
if
(
toDo
.
isSet
(
BUILD
))
{
prob
->
getSolver
()
->
setMultipleRhs
(
false
);
if
(
toDo
.
isSet
(
BUILD
))
prob
->
buildAfterCoarsen
(
adaptInfo
,
markFlag
,
true
,
true
);
}
#endif
if
(
toDo
.
isSet
(
SOLVE
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment