mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev
This commit is contained in:
@ -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;
|
||||
forcesFilePtr_() << obr_.time().value() << tab << fm;
|
||||
|
||||
if (localSystem_)
|
||||
if (localSystem_)
|
||||
{
|
||||
forcesMoments fmLocal;
|
||||
|
||||
fmLocal.first().first() =
|
||||
coordSys_.localVector(fm.first().first());
|
||||
|
||||
fmLocal.first().second() =
|
||||
coordSys_.localVector(fm.first().second());
|
||||
|
||||
fmLocal.second().first() =
|
||||
coordSys_.localVector(fm.second().first());
|
||||
|
||||
fmLocal.second().second() =
|
||||
coordSys_.localVector(fm.second().second());
|
||||
|
||||
forcesFilePtr_() << tab << fmLocal;
|
||||
|
||||
if (log_)
|
||||
{
|
||||
forcesMoments fmLocal;
|
||||
|
||||
fmLocal.first().first() =
|
||||
coordSys_.localVector(fm.first().first());
|
||||
|
||||
fmLocal.first().second() =
|
||||
coordSys_.localVector(fm.first().second());
|
||||
|
||||
fmLocal.second().first() =
|
||||
coordSys_.localVector(fm.second().first());
|
||||
|
||||
fmLocal.second().second() =
|
||||
coordSys_.localVector(fm.second().second());
|
||||
|
||||
forcesFilePtr_() << tab << fmLocal;
|
||||
|
||||
|
||||
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
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user