Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
OpenFOAM-plus
Commits
755a0892
Commit
755a0892
authored
Jun 17, 2019
by
mattijs
Browse files
COMP: lduMatrix: fix solveScalar compilation
parent
321ca189
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
View file @
755a0892
...
...
@@ -253,6 +253,7 @@ public:
//- Read and reset the solver parameters from the given stream
virtual
void
read
(
const
dictionary
&
);
//- Solve with given field and rhs
virtual
solverPerformance
solve
(
scalarField
&
psi
,
...
...
@@ -260,6 +261,15 @@ public:
const
direction
cmpt
=
0
)
const
=
0
;
//- Solve with given field and rhs (in solveScalar precision).
// Default is to call solve routine
virtual
solverPerformance
scalarSolve
(
solveScalarField
&
psi
,
const
solveScalarField
&
source
,
const
direction
cmpt
=
0
)
const
;
//- Return the matrix norm used to normalise the residual for the
//- stopping criterion
solveScalarField
::
cmptType
normFactor
...
...
src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSolver.C
View file @
755a0892
...
...
@@ -27,6 +27,7 @@ License
#include
"lduMatrix.H"
#include
"diagonalSolver.H"
#include
"PrecisionAdaptor.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
...
...
@@ -170,6 +171,23 @@ void Foam::lduMatrix::solver::read(const dictionary& solverControls)
}
Foam
::
solverPerformance
Foam
::
lduMatrix
::
solver
::
scalarSolve
(
solveScalarField
&
psi
,
const
solveScalarField
&
source
,
const
direction
cmpt
)
const
{
PrecisionAdaptor
<
scalar
,
solveScalar
>
tpsi_s
(
psi
);
return
solve
(
tpsi_s
.
ref
(),
ConstPrecisionAdaptor
<
scalar
,
solveScalar
>
(
source
)(),
cmpt
);
}
Foam
::
solveScalarField
::
cmptType
Foam
::
lduMatrix
::
solver
::
normFactor
(
const
solveScalarField
&
psi
,
...
...
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
View file @
755a0892
...
...
@@ -695,7 +695,7 @@ void Foam::GAMGSolver::solveCoarsestLevel
coarsestCorrField
=
0
;
const
solverPerformance
coarseSolverPerf
(
coarsestSolverPtr_
->
solve
coarsestSolverPtr_
->
s
calarS
olve
(
coarsestCorrField
,
coarsestSource
...
...
Write
Preview
Supports
Markdown
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