zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mattijs
2010-09-29 12:10:06 +01:00
parent e4aca56a21 ad925d65d2
commit fdb1c0be4b
9 changed files with 67 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
applications/solvers/multiphase/bubbleFoam/createPhia.H
View File

@ -6,24 +6,26 @@
IOobject::NO_READ
);
surfaceScalarField* phiaPtr;
autoPtr<surfaceScalarField> phiaPtr(NULL);
if (phiaHeader.headerOk())
{
Info<< "Reading face flux field phia\n" << endl;
phiaPtr = new surfaceScalarField
phiaPtr.reset
(
IOobject
new surfaceScalarField
(
"phia",
runTime.timeName(),
mesh,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
mesh
IOobject
(
"phia",
runTime.timeName(),
mesh,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
mesh
)
);
}
else
@ -44,19 +46,22 @@
}
}
phiaPtr = new surfaceScalarField
phiaPtr.reset
(
IOobject
new surfaceScalarField
(
"phia",
runTime.timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
fvc::interpolate(Ua) & mesh.Sf(),
phiTypes
IOobject
(
"phia",
runTime.timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
fvc::interpolate(Ua) & mesh.Sf(),
phiTypes
)
);
}
surfaceScalarField& phia = *phiaPtr;
surfaceScalarField& phia = phiaPtr();

49
applications/solvers/multiphase/bubbleFoam/createPhib.H
View File

@ -6,24 +6,26 @@
IOobject::NO_READ
);
surfaceScalarField* phibPtr;
autoPtr<surfaceScalarField> phibPtr(NULL);
if (phibHeader.headerOk())
{
Info<< "Reading face flux field phib\n" << endl;
phibPtr = new surfaceScalarField
phibPtr.reset
(
IOobject
new surfaceScalarField
(
"phib",
runTime.timeName(),
mesh,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
mesh
IOobject
(
"phib",
runTime.timeName(),
mesh,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
mesh
)
);
}
else
@ -44,19 +46,22 @@
}
}
phibPtr = new surfaceScalarField
phibPtr.reset
(
IOobject
new surfaceScalarField
(
"phib",
runTime.timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
fvc::interpolate(Ub) & mesh.Sf(),
phiTypes
IOobject
(
"phib",
runTime.timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
fvc::interpolate(Ub) & mesh.Sf(),
phiTypes
)
);
}
surfaceScalarField& phib = *phibPtr;
surfaceScalarField& phib = phibPtr();

2
applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.C
View File

@ -80,7 +80,7 @@ Foam::threePhaseMixture::threePhaseMixture
viscosityModel::New
(
"nu3",
subDict(phase2Name_),
subDict(phase3Name_),
U,
phi
)