Commit dd017458 authored by mattijs's avatar mattijs
Browse files

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

parents 81021c37 e90cfe33
......@@ -68,4 +68,6 @@
}
}
phi.oldTime() = phi;
#include "continuityErrs.H"
......@@ -56,6 +56,8 @@
phi -= pcorrEqn.flux();
}
}
#include "continuityErrs.H"
}
phi.oldTime() = phi;
#include "continuityErrs.H"
......@@ -53,6 +53,8 @@
fvc::makeRelative(phi, U);
}
}
#include "continuityErrs.H"
}
phi.oldTime() = phi;
#include "continuityErrs.H"
......@@ -198,10 +198,61 @@ void Foam::fvPatchField<Type>::patchInternalField(Field<Type>& pif) const
template<class Type>
void Foam::fvPatchField<Type>::autoMap
(
const fvPatchFieldMapper& m
const fvPatchFieldMapper& mapper
)
{
Field<Type>::autoMap(m);
Field<Type>& f = *this;
if (!this->size())
{
f.setSize(mapper.size());
if (f.size())
{
f = this->patchInternalField();
}
}
else
{
// Map all faces provided with mapping data
Field<Type>::autoMap(mapper);
// For unmapped faces set to internal field value (zero-gradient)
if
(
mapper.direct()
&& &mapper.directAddressing()
&& mapper.directAddressing().size()
)
{
Field<Type> pif(this->patchInternalField());
const labelList& mapAddressing = mapper.directAddressing();
forAll(mapAddressing, i)
{
if (mapAddressing[i] < 0)
{
f[i] = pif[i];
}
}
}
else if (!mapper.direct() && mapper.addressing().size())
{
Field<Type> pif(this->patchInternalField());
const labelListList& mapAddressing = mapper.addressing();
forAll(mapAddressing, i)
{
const labelList& localAddrs = mapAddressing[i];
if (!localAddrs.size())
{
f[i] = pif[i];
}
}
}
}
}
......
......@@ -29,6 +29,7 @@ boundaryField
outlet
{
type inletOutlet;
phi phiwater;
inletValue uniform 0.1;
value uniform 0.1;
}
......
......@@ -29,6 +29,7 @@ boundaryField
outlet
{
type inletOutlet;
phi phiwater;
inletValue uniform 1e-8;
value uniform 1e-8;
}
......
......@@ -31,6 +31,7 @@ boundaryField
outlet
{
type inletOutlet;
phi phi2;
inletValue uniform 10.0;
value uniform 10.0;
}
......
......@@ -31,6 +31,7 @@ boundaryField
outlet
{
type inletOutlet;
phi phi2;
inletValue uniform 1.0;
value uniform 1.0;
}
......
......@@ -30,6 +30,7 @@ boundaryField
top
{
type inletOutlet;
phi phi1;
inletValue uniform 1.0e-8;
}
......
......@@ -29,6 +29,7 @@ boundaryField
top
{
type inletOutlet;
phi phi2;
inletValue uniform 10.0;
value uniform 10.0;
}
......
......@@ -29,6 +29,7 @@ boundaryField
top
{
type inletOutlet;
phi phi2;
inletValue uniform 1.0;
value uniform 1.0;
}
......
......@@ -27,6 +27,7 @@ boundaryField
outlet
{
type inletOutlet;
phi phi2;
inletValue uniform 10.0;
value uniform 10.0;
}
......
......@@ -27,6 +27,7 @@ boundaryField
outlet
{
type inletOutlet;
phi phi2;
inletValue uniform 1.0;
value uniform 1.0;
}
......
......@@ -29,6 +29,7 @@ boundaryField
outlet
{
type inletOutlet;
phi phi1;
inletValue uniform 1.0e-7;
value uniform 1.0e-7;
}
......
......@@ -29,6 +29,7 @@ boundaryField
outlet
{
type inletOutlet;
phi phi2;
inletValue uniform 0.1;
value uniform 0.1;
}
......
......@@ -29,6 +29,7 @@ boundaryField
outlet
{
type inletOutlet;
phi phi2;
inletValue uniform 1e-8;
value uniform 1e-8;
}
......
Supports Markdown
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