GIT: resolve merge conflict

This commit is contained in:
andy
2012-07-25 09:27:24 +01:00
111 changed files with 2177 additions and 2520 deletions

View File

@ -1,42 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
object changeDictionaryDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dictionaryReplacement
{
boundary
{
AMI1
{
type cyclicAMI;
neighbourPatch AMI2;
transform noOrdering;
surface
{
}
}
AMI2
{
type cyclicAMI;
neighbourPatch AMI1;
transform noOrdering;
surface
{
}
}
}
}
// ************************************************************************* //

View File

@ -16,20 +16,18 @@ FoamFile
ddtSchemes
{
default steadyState;
default steadyState;
}
gradSchemes
{
default Gauss linear;
grad(p) Gauss linear;
grad(U) Gauss linear;
default Gauss linear;
}
divSchemes
{
default none;
div(phi,U) Gauss upwind grad(U);
div(phi,U) Gauss upwind;
div((nuEff*dev(T(grad(U))))) Gauss linear;
div(phi,epsilon) Gauss upwind;
div(phi,k) Gauss upwind;