& gradU)
-{
- GenEddyVisc::correct(gradU);
-
- //volScalarField G = 2*nuSgs_*magSqr(symm(gradU));
- volScalarField G = 2*nuSgs_*(gradU() && dev(symm(gradU())));
-
- solve
- (
- fvm::ddt(k_)
- + fvm::div(phi(), k_)
- - fvm::Sp(fvc::div(phi()), k_)
- - fvm::laplacian(DkEff(), k_)
- ==
- G
- - fvm::Sp(ce_*sqrt(k_)/delta(), k_)
- );
-
- bound(k_, k0());
-
- nuSgs_ = ck_*sqrt(k_)*delta();
- nuSgs_.correctBoundaryConditions();
-}
-
-
-bool devOneEqEddy::read()
-{
- if (GenEddyVisc::read())
- {
- ck_.readIfPresent(coeffDict());
-
- return true;
- }
- else
- {
- return false;
- }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.H b/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.H
deleted file mode 100644
index 30090fe28f..0000000000
--- a/applications/solvers/multiphase/lesCavitatingFoam/devOneEqEddy/devOneEqEddy.H
+++ /dev/null
@@ -1,148 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 1991-2008 OpenCFD Ltd.
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2 of the License, or (at your
- option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Class
- devOneEqEddy
-
-Description
-
- One Equation Eddy Viscosity Model
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Eddy viscosity SGS model using a modeled balance equation to simulate the
- behaviour of k, hence,
-
- d/dt(k) + div(U*k) - div(nuEff*grad(k))
- =
- -B*L - ce*k^3/2/delta
-
- and
-
- B = 2/3*k*I - 2*nuEff*dev(D)
-
- where
-
- D = symm(grad(U));
- nuSgs = ck*sqrt(k)*delta
- nuEff = nuSgs + nu
-
-
-SourceFiles
- devOneEqEddy.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef devOneEqEddy_H
-#define devOneEqEddy_H
-
-#include "GenEddyVisc.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace LESModels
-{
-
-/*---------------------------------------------------------------------------*\
- Class devOneEqEddy Declaration
-\*---------------------------------------------------------------------------*/
-
-class devOneEqEddy
-:
- public GenEddyVisc
-{
- // Private data
-
- volScalarField k_;
-
- dimensionedScalar ck_;
-
-
- // Private Member Functions
-
- // Disallow default bitwise copy construct and assignment
- devOneEqEddy(const devOneEqEddy&);
- devOneEqEddy& operator=(const devOneEqEddy&);
-
-
-public:
-
- //- Runtime type information
- TypeName("devOneEqEddy");
-
- // Constructors
-
- //- Constructor from components
- devOneEqEddy
- (
- const volVectorField& U,
- const surfaceScalarField& phi,
- transportModel& transport
- );
-
-
- // Destructor
-
- ~devOneEqEddy()
- {}
-
-
- // Member Functions
-
- //- Return SGS kinetic energy
- tmp k() const
- {
- return k_;
- }
-
- //- Return the effective diffusivity for k
- tmp DkEff() const
- {
- return tmp
- (
- new volScalarField("DkEff", nuSgs_ + nu())
- );
- }
-
- //- Correct Eddy-Viscosity and related properties
- void correct(const tmp& gradU);
-
- //- Read turbulenceProperties dictionary
- bool read();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace LESModelsModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/solvers/multiphase/lesInterFoam/Make/files b/applications/solvers/multiphase/lesInterFoam/Make/files
deleted file mode 100644
index 40039bd1a7..0000000000
--- a/applications/solvers/multiphase/lesInterFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-lesInterFoam.C
-
-EXE = $(FOAM_APPBIN)/lesInterFoam
diff --git a/applications/solvers/multiphase/lesInterFoam/Make/options b/applications/solvers/multiphase/lesInterFoam/Make/options
deleted file mode 100644
index 43c523e220..0000000000
--- a/applications/solvers/multiphase/lesInterFoam/Make/options
+++ /dev/null
@@ -1,15 +0,0 @@
-EXE_INC = \
- -Iaveraging \
- -I../interFoam \
- -I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
- -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
- -I$(LIB_SRC)/turbulenceModels/LES \
- -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
-
-EXE_LIBS = \
- -linterfaceProperties \
- -lincompressibleTransportModels \
- -lincompressibleLESModels \
- -lfiniteVolume
diff --git a/applications/solvers/multiphase/lesInterFoam/UEqn.H b/applications/solvers/multiphase/lesInterFoam/UEqn.H
deleted file mode 100644
index 1bf56f02dd..0000000000
--- a/applications/solvers/multiphase/lesInterFoam/UEqn.H
+++ /dev/null
@@ -1,32 +0,0 @@
- surfaceScalarField muEff
- (
- "muEff",
- twoPhaseProperties.muf()
- + fvc::interpolate(rho*turbulence->nuSgs())
- );
-
- fvVectorMatrix UEqn
- (
- fvm::ddt(rho, U)
- + fvm::div(rhoPhi, U)
- - fvm::laplacian(muEff, U)
- - (fvc::grad(U) & fvc::grad(muEff))
- //- fvc::div(muEff*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf()))
- );
-
- if (momentumPredictor)
- {
- solve
- (
- UEqn
- ==
- fvc::reconstruct
- (
- (
- fvc::interpolate(interface.sigmaK())*fvc::snGrad(gamma)
- - ghf*fvc::snGrad(rho)
- - fvc::snGrad(pd)
- ) * mesh.magSf()
- )
- );
- }
diff --git a/applications/solvers/multiphase/lesInterFoam/createFields.H b/applications/solvers/multiphase/lesInterFoam/createFields.H
deleted file mode 100644
index c622be1561..0000000000
--- a/applications/solvers/multiphase/lesInterFoam/createFields.H
+++ /dev/null
@@ -1,115 +0,0 @@
- Info<< "Reading field pd\n" << endl;
- volScalarField pd
- (
- IOobject
- (
- "pd",
- runTime.timeName(),
- mesh,
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- mesh
- );
-
- Info<< "Reading field gamma\n" << endl;
- volScalarField gamma
- (
- IOobject
- (
- "gamma",
- runTime.timeName(),
- mesh,
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- mesh
- );
-
- Info<< "Reading field U\n" << endl;
- volVectorField U
- (
- IOobject
- (
- "U",
- runTime.timeName(),
- mesh,
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- mesh
- );
-
-# include "createPhi.H"
-
- Info<< "Reading transportProperties\n" << endl;
- twoPhaseMixture twoPhaseProperties(U, phi, "gamma");
-
- const dimensionedScalar& rho1 = twoPhaseProperties.rho1();
- const dimensionedScalar& rho2 = twoPhaseProperties.rho2();
-
-
- // Need to store rho for ddt(rho, U)
- volScalarField rho
- (
- IOobject
- (
- "rho",
- runTime.timeName(),
- mesh,
- IOobject::READ_IF_PRESENT
- ),
- gamma*rho1 + (scalar(1) - gamma)*rho2,
- gamma.boundaryField().types()
- );
- rho.oldTime();
-
- // Mass flux
- // Initialisation does not matter because rhoPhi is reset after the
- // gamma solution before it is used in the U equation.
- surfaceScalarField rhoPhi
- (
- IOobject
- (
- "rho*phi",
- runTime.timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::NO_WRITE
- ),
- rho1*phi
- );
-
-
- label pdRefCell = 0;
- scalar pdRefValue = 0.0;
- setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue);
-
-
- Info<< "Calculating field g.h\n" << endl;
- volScalarField gh("gh", g & mesh.C());
- surfaceScalarField ghf("gh", g & mesh.Cf());
-
-
- volScalarField p
- (
- IOobject
- (
- "p",
- runTime.timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::AUTO_WRITE
- ),
- pd + rho*gh
- );
-
-
- // Construct interface from gamma distribution
- interfaceProperties interface(gamma, U, twoPhaseProperties);
-
- // Construct LES model
- autoPtr turbulence
- (
- incompressible::LESModel::New(U, phi, twoPhaseProperties)
- );
diff --git a/applications/solvers/multiphase/lesInterFoam/lesInterFoam.C b/applications/solvers/multiphase/lesInterFoam/lesInterFoam.C
deleted file mode 100644
index 8d109f03b3..0000000000
--- a/applications/solvers/multiphase/lesInterFoam/lesInterFoam.C
+++ /dev/null
@@ -1,103 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 1991-2008 OpenCFD Ltd.
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2 of the License, or (at your
- option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
- lesInterFoam
-
-Description
- Solver for 2 incompressible, isothermal immiscible fluids using a VOF
- (volume of fluid) phase-fraction based interface capturing approach.
- The momentum and other fluid properties are of the "mixture" and a single
- momentum equation is solved. Turbulence is modelled using a run-time
- selectable incompressible LES model.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "MULES.H"
-#include "subCycle.H"
-#include "interfaceProperties.H"
-#include "twoPhaseMixture.H"
-#include "incompressible/LESModel/LESModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
- #include "setRootCase.H"
- #include "createTime.H"
- #include "createMesh.H"
- #include "readEnvironmentalProperties.H"
- #include "readPISOControls.H"
- #include "initContinuityErrs.H"
- #include "createFields.H"
- #include "readTimeControls.H"
- #include "correctPhi.H"
- #include "CourantNo.H"
- #include "setInitialDeltaT.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
- Info<< "\nStarting time loop\n" << endl;
-
- while (runTime.run())
- {
- #include "readPISOControls.H"
- #include "readTimeControls.H"
- #include "CourantNo.H"
- #include "setDeltaT.H"
-
- runTime++;
- Info<< "Time = " << runTime.timeName() << nl << endl;
-
- #include "gammaEqnSubCycle.H"
-
- turbulence->correct();
-
- #include "UEqn.H"
-
- // --- PISO loop
- for (int corr=0; corr < nCorr; corr++)
- {
- #include "pEqn.H"
- }
-
- #include "continuityErrs.H"
-
- p = pd + rho*gh;
-
- runTime.write();
-
- Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
- << " ClockTime = " << runTime.elapsedClockTime() << " s"
- << nl << endl;
- }
-
- Info<< "End\n" << endl;
-
- return(0);
-}
-
-
-// ************************************************************************* //
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Make/options b/applications/solvers/multiphase/multiphaseInterFoam/Make/options
index cd906bfa53..1fc821726c 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/Make/options
+++ b/applications/solvers/multiphase/multiphaseInterFoam/Make/options
@@ -6,9 +6,13 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-linterfaceProperties \
-lincompressibleTransportModels \
+ -lincompressibleTransportModels \
+ -lincompressibleRASModels \
+ -lincompressibleLESModels \
-lfiniteVolume
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/UEqn.H b/applications/solvers/multiphase/multiphaseInterFoam/UEqn.H
index 43cc2cb183..5ce0c0c088 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/UEqn.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/UEqn.H
@@ -1,10 +1,34 @@
- surfaceScalarField muf = mixture.muf();
+ surfaceScalarField muEff
+ (
+ "muEff",
+ mixture.muf()
+ + fvc::interpolate(rho*turbulence->nut())
+ );
fvVectorMatrix UEqn
(
fvm::ddt(rho, U)
+ fvm::div(mixture.rhoPhi(), U)
- - fvm::laplacian(muf, U)
- - (fvc::grad(U) & fvc::grad(muf))
- //- fvc::div(muf*(mesh.Sf() & fvc::interpolate(fvc::grad(U)().T())))
+ - fvm::laplacian(muEff, U)
+ - (fvc::grad(U) & fvc::grad(muEff))
+ //- fvc::div(muEff*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf()))
);
+
+ UEqn.relax();
+
+ if (momentumPredictor)
+ {
+ solve
+ (
+ UEqn
+ ==
+ fvc::reconstruct
+ (
+ (
+ mixture.surfaceTensionForce()
+ - ghf*fvc::snGrad(rho)
+ - fvc::snGrad(pd)
+ ) * mesh.magSf()
+ )
+ );
+ }
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H
index 4f71f75ba4..aa62d0f2a1 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H
@@ -46,9 +46,31 @@
Info<< "Calculating field g.h\n" << endl;
+ volScalarField gh("gh", g & mesh.C());
surfaceScalarField ghf("gh", g & mesh.Cf());
+ volScalarField p
+ (
+ IOobject
+ (
+ "p",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ pd + rho*gh
+ );
+
+
label pdRefCell = 0;
scalar pdRefValue = 0.0;
setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue);
+
+
+ // Construct incompressible turbulence model
+ autoPtr turbulence
+ (
+ incompressible::turbulenceModel::New(U, phi, mixture)
+ );
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
index 5dd13984bf..edd2bca880 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
@@ -29,38 +29,40 @@ Description
Solver for n incompressible fluids which captures the interfaces and
includes surface-tension and contact-angle effects for each.
+ Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected.
+
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
#include "multiphaseMixture.H"
+#include "turbulenceModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
int main(int argc, char *argv[])
{
+ #include "setRootCase.H"
+ #include "createTime.H"
+ #include "createMesh.H"
+ #include "readEnvironmentalProperties.H"
+ #include "readPISOControls.H"
+ #include "initContinuityErrs.H"
+ #include "createFields.H"
+ #include "readTimeControls.H"
+ #include "correctPhi.H"
+ #include "CourantNo.H"
+ #include "setInitialDeltaT.H"
-# include "setRootCase.H"
-# include "createTime.H"
-# include "createMesh.H"
-# include "readEnvironmentalProperties.H"
-# include "readPISOControls.H"
-# include "initContinuityErrs.H"
-# include "createFields.H"
-# include "readTimeControls.H"
-# include "correctPhi.H"
-# include "CourantNo.H"
-# include "setInitialDeltaT.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
{
-# include "readPISOControls.H"
-# include "readTimeControls.H"
-# include "CourantNo.H"
-# include "setDeltaT.H"
+ #include "readPISOControls.H"
+ #include "readTimeControls.H"
+ #include "CourantNo.H"
+ #include "setDeltaT.H"
runTime++;
@@ -69,15 +71,19 @@ int main(int argc, char *argv[])
mixture.correct();
rho = mixture.rho();
-# include "UEqn.H"
+ #include "UEqn.H"
// --- PISO loop
for (int corr=0; corrcorrect();
runTime.write();
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/Make/files b/applications/solvers/multiphase/rasCavitatingFoam/Make/files
deleted file mode 100644
index 4509463796..0000000000
--- a/applications/solvers/multiphase/rasCavitatingFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-rasCavitatingFoam.C
-
-EXE = $(FOAM_APPBIN)/rasCavitatingFoam
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/continuityErrs.H b/applications/solvers/multiphase/rasCavitatingFoam/continuityErrs.H
deleted file mode 100644
index 6f1622510f..0000000000
--- a/applications/solvers/multiphase/rasCavitatingFoam/continuityErrs.H
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- volScalarField thermoRho = psi*p + (1.0 - gamma)*rhol0;
-
- dimensionedScalar totalMass = fvc::domainIntegrate(rho);
-
- scalar sumLocalContErr =
- (
- fvc::domainIntegrate(mag(rho - thermoRho))/totalMass
- ).value();
-
- scalar globalContErr =
- (
- fvc::domainIntegrate(rho - thermoRho)/totalMass
- ).value();
-
- cumulativeContErr += globalContErr;
-
- Info<< "time step continuity errors : sum local = " << sumLocalContErr
- << ", global = " << globalContErr
- << ", cumulative = " << cumulativeContErr
- << endl;
-}
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/gammaPsi.H b/applications/solvers/multiphase/rasCavitatingFoam/gammaPsi.H
deleted file mode 100644
index b259ddd322..0000000000
--- a/applications/solvers/multiphase/rasCavitatingFoam/gammaPsi.H
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- gamma = max(min((rho - rholSat)/(rhovSat - rholSat), scalar(1)), scalar(0));
-
- Info<< "max-min gamma: " << max(gamma).value()
- << " " << min(gamma).value() << endl;
-
- psiModel->correct();
-
- //Info<< "min a: " << 1.0/sqrt(max(psi)).value() << endl;
-}
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/pEqn.H b/applications/solvers/multiphase/rasCavitatingFoam/pEqn.H
deleted file mode 100644
index c9382dfc0f..0000000000
--- a/applications/solvers/multiphase/rasCavitatingFoam/pEqn.H
+++ /dev/null
@@ -1,80 +0,0 @@
-{
- if (nOuterCorr == 1)
- {
- p =
- (
- rho
- - (1.0 - gamma)*rhol0
- - ((gamma*psiv + (1.0 - gamma)*psil) - psi)*pSat
- )/psi;
- }
-
- surfaceScalarField rhof = fvc::interpolate(rho, "rhof");
-
- volScalarField rUA = 1.0/UEqn.A();
- surfaceScalarField rUAf("rUAf", rhof*fvc::interpolate(rUA));
- volVectorField HbyA = rUA*UEqn.H();
-
- phiv = (fvc::interpolate(HbyA) & mesh.Sf())
- + fvc::ddtPhiCorr(rUA, rho, U, phiv);
-
- p.boundaryField().updateCoeffs();
-
- surfaceScalarField phiGradp = rUAf*mesh.magSf()*fvc::snGrad(p);
-
- phiv -= phiGradp/rhof;
-
-# include "resetPhivPatches.H"
-
- for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
- {
- fvScalarMatrix pEqn
- (
- fvm::ddt(psi, p)
- - (rhol0 + (psil - psiv)*pSat)*fvc::ddt(gamma) - pSat*fvc::ddt(psi)
- + fvc::div(phiv, rho)
- + fvc::div(phiGradp)
- - fvm::laplacian(rUAf, p)
- );
-
- pEqn.solve();
-
- if (nonOrth == nNonOrthCorr)
- {
- phiv += (phiGradp + pEqn.flux())/rhof;
- }
- }
-
- Info<< "max-min p: " << max(p).value()
- << " " << min(p).value() << endl;
-
-
- U = HbyA - rUA*fvc::grad(p);
-
- // Remove the swirl component of velocity for "wedge" cases
- if (piso.found("removeSwirl"))
- {
- label swirlCmpt(readLabel(piso.lookup("removeSwirl")));
-
- Info<< "Removing swirl component-" << swirlCmpt << " of U" << endl;
- U.field().replace(swirlCmpt, 0.0);
- }
-
- U.correctBoundaryConditions();
-
- Info<< "max(U) " << max(mag(U)).value() << endl;
-
- rho == max
- (
- psi*p
- + (1.0 - gamma)*rhol0
- + ((gamma*psiv + (1.0 - gamma)*psil) - psi)*pSat,
- rhoMin
- );
-
- Info<< "max-min rho: " << max(rho).value()
- << " " << min(rho).value() << endl;
-
-# include "gammaPsi.H"
-
-}
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/rasCavitatingFoam.C b/applications/solvers/multiphase/rasCavitatingFoam/rasCavitatingFoam.C
deleted file mode 100644
index 51d2a31dde..0000000000
--- a/applications/solvers/multiphase/rasCavitatingFoam/rasCavitatingFoam.C
+++ /dev/null
@@ -1,94 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 1991-2008 OpenCFD Ltd.
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2 of the License, or (at your
- option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
- rasCavitatingFoam
-
-Description
- Transient cavitation code with RAS turbulence.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "barotropicCompressibilityModel.H"
-#include "twoPhaseMixture.H"
-#include "incompressible/RASModel/RASModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-
-# include "setRootCase.H"
-
-# include "createTime.H"
-# include "createMesh.H"
-# include "readThermodynamicProperties.H"
-# include "readControls.H"
-# include "createFields.H"
-# include "initContinuityErrs.H"
-# include "compressibleCourantNo.H"
-# include "setInitialDeltaT.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
- Info<< "\nStarting time loop\n" << endl;
-
- while (runTime.run())
- {
-# include "readControls.H"
-# include "CourantNo.H"
-# include "setDeltaT.H"
-
- runTime++;
- Info<< "Time = " << runTime.timeName() << nl << endl;
-
- for (int outerCorr=0; outerCorrcorrect();
-
- runTime.write();
-
- Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
- << " ClockTime = " << runTime.elapsedClockTime() << " s"
- << nl << endl;
- }
-
- Info<< "\n end \n";
-
- return(0);
-}
-
-
-// ************************************************************************* //
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/readControls.H b/applications/solvers/multiphase/rasCavitatingFoam/readControls.H
deleted file mode 100644
index f53e7b9eb1..0000000000
--- a/applications/solvers/multiphase/rasCavitatingFoam/readControls.H
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "readTimeControls.H"
-
-scalar maxAcousticCo
-(
- readScalar(runTime.controlDict().lookup("maxAcousticCo"))
-);
-
-
-#include "readPISOControls.H"
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/readThermodynamicProperties.H b/applications/solvers/multiphase/rasCavitatingFoam/readThermodynamicProperties.H
deleted file mode 100644
index d3fbb9307a..0000000000
--- a/applications/solvers/multiphase/rasCavitatingFoam/readThermodynamicProperties.H
+++ /dev/null
@@ -1,27 +0,0 @@
- Info<< "Reading thermodynamicProperties\n" << endl;
-
- IOdictionary thermodynamicProperties
- (
- IOobject
- (
- "thermodynamicProperties",
- runTime.constant(),
- mesh,
- IOobject::MUST_READ,
- IOobject::NO_WRITE
- )
- );
-
- dimensionedScalar psil(thermodynamicProperties.lookup("psil"));
-
- dimensionedScalar rholSat(thermodynamicProperties.lookup("rholSat"));
-
- dimensionedScalar psiv(thermodynamicProperties.lookup("psiv"));
-
- dimensionedScalar pSat(thermodynamicProperties.lookup("pSat"));
-
- dimensionedScalar rhovSat("rhovSat", psiv*pSat);
-
- dimensionedScalar rhol0("rhol0", rholSat - pSat*psil);
-
- dimensionedScalar rhoMin(thermodynamicProperties.lookup("rhoMin"));
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/resetPhiPatches.H b/applications/solvers/multiphase/rasCavitatingFoam/resetPhiPatches.H
deleted file mode 100644
index e7d0c2f93e..0000000000
--- a/applications/solvers/multiphase/rasCavitatingFoam/resetPhiPatches.H
+++ /dev/null
@@ -1,15 +0,0 @@
-fvsPatchScalarFieldField& phiPatches = phi.boundaryField();
-const fvPatchScalarFieldField& rhoPatches = rho.boundaryField();
-const fvPatchVectorFieldField& Upatches = U.boundaryField();
-const fvsPatchVectorFieldField& SfPatches = mesh.Sf().boundaryField();
-
-forAll(phiPatches, patchI)
-{
- if (phi.boundaryField().types()[patchI] == "calculated")
- {
- calculatedFvsPatchScalarField& phiPatch =
- refCast(phiPatches[patchI]);
-
- phiPatch == ((rhoPatches[patchI]*Upatches[patchI]) & SfPatches[patchI]);
- }
-}
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/resetPhivPatches.H b/applications/solvers/multiphase/rasCavitatingFoam/resetPhivPatches.H
deleted file mode 100644
index 7e8b040bb6..0000000000
--- a/applications/solvers/multiphase/rasCavitatingFoam/resetPhivPatches.H
+++ /dev/null
@@ -1,14 +0,0 @@
-surfaceScalarField::GeometricBoundaryField& phivPatches = phiv.boundaryField();
-const volVectorField::GeometricBoundaryField& Upatches = U.boundaryField();
-const surfaceVectorField::GeometricBoundaryField& SfPatches = mesh.Sf().boundaryField();
-
-forAll(phivPatches, patchI)
-{
- if (phiv.boundaryField().types()[patchI] == "calculated")
- {
- calculatedFvsPatchScalarField& phivPatch =
- refCast(phivPatches[patchI]);
-
- phivPatch == (Upatches[patchI] & SfPatches[patchI]);
- }
-}
diff --git a/applications/solvers/multiphase/rasCavitatingFoam/rhoEqn.H b/applications/solvers/multiphase/rasCavitatingFoam/rhoEqn.H
deleted file mode 100644
index d0bd6e1dad..0000000000
--- a/applications/solvers/multiphase/rasCavitatingFoam/rhoEqn.H
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- fvScalarMatrix rhoEqn
- (
- fvm::ddt(rho)
- + fvm::div(phiv, rho)
- );
-
- rhoEqn.solve();
-
- phi = rhoEqn.flux();
-
- Info<< "max-min rho: " << max(rho).value()
- << " " << min(rho).value() << endl;
-
- rho == max(rho, rhoMin);
-}
diff --git a/applications/solvers/multiphase/rasInterFoam/Make/files b/applications/solvers/multiphase/rasInterFoam/Make/files
deleted file mode 100644
index 39b992ad4d..0000000000
--- a/applications/solvers/multiphase/rasInterFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-rasInterFoam.C
-
-EXE = $(FOAM_APPBIN)/rasInterFoam
diff --git a/applications/solvers/multiphase/rasInterFoam/Make/options b/applications/solvers/multiphase/rasInterFoam/Make/options
deleted file mode 100644
index 04a3c57887..0000000000
--- a/applications/solvers/multiphase/rasInterFoam/Make/options
+++ /dev/null
@@ -1,13 +0,0 @@
-EXE_INC = \
- -I../interFoam \
- -I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
- -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
- -I$(LIB_SRC)/turbulenceModels/RAS \
- -I$(LIB_SRC)/finiteVolume/lnInclude
-
-EXE_LIBS = \
- -linterfaceProperties \
- -lincompressibleTransportModels \
- -lincompressibleRASModels \
- -lfiniteVolume
diff --git a/applications/solvers/multiphase/rasInterFoam/createFields.H b/applications/solvers/multiphase/rasInterFoam/createFields.H
deleted file mode 100644
index e97a3abcb0..0000000000
--- a/applications/solvers/multiphase/rasInterFoam/createFields.H
+++ /dev/null
@@ -1,116 +0,0 @@
- Info<< "Reading field pd\n" << endl;
- volScalarField pd
- (
- IOobject
- (
- "pd",
- runTime.timeName(),
- mesh,
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- mesh
- );
-
- Info<< "Reading field gamma\n" << endl;
- volScalarField gamma
- (
- IOobject
- (
- "gamma",
- runTime.timeName(),
- mesh,
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- mesh
- );
-
- Info<< "Reading field U\n" << endl;
- volVectorField U
- (
- IOobject
- (
- "U",
- runTime.timeName(),
- mesh,
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- mesh
- );
-
-# include "createPhi.H"
-
- Info<< "Reading transportProperties\n" << endl;
- twoPhaseMixture twoPhaseProperties(U, phi, "gamma");
-
- const dimensionedScalar& rho1 = twoPhaseProperties.rho1();
- const dimensionedScalar& rho2 = twoPhaseProperties.rho2();
-
-
- // Need to store rho for ddt(rho, U)
- volScalarField rho
- (
- IOobject
- (
- "rho",
- runTime.timeName(),
- mesh,
- IOobject::READ_IF_PRESENT
- ),
- gamma*rho1 + (scalar(1) - gamma)*rho2,
- gamma.boundaryField().types()
- );
- rho.oldTime();
-
-
- // Mass flux
- // Initialisation does not matter because rhoPhi is reset after the
- // gamma solution before it is used in the U equation.
- surfaceScalarField rhoPhi
- (
- IOobject
- (
- "rho*phi",
- runTime.timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::NO_WRITE
- ),
- rho1*phi
- );
-
-
- label pdRefCell = 0;
- scalar pdRefValue = 0.0;
- setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue);
-
-
- Info<< "Calculating field g.h\n" << endl;
- volScalarField gh("gh", g & mesh.C());
- surfaceScalarField ghf("gh", g & mesh.Cf());
-
-
- volScalarField p
- (
- IOobject
- (
- "p",
- runTime.timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::AUTO_WRITE
- ),
- pd + rho*gh
- );
-
-
- // Construct interface from gamma distribution
- interfaceProperties interface(gamma, U, twoPhaseProperties);
-
- // Construct LES model
- autoPtr turbulence
- (
- incompressible::RASModel::New(U, phi, twoPhaseProperties)
- );
diff --git a/applications/solvers/multiphase/settlingFoam/UEqn.H b/applications/solvers/multiphase/settlingFoam/UEqn.H
index 8dba5041c2..ac4c18ab19 100644
--- a/applications/solvers/multiphase/settlingFoam/UEqn.H
+++ b/applications/solvers/multiphase/settlingFoam/UEqn.H
@@ -1,29 +1,31 @@
-// Solve the Momentum equation
+ // Solve the Momentum equation
-fvVectorMatrix UEqn
-(
- fvm::ddt(rho, U)
- + fvm::div(phi, U)
- + fvc::div
+ fvVectorMatrix UEqn
(
- (Alpha/(scalar(1.001) - Alpha))*(sqr(rhoc)/rho)*Vdj*Vdj,
- "div(phiVdj,Vdj)"
- )
- - fvm::laplacian(mu, U, "laplacian(muEff,U)")
-);
-
-if (momentumPredictor)
-{
- solve
- (
- UEqn
- ==
- fvc::reconstruct
+ fvm::ddt(rho, U)
+ + fvm::div(phi, U)
+ + fvc::div
(
- (
- - ghf*fvc::snGrad(rho)
- - fvc::snGrad(p)
- )*mesh.magSf()
+ (Alpha/(scalar(1.001) - Alpha))*(sqr(rhoc)/rho)*Vdj*Vdj,
+ "div(phiVdj,Vdj)"
)
+ - fvm::laplacian(mu, U, "laplacian(muEff,U)")
);
-}
+
+ UEqn.relax();
+
+ if (momentumPredictor)
+ {
+ solve
+ (
+ UEqn
+ ==
+ fvc::reconstruct
+ (
+ (
+ - ghf*fvc::snGrad(rho)
+ - fvc::snGrad(p)
+ )*mesh.magSf()
+ )
+ );
+ }
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
index ae5ccba0fd..0e21fc2d64 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
@@ -2,9 +2,12 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-linterfaceProperties \
-lincompressibleTransportModels \
+ -lincompressibleRASModels \
+ -lincompressibleLESModels \
-lfiniteVolume
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
index 0ebaec44f5..5a945697ca 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H
@@ -1,14 +1,21 @@
- surfaceScalarField muf = twoPhaseProperties.muf();
+ surfaceScalarField muEff
+ (
+ "muEff",
+ twoPhaseProperties.muf()
+ + fvc::interpolate(rho*turbulence->nut())
+ );
fvVectorMatrix UEqn
(
fvm::ddt(rho, U)
+ fvm::div(rhoPhi, U)
- - fvm::laplacian(muf, U)
- //- (fvc::grad(U) & fvc::grad(muf))
- - fvc::div(muf*(mesh.Sf() & fvc::interpolate(fvc::grad(U)().T())))
+ - fvm::laplacian(muEff, U)
+ - (fvc::grad(U) & fvc::grad(muEff))
+ //- fvc::div(muEff*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf()))
);
+ UEqn.relax();
+
if (momentumPredictor)
{
solve
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H
new file mode 100644
index 0000000000..c126025368
--- /dev/null
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqn.H
@@ -0,0 +1,19 @@
+{
+ fvScalarMatrix alpha1Eqn
+ (
+ fvm::ddt(alpha1)
+ + fvm::div(phi, alpha1)
+ - fvm::laplacian(Dab, alpha1)
+ );
+
+ alpha1Eqn.solve();
+
+ rhoPhi = alpha1Eqn.flux()*(rho1 - rho2) + phi*rho2;
+ rho = alpha1*rho1 + (scalar(1) - alpha1)*rho2;
+
+ Info<< "Phase 1 volume fraction = "
+ << alpha1.weightedAverage(mesh.V()).value()
+ << " Min(alpha1) = " << min(alpha1).value()
+ << " Max(alpha1) = " << max(alpha1).value()
+ << endl;
+}
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
index 652d1ad64c..bd7c3e2c9f 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
@@ -12,12 +12,12 @@
mesh
);
- Info<< "Reading field gamma\n" << endl;
- volScalarField gamma
+ Info<< "Reading field alpha1\n" << endl;
+ volScalarField alpha1
(
IOobject
(
- "gamma",
+ "alpha1",
runTime.timeName(),
mesh,
IOobject::MUST_READ,
@@ -43,21 +43,21 @@
# include "createPhi.H"
Info<< "Reading transportProperties\n" << endl;
- twoPhaseMixture twoPhaseProperties(U, phi, "gamma");
-
+ twoPhaseMixture twoPhaseProperties(U, phi);
+
const dimensionedScalar& rho1 = twoPhaseProperties.rho1();
const dimensionedScalar& rho2 = twoPhaseProperties.rho2();
dimensionedScalar Dab(twoPhaseProperties.lookup("Dab"));
// Need to store rho for ddt(rho, U)
- volScalarField rho("rho", gamma*rho1 + (scalar(1) - gamma)*rho2);
+ volScalarField rho("rho", alpha1*rho1 + (scalar(1) - alpha1)*rho2);
rho.oldTime();
// Mass flux
// Initialisation does not matter because rhoPhi is reset after the
- // gamma solution before it is used in the U equation.
+ // alpha1 solution before it is used in the U equation.
surfaceScalarField rhoPhi
(
IOobject
@@ -73,9 +73,31 @@
Info<< "Calculating field g.h\n" << endl;
+ volScalarField gh("gh", g & mesh.C());
surfaceScalarField ghf("gh", g & mesh.Cf());
+ volScalarField p
+ (
+ IOobject
+ (
+ "p",
+ runTime.timeName(),
+ mesh,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ pd + rho*gh
+ );
+
+
label pdRefCell = 0;
scalar pdRefValue = 0.0;
setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue);
+
+
+ // Construct incompressible turbulence model
+ autoPtr turbulence
+ (
+ incompressible::turbulenceModel::New(U, phi, twoPhaseProperties)
+ );
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/gammaEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/gammaEqn.H
deleted file mode 100644
index 144339f398..0000000000
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/gammaEqn.H
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- fvScalarMatrix gammaEqn
- (
- fvm::ddt(gamma)
- + fvm::div(phi, gamma)
- - fvm::laplacian(Dab, gamma)
- );
-
- gammaEqn.solve();
-
- rhoPhi = gammaEqn.flux()*(rho1 - rho2) + phi*rho2;
- rho = gamma*rho1 + (scalar(1) - gamma)*rho2;
-
- Info<< "Phase 1 volume fraction = "
- << gamma.weightedAverage(mesh.V()).value()
- << " Min(gamma) = " << min(gamma).value()
- << " Max(gamma) = " << max(gamma).value()
- << endl;
-}
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
index 64895530f6..7f9b32a917 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
@@ -28,10 +28,13 @@ Application
Description
Solver for mixing 2 incompressible fluids.
+ Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected.
+
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
#include "twoPhaseMixture.H"
+#include "turbulenceModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -58,7 +61,7 @@ int main(int argc, char *argv[])
twoPhaseProperties.correct();
-# include "gammaEqn.H"
+# include "alphaEqn.H"
# include "UEqn.H"
@@ -70,6 +73,10 @@ int main(int argc, char *argv[])
# include "continuityErrs.H"
+ p = pd + rho*gh;
+
+ turbulence->correct();
+
runTime.write();
Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
diff --git a/applications/test/HashSet/hashSetTest.C b/applications/test/HashSet/hashSetTest.C
index 386839a497..350a656743 100644
--- a/applications/test/HashSet/hashSetTest.C
+++ b/applications/test/HashSet/hashSetTest.C
@@ -26,7 +26,8 @@ Description
\*---------------------------------------------------------------------------*/
-#include "labelHashSet.H"
+#include "HashSet.H"
+#include "Map.H"
using namespace Foam;
@@ -35,19 +36,80 @@ using namespace Foam;
int main(int argc, char *argv[])
{
- HashSet testSet(0);
+ wordHashSet setA(0);
+ HashTable tableA;
- testSet.insert("kjhk");
- testSet.insert("kjhk2");
+ HashTable tableB;
+ Map mapA;
- Info<< testSet << endl;
+ setA.insert("kjhk");
+ setA.insert("kjhk2");
- labelHashSet testLabelHashSet(1);
+ tableA.insert("value1", 1);
+ tableA.insert("value2", 2);
+ tableA.insert("value3", 3);
- testLabelHashSet.insert(11);
- testLabelHashSet.insert(42);
+ tableB.insert("value4", empty());
+ tableB.insert("value5", empty());
+ tableB.insert("value6", empty());
- Info<< testLabelHashSet << endl;
+ mapA.set(1, 1);
+ mapA.set(2, 2);
+ mapA.set(3, 3);
+ mapA.set(4, 4);
+
+ Info<< setA << endl;
+ Info<< tableA << endl;
+ Info<< mapA << endl;
+
+ Info<< "create from HashSet: ";
+ Info<< wordHashSet(setA) << endl;
+ Info<< "create from HashTable: ";
+ Info<< wordHashSet(tableA) << endl;
+ Info<< "create from HashTable: ";
+ Info<< wordHashSet(tableB) << endl;
+
+ Info<< "create from Map: ";
+ Info<< labelHashSet(mapA) << endl;
+
+ Info<<"combined toc: "
+ << (wordHashSet(setA) | wordHashSet(tableA) | wordHashSet(tableB))
+ << nl;
+
+
+ labelHashSet setB(1);
+ setB.insert(11);
+ setB.insert(42);
+
+ Info<< "setB : " << setB << endl;
+
+ labelHashSet setC(1);
+ setC.insert(2008);
+ setC.insert(1984);
+
+ Info<< "setC : " << setC << endl;
+
+ labelHashSet setD(1);
+ setD.insert(11);
+ setD.insert(100);
+ setD.insert(2008);
+
+ Info<< "setD : " << setD << endl;
+
+ Info<< "setB == setC: " << (setB == setC) << endl;
+ Info<< "setC != setD: " << (setC != setD) << endl;
+
+ // test operations
+ setB += setC;
+ Info<< "setB += setC : " << setB << endl;
+
+ setB &= setD;
+ Info<< "setB &= setD : " << setB << endl;
+
+ Info<< "setB : " << setB << endl;
+ Info<< "setC : " << setC << endl;
+ Info<< "setD : " << setD << endl;
+ Info<< "setB ^ setC ^ setD : " << (setB ^ setC ^ setD) << endl;
return 0;
}
diff --git a/applications/test/sort/sortListTest.C b/applications/test/sort/sortListTest.C
index 441e093319..89252ae1f3 100644
--- a/applications/test/sort/sortListTest.C
+++ b/applications/test/sort/sortListTest.C
@@ -26,7 +26,7 @@ Description
\*---------------------------------------------------------------------------*/
-#include "labelList.H"
+#include "SortableList.H"
using namespace Foam;
@@ -35,16 +35,40 @@ using namespace Foam;
int main(int argc, char *argv[])
{
- labelList a(5);
- a[0] = 7;
- a[1] = 4;
- a[2] = 1;
- a[3] = 2;
- a[4] = 9;
+ labelList orig(5);
+ orig[0] = 7;
+ orig[1] = 4;
+ orig[2] = 1;
+ orig[3] = 2;
+ orig[4] = 9;
+ labelList a(orig);
Info << "before: " << a << endl;
sort(a);
- Info << "after: " << a << endl;
+ Info << "after: " << a << endl;
+
+ SortableList b(orig);
+ Info << "sorted: " << b << endl;
+ Info << "indices: " << b.indices() << endl;
+
+ Info << "shrunk: " << b.shrink() << endl;
+ Info << "indices: " << b.indices() << endl;
+
+ // repeat by assignment
+ b = orig;
+ Info << "unsorted: " << b << endl;
+ b.sort();
+
+ Info << "sorted: " << b << endl;
+ Info << "indices: " << b.indices() << endl;
+
+ // transfer assignment
+ b.transfer(orig);
+ Info << "unsorted: " << b << endl;
+ b.sort();
+
+ Info << "sorted: " << b << endl;
+ Info << "indices: " << b.indices() << endl;
Info << "End\n" << endl;
diff --git a/applications/test/tmpField/tmpFieldTest.C b/applications/test/tmpField/tmpFieldTest.C
index f0745e6da4..4c9298874c 100644
--- a/applications/test/tmpField/tmpFieldTest.C
+++ b/applications/test/tmpField/tmpFieldTest.C
@@ -23,8 +23,10 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Application
-
+ tmpFieldTest
+
Description
+ Tests for possible memory leaks in the tmp algebra.
\*---------------------------------------------------------------------------*/
@@ -44,9 +46,6 @@ int main()
f1 = f2 + f3 + f2 + f3;
}
-// Info<< f1 << endl;
-
-
Info<< "end" << endl;
}
diff --git a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
index 306c4eab6b..e2108d220b 100644
--- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
+++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
@@ -206,9 +206,9 @@ int main(int argc, char *argv[])
runTime.timeName(),
runTime
),
- mesh.points(),
- mesh.faces(),
- mesh.cells()
+ xferCopy(mesh.points()), // could we safely re-use the data?
+ xferCopy(mesh.faces()),
+ xferCopy(mesh.cells())
);
// Add the boundary patches
diff --git a/applications/utilities/mesh/conversion/Optional/Allwmake b/applications/utilities/mesh/conversion/Optional/Allwmake
index 2734e41562..ae71b400fa 100755
--- a/applications/utilities/mesh/conversion/Optional/Allwmake
+++ b/applications/utilities/mesh/conversion/Optional/Allwmake
@@ -7,14 +7,12 @@ set -x
# build libccmio and create lnInclude directory
-(
- cd $WM_THIRD_PARTY_DIR && ./AllwmakeLibccmio
-)
+( cd $WM_THIRD_PARTY_DIR && ./AllwmakeLibccmio )
-# if the library built okay, the headers should exist too
+# if the library built properly, the headers should exist too
if [ -e $FOAM_LIBBIN/libccmio.so ]
then
- wmake ccm26ToFoam
+ wmake ccm26ToFoam
fi
# ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
index be9cdc8537..5f0c239a9f 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
@@ -281,7 +281,7 @@ int main(int argc, char *argv[])
)
{
// Scale points for the given scale factor
- points[i++] = scaleFactor*pointIter();
+ points[i++] = scaleFactor * pointIter();
}
@@ -479,7 +479,7 @@ int main(int argc, char *argv[])
runTime.constant(),
runTime
),
- points,
+ xferMove(points),
cellShapes,
boundary,
patchNames,
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
index 55e870e37a..b10217f4f2 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
@@ -727,7 +727,7 @@ int main(int argc, char *argv[])
runTime.constant(),
runTime
),
- points,
+ xferMove(points),
cellShapes,
boundary,
patchNames,
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index 46eb810e05..d114749b1c 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -54,7 +54,10 @@ using namespace Foam;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Scalae factor used to scale points (optional command line argument)
+// Line number
+label lineNo = 1;
+
+// Scale factor used to scale points (optional command line argument)
scalar scaleFactor = 1.0;
label dimensionOfGrid = 0;
@@ -131,8 +134,6 @@ one_space [ \t\f]
space {one_space}*
some_space {one_space}+
cspace ","{space}
-nl (\n|\r)
-spaceNl ({space}|{nl})*
alpha [_[:alpha:]]
digit [[:digit:]]
@@ -146,7 +147,7 @@ quote \"
dash "-"
dotColonDash [.:-]
-schemeSpecialInitial [!$%&*/\\:<=>?~_^#.@]
+schemeSpecialInitial [!$%&*/\\:<=>?~_^#.@']
schemeSpecialSubsequent [.+-]
schemeSymbol (({some_space}|{alpha}|{quote}|{schemeSpecialInitial})({alpha}|{quote}|{digit}|{schemeSpecialInitial}|{schemeSpecialSubsequent})*)
@@ -187,23 +188,23 @@ time ({digit}{digit}":"{digit}{digit}":"{digit}{digit})
versionNumber ({digit}|".")*
-header {spaceNl}"(1"{space}
-dimension {spaceNl}"(2"{space}
-points {spaceNl}"(10"{space}
-faces {spaceNl}"(13"{space}
-cells {spaceNl}"(12"{space}
-zoneVariant1 {spaceNl}"(39"{space}
-zoneVariant2 {spaceNl}"(45"{space}
-faceTree {spaceNl}"(59"{space}
+header {space}"(1"{space}
+dimension {space}"(2"{space}
+points {space}"(10"{space}
+faces {space}"(13"{space}
+cells {space}"(12"{space}
+zoneVariant1 {space}"(39"{space}
+zoneVariant2 {space}"(45"{space}
+faceTree {space}"(59"{space}
comment "0"{space}
unknownPeriodicFace "17"{space}
periodicFace "18"{space}
cellTree "58"{space}
faceParents "61"{space}
-ignoreBlocks ("4"|"37"|"38"|"41"|"60"|"64"){space}
+ignoreBlocks ("4"|"37"|"38"|"40"|"41"|"60"|"64"){space}
-redundantBlock {spaceNl}({comment}|{unknownPeriodicFace}|{periodicFace}|{cellTree}|{faceParents}|{ignoreBlocks}){space}
+redundantBlock {space}({comment}|{unknownPeriodicFace}|{periodicFace}|{cellTree}|{faceParents}|{ignoreBlocks}){space}
endOfSection {space}")"{space}
@@ -290,7 +291,7 @@ endOfSection {space}")"{space}
BEGIN(readPointHeader);
}
-{spaceNl}{lbrac}{space}"0"{space}"1"{space} {
+{space}{lbrac}{space}"0"{space}"1"{space} {
BEGIN(readNumberOfPoints);
}
@@ -302,7 +303,7 @@ endOfSection {space}")"{space}
// Ignore rest of stream
}
-{spaceNl}{lbrac} {
+{space}{lbrac} {
BEGIN(readPointGroupData);
}
@@ -342,7 +343,7 @@ endOfSection {space}")"{space}
BEGIN(readPointData);
}
-{spaceNl}{lbrac}{spaceNl} {
+{space}{lbrac}{space} {
Info<< ". Reading points..." << flush;
cmpt = 0;
yy_push_state(readScalarList);
@@ -350,19 +351,32 @@ endOfSection {space}")"{space}
{signedInteger}{space} {
points[pointi][cmpt++] = scaleFactor*atol(YYText());
+
+ if (cmpt == pointGroupNumberOfComponents)
+ {
+ if (pointGroupNumberOfComponents == 2)
+ {
+ points[pointi].z() = 0.0;
+ }
+
+ cmpt = 0;
+ pointi++;
+ }
}
{scalar}{space} {
points[pointi][cmpt++] = scaleFactor*atof(YYText());
- }
-{spaceNl} {
- if (pointGroupNumberOfComponents == 2)
+ if (cmpt == pointGroupNumberOfComponents)
{
- points[pointi].z() = 0.0;
+ if (pointGroupNumberOfComponents == 2)
+ {
+ points[pointi].z() = 0.0;
+ }
+
+ cmpt = 0;
+ pointi++;
}
- cmpt = 0;
- pointi++;
}
{endOfSection} {
@@ -372,12 +386,13 @@ endOfSection {space}")"{space}
if (pointi != pointGroupEndIndex[pointGroupEndIndex.size()-1]+1)
{
Warning
- << "Problem with reading points: "
- << "start index: "
+ << "Problem with reading points: " << nl
+ << " start index: "
<< pointGroupStartIndex[pointGroupStartIndex.size()-1]
<< " end index: "
<< pointGroupEndIndex[pointGroupEndIndex.size()-1]
- << " last points read: " << pointi << endl;
+ << " last points read: " << pointi << nl
+ << " on line " << lineNo << endl;
}
yy_pop_state();
@@ -387,7 +402,7 @@ endOfSection {space}")"{space}
BEGIN(readFaceHeader);
}
-{spaceNl}{lbrac}{space}"0"{space}"1"{space} {
+{space}{lbrac}{space}"0"{space}"1"{space} {
BEGIN(readNumberOfFaces);
}
@@ -403,7 +418,7 @@ endOfSection {space}")"{space}
// Type and element type not read
}
-{spaceNl}{lbrac} {
+{space}{lbrac} {
BEGIN(readFaceGroupData);
}
@@ -431,12 +446,12 @@ endOfSection {space}")"{space}
<< faceGroupEndIndex[faceGroupEndIndex.size()-1] << flush;
}
-{spaceNl}{endOfSection} {
+{space}{endOfSection} {
BEGIN(readFaceData);
}
-{spaceNl}{lbrac} {
- if (faceGroupElementType == 0)
+{space}{lbrac} {
+ if (faceGroupElementType == 0 || faceGroupElementType > 4)
{
Info<< ". Reading mixed faces..." << flush;
yy_push_state(readFacesMixed);
@@ -448,7 +463,7 @@ endOfSection {space}")"{space}
}
}
-{spaceNl}{hexLabelList} {
+{space}{hexLabelList} {
face& curFaceLabels = faces[facei];
// set size of label list
@@ -465,7 +480,7 @@ endOfSection {space}")"{space}
facei++;
}
-{spaceNl}{hexLabelList} {
+{space}{hexLabelList} {
face& curFaceLabels = faces[facei];
// Set size of label list.
@@ -484,19 +499,20 @@ endOfSection {space}")"{space}
facei++;
}
-{spaceNl}{endOfSection} {
+{space}{endOfSection} {
Info<< "done." << endl;
// check read of fluentFaces
if (facei != faceGroupEndIndex[faceGroupEndIndex.size()-1]+1)
{
Warning
- << "Problem with reading fluentFaces: "
- << "start index: "
+ << "Problem with reading fluentFaces: " << nl
+ << " start index: "
<< faceGroupStartIndex[faceGroupStartIndex.size()-1]
<< " end index: "
<< faceGroupEndIndex[faceGroupEndIndex.size()-1]
- << " last fluentFaces read: " << facei << endl;
+ << " last fluentFaces read: " << facei << nl
+ << " on line " << lineNo << endl;
}
yy_pop_state();
@@ -507,7 +523,7 @@ endOfSection {space}")"{space}
BEGIN(readCellHeader);
}
-{spaceNl}{lbrac}{space}"0"{space}"1"{space} {
+{space}{lbrac}{space}"0"{space}"1"{space} {
BEGIN(readNumberOfCells);
}
@@ -516,7 +532,7 @@ endOfSection {space}")"{space}
Info<< "Number of cells: " << nCells << endl;
}
-{spaceNl}{lbrac} {
+{space}{lbrac} {
BEGIN(readCellGroupData);
}
@@ -526,7 +542,8 @@ endOfSection {space}")"{space}
// non-standard cell definition from Tgrid, which misses the type label.
Warning
- << "Tgrid syntax problem: " << YYText() << endl;
+ << "Tgrid syntax problem: " << YYText() << nl
+ << " on line " << lineNo << endl;
// read cell zone-ID, start and end-label
cellGroupZoneID.append(strtol(YYText(), &endPtr, 16));
@@ -580,7 +597,7 @@ endOfSection {space}")"{space}
BEGIN(readCellData);
}
-{spaceNl}{lbrac} {
+{space}{lbrac} {
// Quickly scan to the end of the cell data block and discard
register int c;
while ((c = yyinput()) != 0 && c != ')')
@@ -601,7 +618,7 @@ endOfSection {space}")"{space}
BEGIN(readZoneHeader);
}
-{spaceNl}{lbrac} {
+{space}{lbrac} {
BEGIN(readZoneGroupData);
}
@@ -623,17 +640,18 @@ endOfSection {space}")"{space}
BEGIN(readZoneData);
}
-{spaceNl}{lbrac} {
+{space}{lbrac} {
Info<< ". Reading zone data..." << flush;
yy_push_state(readZoneBlock);
}
-{spaceNl}{schemeSymbolList} {
+{space}{schemeSymbolList} {
}
{lbrac} {
- Warning
- << "Found unknown block in zone: " << YYText() << endl;
+ //Warning
+ // << "Found unknown block in zone: " << YYText() << nl
+ // << " on line " << lineNo << endl;
yy_push_state(ignoreBlock);
}
@@ -646,7 +664,7 @@ endOfSection {space}")"{space}
/* ------ Reading end of section and others ------ */
-{spaceNl}{endOfSection} {
+{space}{endOfSection} {
BEGIN(INITIAL);
}
@@ -655,7 +673,8 @@ endOfSection {space}")"{space}
{lbrac}{label} {
Warning
<< "Found unknown block of type: "
- << Foam::string(YYText())(1, YYLeng()-1) << endl;
+ << Foam::string(YYText())(1, YYLeng()-1) << nl
+ << " on line " << lineNo << endl;
yy_push_state(ignoreBlock);
}
@@ -664,40 +683,47 @@ endOfSection {space}")"{space}
yy_push_state(ignoreBlock);
}
-{spaceNl}{quote}{text}{quote} {
+{space}{quote}{text}{quote} {
}
-{spaceNl}{schemeSymbol} {
+{space}{schemeSymbol} {
}
-{spaceNl}{lbrac} {
+{space}{lbrac} {
yy_push_state(ignoreEmbeddedBlock);
}
-{spaceNl}{endOfSection} {
+{space}{endOfSection} {
yy_pop_state();
}
-{spaceNl}{labelList} {
+{space}{labelList} {
}
-{spaceNl}{hexLabelList} {
+{space}{hexLabelList} {
}
-{spaceNl}{scalarList} {
+{space}{scalarList} {
}
-{spaceNl}{schemeSymbolList} {
+{space}{schemeSymbolList} {
}
-{spaceNl}{text} {
+{space}{text} {
}
- /* ------ Ignore remaining space and \n s. ------ */
+ /* ------ Count newlines. ------ */
-<*>{some_space}|\n|\r {
+<*>\n {
+ lineNo++;
+ }
+
+
+ /* ------ Ignore remaining space. ------ */
+
+<*>{some_space}|\r {
}
@@ -706,7 +732,8 @@ endOfSection {space}")"{space}
<*>. {
// This is a catch all.
FatalErrorIn("fluentMeshToFoam::lexer")
- << "Do not understand characters: " << YYText()
+ << "Do not understand characters: " << YYText() << nl
+ << " on line " << lineNo
<< exit(FatalError);
}
@@ -856,10 +883,10 @@ int main(int argc, char *argv[])
runTime.constant(),
runTime
),
- pointField(0),
- faceList(0),
- labelList(0),
- labelList(0)
+ xferCopy(pointField()),
+ xferCopy(faceList()),
+ xferCopy(labelList()),
+ xferCopy(labelList())
);
@@ -882,11 +909,8 @@ int main(int argc, char *argv[])
// Check the face groups for boundary patches, baffles and faceZones
// ignoring the interior zones in ignoreCellGroups
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- label nPatches = 0;
- labelList patchIDs(faceGroupZoneID.size());
-
- label nFaceZones = 0;
- labelList faceZoneIDs(faceGroupZoneID.size());
+ DynamicList patchIDs(faceGroupZoneID.size());
+ DynamicList faceZoneIDs(faceGroupZoneID.size());
forAll(faceGroupZoneID, fgi)
{
@@ -900,13 +924,13 @@ int main(int argc, char *argv[])
// Check the first element of neighbour for boundary group
if (neighbour[start] == -1 || fluentGroupToFoamPatch.found(type))
{
- patchIDs[nPatches++] = fgi;
+ patchIDs.append(fgi);
}
else
{
if (!ignoreFaceGroups.found(groupName[faceGroupZoneID[fgi] ]))
{
- faceZoneIDs[nFaceZones++] = fgi;
+ faceZoneIDs.append(fgi);
}
}
}
@@ -928,20 +952,32 @@ int main(int argc, char *argv[])
}
else
{
- FatalErrorIn(args.executable())
- << "Unknown FaceGroup " << zoneID << " not in a zone"
- << exit(FatalError);
+ if (neighbour[start] == -1)
+ {
+ // Boundary face in unknown group. Create a patch for it.
+ groupType.insert(zoneID, "unknown");
+ groupName.insert(zoneID, "FaceGroup" + Foam::name(zoneID));
+ patchIDs.append(fgi);
+ Info<< "Created patch " << fgi << " for unknown FaceGroup "
+ << zoneID << '.' << endl;
+ }
+ else
+ {
+ WarningIn(args.executable())
+ << "Unknown FaceGroup " << zoneID << " not in a zone"
+ << endl;
+ }
}
}
- patchIDs.setSize(nPatches);
- faceZoneIDs.setSize(nFaceZones);
+ patchIDs.shrink();
+ faceZoneIDs.shrink();
// Add empty patches
// ~~~~~~~~~~~~~~~~~
- List newPatches(nPatches);
+ List newPatches(patchIDs.size());
HashSet patchNames;
forAll(patchIDs, patchi)
@@ -1024,7 +1060,7 @@ int main(int argc, char *argv[])
}
// Face zones
- mesh.faceZones().setSize(nFaceZones);
+ mesh.faceZones().setSize(faceZoneIDs.size());
HashSet faceZoneNames;
forAll(faceZoneIDs, faceZonei)
@@ -1098,6 +1134,8 @@ int main(int argc, char *argv[])
}
+ bool doneWarning = false;
+
// Add faceZone faces
forAll(faceZoneIDs, faceZonei)
{
@@ -1113,19 +1151,36 @@ int main(int argc, char *argv[])
for (label facei = start; facei <= end; facei++)
{
- meshMod.addFace
- (
- faces[facei],
- owner[facei],
- neighbour[facei],
- -1, // masterPointID
- -1, // masterEdgeID
- facei, // masterFace
- false, // flipFaceFlux
- -1, // patchID
- faceZonei, // zoneID
- false // zoneFlip
- );
+ if (owner[facei] >= nCells || neighbour[facei] >= nCells)
+ {
+ if (!doneWarning)
+ {
+ WarningIn(args.executable())
+ << "Ignoring internal face " << facei
+ << " on FaceZone " << zoneID
+ << " since owner " << owner[facei] << " or neighbour "
+ << neighbour[facei] << " outside range of cells 0.."
+ << nCells-1 << endl
+ << " Suppressing future warnings." << endl;
+ doneWarning = true;
+ }
+ }
+ else
+ {
+ meshMod.addFace
+ (
+ faces[facei],
+ owner[facei],
+ neighbour[facei],
+ -1, // masterPointID
+ -1, // masterEdgeID
+ facei, // masterFace
+ false, // flipFaceFlux
+ -1, // patchID
+ faceZonei, // zoneID
+ false // zoneFlip
+ );
+ }
// Mark face as being done
owner[facei] = -1;
@@ -1147,27 +1202,26 @@ int main(int argc, char *argv[])
for (label facei = start; facei <= end; facei++)
{
- meshMod.addFace
- (
- faces[facei],
- owner[facei],
- -1,
- -1, // masterPointID
- -1, // masterEdgeID
- facei, // masterFace
- false, // flipFaceFlux
- patchi, // patchID
- -1, // zoneID
- false // zoneFlip
- );
-
- // For baffles create the opposite face
- if (neighbour[start] != -1)
+ if (owner[facei] >= nCells || neighbour[facei] >= nCells)
+ {
+ if (!doneWarning)
+ {
+ WarningIn(args.executable())
+ << "Ignoring patch face " << facei
+ << " on FaceZone " << zoneID
+ << " since owner " << owner[facei] << " or neighbour "
+ << neighbour[facei] << " outside range of cells 0.."
+ << nCells-1 << endl
+ << " Suppressing future warnings." << endl;
+ doneWarning = true;
+ }
+ }
+ else
{
meshMod.addFace
(
- faces[facei].reverseFace(),
- neighbour[facei],
+ faces[facei],
+ owner[facei],
-1,
-1, // masterPointID
-1, // masterEdgeID
@@ -1177,8 +1231,25 @@ int main(int argc, char *argv[])
-1, // zoneID
false // zoneFlip
);
- }
+ // For baffles create the opposite face
+ if (neighbour[start] != -1)
+ {
+ meshMod.addFace
+ (
+ faces[facei].reverseFace(),
+ neighbour[facei],
+ -1,
+ -1, // masterPointID
+ -1, // masterEdgeID
+ facei, // masterFace
+ false, // flipFaceFlux
+ patchi, // patchID
+ -1, // zoneID
+ false // zoneFlip
+ );
+ }
+ }
// Mark face as being done
owner[facei] = -1;
}
@@ -1198,19 +1269,35 @@ int main(int argc, char *argv[])
<< exit(FatalError);
}
- meshMod.addFace
- (
- faces[facei],
- owner[facei],
- neighbour[facei],
- -1, //masterPointID
- -1, //masterEdgeID
- facei, //masterFace
- false, //flipFaceFlux
- -1, //patchID
- -1, //zoneID
- false //zoneFlip
- );
+ if (owner[facei] >= nCells || neighbour[facei] >= nCells)
+ {
+ if (!doneWarning)
+ {
+ WarningIn(args.executable())
+ << "Ignoring internal face " << facei
+ << " since owner " << owner[facei] << " or neighbour "
+ << neighbour[facei] << " outside range of cells 0.."
+ << nCells-1 << endl
+ << " Suppressing future warnings." << endl;
+ doneWarning = true;
+ }
+ }
+ else
+ {
+ meshMod.addFace
+ (
+ faces[facei],
+ owner[facei],
+ neighbour[facei],
+ -1, //masterPointID
+ -1, //masterEdgeID
+ facei, //masterFace
+ false, //flipFaceFlux
+ -1, //patchID
+ -1, //zoneID
+ false //zoneFlip
+ );
+ }
}
}
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
index 39aa6d2159..97dfe395db 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
@@ -1158,7 +1158,7 @@ int main(int argc, char *argv[])
runTime.constant(),
runTime
),
- points,
+ xferMove(points),
cellShapes,
patches,
patchNames,
diff --git a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
index f4061e2a66..d3c178c9ab 100644
--- a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+++ b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
@@ -851,7 +851,7 @@ int main(int argc, char *argv[])
runTime.constant(),
runTime
),
- points,
+ xferMove(points),
cells,
boundary,
patchNames,
diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
index 855c69cc95..a2628027ff 100644
--- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
+++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
@@ -38,7 +38,7 @@ Description
fluentMeshWithInternalFaces).
A use of the cell zone information, is for field initialization with the
- "setFields" utility. see the classes: topoSetSource, zoneToCell.
+ "setFields" utility. see the classes: topoSetSource, zoneToCell.
\*---------------------------------------------------------------------------*/
#include "argList.H"
@@ -166,7 +166,7 @@ label findInternalFace(const primitiveMesh& mesh, const labelList& meshF)
if (nMatched == meshF.size())
{
return faceI;
- }
+ }
}
return -1;
}
@@ -835,7 +835,7 @@ int main(int argc, char *argv[])
runTime.constant(),
runTime
),
- points,
+ xferMove(points),
cells,
boundaryFaces,
boundaryPatchNames,
@@ -951,7 +951,7 @@ int main(int argc, char *argv[])
{
zoneName = iter();
}
-
+
Info<< "Writing zone " << zoneI << " to cellZone "
<< zoneName << " and cellSet"
<< endl;
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
index c651d542c5..eeca6fbcb1 100644
--- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
+++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
@@ -572,6 +572,7 @@ int main(int argc, char *argv[])
{
argList::noParallel();
argList::validArgs.append(".unv file");
+ argList::validOptions.insert("dump", "");
# include "setRootCase.H"
# include "createTime.H"
@@ -806,7 +807,7 @@ int main(int argc, char *argv[])
forAll(dynPatchFaces, patchI)
{
- patchFaceVerts[patchI].transfer(dynPatchFaces[patchI].shrink());
+ patchFaceVerts[patchI].transfer(dynPatchFaces[patchI]);
}
}
else
@@ -845,13 +846,13 @@ int main(int argc, char *argv[])
pointField polyPoints;
polyPoints.transfer(points);
- points.clear();
// Length scaling factor
polyPoints /= lengthScale;
// For debugging: dump boundary faces as triSurface
+ if (args.options().found("dump"))
{
DynamicList triangles(boundaryFaces.size());
@@ -887,7 +888,6 @@ int main(int argc, char *argv[])
}
-
Info<< "Constructing mesh with non-default patches of size:" << nl;
forAll(patchNames, patchI)
{
@@ -907,14 +907,14 @@ int main(int argc, char *argv[])
runTime.constant(),
runTime
),
- polyPoints,
+ xferMove(polyPoints),
cellVerts,
- patchFaceVerts, //boundaryFaces,
- patchNames, //boundaryPatchNames,
- wordList(patchNames.size(), polyPatch::typeName), //boundaryPatchTypes,
- "defaultFaces", //defaultFacesName
- polyPatch::typeName, //defaultFacesType,
- wordList(0) //boundaryPatchPhysicalTypes
+ patchFaceVerts, // boundaryFaces,
+ patchNames, // boundaryPatchNames,
+ wordList(patchNames.size(), polyPatch::typeName), // boundaryPatchTypes,
+ "defaultFaces", // defaultFacesName
+ polyPatch::typeName, // defaultFacesType,
+ wordList(0) // boundaryPatchPhysicalTypes
);
mesh.write();
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
index b264214b8c..d315dce4a0 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
+++ b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
@@ -576,7 +576,7 @@ polyMesh pShapeMesh
runTime.constant(),
runTime
),
- points,
+ xferMove(points),
cellShapes,
boundary,
patchNames,
diff --git a/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C b/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C
index efed09a588..2b955528a6 100644
--- a/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C
+++ b/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C
@@ -140,7 +140,7 @@ int main(int argc, char *argv[])
runTime.constant(),
runTime
),
- points,
+ xferMove(points),
cells,
faceListList(0),
wordList(0),
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
Info<< "Writing mesh ..." << endl;
mesh.write();
-
+
Info<< "End\n" << endl;
diff --git a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
index d3cca93352..f290e7fa42 100644
--- a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
+++ b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
@@ -306,7 +306,7 @@ int main(int argc, char *argv[])
runTime.constant(),
runTime
),
- points,
+ xferMove(points),
cells,
patchFaces,
patchNames,
diff --git a/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C b/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
index 6e81ff9f0b..b4d348c376 100644
--- a/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
+++ b/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
@@ -232,7 +232,7 @@ int main(int argc, char *argv[])
runTime.constant(),
runTime
),
- newPoints,
+ xferMove(newPoints),
cellShapes,
boundary,
patchNames,
diff --git a/applications/utilities/mesh/conversion/sammToFoam/writeMesh.C b/applications/utilities/mesh/conversion/sammToFoam/writeMesh.C
index 6133e22c83..2d69dbc6dc 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/writeMesh.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/writeMesh.C
@@ -47,7 +47,7 @@ void sammMesh::writeMesh()
runTime_.constant(),
runTime_
),
- points_,
+ xferCopy(points_), // we could probably re-use the data
cellShapes_,
boundary_,
patchNames_,
@@ -76,9 +76,9 @@ void sammMesh::writeMesh()
runTime_.constant(),
runTime_
),
- points_,
- meshFaces_,
- cellPolys_
+ xferCopy(points_), // we could probably re-use the data
+ xferCopy(meshFaces_),
+ xferCopy(cellPolys_)
);
pMesh.addPatches(polyBoundaryPatches(pMesh));
diff --git a/applications/utilities/mesh/conversion/starToFoam/writeMesh.C b/applications/utilities/mesh/conversion/starToFoam/writeMesh.C
index a369e0c313..dedbe07bb6 100644
--- a/applications/utilities/mesh/conversion/starToFoam/writeMesh.C
+++ b/applications/utilities/mesh/conversion/starToFoam/writeMesh.C
@@ -51,7 +51,7 @@ void starMesh::writeMesh()
runTime_.constant(),
runTime_
),
- points_,
+ xferCopy(points_), // we could probably re-use the data
cellShapes_,
boundary_,
patchNames_,
@@ -82,9 +82,9 @@ void starMesh::writeMesh()
runTime_.constant(),
runTime_
),
- points_,
- meshFaces_,
- cellPolys_
+ xferCopy(points_), // we could probably re-use the data
+ xferCopy(meshFaces_),
+ xferCopy(cellPolys_)
);
// adding patches also checks the mesh
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
index 1e50ccee0b..e99bca0af1 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
+++ b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
@@ -322,11 +322,11 @@ int main(int argc, char *argv[])
runTime.constant(),
runTime
),
- points,
+ xferCopy(points),
cells,
faceListList(0),
- wordList(0), //boundaryPatchNames
- wordList(0), //boundaryPatchTypes
+ wordList(0), // boundaryPatchNames
+ wordList(0), // boundaryPatchTypes
"defaultFaces",
polyPatch::typeName,
wordList(0)
@@ -531,7 +531,7 @@ int main(int argc, char *argv[])
runTime.constant(),
runTime
),
- points,
+ xferMove(points),
cells,
patchFaces,
patchNames,
diff --git a/applications/utilities/mesh/generation/blockMesh/addOptions.H b/applications/utilities/mesh/generation/blockMesh/addOptions.H
deleted file mode 100644
index c9e07df5a6..0000000000
--- a/applications/utilities/mesh/generation/blockMesh/addOptions.H
+++ /dev/null
@@ -1,4 +0,0 @@
- argList::noParallel();
- argList::validOptions.insert("blockTopology", "");
- argList::validOptions.insert("dict", "dictionary");
-# include "addRegionOption.H"
diff --git a/applications/utilities/mesh/generation/blockMesh/block.C b/applications/utilities/mesh/generation/blockMesh/block.C
index 7ee15c4a6e..d2f0d67ab9 100644
--- a/applications/utilities/mesh/generation/blockMesh/block.C
+++ b/applications/utilities/mesh/generation/blockMesh/block.C
@@ -27,7 +27,6 @@ Description
\*---------------------------------------------------------------------------*/
#include "error.H"
-
#include "block.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/mesh/generation/blockMesh/blockBoundary.C b/applications/utilities/mesh/generation/blockMesh/blockBoundary.C
index 39b45912df..ef176206fd 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockBoundary.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockBoundary.C
@@ -28,18 +28,12 @@ Description
\*---------------------------------------------------------------------------*/
#include "error.H"
-
#include "block.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
-void block::blockBoundary()
+void Foam::block::blockBoundary()
{
label ni = blockDef_.n().x();
label nj = blockDef_.n().y();
@@ -212,9 +206,4 @@ void block::blockBoundary()
}
}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/blockCells.C b/applications/utilities/mesh/generation/blockMesh/blockCells.C
index 95d3d1a700..7968d0c381 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockCells.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockCells.C
@@ -28,18 +28,11 @@ Description
\*---------------------------------------------------------------------------*/
#include "error.H"
-
#include "block.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
-void block::blockCells()
+void Foam::block::blockCells()
{
label ni = blockDef_.n().x();
label nj = blockDef_.n().y();
@@ -69,9 +62,4 @@ void block::blockCells()
}
}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMesh.C b/applications/utilities/mesh/generation/blockMesh/blockMesh.C
index ebd8db02f2..c2a69b5475 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMesh.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMesh.C
@@ -32,21 +32,16 @@ Description
#include "blockMesh.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from IOdictionary
-blockMesh::blockMesh(IOdictionary& meshDescription)
+Foam::blockMesh::blockMesh(IOdictionary& meshDescription)
:
topologyPtr_(createTopology(meshDescription)),
- scale_(readScalar(meshDescription.lookup("convertToMeters"))),
blockOffsets_(createBlockOffsets()),
mergeList_(createMergeList()),
- points_(createPoints()),
+ points_(createPoints(meshDescription)),
cells_(createCells()),
patches_(createPatches())
{}
@@ -54,7 +49,7 @@ blockMesh::blockMesh(IOdictionary& meshDescription)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-blockMesh::~blockMesh()
+Foam::blockMesh::~blockMesh()
{
delete topologyPtr_;
}
@@ -62,7 +57,7 @@ blockMesh::~blockMesh()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-const polyMesh& blockMesh::topology() const
+const Foam::polyMesh& Foam::blockMesh::topology() const
{
if (!topologyPtr_)
{
@@ -75,13 +70,7 @@ const polyMesh& blockMesh::topology() const
}
-const curvedEdgeList& blockMesh::edges() const
-{
- return edges_;
-}
-
-
-wordList blockMesh::patchNames() const
+Foam::wordList Foam::blockMesh::patchNames() const
{
const polyPatchList& patchTopologies = topology().boundaryMesh();
wordList names(patchTopologies.size());
@@ -95,7 +84,7 @@ wordList blockMesh::patchNames() const
}
-wordList blockMesh::patchTypes() const
+Foam::wordList Foam::blockMesh::patchTypes() const
{
const polyPatchList& patchTopologies = topology().boundaryMesh();
wordList types(patchTopologies.size());
@@ -109,7 +98,7 @@ wordList blockMesh::patchTypes() const
}
-wordList blockMesh::patchPhysicalTypes() const
+Foam::wordList Foam::blockMesh::patchPhysicalTypes() const
{
const polyPatchList& patchTopologies = topology().boundaryMesh();
wordList physicalTypes(patchTopologies.size());
@@ -123,7 +112,7 @@ wordList blockMesh::patchPhysicalTypes() const
}
-label blockMesh::numZonedBlocks() const
+Foam::label Foam::blockMesh::numZonedBlocks() const
{
label num = 0;
@@ -139,7 +128,7 @@ label blockMesh::numZonedBlocks() const
}
-void blockMesh::writeTopology(Ostream& os) const
+void Foam::blockMesh::writeTopology(Ostream& os) const
{
const pointField& pts = topology().points();
@@ -160,9 +149,4 @@ void blockMesh::writeTopology(Ostream& os) const
}
}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMesh.H b/applications/utilities/mesh/generation/blockMesh/blockMesh.H
index 808e93dad5..4114cb9619 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMesh.H
+++ b/applications/utilities/mesh/generation/blockMesh/blockMesh.H
@@ -62,8 +62,6 @@ class blockMesh
polyMesh* topologyPtr_;
- scalar scale_;
-
labelList blockOffsets_;
labelList mergeList_;
@@ -94,7 +92,7 @@ class blockMesh
labelList createBlockOffsets();
labelList createMergeList();
- pointField createPoints();
+ pointField createPoints(const dictionary&);
cellShapeList createCells();
faceList createPatchFaces(const polyPatch& patchTopologyFaces);
@@ -123,7 +121,10 @@ public:
const polyMesh& topology() const;
- const curvedEdgeList& edges() const;
+ const curvedEdgeList& edges() const
+ {
+ return edges_;
+ }
const pointField& points() const
{
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
index e73a5262b9..f65e6b852e 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
@@ -72,11 +72,11 @@ using namespace Foam;
int main(int argc, char *argv[])
{
argList::noParallel();
-
-# include "addOptions.H"
+ argList::validOptions.insert("blockTopology", "");
+ argList::validOptions.insert("dict", "dictionary");
+# include "addRegionOption.H"
# include "setRootCase.H"
# include "createTime.H"
-# include "checkOptions.H"
word regionName;
fileName polyMeshDir;
@@ -117,6 +117,7 @@ int main(int argc, char *argv[])
}
}
+ bool writeTopo = args.options().found("blockTopology");
IOobject meshDictIo
(
@@ -139,7 +140,7 @@ int main(int argc, char *argv[])
}
Info<< nl << "Creating block mesh from\n "
- << meshDictIo.objectPath() << endl;
+ << meshDictIo.objectPath() << nl << endl;
IOdictionary meshDict(meshDictIo);
@@ -216,7 +217,7 @@ int main(int argc, char *argv[])
runTime.constant(),
runTime
),
- blocks.points(),
+ xferCopy(blocks.points()), // could we re-use space?
blocks.cells(),
blocks.patches(),
patchNames,
@@ -242,7 +243,7 @@ int main(int argc, char *argv[])
<< exit(FatalError);
}
- //#include "mergePatchPairs.H"
+ //// #include "mergePatchPairs.H"
}
else
{
@@ -316,7 +317,7 @@ int main(int argc, char *argv[])
{
label zoneI = iter();
- cz[zoneI]= new cellZone
+ cz[zoneI] = new cellZone
(
iter.key(),
zoneCells[zoneI].shrink(),
@@ -339,7 +340,7 @@ int main(int argc, char *argv[])
IOstream::defaultPrecision(10);
Info << nl << "Writing polyMesh" << endl;
- mesh.removeFiles(mesh.instance());
+ mesh.removeFiles();
if (!mesh.write())
{
FatalErrorIn(args.executable())
diff --git a/applications/utilities/mesh/generation/blockMesh/blockPoints.C b/applications/utilities/mesh/generation/blockMesh/blockPoints.C
index 2fecb21bf5..107b9d7fd8 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockPoints.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockPoints.C
@@ -28,17 +28,11 @@ Description
\*---------------------------------------------------------------------------*/
#include "error.H"
-
#include "block.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-void block::blockPoints()
+void Foam::block::blockPoints()
{
// set local variables for mesh specification
const label ni = blockDef_.n().x();
@@ -235,9 +229,4 @@ void block::blockPoints()
}
}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/checkBlockMesh.C b/applications/utilities/mesh/generation/blockMesh/checkBlockMesh.C
index 3d093a46dc..ad78b6686c 100644
--- a/applications/utilities/mesh/generation/blockMesh/checkBlockMesh.C
+++ b/applications/utilities/mesh/generation/blockMesh/checkBlockMesh.C
@@ -28,16 +28,10 @@ Description
#include "blockMesh.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// Check the blockMesh topology
-
-void blockMesh::checkBlockMesh(const polyMesh& bm)
+void Foam::blockMesh::checkBlockMesh(const polyMesh& bm)
{
Info<< nl << "Check block mesh topology" << endl;
@@ -148,9 +142,4 @@ void blockMesh::checkBlockMesh(const polyMesh& bm)
}
}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/checkOptions.H b/applications/utilities/mesh/generation/blockMesh/checkOptions.H
deleted file mode 100644
index 902d96966f..0000000000
--- a/applications/utilities/mesh/generation/blockMesh/checkOptions.H
+++ /dev/null
@@ -1 +0,0 @@
- bool writeTopo = args.options().found("blockTopology");
diff --git a/applications/utilities/mesh/generation/blockMesh/createBlockOffsets.C b/applications/utilities/mesh/generation/blockMesh/createBlockOffsets.C
index dbe62491ad..f394b18c16 100644
--- a/applications/utilities/mesh/generation/blockMesh/createBlockOffsets.C
+++ b/applications/utilities/mesh/generation/blockMesh/createBlockOffsets.C
@@ -27,17 +27,11 @@ Description
\*---------------------------------------------------------------------------*/
#include "error.H"
-
#include "blockMesh.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-labelList blockMesh::createBlockOffsets()
+Foam::labelList Foam::blockMesh::createBlockOffsets()
{
Info<< nl << "Creating block offsets" << endl;
@@ -63,10 +57,4 @@ labelList blockMesh::createBlockOffsets()
return BlockOffsets;
}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
-
diff --git a/applications/utilities/mesh/generation/blockMesh/createCells.C b/applications/utilities/mesh/generation/blockMesh/createCells.C
index ef6bb82891..e4792e416a 100644
--- a/applications/utilities/mesh/generation/blockMesh/createCells.C
+++ b/applications/utilities/mesh/generation/blockMesh/createCells.C
@@ -29,14 +29,9 @@ License
#include "blockMesh.H"
#include "cellModeller.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-cellShapeList blockMesh::createCells()
+Foam::cellShapeList Foam::blockMesh::createCells()
{
Info<< nl << "Creating cells" << endl;
@@ -76,10 +71,4 @@ cellShapeList blockMesh::createCells()
return cells;
}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
-
diff --git a/applications/utilities/mesh/generation/blockMesh/createMergeList.C b/applications/utilities/mesh/generation/blockMesh/createMergeList.C
index f799905d63..b6e91a3ca0 100644
--- a/applications/utilities/mesh/generation/blockMesh/createMergeList.C
+++ b/applications/utilities/mesh/generation/blockMesh/createMergeList.C
@@ -26,14 +26,9 @@ License
#include "blockMesh.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-labelList blockMesh::createMergeList()
+Foam::labelList Foam::blockMesh::createMergeList()
{
Info<< nl << "Creating merge list " << flush;
@@ -277,7 +272,7 @@ labelList blockMesh::createMergeList()
if (cp[blockPfaceFacePointLabel] == -1)
{
FatalErrorIn("blockMesh::createMergeList()")
- << "Inconsistent point locations between block pair "
+ << "Inconsistent point locations between block pair "
<< blockPlabel << " and " << blockNlabel << nl
<< " probably due to inconsistent grading."
<< exit(FatalError);
@@ -561,9 +556,4 @@ labelList blockMesh::createMergeList()
return MergeList;
}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/createPatches.C b/applications/utilities/mesh/generation/blockMesh/createPatches.C
index fddd51aa22..1594e1042e 100644
--- a/applications/utilities/mesh/generation/blockMesh/createPatches.C
+++ b/applications/utilities/mesh/generation/blockMesh/createPatches.C
@@ -29,14 +29,9 @@ Description
#include "blockMesh.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-faceList blockMesh::createPatchFaces
+Foam::faceList Foam::blockMesh::createPatchFaces
(
const polyPatch& patchTopologyFaces
)
@@ -157,7 +152,7 @@ faceList blockMesh::createPatchFaces
}
-faceListList blockMesh::createPatches()
+Foam::faceListList Foam::blockMesh::createPatches()
{
Info<< "\nCreating patches\n";
@@ -173,9 +168,4 @@ faceListList blockMesh::createPatches()
return patches;
}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/applications/utilities/mesh/generation/blockMesh/createPoints.C b/applications/utilities/mesh/generation/blockMesh/createPoints.C
index 6f33edb435..01bb9a27f2 100644
--- a/applications/utilities/mesh/generation/blockMesh/createPoints.C
+++ b/applications/utilities/mesh/generation/blockMesh/createPoints.C
@@ -28,24 +28,26 @@ Description
\*---------------------------------------------------------------------------*/
#include "error.H"
-
#include "blockMesh.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-pointField blockMesh::createPoints()
+Foam::pointField Foam::blockMesh::createPoints(const dictionary& dict)
{
- Info<< nl << "Creating points" << endl;
+ blockMesh& blocks = *this;
+
+ scalar scaleFactor = 1.0;
+
+ // optional 'convertToMeters' (or 'scale'?)
+ if (!dict.readIfPresent("convertToMeters", scaleFactor))
+ {
+ dict.readIfPresent("scale", scaleFactor);
+ }
+
+ Info<< nl << "Creating points with scale " << scaleFactor << endl;
pointField points(nPoints_);
- blockMesh& blocks = *this;
-
forAll(blocks, blockLabel)
{
const pointField& blockPoints = blocks[blockLabel].points();
@@ -59,17 +61,11 @@ pointField blockMesh::createPoints()
blockPointLabel
+ blockOffsets_[blockLabel]
]
- ] = scale_*blockPoints[blockPointLabel];
+ ] = scaleFactor * blockPoints[blockPointLabel];
}
}
return points;
}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
-
diff --git a/applications/utilities/mesh/generation/blockMesh/createTopology.C b/applications/utilities/mesh/generation/blockMesh/createTopology.C
index 6b74db8b0a..8be8f42864 100644
--- a/applications/utilities/mesh/generation/blockMesh/createTopology.C
+++ b/applications/utilities/mesh/generation/blockMesh/createTopology.C
@@ -40,9 +40,9 @@ bool Foam::blockMesh::blockLabelsOK
{
bool ok = true;
- for (int i=0; i= points.size())
+ else if (blockShape[blockI] >= points.size())
{
ok = false;
@@ -65,7 +65,7 @@ bool Foam::blockMesh::blockLabelsOK
"(const label blockLabel, const pointField& points, "
"const cellShape& blockShape)"
) << "block " << blockLabel
- << " point label " << blockShape[i]
+ << " point label " << blockShape[blockI]
<< " larger than " << points.size() - 1
<< " the largest defined point label" << endl;
}
@@ -84,38 +84,34 @@ bool Foam::blockMesh::patchLabelsOK
{
bool ok = true;
- for (label facei=0; facei= points.size())
+ else if (f[fp] >= points.size())
{
ok = false;
WarningIn
(
- "bool Foam::blockMesh::patchLabelsOK"
- "(const label patchLabel, const pointField& points, "
- "const faceList& patchFaces)"
+ "bool Foam::blockMesh::patchLabelsOK(...)"
) << "patch " << patchLabel
- << " face " << facei
- << " point label " << labels[i]
+ << " face " << faceI
+ << " point label " << f[fp]
<< " larger than " << points.size() - 1
<< " the largest defined point label" << endl;
}
@@ -137,23 +133,13 @@ Foam::polyMesh* Foam::blockMesh::createTopology(IOdictionary& meshDescription)
word defaultPatchName = "defaultFaces";
word defaultPatchType = emptyPolyPatch::typeName;
- // get names and types for the unassigned patch faces
- if (meshDescription.found("defaultPatch"))
+ // get names/types for the unassigned patch faces
+ // this is a bit heavy handed (and ugly), but there is currently
+ // no easy way to rename polyMesh patches subsequently
+ if (const dictionary* dictPtr = meshDescription.subDictPtr("defaultPatch"))
{
- const dictionary& defaultPatch =
- meshDescription.subDict("defaultPatch");
-
- // this is a bit heavy handed (and ugly), but there is currently
- // no easy way to rename polyMesh patches subsequently
- if (defaultPatch.found("name"))
- {
- defaultPatch.lookup("name") >> defaultPatchName;
- }
-
- if (defaultPatch.found("type"))
- {
- defaultPatch.lookup("type") >> defaultPatchType;
- }
+ dictPtr->readIfPresent("name", defaultPatchName);
+ dictPtr->readIfPresent("type", defaultPatchType);
}
Info<< nl << "Creating blockCorners" << endl;
@@ -439,7 +425,7 @@ Foam::polyMesh* Foam::blockMesh::createTopology(IOdictionary& meshDescription)
IOobject::NO_WRITE,
false
),
- tmpBlockPoints,
+ xferMove(tmpBlockPoints),
tmpBlockCells,
tmpBlocksPatches,
patchNames,
@@ -456,4 +442,3 @@ Foam::polyMesh* Foam::blockMesh::createTopology(IOdictionary& meshDescription)
// ************************************************************************* //
-
diff --git a/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.C b/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.C
index 2efd9b1839..6d7e80d74e 100644
--- a/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.C
+++ b/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.C
@@ -1,4 +1,4 @@
- Info<< nl << "Creating merge patch pairs" << nl << endl;
+ Info<< "Creating merge patch pairs" << nl << endl;
if (mergePatchPairs.size() > 0)
{
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.C b/applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.C
index b650224ec8..dae087a40f 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.C
+++ b/applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.C
@@ -48,7 +48,7 @@ template
template class FaceList,
class PointField
>
-Foam::pointField Foam::extrudedMesh::extrudedPoints
+Foam::xfer Foam::extrudedMesh::extrudedPoints
(
const PrimitivePatch& extrudePatch,
const extrudeModel& model
@@ -76,12 +76,13 @@ Foam::pointField Foam::extrudedMesh::extrudedPoints
}
}
- return ePoints;
+ // return points for transferring
+ return xferMove(ePoints);
}
template class FaceList, class PointField>
-Foam::faceList Foam::extrudedMesh::extrudedFaces
+Foam::xfer Foam::extrudedMesh::extrudedFaces
(
const PrimitivePatch& extrudePatch,
const extrudeModel& model
@@ -177,12 +178,13 @@ Foam::faceList Foam::extrudedMesh::extrudedFaces
);
}
- return eFaces;
+ // return points for transferring
+ return xferMove(eFaces);
}
template class FaceList, class PointField>
-Foam::cellList Foam::extrudedMesh::extrudedCells
+Foam::xfer Foam::extrudedMesh::extrudedCells
(
const PrimitivePatch& extrudePatch,
const extrudeModel& model
@@ -283,7 +285,8 @@ Foam::cellList Foam::extrudedMesh::extrudedCells
facei++;
}
- return eCells;
+ // return points for transferring
+ return xferMove(eCells);
}
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.H b/applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.H
index 71bfb2e07b..d089ee9130 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.H
+++ b/applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.H
@@ -63,26 +63,26 @@ class extrudedMesh
//- Construct and return the extruded mesh points
template class FaceList, class PointField>
- pointField extrudedPoints
+ xfer extrudedPoints
(
const PrimitivePatch& extrudePatch,
- const extrudeModel& model
+ const extrudeModel&
);
//- Construct and return the extruded mesh faces
template class FaceList, class PointField>
- faceList extrudedFaces
+ xfer extrudedFaces
(
const PrimitivePatch& extrudePatch,
- const extrudeModel& model
+ const extrudeModel&
);
//- Construct and return the extruded mesh cells
template class FaceList, class PointField>
- cellList extrudedCells
+ xfer extrudedCells
(
const PrimitivePatch& extrudePatch,
- const extrudeModel& model
+ const extrudeModel&
);
@@ -101,9 +101,9 @@ public:
template class FaceList, class PointField>
extrudedMesh
(
- const IOobject& io,
+ const IOobject&,
const PrimitivePatch& extrudePatch,
- const extrudeModel& model
+ const extrudeModel&
);
};
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
index 5f35621557..761dd606db 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
@@ -374,9 +374,9 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
mirrorMeshPtr_ = new fvMesh
(
io,
- newPoints,
- newFaces,
- newCells
+ xferMove(newPoints),
+ xferMove(newFaces),
+ xferMove(newCells)
);
fvMesh& pMesh = *mirrorMeshPtr_;
diff --git a/applications/utilities/mesh/manipulation/setSet/Allwmake b/applications/utilities/mesh/manipulation/setSet/Allwmake
index e10d037cbc..1e116a3315 100755
--- a/applications/utilities/mesh/manipulation/setSet/Allwmake
+++ b/applications/utilities/mesh/manipulation/setSet/Allwmake
@@ -2,8 +2,9 @@
cd ${0%/*} || exit 1 # run from this directory
READLINE=0
-if [ -f /usr/include/readline/readline.h ]; then
- echo "Found readline/readline.h include file. Enabling readline support."
+if [ -f /usr/include/readline/readline.h ]
+then
+ echo "Found readline/readline.h -- enabling readline support."
READLINE=1
export READLINELINK="-lreadline -lncurses"
break
diff --git a/applications/utilities/mesh/manipulation/splitMesh/regionSide.H b/applications/utilities/mesh/manipulation/splitMesh/regionSide.H
index 514c928095..776fa33117 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/regionSide.H
+++ b/applications/utilities/mesh/manipulation/splitMesh/regionSide.H
@@ -45,7 +45,7 @@ SourceFiles
#ifndef regionSide_H
#define regionSide_H
-#include "labelHashSet.H"
+#include "HashSet.H"
#include "typeInfo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
index dd107c2f2f..548f8247dc 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
@@ -272,9 +272,9 @@ bool domainDecomposition::writeDecomposition()
"constant",
processorDb
),
- procPoints,
- procFaces,
- procCells
+ xferMove(procPoints),
+ xferMove(procFaces),
+ xferMove(procCells)
);
// Create processor boundary patches
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index bfd6ae083b..834b75dfe6 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -506,9 +506,9 @@ int main(int argc, char *argv[])
runTime,
IOobject::NO_READ
),
- pointField(0),
- faceList(0),
- cellList(0)
+ xferCopy(pointField()),
+ xferCopy(faceList()),
+ xferCopy(cellList())
);
for (label procI = 0; procI < nProcs; procI++)
diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C b/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
index 3c2f7f6662..35b1ff4913 100644
--- a/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
+++ b/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
@@ -70,10 +70,10 @@ autoPtr createMesh
runTime,
IOobject::MUST_READ
),
- pointField(0),
- faceList(0),
- labelList(0),
- labelList(0)
+ xferCopy(pointField()),
+ xferCopy(faceList()),
+ xferCopy(labelList()),
+ xferCopy(labelList())
);
if (!haveMesh)
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
index 601df67db4..fe46b10d13 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
@@ -1,19 +1,18 @@
EXE_INC = \
-I$(LIB_SRC)/postProcessing/postCalc \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/turbulenceModels/RAS \
- -I$(LIB_SRC)/turbulenceModels/LES \
+ -I$(LIB_SRC)/turbulenceModels \
-I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
+ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
$(FOAM_LIBBIN)/postCalc.o \
- -lfiniteVolume \
-lincompressibleTransportModels \
-lincompressibleRASModels \
-lincompressibleLESModels \
-lbasicThermophysicalModels \
-lspecie \
-lcompressibleRASModels \
- -lcompressibleLESModels
+ -lcompressibleLESModels \
+ -lfiniteVolume
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
index 3f7a99040b..7a1e86c286 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
@@ -39,12 +39,12 @@ Description
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASModel/RASModel.H"
-#include "incompressible/LESModel/LESModel.H"
+#include "incompressible/RAS/RASModel/RASModel.H"
+#include "incompressible/LES/LESModel/LESModel.H"
#include "basicThermo.H"
-#include "compressible/RASModel/RASModel.H"
-#include "compressible/LESModel/LESModel.H"
+#include "compressible/RAS/RASModel/RASModel.H"
+#include "compressible/LES/LESModel/LESModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/postProcessing/sampling/sample/sampleDict b/applications/utilities/postProcessing/sampling/sample/sampleDict
index 57385a9555..5ca407c90c 100644
--- a/applications/utilities/postProcessing/sampling/sample/sampleDict
+++ b/applications/utilities/postProcessing/sampling/sample/sampleDict
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -155,21 +155,25 @@ surfaces
// Optional: whether to leave as faces (=default) or triangulate
}
- constantIso
- {
- name isoSurface;
- isoField rho;
- isoValue 0.5;
- interpolate false
- }
interpolatedIso
{
- name isoSurface;
+ // Iso surface for interpolated values only
+ type isoSurface;
isoField rho;
isoValue 0.5;
interpolate true;
//regularise false; //optional: do not simplify
}
+ constantIso
+ {
+ // Iso surface for constant values. Guarantees triangles to not
+ // cross cells.
+ type isoSurfaceCell;
+ isoField rho;
+ isoValue 0.5;
+ interpolate false;
+ //regularise false; //optional: do not simplify
+ }
);
diff --git a/applications/utilities/postProcessing/turbulence/R/Make/options b/applications/utilities/postProcessing/turbulence/R/Make/options
index a53125aaf2..5e71b80afa 100644
--- a/applications/utilities/postProcessing/turbulence/R/Make/options
+++ b/applications/utilities/postProcessing/turbulence/R/Make/options
@@ -1,10 +1,10 @@
EXE_INC = \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/turbulenceModels/RAS \
- -I$(LIB_SRC)/transportModels
+ -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \
+ -I$(LIB_SRC)/transportModels \
+ -I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
- -lfiniteVolume \
-lincompressibleRASModels \
-lincompressibleTransportModels \
-lfiniteVolume
diff --git a/applications/utilities/postProcessing/turbulence/R/R.C b/applications/utilities/postProcessing/turbulence/R/R.C
index 7ce19a8c5f..dbf1860bce 100644
--- a/applications/utilities/postProcessing/turbulence/R/R.C
+++ b/applications/utilities/postProcessing/turbulence/R/R.C
@@ -32,21 +32,19 @@ Description
#include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASModel/RASModel.H"
-
+#include "RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
int main(int argc, char *argv[])
{
+ #include "setRootCase.H"
-# include "setRootCase.H"
+ #include "createTime.H"
+ #include "createMesh.H"
+ #include "createFields.H"
-# include "createTime.H"
-# include "createMesh.H"
-# include "createFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info<< "\nCalculating the Reynolds Stress R\n" << endl;
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
index be60a20b9f..a524a0aae5 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/Make/options
@@ -1,9 +1,10 @@
EXE_INC = \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/turbulenceModels/RAS \
- -I$(LIB_SRC)/transportModels
+ -I$(LIB_SRC)/transportModels \
+ -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \
+ -I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
- -lfiniteVolume \
-lincompressibleRASModels \
- -lincompressibleTransportModels
+ -lincompressibleTransportModels \
+ -lfiniteVolume
\ No newline at end of file
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
index 30a74548dd..2a8ed8f529 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
@@ -36,28 +36,26 @@ Source files:
#include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASModel/RASModel.H"
-
+#include "RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
int main(int argc, char *argv[])
{
-
-# include "addTimeOptions.H"
-# include "setRootCase.H"
-# include "createTime.H"
+ #include "addTimeOptions.H"
+ #include "setRootCase.H"
+ #include "createTime.H"
// Get times list
instantList Times = runTime.times();
// set startTime and endTime depending on -time and -latestTime options
-# include "checkTimeOptions.H"
+ #include "checkTimeOptions.H"
runTime.setTime(Times[startTime], startTime);
-# include "createMesh.H"
+ #include "createMesh.H"
-# include "createFields.H"
+ #include "createFields.H"
for (label i=startTime; ialphaEff())*fvc::snGrad(h);
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/Make/options b/applications/utilities/postProcessing/wall/wallShearStress/Make/options
index 2a417f9549..89632547e0 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/Make/options
+++ b/applications/utilities/postProcessing/wall/wallShearStress/Make/options
@@ -1,7 +1,8 @@
EXE_INC = \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/turbulenceModels/RAS \
- -I$(LIB_SRC)/transportModels
+ -I$(LIB_SRC)/transportModels \
+ -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \
+ -I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-lincompressibleRASModels \
diff --git a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
index d53fa5491c..98b7d6ebc2 100644
--- a/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
+++ b/applications/utilities/postProcessing/wall/wallShearStress/wallShearStress.C
@@ -32,7 +32,7 @@ Description
#include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASModel/RASModel.H"
+#include "RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -40,9 +40,9 @@ int main(int argc, char *argv[])
{
timeSelector::addOptions();
#include "setRootCase.H"
-# include "createTime.H"
+ #include "createTime.H"
instantList timeDirs = timeSelector::select0(runTime, args);
-# include "createMesh.H"
+ #include "createMesh.H"
forAll(timeDirs, timeI)
{
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << endl;
mesh.readUpdate();
-# include "createFields.H"
+ #include "createFields.H"
volSymmTensorField Reff(RASModel->devReff());
diff --git a/applications/utilities/postProcessing/wall/yPlusLES/Make/options b/applications/utilities/postProcessing/wall/yPlusLES/Make/options
index b624a502aa..79fbbac91e 100644
--- a/applications/utilities/postProcessing/wall/yPlusLES/Make/options
+++ b/applications/utilities/postProcessing/wall/yPlusLES/Make/options
@@ -1,5 +1,6 @@
EXE_INC = \
- -I$(LIB_SRC)/turbulenceModels/LES \
+ -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/incompressible/LES/LESModel \
-I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/finiteVolume/lnInclude
diff --git a/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C b/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C
index d7c145b953..d89411f497 100644
--- a/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C
+++ b/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C
@@ -32,7 +32,7 @@ Description
#include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/LESModel/LESModel.H"
+#include "LESModel.H"
#include "nearWallDist.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/Make/options b/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
index 2a417f9549..89632547e0 100644
--- a/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
+++ b/applications/utilities/postProcessing/wall/yPlusRAS/Make/options
@@ -1,7 +1,8 @@
EXE_INC = \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/turbulenceModels/RAS \
- -I$(LIB_SRC)/transportModels
+ -I$(LIB_SRC)/transportModels \
+ -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \
+ -I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-lincompressibleRASModels \
diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
index 2db2f0d3b1..f9e164bbd0 100644
--- a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
+++ b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
@@ -32,7 +32,7 @@ Description
#include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
-#include "incompressible/RASModel/RASModel.H"
+#include "RASModel.H"
#include "wallFvPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/surface/surfaceConvert/surfaceConvert.C b/applications/utilities/surface/surfaceConvert/surfaceConvert.C
index a2a62378db..3d3c9cbde5 100644
--- a/applications/utilities/surface/surfaceConvert/surfaceConvert.C
+++ b/applications/utilities/surface/surfaceConvert/surfaceConvert.C
@@ -22,9 +22,26 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+Application
+ surfaceConvert
+
Description
- Converts to and from Foam surface format. Optionally orders triangles
- by region.
+ Converts from one surface mesh format to another
+
+Usage
+ - surfaceConvert inputFile outputFile [OPTION]
+
+ @param -clean \n
+ Perform some surface checking/cleanup on the input surface
+
+ @param -scale \ \n
+ Specify a scaling factor for writing the files
+
+ @param -group \n
+ Orders faces by region
+
+Note
+ The filename extensions are used to determine the file format type.
\*---------------------------------------------------------------------------*/
@@ -44,34 +61,41 @@ int main(int argc, char *argv[])
{
argList::noParallel();
argList::validArgs.clear();
- argList::validOptions.insert("cleanup", "");
+ argList::validArgs.append("inputFile");
+ argList::validArgs.append("outputFile");
+ argList::validOptions.insert("clean", "");
+ argList::validOptions.insert("scale", "scale");
argList::validOptions.insert("group", "");
- argList::validArgs.append("input surface file");
- argList::validArgs.append("output surface file");
+
argList args(argc, argv);
+ const stringList& params = args.additionalArgs();
- fileName inFileName(args.additionalArgs()[0]);
- fileName outFileName(args.additionalArgs()[1]);
+ scalar scaleFactor = 0;
+ if (args.options().found("scale"))
+ {
+ IStringStream(args.options()["scale"])() >> scaleFactor;
+ }
- if (outFileName == inFileName)
+ fileName importName(params[0]);
+ fileName exportName(params[1]);
+
+ if (importName == exportName)
{
FatalErrorIn(args.executable())
- << "Output file " << outFileName
- << " would overwrite input file."
+ << "Output file " << exportName << " would overwrite input file."
<< exit(FatalError);
}
- Info << "Reading : " << inFileName << endl;
- triSurface surf(inFileName);
+ Info<< "Reading : " << importName << endl;
+ triSurface surf(importName);
Info<< "Read surface:" << endl;
surf.writeStats(Info);
Info<< endl;
-
- if (args.options().found("cleanup"))
+ if (args.options().found("clean"))
{
- Info << "Cleaning up surface" << endl;
+ Info<< "Cleaning up surface" << endl;
surf.cleanup(true);
Info<< "After cleaning up surface:" << endl;
@@ -83,20 +107,28 @@ int main(int argc, char *argv[])
if (sortByRegion)
{
- Info << "Reordering faces into groups; one per region." << endl;
+ Info<< "Reordering faces into groups; one per region." << endl;
}
else
{
- Info << "Maintaining face ordering" << endl;
+ Info<< "Maintaining face ordering" << endl;
}
- Info << "Writing : " << outFileName << endl;
- surf.write(outFileName, sortByRegion);
+ Info<< "writing " << exportName;
+ if (scaleFactor > 0)
+ {
+ Info<< " without scaling" << endl;
+ }
+ else
+ {
+ Info<< " with scaling " << scaleFactor << endl;
+ surf.scalePoints(scaleFactor);
+ }
+ surf.write(exportName, sortByRegion);
- Info << "End\n" << endl;
+ Info<< "\nEnd\n" << endl;
return 0;
}
-
// ************************************************************************* //
diff --git a/applications/utilities/surface/surfaceCoordinateSystemTransform/Make/files b/applications/utilities/surface/surfaceCoordinateSystemTransform/Make/files
new file mode 100644
index 0000000000..b937625a71
--- /dev/null
+++ b/applications/utilities/surface/surfaceCoordinateSystemTransform/Make/files
@@ -0,0 +1,3 @@
+surfaceCoordinateSystemTransform.C
+
+EXE = $(FOAM_APPBIN)/surfaceCoordinateSystemTransform
diff --git a/applications/utilities/surface/surfaceCoordinateSystemTransform/Make/options b/applications/utilities/surface/surfaceCoordinateSystemTransform/Make/options
new file mode 100644
index 0000000000..42b30c8652
--- /dev/null
+++ b/applications/utilities/surface/surfaceCoordinateSystemTransform/Make/options
@@ -0,0 +1,5 @@
+EXE_INC = \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/surfMesh/lnInclude
+
+EXE_LIBS = -lmeshTools -lsurfMesh
diff --git a/applications/utilities/surface/surfaceCoordinateSystemTransform/coordinateSystems b/applications/utilities/surface/surfaceCoordinateSystemTransform/coordinateSystems
new file mode 100644
index 0000000000..b414b6b81b
--- /dev/null
+++ b/applications/utilities/surface/surfaceCoordinateSystemTransform/coordinateSystems
@@ -0,0 +1,83 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class IOPtrList;
+ object coordinateSystems;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+7
+(
+system_9
+{
+ type cartesian;
+ origin (1.03291515 -0.114391257 -0.0826236662);
+ e3 (1 0 0);
+ e1 (0 1 0);
+ // STARCDRotation (0 90 90);
+}
+
+system_10
+{
+ type cartesian;
+ origin (0.623151719 -0.286472935 -0.113933262);
+ e3 (0.99508851 0.09829095 0.01173645);
+ e1 (0.01179356 0 -0.99993045);
+ // STARCDRotation (5.6403745 -0.0664172952 89.3275351);
+}
+
+system_15
+{
+ type cartesian;
+ origin (0.644772231 -0.240036493 0.155972187);
+ e3 (-0.01346388 -0.90616979 -0.42269969);
+ e1 (0.00627978 0.42265304 -0.90626981);
+ // STARCDRotation (-90.8512386 0 115.005148);
+}
+
+system_16
+{
+ type cartesian;
+ origin (0.540824938 -0.240036415 0.15928296);
+ e3 (-0.01346388 -0.90616979 -0.42269969);
+ e1 (0.00627978 0.42265304 -0.90626981);
+ // STARCDRotation (-90.8512386 0 115.005148);
+}
+
+system_17
+{
+ type cartesian;
+ origin (0.436877646 -0.240036339 0.162593737);
+ e3 (-0.01346388 -0.90616979 -0.42269969);
+ e1 (0.00627978 0.42265304 -0.90626981);
+ // STARCDRotation (-90.8512386 0 115.005148);
+}
+
+system_18
+{
+ type cartesian;
+ origin (0.332930354 -0.240036261 0.16590451);
+ e3 (-0.01346388 -0.90616979 -0.42269969);
+ e1 (0.00627978 0.42265304 -0.90626981);
+ // STARCDRotation (-90.8512386 0 115.005148);
+}
+
+system_21
+{
+ type cartesian;
+ origin (0.55863733 -0.300866705 0.00317260982);
+ e3 (0.42110287 0.02470132 -0.90667647);
+ e1 (0.90646036 0.02342535 0.42164069);
+ // STARCDRotation (-178.185897 -0.71772221 -155.059695);
+}
+)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/surface/surfaceCoordinateSystemTransform/surfaceCoordinateSystemTransform.C b/applications/utilities/surface/surfaceCoordinateSystemTransform/surfaceCoordinateSystemTransform.C
new file mode 100644
index 0000000000..8453d6f94a
--- /dev/null
+++ b/applications/utilities/surface/surfaceCoordinateSystemTransform/surfaceCoordinateSystemTransform.C
@@ -0,0 +1,235 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2008 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Application
+ surfaceMeshCoordinateSystemTransform
+
+Description
+
+ Transform (scale/rotate/translate) a surface based on
+ a coordinateSystem.
+
+Usage
+ - surfaceMeshCoordinateSystemTransform inputFile outputFile [OPTION]
+
+ @param -clean \n
+ Perform some surface checking/cleanup on the input surface
+
+ @param -scale \ \n
+ Specify a scaling factor for writing the files
+
+ @param -triSurface \n
+ Use triSurface library for input/output
+
+ @param -dict \ \n
+ Specify an alternative dictionary for coordinateSystems.
+
+Note
+ The filename extensions are used to determine the file format type.
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "timeSelector.H"
+#include "Time.H"
+
+#include "MeshedSurfaces.H"
+#include "UnsortedMeshedSurfaces.H"
+#include "coordinateSystems.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Main program:
+
+int main(int argc, char *argv[])
+{
+ argList::noParallel();
+ argList::validArgs.append("inputFile");
+ argList::validArgs.append("outputFile");
+ argList::validOptions.insert("scale", "scale");
+ argList::validOptions.insert("unsorted", "");
+ argList::validOptions.insert("from", "sourceCoordinateSystem");
+ argList::validOptions.insert("to", "targetCoordinateSystem");
+ argList::validOptions.insert("dict", "dictionary");
+
+ argList args(argc, argv);
+ Time runTime(args.rootPath(), args.caseName());
+ const stringList& params = args.additionalArgs();
+
+ word dictName("coordinateSystems");
+ fileName dictPath(runTime.constant());
+ fileName dictLocal;
+
+ if (args.options().found("dict"))
+ {
+ wordList elems(fileName(args.options()["dict"]).components());
+ dictName = elems[elems.size()-1];
+ dictPath = elems[0];
+ dictLocal = "";
+
+ if (elems.size() == 1)
+ {
+ dictPath = ".";
+ }
+ else if (elems.size() > 2)
+ {
+ dictLocal = fileName(SubList(elems, elems.size()-2, 1));
+ }
+ }
+
+ autoPtr fromCsys;
+ autoPtr toCsys;
+
+ if (args.options().found("from") || args.options().found("to"))
+ {
+ IOobject csDictIo
+ (
+ dictName,
+ dictPath,
+ dictLocal,
+ runTime,
+ IOobject::MUST_READ,
+ IOobject::NO_WRITE,
+ false
+ );
+
+ if (!csDictIo.headerOk())
+ {
+ FatalErrorIn(args.executable())
+ << "Cannot open coordinateSystems file\n "
+ << csDictIo.objectPath() << nl
+ << exit(FatalError);
+ }
+
+ coordinateSystems csLst(csDictIo);
+
+ if (args.options().found("from"))
+ {
+ word csName(args.options()["from"]);
+
+ label csId = csLst.find(csName);
+ if (csId < 0)
+ {
+ FatalErrorIn(args.executable())
+ << "Cannot find -from " << csName << nl
+ << "available coordinateSystems: " << csLst.toc() << nl
+ << exit(FatalError);
+ }
+
+ fromCsys.reset(new coordinateSystem(csLst[csId]));
+ }
+
+ if (args.options().found("to"))
+ {
+ word csName(args.options()["to"]);
+
+ label csId = csLst.find(csName);
+ if (csId < 0)
+ {
+ FatalErrorIn(args.executable())
+ << "Cannot find -to " << csName << nl
+ << "available coordinateSystems: " << csLst.toc() << nl
+ << exit(FatalError);
+ }
+
+ toCsys.reset(new coordinateSystem(csLst[csId]));
+ }
+
+
+ // maybe fix this later
+ if (fromCsys.valid() && toCsys.valid())
+ {
+ FatalErrorIn(args.executable())
+ << "Only allowed -from or -to option at the moment."
+ << exit(FatalError);
+ }
+ }
+
+ scalar scaleFactor = 0;
+ if (args.options().found("scale"))
+ {
+ IStringStream(args.options()["scale"])() >> scaleFactor;
+ }
+
+ fileName importName(params[0]);
+ fileName exportName(params[1]);
+
+ if (importName == exportName)
+ {
+ FatalErrorIn(args.executable())
+ << "Output file " << exportName << " would overwrite input file."
+ << exit(FatalError);
+ }
+
+ if
+ (
+ !meshedSurface::canRead(importName, true)
+ || !meshedSurface::canWriteType(exportName.ext(), true)
+ )
+ {
+ return 1;
+ }
+
+
+ {
+ MeshedSurface surf(importName);
+
+ if (args.options().found("clean"))
+ {
+ surf.cleanup(true);
+ surf.checkOrientation(true);
+ }
+
+ if (fromCsys.valid())
+ {
+ tmp tpf = fromCsys().localPosition(surf.points());
+ surf.movePoints(tpf());
+ }
+
+ if (toCsys.valid())
+ {
+ tmp tpf = toCsys().globalPosition(surf.points());
+ surf.movePoints(tpf());
+ }
+
+ Info<< "writing " << exportName;
+ if (scaleFactor <= 0)
+ {
+ Info<< " without scaling" << endl;
+ }
+ else
+ {
+ Info<< " with scaling " << scaleFactor << endl;
+ surf.scalePoints(scaleFactor);
+ }
+ surf.write(exportName);
+ }
+
+ Info<< "\nEnd\n" << endl;
+
+ return 0;
+}
+
+// ************************************************************************* //
diff --git a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
index ad09dc328c..a907c7208c 100644
--- a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
+++ b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
@@ -40,6 +40,9 @@ Usage
@param -triSurface \n
Use triSurface library for input/output
+ @param -keyed \n
+ Use keyedSurface for input/output
+
Note
The filename extensions are used to determine the file format type.
@@ -49,9 +52,11 @@ Note
#include "timeSelector.H"
#include "Time.H"
#include "polyMesh.H"
-#include "meshedSurface.H"
#include "triSurface.H"
+#include "MeshedSurfaces.H"
+#include "UnsortedMeshedSurfaces.H"
+
using namespace Foam;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -62,9 +67,11 @@ int main(int argc, char *argv[])
argList::noParallel();
argList::validArgs.append("inputFile");
argList::validArgs.append("outputFile");
- argList::validOptions.insert("scale", "scale");
argList::validOptions.insert("clean", "");
+ argList::validOptions.insert("scale", "scale");
argList::validOptions.insert("triSurface", "");
+ argList::validOptions.insert("unsorted", "");
+ argList::validOptions.insert("triFace", "");
# include "setRootCase.H"
const stringList& params = args.additionalArgs();
@@ -77,10 +84,17 @@ int main(int argc, char *argv[])
fileName importName(params[0]);
fileName exportName(params[1]);
+ if (importName == exportName)
+ {
+ FatalErrorIn(args.executable())
+ << "Output file " << exportName << " would overwrite input file."
+ << exit(FatalError);
+ }
+
if
(
- !meshedSurface::canRead(importName.ext(), true)
- || !meshedSurface::canWrite(exportName.ext(), true)
+ !meshedSurface::canRead(importName, true)
+ || !meshedSurface::canWriteType(exportName.ext(), true)
)
{
return 1;
@@ -88,10 +102,6 @@ int main(int argc, char *argv[])
if (args.options().found("triSurface"))
{
-// # include "createTime.H"
-// instantList timeDirs = timeSelector::select0(runTime, args);
-// # include "createPolyMesh.H"
-
triSurface surf(importName);
if (args.options().found("clean"))
@@ -107,15 +117,16 @@ int main(int argc, char *argv[])
}
else
{
- Info<< " triSurface does not yet support scaling "
- << scaleFactor << endl;
- // surf.scalePoints(scaleFactor);
+ Info<< " with scaling " << scaleFactor << endl;
+ surf.scalePoints(scaleFactor);
}
- surf.write(exportName);
+
+ // write sorted by region
+ surf.write(exportName, true);
}
- else
+ else if (args.options().found("unsorted"))
{
- meshedSurface surf(importName);
+ UnsortedMeshedSurface surf(importName);
if (args.options().found("clean"))
{
@@ -123,7 +134,29 @@ int main(int argc, char *argv[])
surf.checkOrientation(true);
}
- surf.scalePoints(scaleFactor);
+ Info << "writing " << exportName;
+ if (scaleFactor <= 0)
+ {
+ Info<< " without scaling" << endl;
+ }
+ else
+ {
+ Info<< " with scaling " << scaleFactor << endl;
+ surf.scalePoints(scaleFactor);
+ }
+
+ surf.write(exportName);
+ }
+#if 1
+ else if (args.options().found("triFace"))
+ {
+ MeshedSurface surf(importName);
+
+ if (args.options().found("clean"))
+ {
+ surf.cleanup(true);
+ surf.checkOrientation(true);
+ }
Info<< "writing " << exportName;
if (scaleFactor <= 0)
@@ -133,6 +166,30 @@ int main(int argc, char *argv[])
else
{
Info<< " with scaling " << scaleFactor << endl;
+ surf.scalePoints(scaleFactor);
+ }
+ surf.write(exportName);
+ }
+#endif
+ else
+ {
+ MeshedSurface surf(importName);
+
+ if (args.options().found("clean"))
+ {
+ surf.cleanup(true);
+ surf.checkOrientation(true);
+ }
+
+ Info<< "writing " << exportName;
+ if (scaleFactor <= 0)
+ {
+ Info<< " without scaling" << endl;
+ }
+ else
+ {
+ Info<< " with scaling " << scaleFactor << endl;
+ surf.scalePoints(scaleFactor);
}
surf.write(exportName);
}
diff --git a/bin/foamTemplates/source/foamAppTemplate.C b/bin/foamTemplates/source/foamAppTemplate.C
index 351c9d251b..bef53f7f8e 100644
--- a/bin/foamTemplates/source/foamAppTemplate.C
+++ b/bin/foamTemplates/source/foamAppTemplate.C
@@ -36,10 +36,10 @@ Description
int main(int argc, char *argv[])
{
+ #include "setRootCase.H"
+ #include "createTime.H"
-# include "setRootCase.H"
-# include "createTime.H"
-
+ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info << "End\n" << endl;
diff --git a/bin/foamTemplates/source/foamTemplate.C b/bin/foamTemplates/source/foamTemplate.C
index 99bea11c39..fc947cf9b4 100644
--- a/bin/foamTemplates/source/foamTemplate.C
+++ b/bin/foamTemplates/source/foamTemplate.C
@@ -31,7 +31,7 @@ License
const dataType Foam::className::staticData();
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -71,10 +71,16 @@ Foam::className::~className()
{}
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
-// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
+// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * //
void Foam::className::operator=(const className& rhs)
{
@@ -87,11 +93,10 @@ void Foam::className::operator=(const className& rhs)
}
}
-
-// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * * //
-// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * * //
// ************************************************************************* //
diff --git a/bin/foamTemplates/sourceTemplate/foamTemplateTemplate.C b/bin/foamTemplates/sourceTemplate/foamTemplateTemplate.C
index 92038d8199..f0955b92e4 100644
--- a/bin/foamTemplates/sourceTemplate/foamTemplateTemplate.C
+++ b/bin/foamTemplates/sourceTemplate/foamTemplateTemplate.C
@@ -32,7 +32,7 @@ template
const dataType Foam::ClassName::staticData();
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -84,10 +84,16 @@ Foam::ClassName::~ClassName()
{}
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
+// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * //
template
void Foam::ClassName::operator=
@@ -108,10 +114,10 @@ void Foam::ClassName::operator=
}
-// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * * //
-// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * * //
// ************************************************************************* //
diff --git a/doc/Allwmake b/doc/Allwmake
index e75f1030e2..e180b24e0f 100755
--- a/doc/Allwmake
+++ b/doc/Allwmake
@@ -6,6 +6,6 @@ chmod a+rX $WM_PROJECT_DIR
chmod a+rX $WM_PROJECT_DIR/doc
chmod -R a+rX Doxygen
-( cd Doxygen && ./Allwmake )
+Doxygen/Allwmake
# ----------------------------------------------------------------- end-of-file
diff --git a/etc/apps/cint/bashrc b/etc/apps/cint/bashrc
index 11909e0487..298ef2639a 100644
--- a/etc/apps/cint/bashrc
+++ b/etc/apps/cint/bashrc
@@ -31,9 +31,21 @@
#
#------------------------------------------------------------------------------
-export CINTSYSDIR=~/pub/CINT/cint7
-export PATH=$PATH:$CINTSYSDIR
-export MANPATH=$MANPATH:$CINTSYSDIR/doc
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$CINTSYSDIR
+for CINTSYSDIR in \
+ $HOME/pub/CINT/cint7 \
+ $WM_THIRD_PARTY_DIR/cint-svn/platforms/$WM_OPTIONS \
+ ;
+do
+ if [ -r $CINTSYSDIR ]
+ then
+ export CINTSYSDIR
+ export PATH=$PATH:$CINTSYSDIR/bin
+ export MANPATH=$MANPATH:$CINTSYSDIR/doc
+ export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$CINTSYSDIR/lib
+ break
+ fi
+done
+
+[ -r "$CINTSYSDIR" ] || unset CINTSYSDIR
# -----------------------------------------------------------------------------
diff --git a/etc/apps/ensightFoam/bashrc b/etc/apps/ensight/bashrc
similarity index 93%
rename from etc/apps/ensightFoam/bashrc
rename to etc/apps/ensight/bashrc
index e2fd320048..52d7ba4869 100644
--- a/etc/apps/ensightFoam/bashrc
+++ b/etc/apps/ensight/bashrc
@@ -32,19 +32,23 @@
#------------------------------------------------------------------------------
# fallback value
-if [ ! -d "$CEI_HOME" ]; then
+if [ ! -d "$CEI_HOME" ]
+then
export CEI_HOME=/usr/local/ensight/CEI
fi
-if [ -r $CEI_HOME ]; then
+if [ -r $CEI_HOME ]
+then
# special treatment for 32bit FOAM and 64bit Ensight
- if [ "$WM_ARCH" = linux -a `uname -m` = x86_64 ]; then
+ if [ "$WM_ARCH" = linux -a `uname -m` = x86_64 ]
+ then
export CEI_ARCH=linux_2.6_32
fi
# add to path if required
- if [ "$CEI_HOME/bin/ensight" != "`which ensight 2>/dev/null`" ]; then
+ if [ "$CEI_HOME/bin/ensight" != "`which ensight 2>/dev/null`" ]
+ then
export PATH=$CEI_HOME/bin:$PATH
fi
diff --git a/etc/apps/ensightFoam/cshrc b/etc/apps/ensight/cshrc
similarity index 100%
rename from etc/apps/ensightFoam/cshrc
rename to etc/apps/ensight/cshrc
diff --git a/etc/apps/paraview/bashrc b/etc/apps/paraview/bashrc
index 87a75e0b7a..73d0e4c778 100644
--- a/etc/apps/paraview/bashrc
+++ b/etc/apps/paraview/bashrc
@@ -33,7 +33,8 @@
export CMAKE_HOME=$WM_THIRD_PARTY_DIR/cmake-2.4.6/platforms/$WM_ARCH
-if [ -r $CMAKE_HOME ]; then
+if [ -r $CMAKE_HOME ]
+then
export PATH=$CMAKE_HOME/bin:$PATH
fi
@@ -42,14 +43,16 @@ export ParaView_VERSION=2.4.4
export ParaView_INST_DIR=$WM_THIRD_PARTY_DIR/ParaView$ParaView_VERSION
export ParaView_DIR=$ParaView_INST_DIR/lib/paraview-2.4
-if [ -r $ParaView_INST_DIR ]; then
+if [ -r $ParaView_INST_DIR ]
+then
export PV_INTERFACE_PATH=$FOAM_UTILITIES/postProcessing/graphics/PVFoamReader/PVFoamReader/Make
export PATH=$ParaView_INST_DIR/bin:$PATH
export LD_LIBRARY_PATH=${ParaView_INST_DIR}/lib:${ParaView_INST_DIR}/lib/vtk:${LD_LIBRARY_PATH}
fi
-if [ -r $ParaView_DIR ]; then
+if [ -r $ParaView_DIR ]
+then
export VTK_DIR=$ParaView_DIR/VTK
fi
diff --git a/etc/apps/paraview3/bashrc b/etc/apps/paraview3/bashrc
index b8da8ba698..8ff8781051 100644
--- a/etc/apps/paraview3/bashrc
+++ b/etc/apps/paraview3/bashrc
@@ -33,7 +33,8 @@
export CMAKE_HOME=$WM_THIRD_PARTY_DIR/cmake-2.4.6/platforms/$WM_ARCH
-if [ -r $CMAKE_HOME ]; then
+if [ -r $CMAKE_HOME ]
+then
export PATH=$CMAKE_HOME/bin:$PATH
else
unset CMAKE_HOME
@@ -44,14 +45,16 @@ export ParaView_VERSION="3.3-cvs"
export ParaView_INST_DIR=$WM_THIRD_PARTY_DIR/ParaView$ParaView_VERSION
export ParaView_DIR=$ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER
-if [ "$PYTHONPATH" ]; then
+if [ "$PYTHONPATH" ]
+then
export PYTHONPATH=$PYTHONPATH:$ParaView_DIR/Utilities/VTKPythonWrapping:$ParaView_DIR/lib/paraview-3.3
else
export PYTHONPATH=$ParaView_DIR/Utilities/VTKPythonWrapping:$ParaView_DIR/lib/paraview-3.3
fi
-if [ -r $ParaView_DIR ]; then
+if [ -r $ParaView_DIR ]
+then
export PATH=$ParaView_DIR/bin:$PATH
export LD_LIBRARY_PATH=$ParaView_DIR/bin:$LD_LIBRARY_PATH
export PV_PLUGIN_PATH=$FOAM_LIBBIN
diff --git a/etc/bashrc b/etc/bashrc
index b862b6a933..ec96457be2 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -33,7 +33,7 @@
#------------------------------------------------------------------------------
export WM_PROJECT=OpenFOAM
-#export WM_PROJECT_VERSION=1.5.x
+# export WM_PROJECT_VERSION=1.5.x
: ${WM_PROJECT_VERSION:=dev}; export WM_PROJECT_VERSION
@@ -91,7 +91,7 @@ export WM_COMPILER_LIB_ARCH=
# WM_JAVAC_OPTION = Opt | Debug
: ${WM_JAVAC_OPTION:=Opt}; export WM_JAVAC_OPTION
-# WM_MPLIB = | OPENMPI| LAM | MPICH | MPICH-GM | GAMMA | MPI
+# WM_MPLIB = | OPENMPI| LAM | MPICH | MPICH-GM | HPMPI | GAMMA | MPI
: ${WM_MPLIB:=OPENMPI}; export WM_MPLIB
@@ -152,7 +152,7 @@ Linux)
cat <
+template
+Foam::HashSet::HashSet(const HashTable& ht)
+:
+ HashTable(ht.size())
{
+ for
+ (
+ typename HashTable::const_iterator iter = ht.begin();
+ iter != ht.end();
+ ++iter
+ )
+ {
+ insert(iter.key());
+ }
+}
+
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
template
-bool HashSet::operator==(const HashSet& ht) const
+bool Foam::HashSet::operator==(const HashSet& rhs) const
{
- const HashTable& a = *this;
-
- // Are all my elements in ht?
- for
- (
- typename HashTable::const_iterator iter = a.begin();
- iter != a.end();
- ++iter
- )
+ // Are all lhs elements in rhs?
+ for (const_iterator iter = this->begin(); iter != this->end(); ++iter)
{
- if (!ht.found(iter.key()))
+ if (!rhs.found(iter.key()))
{
return false;
}
}
- // Are all ht elements in me?
- for
- (
- typename HashTable::const_iterator iter = ht.begin();
- iter != ht.end();
- ++iter
- )
+ // Are all rhs elements in lhs?
+ for (const_iterator iter = rhs.begin(); iter != rhs.end(); ++iter)
{
if (!found(iter.key()))
{
return false;
}
}
+
return true;
}
template
-bool HashSet::operator!=(const HashSet& ht) const
+bool Foam::HashSet::operator!=(const HashSet& rhs) const
{
- return !(operator==(ht));
+ return !(operator==(rhs));
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+template
+void Foam::HashSet::operator|=(const HashSet& rhs)
+{
+ // Add rhs elements into lhs
+ for (const_iterator iter = rhs.begin(); iter != rhs.end(); ++iter)
+ {
+ insert(iter.key());
+ }
+}
+
+
+template
+void Foam::HashSet::operator&=(const HashSet& rhs)
+{
+ // Remove elements not also found in rhs
+ for (iterator iter = this->begin(); iter != this->end(); ++iter)
+ {
+ if (!rhs.found(iter.key()))
+ {
+ erase(iter);
+ }
+ }
+}
+
+
+template
+void Foam::HashSet::operator^=(const HashSet& rhs)
+{
+ // Add missed rhs elements, remove duplicate elements
+ for (const_iterator iter = rhs.begin(); iter != rhs.end(); ++iter)
+ {
+ if (found(iter.key()))
+ {
+ erase(iter.key());
+ }
+ else
+ {
+ insert(iter.key());
+ }
+ }
+}
+
+
+template
+void Foam::HashSet::operator-=(const HashSet& rhs)
+{
+ // Remove rhs elements from lhs
+ for (const_iterator iter = rhs.begin(); iter != rhs.end(); ++iter)
+ {
+ erase(iter.key());
+ }
+}
-} // End namespace Foam
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
+/* * * * * * * * * * * * * * * * Global operators * * * * * * * * * * * * * */
+
+template