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

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/lduSolvers/amg/amgPolicy/pamgPolicy.C
View file

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

2
tutorials/viscoelastic/viscoelasticFluidFoam/DCPP/constant/polyMesh/boundary
View file

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

60
tutorials/viscoelastic/viscoelasticFluidFoam/DCPP/system/fvSolution
View file

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

2
tutorials/viscoelastic/viscoelasticFluidFoam/FENE-CR/constant/polyMesh/boundary
View file

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

25
tutorials/viscoelastic/viscoelasticFluidFoam/FENE-CR/system/fvSolution
View file

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

2
tutorials/viscoelastic/viscoelasticFluidFoam/FENE-P/constant/polyMesh/boundary
View file

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

2
tutorials/viscoelastic/viscoelasticFluidFoam/Feta-PTT/constant/polyMesh/boundary
View file

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

40
tutorials/viscoelastic/viscoelasticFluidFoam/Feta-PTT/system/fvSolution
View file

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

2
tutorials/viscoelastic/viscoelasticFluidFoam/Giesekus/constant/polyMesh/boundary
View file

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

2
tutorials/viscoelastic/viscoelasticFluidFoam/Leonov/constant/polyMesh/boundary
View file

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

25
tutorials/viscoelastic/viscoelasticFluidFoam/Leonov/system/fvSolution
View file

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

2
tutorials/viscoelastic/viscoelasticFluidFoam/Oldroyd-B/constant/polyMesh/boundary
View file

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

2
tutorials/viscoelastic/viscoelasticFluidFoam/Oldroyd-B/system/fvSolution
View file

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

2
tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Exponential/constant/polyMesh/boundary
View file

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

40
tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Exponential/system/fvSolution
View file

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

3
tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Linear/0/N1
View file

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

3
tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Linear/0/N2
View file

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

2
tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Linear/constant/polyMesh/boundary
View file

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

25
tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Linear/system/fvSolution
View file

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

2
tutorials/viscoelastic/viscoelasticFluidFoam/S-MDCPP/constant/polyMesh/boundary
View file

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

2
tutorials/viscoelastic/viscoelasticFluidFoam/WhiteMetzner/CarreauYasuda/constant/polyMesh/boundary
View file

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

25
tutorials/viscoelastic/viscoelasticFluidFoam/WhiteMetzner/CarreauYasuda/system/fvSolution
View file

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

2
tutorials/viscoelastic/viscoelasticFluidFoam/XPP_DE/constant/polyMesh/boundary
View file

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

2
tutorials/viscoelastic/viscoelasticFluidFoam/XPP_DE/system/fvSolution
View file

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

2
tutorials/viscoelastic/viscoelasticFluidFoam/XPP_SE/constant/polyMesh/boundary
View file

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

50
tutorials/viscoelastic/viscoelasticFluidFoam/XPP_SE/system/fvSolution
View file

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