Merge remote-tracking branch 'origin/nr/DominikChrist' into nextRelease

This commit is contained in:
Henrik Rusche 2013-08-15 11:33:51 +02:00
commit 43f522bdf0
26 changed files with 62 additions and 267 deletions

View file

@ -30,7 +30,6 @@ Description
Author Author
Hrvoje Jasak, Wikki Ltd. All rights reserved Hrvoje Jasak, Wikki Ltd. All rights reserved
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "pamgPolicy.H" #include "pamgPolicy.H"
@ -125,7 +124,7 @@ void Foam::pamgPolicy::calcChild()
} }
// Reset child array // Reset child array
child_ = -1; child_.setSize(nEqns, -1);
// Calculate agglomeration // Calculate agglomeration

View file

@ -1,6 +1,6 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | | ========= | |
| \\ / F ield | OpenFOAM Extend Project: Open Source CFD | | \\ / F ield | OpenFOAM Extend Project: Open source CFD |
| \\ / O peration | Version: 1.6-ext | | \\ / O peration | Version: 1.6-ext |
| \\ / A nd | Web: www.extend-project.de | | \\ / A nd | Web: www.extend-project.de |
| \\/ M anipulation | | | \\/ M anipulation | |

View file

@ -20,20 +20,7 @@ solvers
p p
{ {
solver PCG; solver PCG;
preconditioner preconditioner Cholesky;
{
// preconditioner Cholesky;
preconditioner AMG;
cycle W-cycle;
policy AAMG;
nPreSweeps 0;
nPostSweeps 2;
groupSize 4;
minCoarseEqns 20;
nMaxLevels 100;
scale off;
smoother ILU;
}
tolerance 1e-07; tolerance 1e-07;
relTol 0; relTol 0;
@ -45,10 +32,7 @@ solvers
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -59,10 +43,7 @@ solvers
Sfirst Sfirst
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -73,10 +54,7 @@ solvers
Ssecond Ssecond
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -87,10 +65,7 @@ solvers
Sthird Sthird
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -101,10 +76,7 @@ solvers
Sfourth Sfourth
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -115,10 +87,7 @@ solvers
Lambdafirst Lambdafirst
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -129,10 +98,7 @@ solvers
Lambdasecond Lambdasecond
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -143,10 +109,7 @@ solvers
Lambdathird Lambdathird
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -157,10 +120,7 @@ solvers
Lambdafourth Lambdafourth
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;

View file

@ -1,6 +1,6 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | | ========= | |
| \\ / F ield | OpenFOAM Extend Project: Open Source CFD | | \\ / F ield | OpenFOAM Extend Project: Open source CFD |
| \\ / O peration | Version: 1.6-ext | | \\ / O peration | Version: 1.6-ext |
| \\ / A nd | Web: www.extend-project.de | | \\ / A nd | Web: www.extend-project.de |
| \\/ M anipulation | | | \\/ M anipulation | |

View file

@ -20,20 +20,7 @@ solvers
p p
{ {
solver PCG; solver PCG;
preconditioner preconditioner Cholesky;
{
// preconditioner Cholesky;
preconditioner AMG;
cycle W-cycle;
policy AAMG;
nPreSweeps 0;
nPostSweeps 2;
groupSize 4;
minCoarseEqns 20;
nMaxLevels 100;
scale off;
smoother ILU;
}
tolerance 1e-07; tolerance 1e-07;
relTol 0; relTol 0;
@ -45,10 +32,7 @@ solvers
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -60,10 +44,7 @@ solvers
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;

View file

@ -1,6 +1,6 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | | ========= | |
| \\ / F ield | OpenFOAM Extend Project: Open Source CFD | | \\ / F ield | OpenFOAM Extend Project: Open source CFD |
| \\ / O peration | Version: 1.6-ext | | \\ / O peration | Version: 1.6-ext |
| \\ / A nd | Web: www.extend-project.de | | \\ / A nd | Web: www.extend-project.de |
| \\/ M anipulation | | | \\/ M anipulation | |

View file

@ -1,6 +1,6 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | | ========= | |
| \\ / F ield | OpenFOAM Extend Project: Open Source CFD | | \\ / F ield | OpenFOAM Extend Project: Open source CFD |
| \\ / O peration | Version: 1.6-ext | | \\ / O peration | Version: 1.6-ext |
| \\ / A nd | Web: www.extend-project.de | | \\ / A nd | Web: www.extend-project.de |
| \\/ M anipulation | | | \\/ M anipulation | |

View file

@ -20,20 +20,7 @@ solvers
p p
{ {
solver PCG; solver PCG;
preconditioner preconditioner Cholesky;
{
// preconditioner Cholesky;
preconditioner AMG;
cycle W-cycle;
policy AAMG;
nPreSweeps 0;
nPostSweeps 2;
groupSize 4;
minCoarseEqns 20;
nMaxLevels 100;
scale off;
smoother ILU;
}
tolerance 1e-07; tolerance 1e-07;
relTol 0; relTol 0;
@ -45,10 +32,7 @@ solvers
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -59,10 +43,7 @@ solvers
taufirst taufirst
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -73,10 +54,7 @@ solvers
tausecond tausecond
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -87,10 +65,7 @@ solvers
tauthird tauthird
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -101,10 +76,7 @@ solvers
taufourth taufourth
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;

View file

@ -1,6 +1,6 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | | ========= | |
| \\ / F ield | OpenFOAM Extend Project: Open Source CFD | | \\ / F ield | OpenFOAM Extend Project: Open source CFD |
| \\ / O peration | Version: 1.6-ext | | \\ / O peration | Version: 1.6-ext |
| \\ / A nd | Web: www.extend-project.de | | \\ / A nd | Web: www.extend-project.de |
| \\/ M anipulation | | | \\/ M anipulation | |

View file

@ -1,6 +1,6 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | | ========= | |
| \\ / F ield | OpenFOAM Extend Project: Open Source CFD | | \\ / F ield | OpenFOAM Extend Project: Open source CFD |
| \\ / O peration | Version: 1.6-ext | | \\ / O peration | Version: 1.6-ext |
| \\ / A nd | Web: www.extend-project.de | | \\ / A nd | Web: www.extend-project.de |
| \\/ M anipulation | | | \\/ M anipulation | |

View file

@ -20,20 +20,7 @@ solvers
p p
{ {
solver PCG; solver PCG;
preconditioner preconditioner Cholesky;
{
// preconditioner Cholesky;
preconditioner AMG;
cycle W-cycle;
policy AAMG;
nPreSweeps 0;
nPostSweeps 2;
groupSize 4;
minCoarseEqns 20;
nMaxLevels 100;
scale off;
smoother ILU;
}
tolerance 1e-07; tolerance 1e-07;
relTol 0; relTol 0;
@ -45,10 +32,7 @@ solvers
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -60,10 +44,7 @@ solvers
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;

View file

@ -1,6 +1,6 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | | ========= | |
| \\ / F ield | OpenFOAM Extend Project: Open Source CFD | | \\ / F ield | OpenFOAM Extend Project: Open source CFD |
| \\ / O peration | Version: 1.6-ext | | \\ / O peration | Version: 1.6-ext |
| \\ / A nd | Web: www.extend-project.de | | \\ / A nd | Web: www.extend-project.de |
| \\/ M anipulation | | | \\/ M anipulation | |

View file

@ -20,7 +20,7 @@ solvers
p p
{ {
solver PCG; solver PCG;
preconditioner Cholesky preconditioner Cholesky;
tolerance 1e-07; tolerance 1e-07;
relTol 0; relTol 0;

View file

@ -1,6 +1,6 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | | ========= | |
| \\ / F ield | OpenFOAM Extend Project: Open Source CFD | | \\ / F ield | OpenFOAM Extend Project: Open source CFD |
| \\ / O peration | Version: 1.6-ext | | \\ / O peration | Version: 1.6-ext |
| \\ / A nd | Web: www.extend-project.de | | \\ / A nd | Web: www.extend-project.de |
| \\/ M anipulation | | | \\/ M anipulation | |

View file

@ -20,20 +20,7 @@ solvers
p p
{ {
solver PCG; solver PCG;
preconditioner preconditioner Cholesky;
{
preconditioner Cholesky;
// preconditioner AMG;
cycle W-cycle;
policy AAMG;
nPreSweeps 0;
nPostSweeps 2;
groupSize 4;
minCoarseEqns 20;
nMaxLevels 100;
scale off;
smoother ILU;
}
tolerance 1e-07; tolerance 1e-07;
relTol 0; relTol 0;
@ -45,10 +32,7 @@ solvers
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -59,10 +43,7 @@ solvers
taufirst taufirst
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -73,10 +54,7 @@ solvers
tausecond tausecond
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -87,10 +65,7 @@ solvers
tauthird tauthird
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -101,10 +76,7 @@ solvers
taufourth taufourth
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;

View file

@ -1,6 +1,6 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | | ========= | |
| \\ / F ield | OpenFOAM Extend Project: Open Source CFD | | \\ / F ield | OpenFOAM Extend Project: Open source CFD |
| \\ / O peration | Version: 1.6-ext | | \\ / O peration | Version: 1.6-ext |
| \\ / A nd | Web: www.extend-project.de | | \\ / A nd | Web: www.extend-project.de |
| \\/ M anipulation | | | \\/ M anipulation | |
@ -46,4 +46,5 @@ boundaryField
} }
} }
// ************************************************************************* // // ************************************************************************* //

View file

@ -1,6 +1,6 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | | ========= | |
| \\ / F ield | OpenFOAM Extend Project: Open Source CFD | | \\ / F ield | OpenFOAM Extend Project: Open source CFD |
| \\ / O peration | Version: 1.6-ext | | \\ / O peration | Version: 1.6-ext |
| \\ / A nd | Web: www.extend-project.de | | \\ / A nd | Web: www.extend-project.de |
| \\/ M anipulation | | | \\/ M anipulation | |
@ -46,4 +46,5 @@ boundaryField
} }
} }
// ************************************************************************* // // ************************************************************************* //

View file

@ -1,6 +1,6 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | | ========= | |
| \\ / F ield | OpenFOAM Extend Project: Open Source CFD | | \\ / F ield | OpenFOAM Extend Project: Open source CFD |
| \\ / O peration | Version: 1.6-ext | | \\ / O peration | Version: 1.6-ext |
| \\ / A nd | Web: www.extend-project.de | | \\ / A nd | Web: www.extend-project.de |
| \\/ M anipulation | | | \\/ M anipulation | |

View file

@ -20,20 +20,7 @@ solvers
p p
{ {
solver PCG; solver PCG;
preconditioner preconditioner Cholesky;
{
// preconditioner Cholesky;
preconditioner AMG;
cycle W-cycle;
policy AAMG;
nPreSweeps 0;
nPostSweeps 2;
groupSize 4;
minCoarseEqns 20;
nMaxLevels 100;
scale off;
smoother ILU;
}
tolerance 1e-07; tolerance 1e-07;
relTol 0; relTol 0;
@ -45,10 +32,7 @@ solvers
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -60,10 +44,7 @@ solvers
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;

View file

@ -1,6 +1,6 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | | ========= | |
| \\ / F ield | OpenFOAM Extend Project: Open Source CFD | | \\ / F ield | OpenFOAM Extend Project: Open source CFD |
| \\ / O peration | Version: 1.6-ext | | \\ / O peration | Version: 1.6-ext |
| \\ / A nd | Web: www.extend-project.de | | \\ / A nd | Web: www.extend-project.de |
| \\/ M anipulation | | | \\/ M anipulation | |

View file

@ -1,6 +1,6 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | | ========= | |
| \\ / F ield | OpenFOAM Extend Project: Open Source CFD | | \\ / F ield | OpenFOAM Extend Project: Open source CFD |
| \\ / O peration | Version: 1.6-ext | | \\ / O peration | Version: 1.6-ext |
| \\ / A nd | Web: www.extend-project.de | | \\ / A nd | Web: www.extend-project.de |
| \\/ M anipulation | | | \\/ M anipulation | |

View file

@ -20,20 +20,7 @@ solvers
p p
{ {
solver PCG; solver PCG;
preconditioner preconditioner Cholesky;
{
// preconditioner Cholesky;
preconditioner AMG;
cycle W-cycle;
policy AAMG;
nPreSweeps 0;
nPostSweeps 2;
groupSize 4;
minCoarseEqns 20;
nMaxLevels 100;
scale off;
smoother ILU;
}
tolerance 1e-07; tolerance 1e-07;
relTol 0; relTol 0;
@ -45,10 +32,7 @@ solvers
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -60,10 +44,7 @@ solvers
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;

View file

@ -1,6 +1,6 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | | ========= | |
| \\ / F ield | OpenFOAM Extend Project: Open Source CFD | | \\ / F ield | OpenFOAM Extend Project: Open source CFD |
| \\ / O peration | Version: 1.6-ext | | \\ / O peration | Version: 1.6-ext |
| \\ / A nd | Web: www.extend-project.de | | \\ / A nd | Web: www.extend-project.de |
| \\/ M anipulation | | | \\/ M anipulation | |

View file

@ -20,7 +20,7 @@ solvers
p p
{ {
solver PCG; solver PCG;
preconditioner DIC; preconditioner Cholesky;
tolerance 1e-07; tolerance 1e-07;
relTol 0; relTol 0;

View file

@ -1,6 +1,6 @@
/*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
| ========= | | | ========= | |
| \\ / F ield | OpenFOAM Extend Project: Open Source CFD | | \\ / F ield | OpenFOAM Extend Project: Open source CFD |
| \\ / O peration | Version: 1.6-ext | | \\ / O peration | Version: 1.6-ext |
| \\ / A nd | Web: www.extend-project.de | | \\ / A nd | Web: www.extend-project.de |
| \\/ M anipulation | | | \\/ M anipulation | |

View file

@ -20,20 +20,7 @@ solvers
p p
{ {
solver PCG; solver PCG;
preconditioner preconditioner Cholesky;
{
// preconditioner Cholesky;
preconditioner AMG;
cycle W-cycle;
policy AAMG;
nPreSweeps 0;
nPostSweeps 2;
groupSize 4;
minCoarseEqns 20;
nMaxLevels 100;
scale off;
smoother ILU;
}
tolerance 1e-07; tolerance 1e-07;
relTol 0; relTol 0;
@ -45,10 +32,7 @@ solvers
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -59,10 +43,7 @@ solvers
taufirst taufirst
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -73,10 +54,7 @@ solvers
tausecond tausecond
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -87,10 +65,7 @@ solvers
tauthird tauthird
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -101,10 +76,7 @@ solvers
taufourth taufourth
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -115,10 +87,7 @@ solvers
taufifth taufifth
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;
@ -129,10 +98,7 @@ solvers
tausixth tausixth
{ {
solver BiCGStab; solver BiCGStab;
preconditioner preconditioner ILU0;
{
preconditioner Cholesky;
}
tolerance 1e-6; tolerance 1e-6;
relTol 0; relTol 0;