Merge branch 'master' of ssh://opencfd:8007/home/dm4/OpenFOAM/repositories/OpenFOAM-dev

This commit is contained in:
Henry
2014-02-21 10:32:46 +00:00
6 changed files with 32 additions and 11 deletions

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -31,6 +31,7 @@ License
#include "incompressiblePerfectGas.H" #include "incompressiblePerfectGas.H"
#include "rhoConst.H" #include "rhoConst.H"
#include "perfectFluid.H" #include "perfectFluid.H"
#include "adiabaticPerfectFluid.H"
#include "hConstThermo.H" #include "hConstThermo.H"
#include "janafThermo.H" #include "janafThermo.H"
#include "sensibleEnthalpy.H" #include "sensibleEnthalpy.H"
@ -114,6 +115,18 @@ makeThermo
specie specie
); );
makeThermo
(
rhoThermo,
heRhoThermo,
pureMixture,
constTransport,
sensibleEnthalpy,
hConstThermo,
adiabaticPerfectFluid,
specie
);
makeThermo makeThermo
( (
rhoThermo, rhoThermo,
@ -225,6 +238,18 @@ makeThermo
specie specie
); );
makeThermo
(
rhoThermo,
heRhoThermo,
pureMixture,
constTransport,
sensibleInternalEnergy,
hConstThermo,
adiabaticPerfectFluid,
specie
);
makeThermo makeThermo
( (
rhoThermo, rhoThermo,

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -563,7 +563,6 @@ void epsilonWallFunctionFvPatchScalarField::write(Ostream& os) const
{ {
fixedValueFvPatchField<scalar>::write(os); fixedValueFvPatchField<scalar>::write(os);
writeLocalEntries(os); writeLocalEntries(os);
writeEntry("value", os);
} }

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -580,7 +580,6 @@ void omegaWallFunctionFvPatchScalarField::write(Ostream& os) const
{ {
fixedValueFvPatchField<scalar>::write(os); fixedValueFvPatchField<scalar>::write(os);
writeLocalEntries(os); writeLocalEntries(os);
writeEntry("value", os);
} }

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -563,7 +563,6 @@ void epsilonWallFunctionFvPatchScalarField::write(Ostream& os) const
{ {
fixedValueFvPatchField<scalar>::write(os); fixedValueFvPatchField<scalar>::write(os);
writeLocalEntries(os); writeLocalEntries(os);
writeEntry("value", os);
} }

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -578,7 +578,6 @@ void omegaWallFunctionFvPatchScalarField::write(Ostream& os) const
{ {
fixedValueFvPatchField<scalar>::write(os); fixedValueFvPatchField<scalar>::write(os);
writeLocalEntries(os); writeLocalEntries(os);
writeEntry("value", os);
} }

View File

@ -8,8 +8,7 @@
forceCoeffs1 forceCoeffs1
{ {
// type forceCoeffs; type forceCoeffs;
type forces;
functionObjectLibs ( "libforces.so" ); functionObjectLibs ( "libforces.so" );
@ -31,6 +30,7 @@ forceCoeffs1
magUInf 20; magUInf 20;
lRef 1.42; // Wheelbase length lRef 1.42; // Wheelbase length
Aref 0.75; // Estimated Aref 0.75; // Estimated
porosity off;
binData binData
{ {