zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Name fields to avoid duplicate registration

Browse Source
This commit is contained in:
Henry
2015-02-12 12:33:45 +00:00
parent a4f46eb5e6
commit 018de2e37a
7 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
applications/solvers/compressible/rhoCentralFoam/compressibleCourantNo.H → applications/solvers/compressible/rhoCentralFoam/centralCourantNo.H
View File

@ -22,16 +22,13 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Global
compressibleCourantNo
centralCourantNo
Description
Calculates the mean and maximum wave speed based Courant Numbers.
\*---------------------------------------------------------------------------*/
scalar CoNum = 0.0;
scalar meanCoNum = 0.0;
if (mesh.nInternalFaces())
{
surfaceScalarField amaxSfbyDelta

1
applications/solvers/compressible/rhoCentralFoam/createFields.H
View File

@ -8,7 +8,6 @@ psiThermo& thermo = pThermo();
volScalarField& p = thermo.p();
volScalarField& e = thermo.he();
const volScalarField& T = thermo.T();
const volScalarField& psi = thermo.psi();
const volScalarField& mu = thermo.mu();

8
applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
View File

@ -53,6 +53,10 @@ int main(int argc, char *argv[])
dimensionedScalar v_zero("v_zero", dimVolume/dimTime, 0.0);
// Courant numbers used to adjust the time-step
scalar CoNum = 0.0;
scalar meanCoNum = 0.0;
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
@ -160,7 +164,7 @@ int main(int argc, char *argv[])
// estimated by the central scheme
amaxSf = max(mag(aphiv_pos), mag(aphiv_neg));
#include "compressibleCourantNo.H"
#include "centralCourantNo.H"
#include "readTimeControls.H"
#include "setDeltaT.H"
@ -199,8 +203,6 @@ int main(int argc, char *argv[])
U.correctBoundaryConditions();
rhoU.boundaryField() = rho.boundaryField()*U.boundaryField();
volScalarField rhoBydt(rho/runTime.deltaT());
if (!inviscid)
{
solve

7
applications/utilities/parallelProcessing/decomposePar/decomposePar.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -346,7 +346,10 @@ int main(int argc, char *argv[])
(
regionName,
runTime.timeName(),
runTime
runTime,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
)
);

2
applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
View File

@ -316,7 +316,7 @@ int main(int argc, char *argv[])
(
IOobject
(
mesh.name(),
"coarse:" + mesh.name(),
runTime.timeName(),
runTime,
IOobject::NO_READ,

5
src/combustionModels/PaSR/PaSR.C
View File

@ -72,15 +72,14 @@ void Foam::combustionModels::PaSR<Type>::correct()
if (turbulentReaction_)
{
tmp<volScalarField> trho(this->rho());
const volScalarField& rho = trho();
tmp<volScalarField> tepsilon(this->turbulence().epsilon());
const volScalarField& epsilon = tepsilon();
tmp<volScalarField> tmuEff(this->turbulence().muEff());
const volScalarField& muEff = tmuEff();
tmp<volScalarField> ttc(this->tc());
const volScalarField& tc = ttc();
tmp<volScalarField> trho(this->rho());
const volScalarField& rho = trho();
forAll(epsilon, i)
{

5
src/parallel/reconstruct/reconstruct/processorMeshes.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -221,7 +221,8 @@ void Foam::processorMeshes::reconstructPoints(fvMesh& mesh)
polyMesh::meshSubDir,
meshes_[procI],
IOobject::MUST_READ,
IOobject::NO_WRITE
IOobject::NO_WRITE,
false
)
)
);