exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'HrvojeJasak'

Browse source
This commit is contained in:
Hrvoje Jasak 2010-10-19 20:56:52 +01:00
commit 607d5fefc4
3 changed files with 38 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
applications/solvers/combustion/rhoReactingFoam/pEqn.H
View file

@ -31,7 +31,12 @@
- fvm::laplacian(rho*rUA, p) - fvm::laplacian(rho*rUA, p)
); );
if (ocorr == nOuterCorr && corr == nCorr && nonOrth == nNonOrthCorr) if
(
ocorr == nOuterCorr
&& corr == nCorr
&& nonOrth == nNonOrthCorr
)
{ {
pEqn.solve(mesh.solver(p.name() + "Final")); pEqn.solve(mesh.solver(p.name() + "Final"));
} }
@ -64,7 +69,12 @@
- fvm::laplacian(rho*rUA, p) - fvm::laplacian(rho*rUA, p)
); );
if (ocorr == nOuterCorr && corr == nCorr && nonOrth == nNonOrthCorr) if
(
ocorr == nOuterCorr
&& corr == nCorr
&& nonOrth == nNonOrthCorr
)
{ {
pEqn.solve(mesh.solver(p.name() + "Final")); pEqn.solve(mesh.solver(p.name() + "Final"));
} }

6
src/OpenFOAM/fields/Fields/Field/Field.H
View file

@ -194,6 +194,12 @@ public:
//- Clone //- Clone
tmp<Field<Type> > clone() const; tmp<Field<Type> > clone() const;
//- Return a pointer to a new Field created on freestore
static autoPtr<Field<Type> > New(Istream& is)
{
return autoPtr<Field<Type> >(new Field<Type>(is));
}
//- Return a pointer to a new calculatedFvPatchFieldField created on //- Return a pointer to a new calculatedFvPatchFieldField created on
// freestore without setting patchField values // freestore without setting patchField values
template<class Type2> template<class Type2>