Commit e51f57c7 authored by Andrew Heather's avatar Andrew Heather
Browse files

Merge branch 'tutorials'

parents 3ec6e289 00fbaf62
......@@ -79,12 +79,7 @@ bool Foam::dictionary::substituteKeyword(const word& keyword)
{
const dictionary& addDict = ePtr->dict();
for
(
IDLList<entry>::const_iterator iter = addDict.begin();
iter != addDict.end();
++iter
)
forAllConstIter(IDLList<entry>, addDict, iter)
{
add(iter());
}
......@@ -152,15 +147,22 @@ void Foam::dictionary::write(Ostream& os, bool subDict) const
os << nl << indent << token::BEGIN_BLOCK << incrIndent << nl;
}
for
(
IDLList<entry>::const_iterator iter = begin();
iter != end();
++iter
)
forAllConstIter(IDLList<entry>, *this, iter)
{
// Write entry & follow with carriage return.
os << *iter;
const entry& e = *iter;
// Write entry
os << e;
// Add new line if applicable
if
(
(e.isDict() || (!e.isDict() && parent()==dictionary::null))
&& e != *last()
)
{
os << nl;
}
// Check stream before going to next entry.
if (!os.good())
......
......@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
......@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
location "constant";
object boxTurbDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......@@ -18,4 +19,5 @@ Ea 10;
k0 5;
// ************************************************************************* //
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "constant";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
nu nu [ 0 2 -1 0 0 0 0 ] 0.025;
// ************************************************************************* //
......@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
......@@ -10,16 +10,18 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
location "constant";
object turbulenceProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
UOsigma 0.090295049;
UOsigma 0.090295;
UOalpha 0.81532036;
UOalpha 0.81532;
UOKupper 10;
UOKlower 7;
// ************************************************************************* //
......@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
......@@ -10,11 +10,11 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
startFrom startTime;
startTime 0;
......@@ -45,4 +45,5 @@ runTimeModifiable yes;
graphFormat raw;
// ************************************************************************* //
......@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
......@@ -10,13 +10,14 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{
default Euler;
default Euler;
}
gradSchemes
......@@ -53,7 +54,8 @@ snGradSchemes
fluxRequired
{
default no;
p;
p ;
}
// ************************************************************************* //
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment