exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Clean-up of smoother selection

Browse source 
Conflicts:
	src/foam/matrices/blockLduMatrix/BlockLduSmoothers/BlockLduSmoother/BlockLduSmoother.C
This commit is contained in:
Hrvoje Jasak 2015-09-30 09:45:45 +01:00
parent 96829595a8
commit b1a280bb0c
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/foam/matrices/blockLduMatrix/BlockLduSmoothers/BlockLduSmoother/BlockLduSmoother.C
View file

@ -43,7 +43,11 @@ Foam::autoPtr<Foam::BlockLduSmoother<Type> > Foam::BlockLduSmoother<Type>::New
const dictionary& dict
)
{
<<<<<<< HEAD
word smootherName = getName(dict);
=======
word smootherName = this->getName(dict);
>>>>>>> ac8bcf5... Clean-up of smoother selection
// Not (yet?) needed:
// const dictionary& controls = e.isDict() ? e.dict() : dictionary::null;