Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
129f7962
Commit
129f7962
authored
Jan 19, 2010
by
graham
Browse files
Merge branch 'master' into sixDofPatch
parents
a820021a
583e1b1e
Changes
1000
Hide whitespace changes
Inline
Side-by-side
Too many changes to show.
To preserve performance only
1000 of 1000+
files are displayed.
Plain diff
Email patch
applications/solvers/basic/potentialFoam/potentialFoam.C
View file @
129f7962
...
...
@@ -38,11 +38,9 @@ Description
int
main
(
int
argc
,
char
*
argv
[])
{
argList
::
validOptions
.
insert
(
"writep"
,
""
);
argList
::
addBoolOption
(
"writep"
,
"write the final pressure field"
);
# include "setRootCase.H"
# include "createTime.H"
# include "createMesh.H"
# include "createFields.H"
...
...
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
View file @
129f7962
...
...
@@ -124,11 +124,6 @@ public:
// Member Functions
tmp
<
volScalarField
>
mut
()
const
{
return
mut_
;
}
//- Return the effective diffusivity for k
tmp
<
volScalarField
>
DkEff
()
const
{
...
...
@@ -147,41 +142,44 @@ public:
);
}
//- Return the
effective turbulent thermal diffusiv
ity
tmp
<
volScalarField
>
alphaEff
()
const
//- Return the
turbulence viscos
ity
virtual
tmp
<
volScalarField
>
mut
()
const
{
return
tmp
<
volScalarField
>
(
new
volScalarField
(
"alphaEff"
,
alphat_
+
alpha
())
);
return
mut_
;
}
//- Return the turbulence thermal diffusivity
virtual
tmp
<
volScalarField
>
alphat
()
const
{
return
alphat_
;
}
//- Return the turbulence kinetic energy
tmp
<
volScalarField
>
k
()
const
virtual
tmp
<
volScalarField
>
k
()
const
{
return
k_
;
}
//- Return the turbulence kinetic energy dissipation rate
tmp
<
volScalarField
>
epsilon
()
const
virtual
tmp
<
volScalarField
>
epsilon
()
const
{
return
epsilon_
;
}
//- Return the Reynolds stress tensor
tmp
<
volSymmTensorField
>
R
()
const
;
virtual
tmp
<
volSymmTensorField
>
R
()
const
;
//- Return the effective stress tensor including the laminar stress
tmp
<
volSymmTensorField
>
devRhoReff
()
const
;
virtual
tmp
<
volSymmTensorField
>
devRhoReff
()
const
;
//- Return the source term for the momentum equation
tmp
<
fvVectorMatrix
>
divDevRhoReff
(
volVectorField
&
U
)
const
;
virtual
tmp
<
fvVectorMatrix
>
divDevRhoReff
(
volVectorField
&
U
)
const
;
//- Solve the turbulence equations and correct the turbulence viscosity
void
correct
();
virtual
void
correct
();
//- Read turbulenceProperties dictionary
bool
read
();
virtual
bool
read
();
};
...
...
applications/solvers/combustion/PDRFoam/XiEqns
View file @
129f7962
...
...
@@ -22,7 +22,7 @@
volScalarField GEta = GEtaCoef/tauEta;
volScalarField XiEqEta = 1.0 + XiCoef*sqrt(up/(Su + SuMin))*Reta;
volScalarField R =
volScalarField R =
GEta*XiEqEta/(XiEqEta - 0.999) + GIn*XiIn/(XiIn - 0.999);
volScalarField XiEqStar = R/(R - GEta - GIn);
...
...
@@ -42,7 +42,7 @@
volScalarField GEta = GEtaCoef/tauEta;
volScalarField XiEqEta = 1.0 + XiCoef*sqrt(up/(Su + SuMin))*Reta;
volScalarField R =
volScalarField R =
GEta*XiEqEta/(XiEqEta - 0.999) + GIn*XiIn/(XiIn - 0.999);
volScalarField XiEqStar = R/(R - GEta - GIn);
...
...
applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C
View file @
129f7962
...
...
@@ -91,7 +91,7 @@ bool Foam::XiModels::algebraic::read(const dictionary& XiProperties)
XiModel
::
read
(
XiProperties
);
XiModelCoeffs_
.
lookup
(
"XiShapeCoef"
)
>>
XiShapeCoef
;
return
true
;
}
...
...
applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
View file @
129f7962
...
...
@@ -117,7 +117,7 @@ inline Foam::scalar Foam::laminarFlameSpeedModels::SCOPE::polyPhi
{
scalar
x
=
phi
-
1
.
0
;
return
return
a
[
0
]
*
(
scalar
(
1
)
...
...
applications/solvers/combustion/PDRFoam/setDeltaT.H
View file @
129f7962
...
...
@@ -45,7 +45,7 @@ if (adjustTimeStep)
maxDeltaT
)
);
Info
<<
"deltaT = "
<<
runTime
.
deltaTValue
()
<<
endl
;
}
...
...
applications/solvers/combustion/dieselEngineFoam/createFields.H
View file @
129f7962
...
...
@@ -88,7 +88,7 @@ volScalarField DpDt =
multivariateSurfaceInterpolationScheme
<
scalar
>::
fieldTable
fields
;
forAll
(
Y
,
i
)
forAll
(
Y
,
i
)
{
fields
.
add
(
Y
[
i
]);
}
...
...
applications/solvers/combustion/reactingFoam/createFields.H
View file @
129f7962
...
...
@@ -77,7 +77,7 @@ volScalarField DpDt =
multivariateSurfaceInterpolationScheme
<
scalar
>::
fieldTable
fields
;
forAll
(
Y
,
i
)
forAll
(
Y
,
i
)
{
fields
.
add
(
Y
[
i
]);
}
...
...
applications/solvers/combustion/rhoReactingFoam/createFields.H
View file @
129f7962
...
...
@@ -77,7 +77,7 @@ volScalarField DpDt =
multivariateSurfaceInterpolationScheme
<
scalar
>::
fieldTable
fields
;
forAll
(
Y
,
i
)
forAll
(
Y
,
i
)
{
fields
.
add
(
Y
[
i
]);
}
...
...
applications/solvers/compressible/rhoCentralFoam/Allwmake
View file @
129f7962
...
...
@@ -2,7 +2,7 @@
cd
${
0
%/*
}
||
exit
1
# run from this directory
set
-x
wmake libso BCs
wmake libso BCs
wmake
# ----------------------------------------------------------------- end-of-file
applications/solvers/compressible/rhoCentralFoam/BCs/Make/options
View file @
129f7962
...
...
@@ -6,5 +6,5 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lbasicThermophysicalModels \
-lspecie
-lspecie
applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
View file @
129f7962
...
...
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/
#include "maxwellSlipUFvPatchVectorField.H"
...
...
applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchFields.C
View file @
129f7962
...
...
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Description
\*---------------------------------------------------------------------------*/
#include "mixedFixedValueSlipFvPatchFields.H"
...
...
applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C
View file @
129f7962
...
...
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
(
fvm
::
ddt
(
rhoU
)
+
fvm
::
div
(
phiv
,
rhoU
)
==
==
-
fvc
::
grad
(
p
)
);
...
...
applications/solvers/compressible/rhopSonicFoam/Allwmake
View file @
129f7962
...
...
@@ -2,7 +2,7 @@
cd
${
0
%/*
}
||
exit
1
# run from this directory
set
-x
wmake libso BCs
wmake libso BCs
wmake
# ----------------------------------------------------------------- end-of-file
applications/solvers/compressible/rhopSonicFoam/BCs/p/inviscidWallPFvPatchScalarField.C
View file @
129f7962
...
...
@@ -131,7 +131,7 @@ void inviscidWallPFvPatchScalarField::updateCoeffs()
const
fvPatchField
<
vector
>&
rhoUp
=
patch
().
lookupPatchField
<
volVectorField
,
vector
>
(
"rhoU"
);
const
fvsPatchField
<
scalar
>&
phip
=
const
fvsPatchField
<
scalar
>&
phip
=
patch
().
lookupPatchField
<
surfaceScalarField
,
scalar
>
(
"phi"
);
const
fvsPatchField
<
scalar
>&
rAp
=
...
...
@@ -147,7 +147,7 @@ void inviscidWallPFvPatchScalarField::updateCoeffs()
void
inviscidWallPFvPatchScalarField
::
write
(
Ostream
&
os
)
const
{
fixedGradientFvPatchScalarField
::
write
(
os
);
os
.
writeKeyword
(
"fluxFraction"
)
os
.
writeKeyword
(
"fluxFraction"
)
<<
fluxFraction_
<<
token
::
END_STATEMENT
<<
nl
;
writeEntry
(
"value"
,
os
);
}
...
...
applications/solvers/compressible/rhopSonicFoam/BCs/rhoE/mixedRhoEFvPatchScalarField.C
View file @
129f7962
...
...
@@ -145,7 +145,7 @@ void mixedRhoEFvPatchScalarField::updateCoeffs()
const
volScalarField
&
T
=
db
().
lookupObject
<
volScalarField
>
(
"T"
);
const
label
patchi
=
patch
().
index
();
fvPatchScalarField
&
Tp
=
fvPatchScalarField
&
Tp
=
const_cast
<
fvPatchScalarField
&>
(
T
.
boundaryField
()[
patchi
]);
Tp
.
evaluate
();
...
...
@@ -164,7 +164,7 @@ void mixedRhoEFvPatchScalarField::updateCoeffs()
refGrad
()
=
rhop
*
Cv
.
value
()
*
Tp
.
snGrad
()
+
(
refValue
()
refValue
()
-
(
0
.
5
*
rhop
.
patchInternalField
()
*
magSqr
(
rhoUp
.
patchInternalField
()
/
rhop
.
patchInternalField
()))
)
*
patch
().
deltaCoeffs
();
...
...
applications/solvers/compressible/rhopSonicFoam/BCs/rhoU/fixedRhoUFvPatchVectorField.H
View file @
129f7962
...
...
@@ -66,7 +66,7 @@ public:
const
dictionary
&
);
//- Construct by mapping given fixedRhoUFvPatchVectorField
//- Construct by mapping given fixedRhoUFvPatchVectorField
// onto a new patch
fixedRhoUFvPatchVectorField
(
...
...
applications/solvers/electromagnetics/electrostaticFoam/Make/files
View file @
129f7962
electrostaticFoam.C
electrostaticFoam.C
EXE = $(FOAM_APPBIN)/electrostaticFoam
applications/solvers/incompressible/icoFoam/Make/files
View file @
129f7962
icoFoam.C
icoFoam.C
EXE = $(FOAM_APPBIN)/icoFoam
Prev
1
2
3
4
5
…
50
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment