Commit 5fde154c authored by mattijs's avatar mattijs
Browse files

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

parents 99c860d2 cb13393b
......@@ -428,36 +428,43 @@ void Foam::forces::write()
Info<< "forces output:" << nl
<< " forces(pressure, viscous)" << fm.first() << nl
<< " moment(pressure, viscous)" << fm.second() << nl;
}
forcesFilePtr_() << obr_.time().value() << tab << fm;
if (localSystem_)
{
forcesMoments fmLocal;
forcesFilePtr_() << obr_.time().value() << tab << fm;
fmLocal.first().first() =
coordSys_.localVector(fm.first().first());
if (localSystem_)
{
forcesMoments fmLocal;
fmLocal.first().second() =
coordSys_.localVector(fm.first().second());
fmLocal.first().first() =
coordSys_.localVector(fm.first().first());
fmLocal.second().first() =
coordSys_.localVector(fm.second().first());
fmLocal.first().second() =
coordSys_.localVector(fm.first().second());
fmLocal.second().second() =
coordSys_.localVector(fm.second().second());
fmLocal.second().first() =
coordSys_.localVector(fm.second().first());
forcesFilePtr_() << tab << fmLocal;
fmLocal.second().second() =
coordSys_.localVector(fm.second().second());
forcesFilePtr_() << tab << fmLocal;
if (log_)
{
Info<< " local:" << nl
<< " forces(pressure, viscous)" << fmLocal.first()
<< nl
<< " moment(pressure, viscous)" << fmLocal.second()
<< nl;
}
}
forcesFilePtr_() << endl;
forcesFilePtr_() << endl;
if (log_)
{
Info<< endl;
}
}
......
......@@ -49,7 +49,8 @@ const ThermoType& Foam::multiComponentMixture<ThermoType>::constructSpeciesData
template<class ThermoType>
void Foam::multiComponentMixture<ThermoType>::correctMassFractions()
{
volScalarField Yt("Yt", Y_[0]);
// It changes Yt patches to "calculated"
volScalarField Yt("Yt", 1.0*Y_[0]);
for (label n=1; n<Y_.size(); n++)
{
......
......@@ -21,32 +21,27 @@ boundaryField
{
top
{
type inletOutlet;
inletValue $internalField;
value $internalField;
type calculated;
}
ground
{
type zeroGradient;
type calculated;
}
sides
{
type inletOutlet;
inletValue $internalField;
value $internalField;
type calculated;
}
burner
{
type fixedValue;
value uniform 0;
type calculated;
}
"(region0_to.*)"
{
type zeroGradient;
type calculated;
}
}
......
......@@ -23,24 +23,19 @@ boundaryField
{
outlet
{
type inletOutlet;
inletValue $internalField;
value $internalField;
type calculated;
}
sides
{
type inletOutlet;
inletValue $internalField;
value $internalField;
type calculated;
}
base
{
type zeroGradient;
type calculated;
}
inlet
{
type fixedValue;
value uniform 0;
type calculated;
}
frontBack
{
......
......@@ -23,24 +23,19 @@ boundaryField
{
outlet
{
type inletOutlet;
inletValue $internalField;
value $internalField;
type calculated;
}
sides
{
type inletOutlet;
inletValue $internalField;
value $internalField;
type calculated;
}
base
{
type zeroGradient;
type calculated;
}
inlet
{
type fixedValue;
value uniform 0;
type calculated;
}
}
......
......@@ -23,20 +23,15 @@ boundaryField
{
fuel
{
type fixedValue;
value uniform 0.0;
type calculated;
}
air
{
type fixedValue;
value uniform 0.77;
type calculated;
}
outlet
{
type inletOutlet;
inletValue uniform 0.77;
value uniform 0.77;
type calculated;
}
frontAndBack
{
......
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