diff --git a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
index c23d85bfe8583c466793b02b7c8a3995a49de2b9..85bba58da3fb9cb468140847eb7157cfd65235a8 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
{
argList::addOption
(
- "cloudName",
+ "cloud",
"name",
"specify alternative cloud name. default is 'kinematicCloud'"
);
diff --git a/applications/solvers/lagrangian/DPMFoam/createFields.H b/applications/solvers/lagrangian/DPMFoam/createFields.H
index 26467976f5ea855bd82f24b057582cc073486f7c..49f280e428cde8cd74a1fcf64ddfaca2c25b8979 100644
--- a/applications/solvers/lagrangian/DPMFoam/createFields.H
+++ b/applications/solvers/lagrangian/DPMFoam/createFields.H
@@ -11,7 +11,7 @@ word continuousPhaseName
mesh,
IOobject::MUST_READ
)
- ).lookup("continuousPhaseName")
+ ).lookup("continuousPhase")
);
Info<< "Reading field U\n" << endl;
@@ -123,7 +123,7 @@ volScalarField alphac
);
word kinematicCloudName("kinematicCloud");
-args.optionReadIfPresent("cloudName", kinematicCloudName);
+args.optionReadIfPresent("cloud", kinematicCloudName);
Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
basicKinematicTypeCloud kinematicCloud
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
index 77287eed8762add0ddab922cc4a1f68124078298..76c70fffd956a200f85eae6478cfce2aba769cf0 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
@@ -58,7 +58,7 @@ volScalarField mu
);
word kinematicCloudName("kinematicCloud");
-args.optionReadIfPresent("cloudName", kinematicCloudName);
+args.optionReadIfPresent("cloud", kinematicCloudName);
Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
basicKinematicCollidingCloud kinematicCloud
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
index d672386e50f80522a9dccd099d2c1699b17274fb..be0905796ba3c19f8b98aefd7ddcc8802cfb7cc1 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
{
argList::addOption
(
- "cloudName",
+ "cloud",
"name",
"specify alternative cloud name. default is 'kinematicCloud'"
);
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
index c21100b0be8a548695a23e40b65a8a35a2ae2cce..6b64ce99f3ec5c85dec29edff53244b5a5615d54 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
{
argList::addOption
(
- "cloudName",
+ "cloud",
"name",
"specify alternative cloud name. default is 'kinematicCloud'"
);
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H
index 9f728049f9b6885398601cfd83e36ba49fc95b58..9aa648ce5f922b0fc3f4a210bb8c1a0d34cbab7f 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H
@@ -51,7 +51,7 @@ autoPtr<compressible::turbulenceModel> turbulence
const word kinematicCloudName
(
- args.optionLookupOrDefault<word>("cloudName", "kinematicCloud")
+ args.optionLookupOrDefault<word>("cloud", "kinematicCloud")
);
Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
index d3a1f829fdfb4726ef559d8e2760753d4690d2f1..006c98b7a8894a65879af2fc732cfe7c31075b63 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
{
argList::addOption
(
- "cloudName",
+ "cloud",
"name",
"specify alternative cloud name. default is 'kinematicCloud'"
);
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
index 2f7abc70151a85dc9a972983b0dcf34e002030f3..63c85938cfdd90dafbc7e0eb13c01229d9e6542f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
@@ -49,7 +49,7 @@ Foam::copiedFixedValueFvPatchScalarField::copiedFixedValueFvPatchScalarField
)
:
fixedValueFvPatchScalarField(p, iF, dict),
- sourceFieldName_(dict.lookup("sourceFieldName"))
+ sourceFieldName_(dict.lookup("sourceField"))
{}
@@ -109,7 +109,7 @@ void Foam::copiedFixedValueFvPatchScalarField::updateCoeffs()
void Foam::copiedFixedValueFvPatchScalarField::write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
- os.writeKeyword("sourceFieldName")
+ os.writeKeyword("sourceField")
<< sourceFieldName_ << token::END_STATEMENT << nl;
writeEntry("value", os);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H
index b2af2f1c4a8003f59546485d7d33e4d65104d3b4..f0f224d3535c71ede737227893f4f107bc19957e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H
@@ -62,6 +62,7 @@ protected:
word sourceFieldName_;
+
public:
//- Runtime type information
diff --git a/applications/test/dimensionedType/Test-dimensionedType.C b/applications/test/dimensionedType/Test-dimensionedType.C
index 965de25ead7de6a51ba17d9e7402dde8d1941b1b..892552fa7082c575e76bcec73e980e9c3e1938dd 100644
--- a/applications/test/dimensionedType/Test-dimensionedType.C
+++ b/applications/test/dimensionedType/Test-dimensionedType.C
@@ -81,6 +81,10 @@ int main(int argc, char *argv[])
}
+ Pout<< "zero scalar (time): " << dimensionedScalar(dimTime) << endl;
+ Pout<< "zero vector: " << dimensionedVector(dimLength) << endl;
+ Pout<< "zero tensor: " << dimensionedTensor(dimLength) << endl;
+
Info<< "End\n" << endl;
return 0;
diff --git a/applications/test/objectRegistry/Make/files b/applications/test/objectRegistry/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..b7c477f791db2df46c2c1b5e69deeca333fa99f0
--- /dev/null
+++ b/applications/test/objectRegistry/Make/files
@@ -0,0 +1,3 @@
+Test-objectRegistry.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-objectRegistry
diff --git a/applications/test/objectRegistry/Make/options b/applications/test/objectRegistry/Make/options
new file mode 100644
index 0000000000000000000000000000000000000000..6a9e9810b3d5ce6684bdaf03143933480ff45e42
--- /dev/null
+++ b/applications/test/objectRegistry/Make/options
@@ -0,0 +1,2 @@
+/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
+/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/objectRegistry/Test-objectRegistry.C b/applications/test/objectRegistry/Test-objectRegistry.C
new file mode 100644
index 0000000000000000000000000000000000000000..c807ba9c047d254f42aa023977e5f61e3fd08c65
--- /dev/null
+++ b/applications/test/objectRegistry/Test-objectRegistry.C
@@ -0,0 +1,278 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2016 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Application
+ Test-objectRegistry
+
+Description
+ Simple test of objectRegistry functionality.
+ Particular focus on the behaviour of subRegistry.
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "Time.H"
+#include "polyMesh.H"
+#include "IOstreams.H"
+#include "objectRegistry.H"
+#include "hashedWordList.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// file variable, needed for switching the default in lookupObject etc.
+bool recursive = false;
+
+
+template<class Type>
+Foam::Ostream& printList(Foam::Ostream& os, const UList<Type>& list)
+{
+ // list with out any linebreaks
+ os << '(';
+ forAll(list, i)
+ {
+ if (i) os << ' ';
+ os << list[i];
+ }
+ os << ')';
+
+ return os;
+}
+
+
+void printRegistry
+(
+ Foam::Ostream& os,
+ const Foam::objectRegistry& obr,
+ Foam::label indent = 4
+);
+
+
+void printRegistry
+(
+ Foam::Ostream& os,
+ const Foam::objectRegistry& obr,
+ Foam::label indent
+)
+{
+ hashedWordList regs = obr.names<objectRegistry>();
+ regs.sort();
+ wordList names = obr.sortedNames();
+
+ std::string prefix;
+ for (label i=indent; i; --i)
+ {
+ prefix += ' ';
+ }
+
+ os << '#' << prefix.c_str() << obr.name()
+ << " parent:" << obr.parent().name() << nl;
+
+ // all names
+ {
+ os << ' ' << prefix.c_str() << "objects: ";
+ printList(os, names) << nl;
+ }
+
+ // sub-registry names
+ {
+ os << ' ' << prefix.c_str() << "registries: ";
+ printList(os, regs) << nl;
+ }
+
+ // Print, but skip expansion of sub-registries for now
+ forAll(names, i)
+ {
+ const word& name = names[i];
+
+ os << (regs.found(name) ? '-' : ' ')
+ << prefix.c_str() << name << " => " << obr[name]->type() << nl;
+ }
+ for (label i=indent; i; --i)
+ {
+ os << '-'; // divider
+ }
+ os << '\n';
+
+ // Now descend into the sub-registries
+ forAll(regs, i)
+ {
+ const word& name = regs[i];
+ const objectRegistry& next = obr.lookupObject<objectRegistry>
+ (
+ name
+ );
+
+ os << prefix.c_str()
+ << "current:" << obr.name() << " next:"
+ << next.name() << " next-parent:" << next.parent().name() << nl;
+
+ os << prefix.c_str() << name << " => " << obr[name]->type();
+
+ if ("dictionary" == obr[name]->type())
+ {
+ os << " (skip dictionary)" << nl;
+ }
+ else
+ {
+ os << nl;
+ printRegistry(os, next, indent + 4);
+ }
+ }
+}
+
+// Main program:
+
+int main(int argc, char *argv[])
+{
+ argList::noBanner();
+ argList::noParallel();
+ argList::addBoolOption
+ (
+ "mesh",
+ "test with polyMesh objectRegistry instead of runTime"
+ );
+ argList::addBoolOption
+ (
+ "skip",
+ "skip some parts"
+ );
+ // argList::validArgs.append("recursive (true|false)");
+
+ #include "setRootCase.H"
+ #include "createTime.H"
+ #include "createPolyMesh.H"
+
+ // recursive = Switch(args[1]);
+
+ const bool optMesh = args.optionFound("mesh");
+ const bool optSkip = args.optionFound("skip");
+ const objectRegistry& db = (optMesh ? mesh.thisDb() : runTime);
+
+ Info<<"## start ##" << nl;
+ printRegistry(Info, db);
+ Info<< nl;
+
+ const label nRegs = 3;
+
+ // Add some items
+ for (label j = 0; j < 3; ++j)
+ {
+ word entryName = "entry" + name(j);
+ db.subRegistry
+ (
+ entryName,
+ true
+ );
+ }
+
+ Info<<"## initally populated ##" << nl;
+ printRegistry(Info, db);
+ Info<< nl;
+
+
+ // create a few sub-registries
+ for (label i = 0; i < nRegs; ++i)
+ {
+ word regName = "subreg" + name(i);
+
+ const objectRegistry& subreg = db.subRegistry
+ (
+ regName,
+ true
+ );
+
+ for (label j = 0; j < 3; ++j)
+ {
+ word entryName = "entry" + name(j);
+
+ subreg.subRegistry
+ (
+ entryName,
+ true
+ );
+ subreg.subRegistry
+ (
+ "$" + entryName, // qualified to avoid collisions
+ true
+ );
+ }
+ }
+
+ Info<<"## after adding sub-registries" << nl;
+ printRegistry(Info, db);
+ Info<< nl;
+
+ // Add further items into top-level
+ for (label j = 0; j < 6; ++j)
+ {
+ word entryName = "entry" + name(j);
+ db.subRegistry
+ (
+ entryName,
+ true
+ );
+ }
+
+ Info<< "after adding some entries, top-level now contains: ";
+ printList(Info, db.names()) << endl;
+
+ Info<<"## Now attempt to add a few more entries ##" << nl;
+
+ // Try adding the same items into sub registry
+ // create a few sub-registries
+ for (label i = 0; i < nRegs; ++i)
+ {
+ word regName = "subreg" + name(i);
+
+ const objectRegistry& subreg = db.subRegistry
+ (
+ regName,
+ false
+ );
+
+ if (!optSkip)
+ {
+ for (label j = 0; j < 6; ++j)
+ {
+ word entryName = "entry" + name(j);
+
+ subreg.subRegistry
+ (
+ entryName,
+ true
+ );
+ }
+ }
+ }
+
+ Info<<"## Complete picture ##" << nl;
+ printRegistry(Info, db);
+ Info<< nl;
+
+ return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/passiveParticle/Test-passiveParticle.C b/applications/test/passiveParticle/Test-passiveParticle.C
index 68bea7b8efa18ec762d7e1e9a214ba105fa70f5e..96fcc35282763998eb81537b3cfd167eb8f2882b 100644
--- a/applications/test/passiveParticle/Test-passiveParticle.C
+++ b/applications/test/passiveParticle/Test-passiveParticle.C
@@ -36,7 +36,7 @@ Description
int main(int argc, char *argv[])
{
- argList::validArgs.append("cloudName");
+ argList::validArgs.append("cloud");
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index 25c536e10324d176ee0025f40c0d40ae9d57447f..7385fd502936689b5ad5f9cdcffcb311161c50a3 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -602,8 +602,8 @@ int main(int argc, char *argv[])
const word& key = iter().keyword();
const dictionary& dict = iter().dict();
- const word cyclicName = dict.lookup("cyclicMasterPatchName");
- const word wallName = dict.lookup("wallPatchName");
+ const word cyclicName = dict.lookup("cyclicMasterPatch");
+ const word wallName = dict.lookup("wallPatch");
FixedList<word, 3> nameAndType;
nameAndType[0] = key;
nameAndType[1] = wallName;
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMesh.C b/applications/utilities/mesh/generation/blockMesh/blockMesh.C
index 4441f15e4934c61cf8135312682ea1e59c98c292..d48980cb8c06a4d15a9ea8b33e2980bbd11471e6 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMesh.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMesh.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -148,6 +148,15 @@ int main(int argc, char *argv[])
dictPath =
runTime.constant()
/regionPath/polyMesh::meshSubDir/dictName;
+
+ // Warn that constant/polyMesh/blockMesh was selected instead of
+ // system/blockMesh
+ WarningIn(args[0])
+ << "Using the old blockMeshDict location: "
+ << dictPath << nl
+ << " instead of the default location: "
+ << runTime.system()/regionPath/dictName << nl
+ << endl;
}
// Otherwise assume the dictionary is present in the system directory
else
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 7b998241d65bb686f7e2f22cfc751aca95b86587..ed0e635787ad1906f4c0c230423caf2943fd8008 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -901,33 +901,42 @@ int main(int argc, char *argv[])
// Read decomposePar dictionary
dictionary decomposeDict;
+ if (Pstream::parRun())
{
- if (Pstream::parRun())
- {
- fileName decompDictFile;
- args.optionReadIfPresent("decomposeParDict", decompDictFile);
+ fileName decompDictFile;
+ args.optionReadIfPresent("decomposeParDict", decompDictFile);
+
+ // A demand-driven decompositionMethod can have issues finding
+ // an alternative decomposeParDict location.
- decomposeDict = IOdictionary
+ IOdictionary* dictPtr = new IOdictionary
+ (
+ decompositionModel::selectIO
(
- decompositionModel::selectIO
+ IOobject
(
- IOobject
- (
- "decomposeParDict",
- runTime.system(),
- mesh,
- IOobject::MUST_READ_IF_MODIFIED,
- IOobject::NO_WRITE
- ),
- decompDictFile
- )
- );
- }
- else
- {
- decomposeDict.add("method", "none");
- decomposeDict.add("numberOfSubdomains", 1);
- }
+ "decomposeParDict",
+ runTime.system(),
+ runTime,
+ IOobject::MUST_READ,
+ IOobject::NO_WRITE
+ ),
+ decompDictFile
+ )
+ );
+
+ // Store it on the object registry, but to be found it must also
+ // have the expected "decomposeParDict" name.
+
+ dictPtr->rename("decomposeParDict");
+ runTime.store(dictPtr);
+
+ decomposeDict = *dictPtr;
+ }
+ else
+ {
+ decomposeDict.add("method", "none");
+ decomposeDict.add("numberOfSubdomains", 1);
}
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
index 6261216c655cca786a8818f1d050499c2d47f1c1..bf257a8ff55b8cfa687a2c9400cace03604bdc89 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
@@ -431,7 +431,11 @@ snapControls
// (wip) Optional for explicit feature snapping:
//- Detect baffle edges. Default is true.
//detectBaffles false;
- //- Erase attraction close to feature point. Default is false.
+ //- On any faces where points are on multiple regions (see
+ // multiRegionFeatureSnap) have the other points follow these points
+ // instead of having their own independent movement, i.e. have snapping
+ // to multi-region edges/points take priority. This might aid snapping
+ // to sharp edges that are also region edges. The default is false.
//releasePoints true;
//- Walk along feature edges, adding missing ones. Default is true.
//stringFeatures false;
diff --git a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
index ab692d470605646adab53f672af4c8233106eecb..71013769a13b163f1fdcdf92d78ce4ceaa412193 100644
--- a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
+++ b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -28,15 +28,31 @@ Group
grpMeshManipulationUtilities
Description
- Detects faces that share points (baffles). Either merge them or
+ Detects boundary faces that share points (baffles). Either merges them or
duplicate the points.
- Notes:
+Usage
+ \b mergeOrSplitBaffles [OPTION]
+
+ Options:
+ - \par -detect
+ Detect baffles and write to faceSet duplicateFaces.
+
+ - \par -merge
+ Detect baffles and convert to internal faces.
+
+ - \par -split
+ Detect baffles and duplicate the points (used so the two sides
+ can move independently)
+
+ - \par -dict \<dictionary\>
+ Specify a dictionary to read actions from.
+
+
+Note
- can only handle pairwise boundary faces. So three faces using
the same points is not handled (is illegal mesh anyway)
- - there is no option to only split/merge some baffles.
-
- surfaces consisting of duplicate faces can be topologically split
if the points on the interior of the surface cannot walk to all the
cells that use them in one go.
@@ -71,6 +87,7 @@ using namespace Foam;
void insertDuplicateMerge
(
const polyMesh& mesh,
+ const labelList& boundaryFaces,
const labelList& duplicates,
polyTopoChange& meshMod
)
@@ -87,8 +104,8 @@ void insertDuplicateMerge
{
// Two duplicate faces. Merge.
- label face0 = mesh.nInternalFaces() + bFacei;
- label face1 = mesh.nInternalFaces() + otherFacei;
+ label face0 = boundaryFaces[bFacei];
+ label face1 = boundaryFaces[otherFacei];
label own0 = faceOwner[face0];
label own1 = faceOwner[face1];
@@ -156,6 +173,45 @@ void insertDuplicateMerge
}
+label patchSize(const polyMesh& mesh, const labelList& patchIDs)
+{
+ const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+ label sz = 0;
+ forAll(patchIDs, i)
+ {
+ const polyPatch& pp = patches[patchIDs[i]];
+ sz += pp.size();
+ }
+ return sz;
+}
+
+
+labelList patchFaces(const polyMesh& mesh, const labelList& patchIDs)
+{
+ const polyBoundaryMesh& patches = mesh.boundaryMesh();
+
+ labelList faceIDs(patchSize(mesh, patchIDs));
+ label sz = 0;
+ forAll(patchIDs, i)
+ {
+ const polyPatch& pp = patches[patchIDs[i]];
+
+ forAll(pp, ppi)
+ {
+ faceIDs[sz++] = pp.start()+ppi;
+ }
+ }
+
+if (faceIDs.size() != sz)
+{
+ FatalErrorInFunction << exit(FatalError);
+}
+
+ return faceIDs;
+}
+
+
labelList findBaffles(const polyMesh& mesh, const labelList& boundaryFaces)
{
// Get all duplicate face labels (in boundaryFaces indices!).
@@ -173,7 +229,7 @@ labelList findBaffles(const polyMesh& mesh, const labelList& boundaryFaces)
{
if (duplicates[bFacei] != -1)
{
- label facei = mesh.nInternalFaces() + bFacei;
+ label facei = boundaryFaces[bFacei];
label patchi = patches.whichPatch(facei);
if (isA<processorPolyPatch>(patches[patchi]))
@@ -205,12 +261,12 @@ labelList findBaffles(const polyMesh& mesh, const labelList& boundaryFaces)
if (otherFacei != -1 && otherFacei > bFacei)
{
- duplicateSet.insert(mesh.nInternalFaces() + bFacei);
- duplicateSet.insert(mesh.nInternalFaces() + otherFacei);
+ duplicateSet.insert(boundaryFaces[bFacei]);
+ duplicateSet.insert(boundaryFaces[otherFacei]);
}
}
- Pout<< "Writing " << duplicateSet.size()
+ Info<< "Writing " << returnReduce(duplicateSet.size(), sumOp<label>())
<< " duplicate faces to faceSet " << duplicateSet.objectPath()
<< nl << endl;
duplicateSet.write();
@@ -220,8 +276,6 @@ labelList findBaffles(const polyMesh& mesh, const labelList& boundaryFaces)
}
-
-
int main(int argc, char *argv[])
{
argList::addNote
@@ -232,6 +286,7 @@ int main(int argc, char *argv[])
#include "addOverwriteOption.H"
#include "addRegionOption.H"
+ #include "addDictOption.H"
argList::addBoolOption
(
"detectOnly",
@@ -249,27 +304,91 @@ int main(int argc, char *argv[])
#include "createNamedMesh.H"
const word oldInstance = mesh.pointsInstance();
+ const polyBoundaryMesh& patches = mesh.boundaryMesh();
+ const bool readDict = args.optionFound("dict");
const bool split = args.optionFound("split");
const bool overwrite = args.optionFound("overwrite");
const bool detectOnly = args.optionFound("detectOnly");
- // Collect all boundary faces
- labelList boundaryFaces(mesh.nFaces() - mesh.nInternalFaces());
+ if (readDict && (split || detectOnly))
+ {
+ FatalErrorInFunction
+ << "Use of dictionary for settings not compatible with"
+ << " using command line arguments for \"split\""
+ << " or \"detectOnly\"" << exit(FatalError);
+ }
+
+
+ labelList detectPatchIDs;
+ labelList splitPatchIDs;
+ labelList mergePatchIDs;
- forAll(boundaryFaces, i)
+ if (readDict)
{
- boundaryFaces[i] = i+mesh.nInternalFaces();
+ const word dictName;
+ #include "setSystemMeshDictionaryIO.H"
+
+ Info<< "Reading " << dictName << "\n" << endl;
+ IOdictionary dict(dictIO);
+
+ if (dict.found("detect"))
+ {
+ wordReList patchNames(dict.subDict("detect").lookup("patches"));
+ detectPatchIDs = patches.patchSet(patchNames).sortedToc();
+ Info<< "Detecting baffles on " << detectPatchIDs.size()
+ << " patches with "
+ << returnReduce(patchSize(mesh, detectPatchIDs), sumOp<label>())
+ << " faces" << endl;
+ }
+ if (dict.found("merge"))
+ {
+ wordReList patchNames(dict.subDict("merge").lookup("patches"));
+ mergePatchIDs = patches.patchSet(patchNames).sortedToc();
+ Info<< "Detecting baffles on " << mergePatchIDs.size()
+ << " patches with "
+ << returnReduce(patchSize(mesh, mergePatchIDs), sumOp<label>())
+ << " faces" << endl;
+ }
+ if (dict.found("split"))
+ {
+ wordReList patchNames(dict.subDict("split").lookup("patches"));
+ splitPatchIDs = patches.patchSet(patchNames).sortedToc();
+ Info<< "Detecting baffles on " << splitPatchIDs.size()
+ << " patches with "
+ << returnReduce(patchSize(mesh, splitPatchIDs), sumOp<label>())
+ << " faces" << endl;
+ }
+ }
+ else
+ {
+ if (detectOnly)
+ {
+ detectPatchIDs = identity(patches.size());
+ }
+ else if (split)
+ {
+ splitPatchIDs = identity(patches.size());
+ }
+ else
+ {
+ mergePatchIDs = identity(patches.size());
+ }
}
- if (detectOnly)
+ if (detectPatchIDs.size())
{
- findBaffles(mesh, boundaryFaces);
- return 0;
+ findBaffles(mesh, patchFaces(mesh, detectPatchIDs));
+
+ if (detectOnly)
+ {
+ return 0;
+ }
}
+
// Read objects in time directory
IOobjectList objects(mesh, runTime.timeName());
@@ -308,64 +427,118 @@ int main(int argc, char *argv[])
ReadFields(mesh, objects, stFlds);
- // Mesh change engine
- polyTopoChange meshMod(mesh);
+ if (mergePatchIDs.size())
+ {
+ Info<< "Merging duplicate faces" << nl << endl;
+
+ // Mesh change engine
+ polyTopoChange meshMod(mesh);
+
+ const labelList boundaryFaces(patchFaces(mesh, mergePatchIDs));
+
+ // Get all duplicate face pairs (in boundaryFaces indices!).
+ labelList duplicates(findBaffles(mesh, boundaryFaces));
+
+ // Merge into internal faces.
+ insertDuplicateMerge(mesh, boundaryFaces, duplicates, meshMod);
+
+ if (!overwrite)
+ {
+ runTime++;
+ }
- if (split)
+ // Change the mesh. No inflation.
+ autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false);
+
+ // Update fields
+ mesh.updateMesh(map);
+
+ // Move mesh (since morphing does not do this)
+ if (map().hasMotionPoints())
+ {
+ mesh.movePoints(map().preMotionPoints());
+ }
+
+ if (overwrite)
+ {
+ mesh.setInstance(oldInstance);
+ }
+ Info<< "Writing mesh to time " << runTime.timeName() << endl;
+ mesh.write();
+ }
+
+
+ if (splitPatchIDs.size())
{
- Pout<< "Topologically splitting duplicate surfaces"
- << ", i.e. duplicating points internal to duplicate surfaces."
+ Info<< "Topologically splitting duplicate surfaces"
+ << ", i.e. duplicating points internal to duplicate surfaces"
<< nl << endl;
+ // Determine points on split patches
+ DynamicList<label> candidates;
+ {
+ label sz = 0;
+ forAll(splitPatchIDs, i)
+ {
+ sz += patches[splitPatchIDs[i]].nPoints();
+ }
+ candidates.setCapacity(sz);
+
+ PackedBoolList isCandidate(mesh.nPoints());
+ forAll(splitPatchIDs, i)
+ {
+ const labelList& mp = patches[splitPatchIDs[i]].meshPoints();
+ forAll(mp, mpi)
+ {
+ label pointi = mp[mpi];
+ if (isCandidate.set(pointi))
+ {
+ candidates.append(pointi);
+ }
+ }
+ }
+ }
+
+
// Analyse which points need to be duplicated
- localPointRegion regionSide(mesh);
+ localPointRegion regionSide(mesh, candidates);
// Point duplication engine
duplicatePoints pointDuplicator(mesh);
+ // Mesh change engine
+ polyTopoChange meshMod(mesh);
+
// Insert topo changes
pointDuplicator.setRefinement(regionSide, meshMod);
- }
- else
- {
- Pout<< "Merging duplicate faces."
- << nl << endl;
- // Get all duplicate face labels (in boundaryFaces indices!).
- labelList duplicates(findBaffles(mesh, boundaryFaces));
-
- // Merge into internal faces.
- insertDuplicateMerge(mesh, duplicates, meshMod);
- }
+ if (!overwrite)
+ {
+ runTime++;
+ }
- if (!overwrite)
- {
- runTime++;
- }
+ // Change the mesh. No inflation.
+ autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false);
- // Change the mesh. No inflation.
- autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false);
+ // Update fields
+ mesh.updateMesh(map);
- // Update fields
- mesh.updateMesh(map);
+ // Move mesh (since morphing does not do this)
+ if (map().hasMotionPoints())
+ {
+ mesh.movePoints(map().preMotionPoints());
+ }
- // Move mesh (since morphing does not do this)
- if (map().hasMotionPoints())
- {
- mesh.movePoints(map().preMotionPoints());
- }
+ if (overwrite)
+ {
+ mesh.setInstance(oldInstance);
+ }
+ Info<< "Writing mesh to time " << runTime.timeName() << endl;
+ mesh.write();
- if (overwrite)
- {
- mesh.setInstance(oldInstance);
- }
- Pout<< "Writing mesh to time " << runTime.timeName() << endl;
- mesh.write();
- // Dump duplicated points (if any)
- if (split)
- {
+ // Dump duplicated points (if any)
const labelList& pointMap = map().pointMap();
labelList nDupPerPoint(map().nOldPoints(), 0);
@@ -385,7 +558,7 @@ int main(int argc, char *argv[])
}
}
- Pout<< "Writing " << dupPoints.size()
+ Info<< "Writing " << returnReduce(dupPoints.size(), sumOp<label>())
<< " duplicated points to pointSet "
<< dupPoints.objectPath() << nl << endl;
diff --git a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBafflesDict b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBafflesDict
new file mode 100644
index 0000000000000000000000000000000000000000..b7ade863524616d6125e53220f3ce363039be15e
--- /dev/null
+++ b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBafflesDict
@@ -0,0 +1,39 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: www.OpenFOAM.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object mergeOrSplitBafflesDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Detect baffles (boundary faces sharing points) on selected set of patches
+// and write to a faceSet.
+detect
+{
+ patches (".*Wall");
+}
+
+// Detect baffles (on selected patches) and merge these into internal faces.
+merge
+{
+ patches ("mergePatch");
+}
+
+// Detect baffles (on selected patches) and duplicate the points. This is
+// used if e.g. the two sides need to move separately. Note that since the
+// points are duplicated the two faces are no longer baffles.
+split
+{
+ patches ("split.*Patches");
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/miscellaneous/foamList/Make/options b/applications/utilities/miscellaneous/foamList/Make/options
index 84027a1c28ddddee75f045cd41a1f2b96fa9f73a..18d4dfeb9fa278a50edc2f208210e42c83e1e8b6 100644
--- a/applications/utilities/miscellaneous/foamList/Make/options
+++ b/applications/utilities/miscellaneous/foamList/Make/options
@@ -15,10 +15,12 @@ EXE_LIBS = \
-lchemistryModel \
-lcoalCombustion \
-lcombustionModels \
- -lcompressibleTransportModels \
+ -lcompressibleEulerianInterfacialModels \
+ -lcompressibleMultiphaseEulerianInterfacialModels \
-lcompressibleTurbulenceModels \
- -lconversion \
- -ldecompose \
+ -lCompressibleTwoPhaseMixtureTurbulenceModels \
+ -lcompressibleTwoPhaseSystem \
+ -lconformalVoronoiMesh \
-ldecompositionMethods \
-ldistributed \
-ldistributionModels \
@@ -35,29 +37,32 @@ EXE_LIBS = \
-lfileFormats \
-lfiniteVolume \
-lfluidThermophysicalModels \
+ -lfoamToVTK \
-lforces \
-lfvMotionSolvers \
-lfvOptions \
-lgenericPatchFields \
- -limmiscibleIncompressibleTwoPhaseMixture \
+ -lhelpTypes \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModels \
-linterfaceProperties \
-llagrangianFunctionObjects \
-llagrangianIntermediate \
- -llagrangian \
-llagrangianSpray \
-llagrangianTurbulence \
-llaminarFlameSpeedModels \
- -lliquidMixtureProperties \
+ -lliquidPropertiesFvPatchFields \
-lliquidProperties \
-lmeshTools \
- -lmolecularMeasurements \
- -lmolecule \
+ -lmultiphaseInterFoam \
+ -lmultiphaseMixtureThermo \
+ -lmultiphaseReactingTurbulenceModels \
+ -lmultiphaseSystem \
-lODE \
-lOpenFOAM \
- -lpairPatchAgglomeration \
-lphaseChangeTwoPhaseMixtures \
+ -lphaseCompressibleTurbulenceModels \
+ -lphaseTemperatureChangeTwoPhaseMixtures \
-lpotential \
-lpyrolysisModels \
-lradiationModels \
@@ -68,7 +73,6 @@ EXE_LIBS = \
-lreactingPhaseSystem \
-lreactingTwoPhaseSystem \
-lreactionThermophysicalModels \
- -lreconstruct \
-lregionCoupled \
-lregionCoupling \
-lregionModels \
@@ -79,11 +83,9 @@ EXE_LIBS = \
-lsampling \
-lscotchDecomp \
-lsixDoFRigidBodyMotion \
- -lSLGThermo \
+ -lSloanRenumber \
-lsnappyHexMesh \
-lsolidChemistryModel \
- -lsolidMixtureProperties \
- -lsolidParticle \
-lsolidProperties \
-lsolidSpecie \
-lsolidThermo \
@@ -92,13 +94,12 @@ EXE_LIBS = \
-lsurfaceFilmDerivedFvPatchFields \
-lsurfaceFilmModels \
-lsurfMesh \
+ -ltabulatedWallFunctions \
-lthermalBaffleModels \
-lthermophysicalFunctions \
-ltopoChangerFvMesh \
- -ltriSurface \
+ -lturbulenceModelSchemes \
-lturbulenceModels \
- -ltwoPhaseMixture \
- -ltwoPhaseMixtureThermo \
-ltwoPhaseProperties \
-ltwoPhaseReactingTurbulenceModels \
-lutilityFunctionObjects
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index 4eea56f1c0fa6290bfeffe8adbee281307b3353a..48cfbac21f09cf45ae823b0ecf214e9a80fc93ee 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -347,7 +347,7 @@ int main(int argc, char *argv[])
runTime.time().system(),
regionDir, // use region if non-standard
runTime,
- IOobject::MUST_READ_IF_MODIFIED,
+ IOobject::MUST_READ,
IOobject::NO_WRITE,
false
),
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/Allwclean b/applications/utilities/postProcessing/graphics/PVReaders/Allwclean
index c8d0f03e86b020cf4afa44cf002a9cd8f9eb9d23..89cadd30408d751680cbbcc23a011129f4d5d5bb 100755
--- a/applications/utilities/postProcessing/graphics/PVReaders/Allwclean
+++ b/applications/utilities/postProcessing/graphics/PVReaders/Allwclean
@@ -1,6 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-set -x
+#set -x
wclean libso vtkPVReaders
PVblockMeshReader/Allwclean
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwclean b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwclean
index 914ce6dd4e0198c09bb30a3c8d8f2a63bc6a3464..f0cd56dee20a9f6965864c15c771caaae5ea9a5c 100755
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwclean
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwclean
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source the wmake functions
. $WM_DIR/scripts/wmakeFunctions
-set -x
+#set -x
# deal with client/server vs combined plugins
rm -f $FOAM_LIBBIN/libPVFoamReader* 2>/dev/null
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake
index 296767f4a895c56e8e85e90a46e766d896d757e2..7788998933d05849534a7d11f84e35d46d0e8fc7 100755
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake
@@ -7,29 +7,49 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source the wmake functions
. $WM_DIR/scripts/wmakeFunctions
-# ensure CMake gets the correct C/C++ compilers
+# Ensure CMake gets the correct C/C++ compilers
[ -n "$WM_CC" ] && export CC="$WM_CC"
[ -n "$WM_CXX" ] && export CXX="$WM_CXX"
-set -x
-if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
+
+# CMake into objectsDir,
+# with an additional attempt if (possibly incorrect) CMakeCache.txt existed
+doCmake()
+{
+ local sourceDir="$1"
+
+ findObjectDir $sourceDir # Where are generated files stored?
+ test -f "$objectsDir/CMakeCache.txt"
+ retry=$? # CMakeCache.txt exists, but sources may have moved
+
+ mkdir -p $objectsDir && \
+ (
+ cd $objectsDir || exit 1
+
+ cmake $sourceDir || {
+ if [ $retry -eq 0 ]
+ then
+ echo "Removing CMakeCache.txt and attempt again"
+ rm -f CMakeCache.txt
+ cmake $sourceDir
+ else
+ exit 1
+ fi
+ } && make
+ )
+}
+
+
+if [ -d "$ParaView_DIR" ]
then
wmake $targetType vtkPVFoam
- if [ "$targetType" != "objects" ]
+ if [ "$targetType" != objects ]
then
- sourceDir=$PWD/PVFoamReader
-
- # Where are any generated files stored?
- findObjectDir $sourceDir
- (
- mkdir -p $objectsDir \
- && cd $objectsDir \
- && cmake $sourceDir \
- && make
- ) || {
+ doCmake $PWD/PVFoamReader || {
+ echo
+ echo " WARNING: incomplete build of ParaView OpenFOAM plugin"
echo
- echo "WARNING: incomplete build of ParaView OpenFOAM plugin"
}
fi
fi
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/options b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/options
index 9f63402d646402607cc5a547da62abbdbfabfd68..0154a3bcbacab572a9f7b553a96d81529f3a04cf 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/options
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/options
@@ -1,4 +1,5 @@
EXE_INC = \
+ ${c++LESSWARN} \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwclean b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwclean
index afce206c8bed6a8c40f4dcb240378ed537e680bf..3a81901a0bb8494663a389e04c08916fefffad26 100755
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwclean
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwclean
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source the wmake functions
. $WM_DIR/scripts/wmakeFunctions
-set -x
+#set -x
# deal with client/server vs combined plugins
rm -f $FOAM_LIBBIN/libPVblockMeshReader* 2>/dev/null
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
index 5959a30fbb67fcc598e9632351829dda9450cba9..607a6cb8e3cf8da211f9ec8fa284bad83a069270 100755
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
@@ -11,25 +11,45 @@ cd ${0%/*} || exit 1 # Run from this directory
[ -n "$WM_CC" ] && export CC="$WM_CC"
[ -n "$WM_CXX" ] && export CXX="$WM_CXX"
-set -x
-if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
+
+# CMake into objectsDir,
+# with an additional attempt if (possibly incorrect) CMakeCache.txt existed
+doCmake()
+{
+ local sourceDir="$1"
+
+ findObjectDir $sourceDir # Where are generated files stored?
+ test -f "$objectsDir/CMakeCache.txt"
+ retry=$? # CMakeCache.txt exists, but sources may have moved
+
+ mkdir -p $objectsDir && \
+ (
+ cd $objectsDir || exit 1
+
+ cmake $sourceDir || {
+ if [ $retry -eq 0 ]
+ then
+ echo "Removing CMakeCache.txt and attempt again"
+ rm -f CMakeCache.txt
+ cmake $sourceDir
+ else
+ exit 1
+ fi
+ } && make
+ )
+}
+
+
+if [ -d "$ParaView_DIR" ]
then
wmake $targetType vtkPVblockMesh
- if [ "$targetType" != "objects" ]
+ if [ "$targetType" != objects ]
then
- sourceDir=$PWD/PVblockMeshReader
-
- # Where are any generated files stored?
- findObjectDir $sourceDir
- (
- mkdir -p $objectsDir \
- && cd $objectsDir \
- && cmake $sourceDir \
- && make
- ) || {
+ doCmake $PWD/PVblockMeshReader || {
+ echo
+ echo " WARNING: incomplete build of ParaView BlockMesh plugin"
echo
- echo "WARNING: incomplete build of ParaView BlockMesh plugin"
}
fi
fi
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/options b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/options
index 9dcba4b39b761c7cff34c596e7a5b83141993cb6..79abf2d7fc4066ac9e24f917a5a381f6a771e23b 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/options
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/options
@@ -1,4 +1,5 @@
EXE_INC = \
+ ${c++LESSWARN} \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/mesh/blockMesh/lnInclude \
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/Make/options b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/Make/options
index 8a80ee14970d1cb3adc50b58537e3a22c5c7d4c5..d84fae1560c139b3eb0a19d7ad4d9e67d5d2faf9 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/Make/options
+++ b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVReaders/Make/options
@@ -1,4 +1,5 @@
EXE_INC = \
+ ${c++LESSWARN} \
-I$(ParaView_INCLUDE_DIR) \
-I$(ParaView_INCLUDE_DIR)/vtkkwiml
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H b/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
index 78738e321d8a945e01e7d5cff5ef5ea432d6bd13..267d0959a8df3ee48720a9cae30207d1e63e1a47 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
@@ -9,7 +9,7 @@ IOdictionary propsDict
)
);
-const word cloudName(propsDict.lookup("cloudName"));
+const word cloudName(propsDict.lookup("cloud"));
label sampleFrequency(readLabel(propsDict.lookup("sampleFrequency")));
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H
index 309d7718f6682283ce980002cf146e94c49c5d3a..67699d3c0ab6703ad83d1341f127c40b0a1e0e2d 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H
@@ -4,6 +4,6 @@ const word dictName("particleTrackDict");
IOdictionary propsDict(dictIO);
-word cloudName(propsDict.lookup("cloudName"));
+word cloudName(propsDict.lookup("cloud"));
List<word> userFields(propsDict.lookup("fields"));
diff --git a/applications/utilities/preProcessing/mapFields/mapFields.C b/applications/utilities/preProcessing/mapFields/mapFields.C
index 35d4faccc6072e7ccd93e5ae55ec8f59a2587ebc..8e9f95352237af642e43b1985b8601652f4e2fb9 100644
--- a/applications/utilities/preProcessing/mapFields/mapFields.C
+++ b/applications/utilities/preProcessing/mapFields/mapFields.C
@@ -69,7 +69,7 @@ int readNumProcs
dictName,
runTime.system(),
runTime,
- IOobject::MUST_READ_IF_MODIFIED,
+ IOobject::MUST_READ,
IOobject::NO_WRITE,
false
),
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options
index 424f89a8aba98e7eae709757dcc68d0a3471ec1e..367e9e2e3cfd19e541ae01dd4f6845665ffd157e 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options
+++ b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options
@@ -20,5 +20,6 @@ EXE_INC = \
-I/usr/include/Qt
LIB_LIBS = \
+ -L$(CGAL_ARCH_PATH)/lib \
-L$(CGAL_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
-ltriSurface
diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
index dcbf38b8708f2a5f0e2bfbba09ffe56fff32a94f..0af29e1962e571c837062e4f77b472412a0cbe38 100644
--- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C
+++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
@@ -55,6 +55,7 @@ Usage
#include "triangle.H"
#include "triSurface.H"
#include "triSurfaceSearch.H"
+#include "triSurfaceTools.H"
#include "argList.H"
#include "OFstream.H"
#include "OBJstream.H"
@@ -64,79 +65,6 @@ Usage
using namespace Foam;
-// Does face use valid vertices?
-bool validTri
-(
- const bool verbose,
- const triSurface& surf,
- const label facei
-)
-{
- // Simple check on indices ok.
-
- const labelledTri& f = surf[facei];
-
- forAll(f, fp)
- {
- if (f[fp] < 0 || f[fp] >= surf.points().size())
- {
- WarningInFunction
- << "triangle " << facei << " vertices " << f
- << " uses point indices outside point range 0.."
- << surf.points().size()-1 << endl;
- return false;
- }
- }
-
- if ((f[0] == f[1]) || (f[0] == f[2]) || (f[1] == f[2]))
- {
- WarningInFunction
- << "triangle " << facei
- << " uses non-unique vertices " << f
- << " coords:" << f.points(surf.points())
- << endl;
- return false;
- }
-
- // duplicate triangle check
-
- const labelList& fFaces = surf.faceFaces()[facei];
-
- // Check if faceNeighbours use same points as this face.
- // Note: discards normal information - sides of baffle are merged.
- forAll(fFaces, i)
- {
- label nbrFacei = fFaces[i];
-
- if (nbrFacei <= facei)
- {
- // lower numbered faces already checked
- continue;
- }
-
- const labelledTri& nbrF = surf[nbrFacei];
-
- if
- (
- ((f[0] == nbrF[0]) || (f[0] == nbrF[1]) || (f[0] == nbrF[2]))
- && ((f[1] == nbrF[0]) || (f[1] == nbrF[1]) || (f[1] == nbrF[2]))
- && ((f[2] == nbrF[0]) || (f[2] == nbrF[1]) || (f[2] == nbrF[2]))
- )
- {
- WarningInFunction
- << "triangle " << facei << " vertices " << f
- << " has the same vertices as triangle " << nbrFacei
- << " vertices " << nbrF
- << " coords:" << f.points(surf.points())
- << endl;
-
- return false;
- }
- }
- return true;
-}
-
-
labelList countBins
(
const scalar min,
@@ -377,14 +305,12 @@ int main(int argc, char *argv[])
const fileName surfFileName = args[1];
const bool checkSelfIntersect = args.optionFound("checkSelfIntersection");
- const bool verbose = args.optionFound("verbose");
const bool splitNonManifold = args.optionFound("splitNonManifold");
label outputThreshold = 10;
args.optionReadIfPresent("outputThreshold", outputThreshold);
Info<< "Reading surface from " << surfFileName << " ..." << nl << endl;
-
// Read
// ~~~~
@@ -479,7 +405,7 @@ int main(int argc, char *argv[])
forAll(surf, facei)
{
- if (!validTri(verbose, surf, facei))
+ if (!triSurfaceTools::validTri(surf, facei))
{
illegalFaces.append(facei);
}
diff --git a/applications/utilities/surface/surfaceClean/surfaceClean.C b/applications/utilities/surface/surfaceClean/surfaceClean.C
index 6c55ce14d526870093e32c43d944379ac6c0e11a..b11845df044e15bdb36cf99e3db4138245a0ee98 100644
--- a/applications/utilities/surface/surfaceClean/surfaceClean.C
+++ b/applications/utilities/surface/surfaceClean/surfaceClean.C
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
argList::addBoolOption
(
"noClean",
- "perform some surface checking/cleanup on the input surface"
+ "suppress surface checking/cleanup on the input surface"
);
argList args(argc, argv);
diff --git a/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C b/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
index bc7d50f495e3a4b3fe807d7946e84c4b9bc85615..5f1c5e9a33dbc2e94e984b654889927c1cbd41a3 100644
--- a/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
+++ b/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
@@ -91,7 +91,11 @@ int main(int argc, char *argv[])
argList::validArgs.append("inputFile");
argList::validArgs.append("outputFile");
- argList::addBoolOption("clean");
+ argList::addBoolOption
+ (
+ "clean",
+ "perform some surface checking/cleanup on the input surface"
+ );
argList::addBoolOption
(
"orient",
diff --git a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
index d478f8ab4071577eec16612442e90937e956eca9..219a4552090ae138d363cffc6d64b4faeca9e336 100644
--- a/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
+++ b/applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C
@@ -161,7 +161,10 @@ int main(int argc, char *argv[])
fileName decompDictFile;
args.optionReadIfPresent("decomposeParDict", decompDictFile);
- IOdictionary* dict = new IOdictionary
+ // A demand-driven decompositionMethod can have issues finding
+ // an alternative decomposeParDict location.
+
+ IOdictionary* dictPtr = new IOdictionary
(
decompositionModel::selectIO
(
@@ -170,18 +173,18 @@ int main(int argc, char *argv[])
"decomposeParDict",
runTime.system(),
runTime,
- IOobject::MUST_READ_IF_MODIFIED,
+ IOobject::MUST_READ,
IOobject::NO_WRITE
),
decompDictFile
)
);
- // The object must have the expected "decomposeParDict" name.
- // This also implies that it cannot be changed during the run.
- dict->rename("decomposeParDict");
+ // Store it on the object registry, but to be found it must also
+ // have the expected "decomposeParDict" name.
- runTime.store(dict);
+ dictPtr->rename("decomposeParDict");
+ runTime.store(dictPtr);
}
// Determine mesh bounding boxes:
diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index f99ab370b509b491ab5e957b153386c1e481ceb4..c3c6be894831806843952b5562a15d0feb0b0326 100755
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@@ -56,15 +56,17 @@ isTest()
#
getNumberOfProcessors()
{
+ local dict="${1:-system/decomposeParDict}"
+
# Re-use positional parameters for automatic whitespace elimination
- set -- $(foamDictionary -entry numberOfSubdomains -value "${1:-system/decomposeParDict}")
+ set -- $(foamDictionary -entry numberOfSubdomains -value "$dict" 2>/dev/null)
if [ "$#" -eq 1 ]
then
echo "$1"
else
- echo "Error retrieving 'numberOfSubdomains' from decomposeParDict" 1>&2
- echo 1
+ echo "Warning no 'numberOfSubdomains' in '$dict'" 1>&2
+ echo 1 # serial as fallback
return 1
fi
}
diff --git a/etc/config.csh/CGAL b/etc/config.csh/CGAL
index 84bc71bda6099e176d517c47763a95398a6d51d4..0caa0c51d7099635dee75c5a4b7731e4d9112096 100644
--- a/etc/config.csh/CGAL
+++ b/etc/config.csh/CGAL
@@ -50,8 +50,8 @@
#
#------------------------------------------------------------------------------
-set boost_version=boost_1_61_0
-set cgal_version=CGAL-4.8
+set boost_version=boost_1_62_0
+set cgal_version=CGAL-4.9
setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
setenv CGAL_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
diff --git a/etc/config.csh/FFTW b/etc/config.csh/FFTW
index 78d24e17b10babd88ffaa80f18a058c0dd157a8a..515c429e66c7e619ce90142892ddde2d17bf8052 100644
--- a/etc/config.csh/FFTW
+++ b/etc/config.csh/FFTW
@@ -22,7 +22,7 @@
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
#
# File
-# etc/config.sh/FFTW
+# etc/config.csh/FFTW
#
# Description
# Setup file for FFTW include/libraries.
@@ -48,7 +48,7 @@
#
#------------------------------------------------------------------------------
-set fftw_version=fftw-3.3.4
+set fftw_version=fftw-3.3.5
setenv FFTW_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version
diff --git a/etc/config.csh/example/paraview b/etc/config.csh/example/paraview
index 47747cafad74bf6ce0f67f6eefa5bea1331a33dc..b65dd6a07dcec007d2ffd01bee762ae537dc80c0 100644
--- a/etc/config.csh/example/paraview
+++ b/etc/config.csh/example/paraview
@@ -35,7 +35,7 @@
#------------------------------------------------------------------------------
#
-# Use other (shipped) paraview.csh with a different ParaView_VERSION
+# Use other (shipped) paraview with a different ParaView_VERSION
#
set foamFile=`$WM_PROJECT_DIR/bin/foamEtcFile -mode o config.csh/paraview`
diff --git a/etc/config.csh/mpi b/etc/config.csh/mpi
index 974555857aacd833c58b40f6f453b8cb7d307077..c56bbab3f922557f2a2013b88bc4b0560ead9da5 100644
--- a/etc/config.csh/mpi
+++ b/etc/config.csh/mpi
@@ -51,7 +51,7 @@ case SYSTEMOPENMPI:
breaksw
case OPENMPI:
- setenv FOAM_MPI openmpi-1.10.2
+ setenv FOAM_MPI openmpi-1.10.4
# Optional configuration tweaks:
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/openmpi`
@@ -60,6 +60,12 @@ case OPENMPI:
# Tell OpenMPI where to find its install directory
setenv OPAL_PREFIX $MPI_ARCH_PATH
+ if ($?FOAM_VERBOSE && $?prompt) then
+ echo "Using OPENMPI:"
+ echo " OPAL_PREFIX : $OPAL_PREFIX"
+ echo " FOAM_MPI : $FOAM_MPI"
+ endif
+
_foamAddPath $MPI_ARCH_PATH/bin
_foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
_foamAddMan $MPI_ARCH_PATH/share/man
@@ -111,8 +117,8 @@ case SYSTEMMPI:
case MPICH:
setenv FOAM_MPI mpich2-1.1.1p1
- setenv MPI_HOME $WM_THIRD_PARTY_DIR/$FOAM_MPI
setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
+ setenv MPI_HOME $MPI_ARCH_PATH
_foamAddPath $MPI_ARCH_PATH/bin
diff --git a/etc/config.csh/paraview b/etc/config.csh/paraview
index 0fea6e0c07a1ff1fde18e450095c8452cf37a6cd..d768864f30a27007d2e994bb0b7347e290ed6dc3 100644
--- a/etc/config.csh/paraview
+++ b/etc/config.csh/paraview
@@ -41,17 +41,17 @@
# If using a central installation not located under ThirdParty, you will
# need to set some environment values directly. For example,
#
-# setenv ParaView_DIR /opt/paraview/paraview-5.2.0
-# setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview-5.2
-# setenv PV_PLUGIN_PATH $FOAM_LIBBIN/paraview-5.2
+# setenv ParaView_DIR /opt/paraview/paraview-5.0.1
+# setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview-5.0
+# setenv PV_PLUGIN_PATH $FOAM_LIBBIN/paraview-5.0
#
# setenv PATH ${ParaView_DIR}/bin:${PATH}
-# setenv LD_LIBRARY_PATH ${ParaView_DIR}/lib/paraview-5.2:${LD_LIBRARY_PATH}
+# setenv LD_LIBRARY_PATH ${ParaView_DIR}/lib/paraview-5.0:${LD_LIBRARY_PATH}
# unsetenv ParaView_VERSION # avoid using ThirdParty settings
#
#------------------------------------------------------------------------------
-setenv ParaView_VERSION 5.1.2
+setenv ParaView_VERSION 5.0.1
setenv ParaView_MAJOR detect # Automatically determine major version
set cmake_version=cmake-system
@@ -63,12 +63,11 @@ if ( ! $?ParaView_DIR ) setenv ParaView_DIR
set cleaned=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/cmake- $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-"`
if ( $status == 0 ) setenv PATH $cleaned
-# Environment for ThirdParty cmake
-unsetenv CMAKE_HOME
+# ThirdParty cmake
set cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake_version
-if ( -r $cmake ) then
- setenv CMAKE_HOME $cmake
- setenv PATH ${CMAKE_HOME}/bin:${PATH}
+if ( -r $cmake/bin/cmake ) then
+ # _foamAddPath not available when foamPV alias is used
+ setenv PATH $cmake/bin:${PATH}
endif
# Evaluate command-line parameters for ParaView
@@ -103,18 +102,17 @@ if ( $?ParaView_VERSION ) then
set pvName=ParaView-$ParaView_VERSION
set pvMajor=paraview-$ParaView_MAJOR
- set pvSrcDir=$WM_THIRD_PARTY_DIR/$pvName
setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$pvName
- # Set paths if binaries or source are present
- if ( -r $ParaView_DIR || -r $pvSrcDir ) then
+ # Set paths if binaries are present
+ if ( -r $ParaView_DIR ) then
set pvLibDir=${ParaView_DIR}/lib/$pvMajor
set pvPython=$ParaView_DIR/Utilities/VTKPythonWrapping
+ setenv PATH ${ParaView_DIR}/bin:${PATH}
setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/$pvMajor
setenv PV_PLUGIN_PATH $FOAM_LIBBIN/$pvMajor
- setenv PATH ${ParaView_DIR}/bin:${PATH}
setenv LD_LIBRARY_PATH "${pvLibDir}:${LD_LIBRARY_PATH}"
# Add in python libraries if required
@@ -134,13 +132,18 @@ if ( $?ParaView_VERSION ) then
echo " PV_PLUGIN_PATH : $PV_PLUGIN_PATH"
endif
else
+ if ($?FOAM_VERBOSE && $?prompt) then
+ echo "No paraview found"
+ echo " ParaView_DIR : $ParaView_DIR"
+ endif
+
unsetenv ParaView_INCLUDE_DIR PV_PLUGIN_PATH
setenv ParaView_DIR # Defined but empty (used by foamPV alias)
endif
endif
-unset cleaned cmake cmake_version pvName pvMajor pvSrcDir pvLibDir pvPython
-unsetenv ParaView_VERSION ParaView_MAJOR
+unset cleaned cmake cmake_version pvName pvMajor pvLibDir pvPython
+unsetenv ParaView_MAJOR ParaView_VERSION
#------------------------------------------------------------------------------
diff --git a/etc/config.csh/unset b/etc/config.csh/unset
index a1ef724b3c07f964219176f6d040f0fc8d332caa..88bdd3454eff250015cf83b34161849ee94dded9 100644
--- a/etc/config.csh/unset
+++ b/etc/config.csh/unset
@@ -3,7 +3,7 @@
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
-# \\/ M anipulation |
+# \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
@@ -119,7 +119,6 @@ unsetenv OPAL_PREFIX
# Unset Ensight/ParaView-related environment variables
unsetenv ENSIGHT9_READER
-unsetenv CMAKE_HOME
unsetenv ParaView_DIR
unsetenv ParaView_INCLUDE_DIR
unsetenv ParaView_MAJOR
@@ -129,12 +128,15 @@ unsetenv PV_PLUGIN_PATH
#------------------------------------------------------------------------------
# unset other ThirdParty environment variables
+unsetenv ADIOS_ARCH_PATH
unsetenv BOOST_ARCH_PATH
unsetenv CCMIO_ARCH_PATH
unsetenv CGAL_ARCH_PATH
unsetenv FFTW_ARCH_PATH
+unsetenv GPERFTOOLS_ARCH_PATH
unsetenv GMP_ARCH_PATH
unsetenv MPFR_ARCH_PATH
+unsetenv METIS_ARCH_PATH
unsetenv SCOTCH_ARCH_PATH
#------------------------------------------------------------------------------
@@ -174,7 +176,6 @@ unalias wm32
unalias wmSP
unalias wmDP
-unalias wmRefresh
unalias wmUnset
unalias wmSchedOn
@@ -191,6 +192,7 @@ unalias util
unalias tut
unalias run
+unalias wmRefresh
unalias foamVersion
unalias foamPV
diff --git a/etc/config.sh/CGAL b/etc/config.sh/CGAL
index 044327109f64ec5c4762546ff1214e3c04b2c2fb..5f9c64b1b9f534b96c5ee4655be63507e2bd5eb2 100644
--- a/etc/config.sh/CGAL
+++ b/etc/config.sh/CGAL
@@ -49,8 +49,8 @@
# - the LD_LIBRARY_PATH is not adjusted.
#------------------------------------------------------------------------------
-boost_version=boost_1_61_0
-cgal_version=CGAL-4.8
+boost_version=boost_1_62_0
+cgal_version=CGAL-4.9
export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
export CGAL_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
diff --git a/etc/config.sh/FFTW b/etc/config.sh/FFTW
index f3cb4ea70ee775ef7e4da0f1800c00833e099f6a..e3a6fee2fd6e03ed01cf605766ede045d27abdc0 100644
--- a/etc/config.sh/FFTW
+++ b/etc/config.sh/FFTW
@@ -47,7 +47,7 @@
# - the LD_LIBRARY_PATH is not adjusted.
#------------------------------------------------------------------------------
-fftw_version=fftw-3.3.4
+fftw_version=fftw-3.3.5
export FFTW_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version
diff --git a/etc/config.sh/gperftools b/etc/config.sh/gperftools
index 06604630377dc675a9b858168757c2a7e7c05581..d42b46df21576f006843b555a39f3ab46e9ece54 100644
--- a/etc/config.sh/gperftools
+++ b/etc/config.sh/gperftools
@@ -3,7 +3,7 @@
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
-# \\/ M anipulation |
+# \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
@@ -25,17 +25,54 @@
# etc/config.sh/gperftools
#
# Description
-# Setup file for gperftools binaries libraries.
+# Setup file for gperftools binaries and libraries.
+# Sourced from OpenFOAM-<VERSION>/etc/bashrc
#
+# If using system-wide installations, use the following settings:
+#
+# gperftools_version=gperftools-system
+#
+# If the system gperftools is unusable (eg, too old) and you don't
+# have or want a ThirdParty installation:
+#
+# gperftools_version=gperftools-none
+#
+# If using a central installation, but not located under ThirdParty:
+# - specify gperftools-system
+# - provide full paths for GPERFTOOLS_ARCH_PATH
+#
+# Note
+# When _foamAddLib is unset (eg, called from makeGperftools):
+# - gperftools_version variable are retained.
+# - the LD_LIBRARY_PATH and PATH are not adjusted.
#------------------------------------------------------------------------------
-version=svn
-gperftools_install=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER
+gperftools_version=gperftools-2.5
+
+GPERFTOOLS_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$gperftools_version
+
+#------------------------------------------------------------------------------
+if [ "$FOAM_VERBOSE" -a "$PS1" ]
+then
+ echo "Using gperftools ($gperftools_version) -> $GPERFTOOLS_ARCH_PATH" 1>&2
+fi
+
+if type _foamAddLib > /dev/null 2>&1 # normal sourcing
+then
+
+ # If GPERFTOOLS_ARCH_PATH does not end with '-system' or '-none',
+ # it is located within ThirdParty, or a central installation
+ # outside of ThirdParty and must be added to the lib-path.
+
+ ending="${GPERFTOOLS_ARCH_PATH##*-}"
+ if [ "$ending" != none -a "$ending" != system ]
+ then
+ _foamAddLib $GPERFTOOLS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+ _foamAddPath $GPERFTOOLS_ARCH_PATH/bin
+ fi
-GPERFTOOLS_VERSION=gperftools-$version
-GPERFTOOLS_ARCH_PATH=$gperftools_install/$GPERFTOOLS_VERSION
+ unset gperftools_version ending
-export PATH=$GPERFTOOLS_ARCH_PATH/bin:$PATH
-export LD_LIBRARY_PATH=$GPERFTOOLS_ARCH_PATH/lib:$LD_LIBRARY_PATH
+fi
#------------------------------------------------------------------------------
diff --git a/etc/config.sh/mpi b/etc/config.sh/mpi
index d41751432e1d24aad15ed3ac3b3fa33d7dda0692..757aef05ee2e8903698569980f25b2a85b2227f0 100644
--- a/etc/config.sh/mpi
+++ b/etc/config.sh/mpi
@@ -54,7 +54,7 @@ SYSTEMOPENMPI)
;;
OPENMPI)
- export FOAM_MPI=openmpi-1.10.2
+ export FOAM_MPI=openmpi-1.10.4
# Optional configuration tweaks:
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/openmpi`
@@ -63,6 +63,13 @@ OPENMPI)
# Tell OpenMPI where to find its install directory
export OPAL_PREFIX=$MPI_ARCH_PATH
+ if [ "$FOAM_VERBOSE" -a "$PS1" ]
+ then
+ echo "Using OPENMPI:" 1>&2
+ echo " OPAL_PREFIX : $OPAL_PREFIX" 1>&2
+ echo " FOAM_MPI : $FOAM_MPI" 1>&2
+ fi
+
_foamAddPath $MPI_ARCH_PATH/bin
_foamAddLib $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
_foamAddMan $MPI_ARCH_PATH/share/man
@@ -118,8 +125,8 @@ SYSTEMMPI)
MPICH)
export FOAM_MPI=mpich2-1.1.1p1
- export MPI_HOME=$WM_THIRD_PARTY_DIR/$FOAM_MPI
export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
+ export MPI_HOME=$MPI_ARCH_PATH
_foamAddPath $MPI_ARCH_PATH/bin
diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview
index c9b8621d5251c93124f5882d38b12e87a33cc2f5..a8df5e7d9c951d955a76cccb4c16543a64b0a601 100644
--- a/etc/config.sh/paraview
+++ b/etc/config.sh/paraview
@@ -41,17 +41,20 @@
# If using a central installation not located under ThirdParty, you will
# need to set some environment values directly. For example,
#
-# export ParaView_DIR=/opt/paraview/paraview-5.2.0
-# export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-5.2
-# export PV_PLUGIN_PATH=$FOAM_LIBBIN/paraview-5.2
+# export ParaView_DIR=/opt/paraview/paraview-5.0.1
+# export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-5.0
+# export PV_PLUGIN_PATH=$FOAM_LIBBIN/paraview-5.0
#
# export PATH=$ParaView_DIR/bin:$PATH
-# export LD_LIBRARY_PATH=$ParaView_DIR/lib/paraview-5.2:$LD_LIBRARY_PATH
+# export LD_LIBRARY_PATH=$ParaView_DIR/lib/paraview-5.0:$LD_LIBRARY_PATH
# unset ParaView_VERSION # avoid using ThirdParty settings
#
+# Note
+# When _foamAddLib is unset (eg, called from makeParaView or from foamPV):
+# - the ParaView_VERSION variable is retained.
#------------------------------------------------------------------------------
-ParaView_VERSION=5.1.2
+ParaView_VERSION=5.0.1
ParaView_MAJOR=detect # Automatically determine major version
cmake_version=cmake-system
@@ -66,14 +69,12 @@ cleaned=$($WM_PROJECT_DIR/bin/foamCleanPath "$PATH" \
) \
&& PATH="$cleaned"
-# Environment for ThirdParty cmake
-unset CMAKE_HOME
+# ThirdParty cmake
cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake_version
-if [ -r $cmake ]
+if [ -r $cmake/bin/cmake ]
then
- export CMAKE_HOME=$cmake
- export CMAKE_ROOT=$cmake
- export PATH=$CMAKE_HOME/bin:$PATH
+ # _foamAddPath not available when foamPV function is used
+ PATH=$cmake/bin:$PATH
fi
# Evaluate command-line parameters for ParaView
@@ -115,19 +116,18 @@ then
pvName=ParaView-$ParaView_VERSION
pvMajor=paraview-$ParaView_MAJOR
- pvSrcDir=$WM_THIRD_PARTY_DIR/$pvName
export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$pvName
# Set paths if binaries or source are present
- if [ -r $ParaView_DIR -o -r $pvSrcDir ]
+ if [ -r $ParaView_DIR ]
then
pvLibDir=$ParaView_DIR/lib/$pvMajor
pvPython=$ParaView_DIR/Utilities/VTKPythonWrapping
+ export PATH=$ParaView_DIR/bin:$PATH
export ParaView_INCLUDE_DIR=$ParaView_DIR/include/$pvMajor
export PV_PLUGIN_PATH=$FOAM_LIBBIN/$pvMajor
- export PATH=$ParaView_DIR/bin:$PATH
export LD_LIBRARY_PATH=$pvLibDir:$LD_LIBRARY_PATH
# Add in python libraries if required
@@ -150,13 +150,24 @@ then
echo " PV_PLUGIN_PATH : $PV_PLUGIN_PATH"
fi
else
+ if [ "$FOAM_VERBOSE" -a "$PS1" ]
+ then
+ echo "No paraview found"
+ echo " ParaView_DIR : $ParaView_DIR"
+ fi
+
unset ParaView_DIR ParaView_INCLUDE_DIR PV_PLUGIN_PATH
fi
fi
unset -f _foamParaviewEval
-unset cleaned cmake cmake_version pvName pvMajor pvSrcDir pvLibDir pvPython
-unset ParaView_VERSION ParaView_MAJOR
+unset cleaned cmake cmake_version pvName pvMajor pvLibDir pvPython
+unset ParaView_MAJOR
+
+if type _foamAddLib > /dev/null 2>&1 # normal sourcing
+then
+ unset ParaView_VERSION
+fi
#------------------------------------------------------------------------------
diff --git a/etc/config.sh/unset b/etc/config.sh/unset
index 114f313a3995b51dd567ed16236075000384422e..e7b834baeb784621e7d34587249c79f1b2c91e7f 100644
--- a/etc/config.sh/unset
+++ b/etc/config.sh/unset
@@ -3,7 +3,7 @@
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
-# \\/ M anipulation |
+# \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
@@ -115,7 +115,6 @@ fi
# Unset Ensight/ParaView-related environment variables
unset ENSIGHT9_READER
-unset CMAKE_HOME
unset ParaView_DIR
unset ParaView_INCLUDE_DIR
unset ParaView_MAJOR
@@ -125,12 +124,15 @@ unset PV_PLUGIN_PATH
#------------------------------------------------------------------------------
# unset other ThirdParty environment variables
+unset ADIOS_ARCH_PATH
unset BOOST_ARCH_PATH
unset CCMIO_ARCH_PATH
unset CGAL_ARCH_PATH
unset FFTW_ARCH_PATH
+unset GPERFTOOLS_ARCH_PATH
unset GMP_ARCH_PATH
unset MPFR_ARCH_PATH
+unset METIS_ARCH_PATH
unset SCOTCH_ARCH_PATH
#------------------------------------------------------------------------------
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index 448e4604ae8b1e108f57a9a51fcfc44f0ed5e2cc..fdb4559bf75ec8abed82d79bd914775871290cea 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -76,8 +76,6 @@ template<class T> class IndirectList;
template<class T> class UIndirectList;
template<class T> class BiIndirectList;
-typedef UList<label> unallocLabelList;
-
/*---------------------------------------------------------------------------*\
Class List Declaration
\*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C
index 1f179698d100fa4bab81c26e9705793aee40614b..8251159d02f7ad1bfaf1e04fc8f25ae350b76216 100644
--- a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C
+++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C
@@ -77,7 +77,8 @@ Foam::functionObjects::timeControl::timeControl
),
executeControl_(t, dict, "execute"),
writeControl_(t, dict, "write"),
- foPtr_(functionObject::New(name, t, dict_))
+ foPtr_(functionObject::New(name, t, dict_)),
+ executeTimeIndex_(-1)
{
readControls();
}
@@ -89,6 +90,7 @@ bool Foam::functionObjects::timeControl::execute()
{
if (active() && (postProcess || executeControl_.execute()))
{
+ executeTimeIndex_ = time_.timeIndex();
foPtr_->execute();
}
@@ -100,6 +102,13 @@ bool Foam::functionObjects::timeControl::write()
{
if (active() && (postProcess || writeControl_.execute()))
{
+ // Ensure written results reflect the current state
+ if (executeTimeIndex_ != time_.timeIndex())
+ {
+ executeTimeIndex_ = time_.timeIndex();
+ foPtr_->execute();
+ }
+
foPtr_->write();
}
diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H
index e256144f6b21a8e3f99e5fdbde4322c924e48cba..d019a7e8b64bb36808d841c6449bf5a2986c9bd9 100644
--- a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H
@@ -99,6 +99,9 @@ class timeControl
//- The functionObject to execute
autoPtr<functionObject> foPtr_;
+ //- Time index of the last execute call
+ label executeTimeIndex_;
+
// Private Member Functions
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index f5381ef91e05712331a226d15542f99f301508d8..dca595c6a3e3ef4b34f26669c5c68f3726c21b19 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -169,6 +169,18 @@ Foam::dimensioned<Type>::dimensioned
{}
+template<class Type>
+Foam::dimensioned<Type>::dimensioned
+(
+ const dimensionSet& dimSet
+)
+:
+ name_("0"),
+ dimensions_(dimSet),
+ value_(Zero)
+{}
+
+
// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
template<class Type>
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
index fe817e4afec8bbdf6a67bd6599be20fb06a8ed87..fde67a1fc1eb626f6f66670a662f5ef71699f750 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -117,9 +117,12 @@ public:
//- Construct from dictionary lookup with a given name and dimensions
dimensioned(const word&, const dimensionSet&, const dictionary&);
- //- Null constructor
+ //- Null constructor - a dimensionless Zero, named "undefined"
dimensioned();
+ //- A dimensioned Zero, named "0"
+ explicit dimensioned(const dimensionSet&);
+
// Static member functions
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
index eeb3618c2aa3c4c9d4633e2f1fd1370ee66bf2a3..0aa6d2606376533bf82f50d605b3c94eb2d6009e 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixATmul.C
@@ -202,7 +202,7 @@ void Foam::LduMatrix<Type, DType, LUType>::sumA
{
if (interfaces_.set(patchi))
{
- const unallocLabelList& pa = lduAddr().patchAddr(patchi);
+ const labelUList& pa = lduAddr().patchAddr(patchi);
const Field<LUType>& pCoeffs = interfacesUpper_[patchi];
forAll(pa, face)
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
index 6d5f5be9c064b6b268303e3bc0e7be4f6d6b2338..f13202a69c6af35bd997ce55d2ad0f6dc708d3e1 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixOperations.C
@@ -34,8 +34,8 @@ void Foam::LduMatrix<Type, DType, LUType>::sumDiag()
const Field<LUType>& Upper = const_cast<const LduMatrix&>(*this).upper();
Field<DType>& Diag = diag();
- const unallocLabelList& l = lduAddr().lowerAddr();
- const unallocLabelList& u = lduAddr().upperAddr();
+ const labelUList& l = lduAddr().lowerAddr();
+ const labelUList& u = lduAddr().upperAddr();
for (label face=0; face<l.size(); face++)
{
@@ -52,8 +52,8 @@ void Foam::LduMatrix<Type, DType, LUType>::negSumDiag()
const Field<LUType>& Upper = const_cast<const LduMatrix&>(*this).upper();
Field<DType>& Diag = diag();
- const unallocLabelList& l = lduAddr().lowerAddr();
- const unallocLabelList& u = lduAddr().upperAddr();
+ const labelUList& l = lduAddr().lowerAddr();
+ const labelUList& u = lduAddr().upperAddr();
for (label face=0; face<l.size(); face++)
{
@@ -72,8 +72,8 @@ void Foam::LduMatrix<Type, DType, LUType>::sumMagOffDiag
const Field<LUType>& Lower = const_cast<const LduMatrix&>(*this).lower();
const Field<LUType>& Upper = const_cast<const LduMatrix&>(*this).upper();
- const unallocLabelList& l = lduAddr().lowerAddr();
- const unallocLabelList& u = lduAddr().upperAddr();
+ const labelUList& l = lduAddr().lowerAddr();
+ const labelUList& u = lduAddr().upperAddr();
for (label face = 0; face < l.size(); face++)
{
@@ -135,9 +135,9 @@ Foam::LduMatrix<Type, DType, LUType>::faceH(const Field<Type>& psi) const
const Field<LUType>& Lower = const_cast<const LduMatrix&>(*this).lower();
const Field<LUType>& Upper = const_cast<const LduMatrix&>(*this).upper();
- // Take refereces to addressing
- const unallocLabelList& l = lduAddr().lowerAddr();
- const unallocLabelList& u = lduAddr().upperAddr();
+ // Take references to addressing
+ const labelUList& l = lduAddr().lowerAddr();
+ const labelUList& u = lduAddr().upperAddr();
tmp<Field<Type>> tfaceHpsi(new Field<Type> (Lower.size()));
Field<Type> & faceHpsi = tfaceHpsi();
@@ -413,8 +413,8 @@ void Foam::LduMatrix<Type, DType, LUType>::operator*=
Field<LUType>& upper = this->upper();
Field<LUType>& lower = this->lower();
- const unallocLabelList& l = lduAddr().lowerAddr();
- const unallocLabelList& u = lduAddr().upperAddr();
+ const labelUList& l = lduAddr().lowerAddr();
+ const labelUList& u = lduAddr().upperAddr();
for (label face=0; face<upper.size(); face++)
{
diff --git a/src/OpenFOAM/meshes/Identifiers/surface/surfZoneIdentifier.C b/src/OpenFOAM/meshes/Identifiers/surface/surfZoneIdentifier.C
index 88c3f2d788f98a66ef09b0fd7cddf07694a01c77..d9179f42748bb4b1763183e056ec596c2e556896 100644
--- a/src/OpenFOAM/meshes/Identifiers/surface/surfZoneIdentifier.C
+++ b/src/OpenFOAM/meshes/Identifiers/surface/surfZoneIdentifier.C
@@ -41,7 +41,7 @@ Foam::surfZoneIdentifier::surfZoneIdentifier()
{}
-Foam::surfZoneIdentifier::surfZoneIdentifier(label index)
+Foam::surfZoneIdentifier::surfZoneIdentifier(const label index)
:
name_(),
index_(index),
diff --git a/src/OpenFOAM/meshes/Identifiers/surface/surfZoneIdentifier.H b/src/OpenFOAM/meshes/Identifiers/surface/surfZoneIdentifier.H
index ff75b56afa566d0935d1cf25be468deb2c81b560..a084e0196a3145d550df311ef9f9cc38d4e8fb08 100644
--- a/src/OpenFOAM/meshes/Identifiers/surface/surfZoneIdentifier.H
+++ b/src/OpenFOAM/meshes/Identifiers/surface/surfZoneIdentifier.H
@@ -86,10 +86,7 @@ public:
surfZoneIdentifier();
//- Construct null with specified index
- explicit surfZoneIdentifier
- (
- const label index
- );
+ explicit surfZoneIdentifier(const label index);
//- Construct from components
surfZoneIdentifier
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
index 690c49e0314e16594393ce1b8047d227d5480b7d..253c78e1da51048ae001101adefb4db6065051f8 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
@@ -113,9 +113,6 @@ protected:
//- Build primitive patch
void calcFaceZonePatch() const;
- //- Return map of local face indices
- const Map<label>& faceLookupMap() const;
-
//- Calculate master and slave face layer
void calcCellLayers() const;
diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
index 9d2d8581744257db01d59e0f56e0f717ac34a068..b82b4d30102d192a255567e8364dd29222a41829 100644
--- a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
+++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
@@ -204,7 +204,8 @@ Foam::Function1Types::CSV<Type>::CSV
(
const word& entryName,
const dictionary& dict,
- const word& ext
+ const word& ext,
+ const fileName& fName
)
:
TableBase<Type>(entryName, dict.subDict(entryName + ext)),
@@ -214,7 +215,7 @@ Foam::Function1Types::CSV<Type>::CSV
componentColumns_(coeffs_.lookup("componentColumns")),
separator_(coeffs_.lookupOrDefault<string>("separator", string(","))[0]),
mergeSeparators_(readBool(coeffs_.lookup("mergeSeparators"))),
- fName_(coeffs_.lookup("fileName"))
+ fName_(fName != fileName::null ? fName : coeffs_.lookup("fileName"))
{
if (componentColumns_.size() != pTraits<Type>::nComponents)
{
diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
index 97e0047a2b70a422c3f4e5b59aeaafa050b3c515..ddba48afa5ed32519fa9d56e588eea5b828cff62 100644
--- a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
+++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
@@ -122,7 +122,8 @@ public:
(
const word& entryName,
const dictionary& dict,
- const word& ext = "Coeffs"
+ const word& ext = "Coeffs",
+ const fileName& fName = fileName::null
);
//- Copy constructor
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
index 1522f6583880ac45aa7e2e8b652ec85498abe525..55a81ea6ecdf488cce355e281e2238e6725d611f 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
@@ -74,7 +74,7 @@ outletMappedUniformInletHeatAdditionFvPatchField
)
:
fixedValueFvPatchScalarField(p, iF, dict),
- outletPatchName_(dict.lookup("outletPatchName")),
+ outletPatchName_(dict.lookup("outletPatch")),
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
Q_(readScalar(dict.lookup("Q"))),
minTempLimit_(dict.lookupOrDefault<scalar>("minTempLimit", 0)),
@@ -167,8 +167,7 @@ void Foam::outletMappedUniformInletHeatAdditionFvPatchField::updateCoeffs()
scalar averageOutletField =
gSum(outletPatchPhi*outletPatchField)/sumOutletPatchPhi;
- const scalarField Cpf =
- thermo.Cp()().boundaryField()[outletPatchID];
+ const scalarField Cpf(thermo.Cp()().boundaryField()[outletPatchID]);
scalar totalPhiCp = gSum(outletPatchPhi)*gAverage(Cpf);
@@ -198,11 +197,13 @@ void Foam::outletMappedUniformInletHeatAdditionFvPatchField::updateCoeffs()
}
-void Foam::outletMappedUniformInletHeatAdditionFvPatchField::
-write(Ostream& os) const
+void Foam::outletMappedUniformInletHeatAdditionFvPatchField::write
+(
+ Ostream& os
+) const
{
fvPatchScalarField::write(os);
- os.writeKeyword("outletPatchName")
+ os.writeKeyword("outletPatch")
<< outletPatchName_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
@@ -216,6 +217,7 @@ write(Ostream& os) const
this->writeEntry("value", os);
}
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H
index 7d1faaad4a8a4d305fe0c07778a884a0318ff248..b80efdd5233f34b924f4b2d2fa620d8152e2e9dc 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H
@@ -28,6 +28,7 @@ Group
grpInletBoundaryConditions
Description
+
This temperature boundary condition averages the temperature over the
"outlet" patch specified by name "outletPatchName" and applies an extra
heat source. This is set as a uniform temperature value on this patch.
@@ -37,7 +38,7 @@ Description
\table
Property | Description | Required | Default value
- outletPatchName | name of outlet patch | yes |
+ outletPatch | name of outlet patch | yes |
Q | Heat addition | yes
phi | flux field name | no | phi
minTempLimit | min temperature limit | no | 0.0
@@ -49,7 +50,7 @@ Description
myPatch
{
type outletMappedUniformInletHeatAddition;
- outletPatchName aPatch;
+ outletPatch aPatch;
Q 10; // Heat addition in W
phi phi;
value uniform 0;
@@ -100,6 +101,7 @@ class outletMappedUniformInletHeatAdditionFvPatchField
//- Maxmum Temperature Limit
scalar maxTempLimit_;
+
public:
//- Runtime type information
diff --git a/src/conversion/ccm/Allwmake b/src/conversion/ccm/Allwmake
index a3e067e1dc0b9cdef6e24986923e5cdcd85a866a..da52586adda8b48d1d4b820130b7027753de80a7 100755
--- a/src/conversion/ccm/Allwmake
+++ b/src/conversion/ccm/Allwmake
@@ -15,8 +15,13 @@ if [ "$WM_LABEL_SIZE" = 64 ]
then
# The libccmio uses int32_t.
# The OpenFOAM adapter thus requires additional work for 64-bit labels.
- echo "Skipping optional component libccm"
+ echo "Skipping optional 'libccm' adapter component"
echo " does not support 64-bit labels"
+elif [ "$WM_PRECISION_OPTION" = SP ]
+then
+ # The OpenFOAM adapter was originally only designed for 'double'
+ echo "Skipping optional 'libccm' adapter component"
+ echo " was not originally designed for 'single precision' values"
elif [ -e $CCMIO_ARCH_PATH/include/libccmio/ccmio.h \
-a -e $CCMIO_ARCH_PATH/lib/libccmio.a ]
then
diff --git a/src/conversion/ensight/mesh/ensightMesh.C b/src/conversion/ensight/mesh/ensightMesh.C
index c10721d51e8799a33aa47b672eac769ad09a010a..72c785620186b60396d1941fcce843c138438697 100644
--- a/src/conversion/ensight/mesh/ensightMesh.C
+++ b/src/conversion/ensight/mesh/ensightMesh.C
@@ -258,9 +258,9 @@ void Foam::ensightMesh::correct()
Foam::sort(selectZones);
// Count face types in each selected faceZone
- forAll(selectZones, zoneI)
+ forAll(selectZones, zonei)
{
- const word& zoneName = selectZones[zoneI];
+ const word& zoneName = selectZones[zonei];
const label zoneID = mesh_.faceZones().findZoneID(zoneName);
const faceZone& fz = mesh_.faceZones()[zoneID];
@@ -342,12 +342,12 @@ void Foam::ensightMesh::write(ensightGeoFile& os) const
(
pp.meshPoints(),
pp.meshPointMap(),
- pointToGlobal,
- uniqueMeshPointLabels
+ pointToGlobal, // local patch point to unique global index
+ uniqueMeshPointLabels // unique global points
);
- pointField uniquePoints(mesh_.points(), uniqueMeshPointLabels);
- // Renumber the patch faces
+ // Renumber the patch faces,
+ // from local patch indexing to unique global index
faceList patchFaces(pp.localFaces());
forAll(patchFaces, i)
{
@@ -359,7 +359,7 @@ void Foam::ensightMesh::write(ensightGeoFile& os) const
ensFaces.index(),
patchName,
globalPointsPtr().size(),
- uniquePoints,
+ pointField(mesh_.points(), uniqueMeshPointLabels),
os
);
@@ -391,30 +391,28 @@ void Foam::ensightMesh::write(ensightGeoFile& os) const
uniqueMeshPointLabels
);
- pointField uniquePoints(mesh_.points(), uniqueMeshPointLabels);
-
- primitiveFacePatch facePatch
+ // Make a copy in the proper order
+ primitiveFacePatch pp
(
faceList(mesh_.faces(), ensFaces.faceIds()),
mesh_.points()
);
const boolList& flip = ensFaces.flipMap();
- forAll(facePatch[faceI], faceI)
+ forAll(pp, facei)
{
- if (flip[faceI])
+ if (flip[facei])
{
- facePatch[faceI].flip();
+ pp[facei].flip();
}
}
- // Faces belonging to the faceZone, in local numbering
- faceList localFaces(facePatch.localFaces());
-
- // Renumber the faceZone master faces
- forAll(localFaces, i)
+ // Renumber the faces belonging to the faceZone,
+ // from local numbering to unique global index
+ faceList patchFaces(pp.localFaces());
+ forAll(patchFaces, i)
{
- inplaceRenumber(pointToGlobal, localFaces[i]);
+ inplaceRenumber(pointToGlobal, patchFaces[i]);
}
writeAllPoints
@@ -422,11 +420,11 @@ void Foam::ensightMesh::write(ensightGeoFile& os) const
ensFaces.index(),
zoneName,
globalPointsPtr().size(),
- uniquePoints,
+ pointField(mesh_.points(), uniqueMeshPointLabels),
os
);
- writeFaceConnectivity(ensFaces, localFaces, os, true);
+ writeFaceConnectivity(ensFaces, patchFaces, os, true);
}
}
diff --git a/src/conversion/ensight/output/ensightOutput.H b/src/conversion/ensight/output/ensightOutput.H
index 5fec26bbf8c35c1c804070522fe3dc14b296bb45..1f33b3f83041f43aca5c813e73498a7a6b802aec 100644
--- a/src/conversion/ensight/output/ensightOutput.H
+++ b/src/conversion/ensight/output/ensightOutput.H
@@ -55,27 +55,42 @@ class ensightOutput
{
// Private Methods
- template<class Type>
- static void writeField
+ //- Write field content (component-wise) for the given ensight element type
+ template<template<typename> class FieldContainer, class Type>
+ static void writeFieldContent
(
const char* key,
+ const FieldContainer<Type>& fld,
+ ensightFile& os
+ );
+
+ //- Write a field of faces values as an indirect list,
+ // using the face ids from ensightFaces
+ template<class Type>
+ static bool writeFaceField
+ (
const Field<Type>& fld,
+ const ensightFaces&,
ensightFile& os
);
+ //- Write a field of faces values as a sublist,
+ // using the sublist sizes ensightFaces
template<class Type>
- static bool writePatchField
+ static bool writeFaceSubField
(
- const Field<Type>& pf,
- const ensightFaces& ensFaces,
+ const Field<Type>& fld,
+ const ensightFaces&,
ensightFile& os
);
+ //- Write a field of cell values as an indirect list,
+ // using the cell ids from ensightCells
template<class Type>
- static bool writeVolField
+ static bool writeCellField
(
- const Field<Type>& vf,
- const ensightCells& ensCells,
+ const Field<Type>& fld,
+ const ensightCells&,
ensightFile& os,
const bool deprecatedOrder = false
);
diff --git a/src/conversion/ensight/output/ensightOutputTemplates.C b/src/conversion/ensight/output/ensightOutputTemplates.C
index a68058faf76a904ca823a167a091752c49f9e05d..4e456fb53850292150093915b8ab350d7a19b5a4 100644
--- a/src/conversion/ensight/output/ensightOutputTemplates.C
+++ b/src/conversion/ensight/output/ensightOutputTemplates.C
@@ -41,11 +41,11 @@ License
// * * * * * * * * * * Static Private Member Functions * * * * * * * * * * * //
-template<class Type>
-void Foam::ensightOutput::writeField
+template<template<typename> class FieldContainer, class Type>
+void Foam::ensightOutput::writeFieldContent
(
const char* key,
- const Field<Type>& fld,
+ const FieldContainer<Type>& fld,
ensightFile& os
)
{
@@ -85,7 +85,7 @@ void Foam::ensightOutput::writeField
template<class Type>
-bool Foam::ensightOutput::writePatchField
+bool Foam::ensightOutput::writeFaceField
(
const Field<Type>& pf,
const ensightFaces& ensFaces,
@@ -99,14 +99,11 @@ bool Foam::ensightOutput::writePatchField
os.beginPart(ensFaces.index());
}
- const List<ensightFaces::elemType> enums =
- ensightFaces::elemEnum.enums();
-
- forAllConstIter(List<ensightFaces::elemType>, enums, iter)
+ for (label typei=0; typei < ensightFaces::nTypes; ++typei)
{
- const ensightFaces::elemType& what = *iter;
+ const ensightFaces::elemType what = ensightFaces::elemType(typei);
- writeField
+ writeFieldContent
(
ensightFaces::key(what),
Field<Type>(pf, ensFaces.faceIds(what)),
@@ -124,7 +121,47 @@ bool Foam::ensightOutput::writePatchField
template<class Type>
-bool Foam::ensightOutput::writeVolField
+bool Foam::ensightOutput::writeFaceSubField
+(
+ const Field<Type>& pf,
+ const ensightFaces& ensFaces,
+ Foam::ensightFile& os
+)
+{
+ if (ensFaces.total())
+ {
+ if (Pstream::master())
+ {
+ os.beginPart(ensFaces.index());
+ }
+
+ label start = 0; // start of sublist
+ for (label typei = 0; typei < ensightFaces::nTypes; ++typei)
+ {
+ const ensightFaces::elemType what = ensightFaces::elemType(typei);
+ const label size = ensFaces.faceIds(what).size();
+
+ writeFieldContent
+ (
+ ensightFaces::key(what),
+ SubField<Type>(pf, size, start),
+ os
+ );
+
+ start += size; // start of next sublist
+ }
+
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+}
+
+
+template<class Type>
+bool Foam::ensightOutput::writeCellField
(
const Field<Type>& vf,
const ensightCells& ensCells,
@@ -151,34 +188,30 @@ bool Foam::ensightOutput::writeVolField
ensightCells::NFACED
};
- for (int i=0; i < 5; ++i)
+ for (label typei=0; typei < ensightCells::nTypes; ++typei)
{
- const ensightCells::elemType& what = oldOrder[i];
+ const ensightCells::elemType& what = oldOrder[typei];
- writeField
+ writeFieldContent
(
ensightCells::key(what),
Field<Type>(vf, ensCells.cellIds(what)),
os
);
}
+ return true;
}
- else
- {
- const List<ensightCells::elemType> enums =
- ensightCells::elemEnum.enums();
- forAllConstIter(List<ensightCells::elemType>, enums, iter)
- {
- const ensightCells::elemType& what = *iter;
+ for (label typei=0; typei < ensightCells::nTypes; ++typei)
+ {
+ const ensightCells::elemType what = ensightCells::elemType(typei);
- writeField
- (
- ensightCells::key(what),
- Field<Type>(vf, ensCells.cellIds(what)),
- os
- );
- }
+ writeFieldContent
+ (
+ ensightCells::key(what),
+ Field<Type>(vf, ensCells.cellIds(what)),
+ os
+ );
}
return true;
@@ -209,7 +242,7 @@ bool Foam::ensightOutput::writeField
//
if (ensMesh.useInternalMesh())
{
- writeVolField(vf, meshCells, os, ensMesh.deprecatedOrder());
+ writeCellField(vf, meshCells, os, ensMesh.deprecatedOrder());
}
//
@@ -223,7 +256,7 @@ bool Foam::ensightOutput::writeField
const word& patchName = patchLookup[listi];
const ensightFaces& ensFaces = patchFaces[patchName];
- writePatchField
+ writeFaceField
(
vf.boundaryField()[patchId],
ensFaces,
@@ -303,7 +336,9 @@ bool Foam::ensightOutput::writeField
);
}
- writePatchField(values, ensFaces, os);
+ // The field is already copied in the proper order
+ // - just need its corresponding sub-fields
+ writeFaceSubField(values, ensFaces, os);
}
}
@@ -335,7 +370,7 @@ bool Foam::ensightOutput::ensightPointField
os.beginPart(0); // 0 = internalMesh
}
- writeField
+ writeFieldContent
(
"coordinates",
Field<Type>(pf.internalField(), ensMesh.uniquePointMap()),
@@ -373,7 +408,7 @@ bool Foam::ensightOutput::ensightPointField
os.beginPart(ensFaces.index());
}
- writeField
+ writeFieldContent
(
"coordinates",
Field<Type>(pf.internalField(), uniqueMeshPointLabels),
@@ -417,7 +452,7 @@ bool Foam::ensightOutput::ensightPointField
os.beginPart(ensFaces.index());
}
- writeField
+ writeFieldContent
(
"coordinates",
Field<Type>(pf.internalField(), uniqueMeshPointLabels),
diff --git a/src/conversion/ensight/output/ensightSerialOutput.H b/src/conversion/ensight/output/ensightSerialOutput.H
index 8fcbc3025fe6fd0370e03a9762121ad7744e39e8..823c7ba5bf3b42333d5ffd796916d5394e7df1f7 100644
--- a/src/conversion/ensight/output/ensightSerialOutput.H
+++ b/src/conversion/ensight/output/ensightSerialOutput.H
@@ -55,12 +55,12 @@ class ensightSerialOutput
{
// Private Methods
- //- Write field component-wise
- template<class Type>
- static void writeField
+ //- Write field content (component-wise) for the given ensight element type
+ template<template<typename> class FieldContainer, class Type>
+ static void writeFieldContent
(
const word& key,
- const Field<Type>& field,
+ const FieldContainer<Type>& fld,
ensightFile& os
);
diff --git a/src/conversion/ensight/output/ensightSerialOutputTemplates.C b/src/conversion/ensight/output/ensightSerialOutputTemplates.C
index 31f4ad9370d9669bbd9a2ba4a8d1a576912671dc..80ed67b26a0c82aad489106517d0c3b60e6c77ce 100644
--- a/src/conversion/ensight/output/ensightSerialOutputTemplates.C
+++ b/src/conversion/ensight/output/ensightSerialOutputTemplates.C
@@ -31,11 +31,11 @@ License
// * * * * * * * * * * Static Private Member Functions * * * * * * * * * * * //
-template<class Type>
-void Foam::ensightSerialOutput::writeField
+template<template<typename> class FieldContainer, class Type>
+void Foam::ensightSerialOutput::writeFieldContent
(
const word& key,
- const Field<Type>& fld,
+ const FieldContainer<Type>& fld,
ensightFile& os
)
{
@@ -82,14 +82,11 @@ bool Foam::ensightSerialOutput::writeField
{
os.beginPart(part.index());
- const List<ensightFaces::elemType> enums =
- ensightFaces::elemEnum.enums();
-
- forAllConstIter(List<ensightFaces::elemType>, enums, iter)
+ for (label typei=0; typei < ensightFaces::nTypes; ++typei)
{
- const ensightFaces::elemType what = *iter;
+ const ensightFaces::elemType what = ensightFaces::elemType(typei);
- writeField
+ writeFieldContent
(
ensightFaces::key(what),
Field<Type>(fld, part.faceIds(what)),
@@ -115,14 +112,11 @@ bool Foam::ensightSerialOutput::writeField
{
os.beginPart(part.index());
- const List<ensightCells::elemType> enums =
- ensightCells::elemEnum.enums();
-
- forAllConstIter(List<ensightCells::elemType>, enums, iter)
+ for (label typei=0; typei < ensightCells::nTypes; ++typei)
{
- const ensightCells::elemType what = *iter;
+ const ensightCells::elemType what = ensightCells::elemType(typei);
- writeField
+ writeFieldContent
(
ensightCells::key(what),
Field<Type>(fld, part.cellIds(what)),
diff --git a/src/conversion/ensight/part/ensightPartFaces.C b/src/conversion/ensight/part/ensightPartFaces.C
index 4875b19cfbfcce79779f6666f37bf012f5ba8cf2..576032482650fe119270ca4c84fd4b5932c3f53c 100644
--- a/src/conversion/ensight/part/ensightPartFaces.C
+++ b/src/conversion/ensight/part/ensightPartFaces.C
@@ -48,10 +48,10 @@ Foam::ensightPart::localPoints Foam::ensightPartFaces::calcLocalPoints() const
labelList& usedPoints = ptList.list;
label nPoints = 0;
- // add all points from faces
+ // Add all points from faces
const labelUList& idList = this->faceIds();
- // add all points from faces
+ // Add all points from faces
forAll(idList, i)
{
const label id = idList[i] + start_;
@@ -67,7 +67,7 @@ Foam::ensightPart::localPoints Foam::ensightPartFaces::calcLocalPoints() const
}
- // this is not absolutely necessary, but renumber anyhow
+ // This is not absolutely necessary, but renumber anyhow
nPoints = 0;
forAll(usedPoints, ptI)
{
@@ -101,7 +101,7 @@ Foam::ensightPartFaces::ensightPartFaces
points_(points),
contiguousPoints_(contiguousPoints)
{
- // classify the face shapes
+ // Classify the face shapes
classify(faces);
}
@@ -121,7 +121,7 @@ Foam::ensightPartFaces::ensightPartFaces
points_(mesh.points()),
contiguousPoints_(false)
{
- // classify the face shapes
+ // Classify the face shapes
classify(patch);
}
@@ -149,10 +149,10 @@ void Foam::ensightPartFaces::writeConnectivity
os.write(idList.size());
os.newline();
- // write (polygon) face sizes
+ // Write (polygon) face sizes
if (key == "nsided")
{
- // write the number of points per face
+ // Write the number of points per face
forAll(idList, i)
{
const label id = idList[i] + start_;
@@ -163,13 +163,13 @@ void Foam::ensightPartFaces::writeConnectivity
}
}
- // write the points describing the face
+ // Write the points describing the face
forAll(idList, i)
{
const label id = idList[i] + start_;
const face& f = faces[id];
- // convert global -> local index
+ // Convert global -> local index
// (note: Ensight indices start with 1)
forAll(f, fp)
{
@@ -205,7 +205,7 @@ void Foam::ensightPartFaces::write
const pointField& points
) const
{
- if (ensightPart::size())
+ if (size())
{
const localPoints ptList = calcLocalPoints();
const labelUList& pointMap = ptList.list;
diff --git a/src/conversion/ensight/part/ensightPartFaces.H b/src/conversion/ensight/part/ensightPartFaces.H
index 974ca68a055783cb702077a64320b59becbe9ff2..bdb6c062c8b4824d8fc0a70c603e5822e49c193c 100644
--- a/src/conversion/ensight/part/ensightPartFaces.H
+++ b/src/conversion/ensight/part/ensightPartFaces.H
@@ -138,44 +138,43 @@ public:
// Member Functions
- // Access
+ // Access
- //- Part index (0-based)
- virtual label index() const
- {
- return ensightFaces::index();
- }
+ //- Part index (0-based)
+ virtual label index() const
+ {
+ return ensightFaces::index();
+ }
- //- Number of elements in this part
- virtual label size() const
- {
- return ensightFaces::size();
- }
+ //- Number of elements in this part
+ virtual label size() const
+ {
+ return ensightFaces::size();
+ }
- //- Return the patch index, -1 when not in use.
- inline label patchIndex() const
- {
- return patchIndex_;
- }
+ //- Return the patch index, -1 when not in use.
+ inline label patchIndex() const
+ {
+ return patchIndex_;
+ }
- // Output
+ // Output
- //- Write summary information about the object
- virtual void writeSummary(Ostream&) const;
+ //- Write summary information about the object
+ virtual void writeSummary(Ostream&) const;
- //- Write geometry
- virtual void write(ensightGeoFile&) const;
+ //- Write geometry
+ virtual void write(ensightGeoFile&) const;
- //- Helper: write geometry given the pointField
- virtual void write(ensightGeoFile&, const pointField&) const;
+ //- Helper: write geometry given the pointField
+ virtual void write(ensightGeoFile&, const pointField&) const;
- //- Print various types of debugging information
- virtual void dumpInfo(Ostream&) const;
-
+ //- Print various types of debugging information
+ virtual void dumpInfo(Ostream&) const;
};
diff --git a/src/fileFormats/ensight/part/ensightCells.C b/src/fileFormats/ensight/part/ensightCells.C
index 8db55a927ab557891357aa8726d9cfb3e0b8484d..141df44053ec83cd19b22d432a4602f00941d9ce 100644
--- a/src/fileFormats/ensight/part/ensightCells.C
+++ b/src/fileFormats/ensight/part/ensightCells.C
@@ -191,10 +191,7 @@ void Foam::ensightCells::sort()
{
forAll(lists_, typeI)
{
- if (lists_[typeI])
- {
- Foam::sort(*(lists_[typeI]));
- }
+ Foam::sort(*(lists_[typeI]));
}
}
diff --git a/src/fileFormats/ensight/part/ensightFaces.C b/src/fileFormats/ensight/part/ensightFaces.C
index e1e67153fdb6206d9dc69fe1b963816df376e74b..e8085b1fcbd3c45aa81dea0ae5a14680cfe69bae 100644
--- a/src/fileFormats/ensight/part/ensightFaces.C
+++ b/src/fileFormats/ensight/part/ensightFaces.C
@@ -233,28 +233,25 @@ void Foam::ensightFaces::sort()
{
if (flipMap_.size() == address_.size())
{
- // sort flip too
+ // sort flip map too
labelList order;
label start = 0;
forAll(lists_, typeI)
{
- if (lists_[typeI])
- {
- SubList<label>& idLst = *(lists_[typeI]);
- const label sz = idLst.size();
+ SubList<label>& idLst = *(lists_[typeI]);
+ const label sz = idLst.size();
- if (sz)
- {
- SubList<bool> flip(flipMap_, sz, start);
- start += sz; // for next sub-list
+ if (sz)
+ {
+ SubList<bool> flip(flipMap_, sz, start);
+ start += sz; // for next sub-list
- sortedOrder(idLst, order);
+ Foam::sortedOrder(idLst, order);
- idLst = reorder<labelList>(order, idLst);
- flip = reorder<boolList>(order, flip);
- }
+ idLst = reorder<labelList>(order, idLst);
+ flip = reorder<boolList>(order, flip);
}
}
}
@@ -263,16 +260,9 @@ void Foam::ensightFaces::sort()
// no flip-maps, simpler to sort
forAll(lists_, typeI)
{
- if (lists_[typeI])
- {
- SubList<label>& idLst = *(lists_[typeI]);
- const label sz = idLst.size();
- if (sz)
- {
- Foam::sort(idLst);
- }
- }
+ Foam::sort(*(lists_[typeI]));
}
+ flipMap_.clear(); // for safety
}
}
diff --git a/src/fileFormats/ensight/part/ensightFaces.H b/src/fileFormats/ensight/part/ensightFaces.H
index dfb16859c0732da4edb5efa1b54231da46978a46..ddce1410d818f55fe4c4893d156155252d935f6d 100644
--- a/src/fileFormats/ensight/part/ensightFaces.H
+++ b/src/fileFormats/ensight/part/ensightFaces.H
@@ -132,83 +132,82 @@ public:
// Member Functions
- // Access
+ // Access
- //- The index in a list.
- inline label index() const;
+ //- The index in a list.
+ inline label index() const;
- //- The index in a list, non-const access.
- inline label& index();
+ //- The index in a list, non-const access.
+ inline label& index();
- //- The processor local size of all elements.
- inline label size() const;
+ //- The processor local size of all elements.
+ inline label size() const;
- //- The global number of the specified element type.
- // This value is only meaningful after a reduce operation.
- inline label total(const enum elemType) const;
+ //- The global number of the specified element type.
+ // This value is only meaningful after a reduce operation.
+ inline label total(const enum elemType) const;
- //- The global number of all element types.
- // This value is only meaningful after a reduce operation.
- label total() const;
+ //- The global number of all element types.
+ // This value is only meaningful after a reduce operation.
+ label total() const;
- //- The processor local sizes per element type.
- FixedList<label, 3> sizes() const;
+ //- The processor local sizes per element type.
+ FixedList<label, 3> sizes() const;
- //- The global numbers per element type.
- // This value is only meaningful after a reduce operation.
- const FixedList<label, 3>& totals() const;
+ //- The global numbers per element type.
+ // This value is only meaningful after a reduce operation.
+ const FixedList<label, 3>& totals() const;
- //- Return the (local) face ids of the specified element type
- inline const labelUList& faceIds(const enum elemType) const;
+ //- Return the (local) face ids of the specified element type
+ inline const labelUList& faceIds(const enum elemType) const;
- //- Return the face ids of all elements
- inline const labelUList& faceIds() const;
+ //- Return the face ids of all elements
+ inline const labelUList& faceIds() const;
- //- Return the flip-map of all elements
- inline const boolList& flipMap() const;
+ //- Return the flip-map of all elements
+ inline const boolList& flipMap() const;
- //- Starting offset of element type.
- label offset(const enum elemType what) const;
+ //- Starting offset of element type.
+ label offset(const enum elemType what) const;
- // Edit
+ // Edit
- //- Classify the face types, set element list.
- void classify(const faceList& faces);
+ //- Classify the face types, set element list.
+ void classify(const faceList& faces);
- //- Classify the face types, set element list.
- // The indirect addressing can be used when classifying groups of
- // face (eg, from a faceZone etc) with an optional flipMap.
- // The optional exclude marker can be used to skip faces on particular
- // boundary types or regions.
- void classify
- (
- const faceList& faces,
- const labelUList& addressing,
- const boolList& flipMap = boolList(),
- const PackedBoolList& exclude = PackedBoolList()
- );
+ //- Classify the face types, set element list.
+ // The indirect addressing can be used when classifying groups of
+ // face (eg, from a faceZone etc) with an optional flipMap.
+ // The optional exclude marker can be used to skip faces on particular
+ // boundary types or regions.
+ void classify
+ (
+ const faceList& faces,
+ const labelUList& addressing,
+ const boolList& flipMap = boolList(),
+ const PackedBoolList& exclude = PackedBoolList()
+ );
- //- Set addressable sizes to zero, free up addressing memory.
- void clear();
+ //- Set addressable sizes to zero, free up addressing memory.
+ void clear();
- //- Sum element counts across all processes.
- void reduce();
+ //- Sum element counts across all processes.
+ void reduce();
- //- Sort element lists numerically.
- void sort();
+ //- Sort element lists numerically.
+ void sort();
// Member operators
//- Return element from linear-list.
inline label operator[](const label i) const;
-
};
diff --git a/src/fileFormats/starcd/STARCDCore.C b/src/fileFormats/starcd/STARCDCore.C
index 612b9c30911fb2913314787a888cdcb0ee7ea1bf..7ea833b488ae291e55cbbc68f7c260ba903200ee 100644
--- a/src/fileFormats/starcd/STARCDCore.C
+++ b/src/fileFormats/starcd/STARCDCore.C
@@ -230,7 +230,7 @@ void Foam::fileFormats::STARCDCore::writePoints
(
Ostream& os,
const pointField& points,
- const double scaleFactor
+ const scalar scaleFactor
)
{
writeHeader(os, HEADER_VRT);
diff --git a/src/fileFormats/vtk/format/foamVtkFormatter.C b/src/fileFormats/vtk/format/foamVtkFormatter.C
index b204ad22795410165c657f553ea44b8b63b52cff..7271dd22f5ebbee7037f5dd1484fd8b67ef5046c 100644
--- a/src/fileFormats/vtk/format/foamVtkFormatter.C
+++ b/src/fileFormats/vtk/format/foamVtkFormatter.C
@@ -116,7 +116,7 @@ Foam::foamVtkFormatter::openTag(const word& tag)
Foam::foamVtkFormatter&
-Foam::foamVtkFormatter::closeTag(bool isEmpty)
+Foam::foamVtkFormatter::closeTag(const bool isEmpty)
{
if (!inTag_)
{
@@ -207,20 +207,23 @@ Foam::foamVtkFormatter&
Foam::foamVtkFormatter::xmlAttr
(
const word& k,
- const label v,
+ const int32_t v,
const char quote
)
{
- if (!inTag_)
- {
- WarningInFunction
- << "xml attribute '" << k << "' but not within a tag!"
- << endl;
- }
+ return xmlAttribute(k, v, quote);
+}
- os_ << ' ' << k << '=' << quote << v << quote;
- return *this;
+Foam::foamVtkFormatter&
+Foam::foamVtkFormatter::xmlAttr
+(
+ const word& k,
+ const int64_t v,
+ const char quote
+)
+{
+ return xmlAttribute(k, v, quote);
}
@@ -232,16 +235,7 @@ Foam::foamVtkFormatter::xmlAttr
const char quote
)
{
- if (!inTag_)
- {
- WarningInFunction
- << "xml attribute '" << k << "' but not within a tag!"
- << endl;
- }
-
- os_ << ' ' << k << '=' << quote << v << quote;
-
- return *this;
+ return xmlAttribute(k, v, quote);
}
@@ -253,16 +247,7 @@ Foam::foamVtkFormatter::xmlAttr
const char quote
)
{
- if (!inTag_)
- {
- WarningInFunction
- << "xml attribute '" << k << "' but not within a tag!"
- << endl;
- }
-
- os_ << ' ' << k << '=' << quote << v << quote;
-
- return *this;
+ return xmlAttribute(k, v, quote);
}
@@ -283,7 +268,18 @@ Foam::foamVtkFormatter&
Foam::foamVtkFormatter::operator()
(
const word& k,
- const label v
+ const int32_t v
+)
+{
+ return xmlAttr(k, v);
+}
+
+
+Foam::foamVtkFormatter&
+Foam::foamVtkFormatter::operator()
+(
+ const word& k,
+ const int64_t v
)
{
return xmlAttr(k, v);
diff --git a/src/fileFormats/vtk/format/foamVtkFormatter.H b/src/fileFormats/vtk/format/foamVtkFormatter.H
index 4fe0cb997773461de2a049b087af731126b359ee..65519b1955a0265fbd09154100be57124c111d69 100644
--- a/src/fileFormats/vtk/format/foamVtkFormatter.H
+++ b/src/fileFormats/vtk/format/foamVtkFormatter.H
@@ -70,6 +70,16 @@ class foamVtkFormatter
mutable bool inTag_;
+ //- Write XML attribute
+ template<class Type>
+ foamVtkFormatter& xmlAttribute
+ (
+ const word&,
+ const Type&,
+ const char quote
+ );
+
+
protected:
// Protected Member Functions
@@ -113,9 +123,9 @@ public:
virtual void writeSize(const uint64_t) = 0;
virtual void write(const uint8_t) = 0;
- virtual void write(const label) = 0;
- virtual void write(const float) = 0;
- virtual void write(const double) = 0;
+ virtual void write(const label) = 0;
+ virtual void write(const float) = 0;
+ virtual void write(const double) = 0;
virtual void flush() = 0;
@@ -136,7 +146,7 @@ public:
//- Close XML tag, optional as an empty container.
// Always adds a trailing newline.
- foamVtkFormatter& closeTag(bool isEmpty = false);
+ foamVtkFormatter& closeTag(const bool isEmpty = false);
//- End XML tag, optional with sanity check
// Always adds a trailing newline.
@@ -164,21 +174,28 @@ public:
}
-
//- Write XML attribute
foamVtkFormatter& xmlAttr
(
const word&,
const std::string&,
- const char quote='\''
+ const char quote = '\''
);
//- Write XML attribute
foamVtkFormatter& xmlAttr
(
const word&,
- const label,
- const char quote='\''
+ const int32_t,
+ const char quote = '\''
+ );
+
+ //- Write XML attribute
+ foamVtkFormatter& xmlAttr
+ (
+ const word&,
+ const int64_t,
+ const char quote = '\''
);
//- Write XML attribute
@@ -186,7 +203,7 @@ public:
(
const word&,
const uint64_t,
- const char quote='\''
+ const char quote = '\''
);
//- Write XML attribute
@@ -194,7 +211,7 @@ public:
(
const word&,
const scalar,
- const char quote='\''
+ const char quote = '\''
);
@@ -205,7 +222,10 @@ public:
foamVtkFormatter& operator()(const word&, const std::string&);
//- Write XML attribute
- foamVtkFormatter& operator()(const word&, const label);
+ foamVtkFormatter& operator()(const word&, const int32_t);
+
+ //- Write XML attribute
+ foamVtkFormatter& operator()(const word&, const int64_t);
//- Write XML attribute
foamVtkFormatter& operator()(const word&, const uint64_t);
diff --git a/src/fileFormats/vtk/format/foamVtkFormatterTemplates.C b/src/fileFormats/vtk/format/foamVtkFormatterTemplates.C
index 6e0830e2b1fab52f022a8ef6cfd81dbf15581d03..1cde34a61e278147dca32ef073238687476c8672 100644
--- a/src/fileFormats/vtk/format/foamVtkFormatterTemplates.C
+++ b/src/fileFormats/vtk/format/foamVtkFormatterTemplates.C
@@ -26,6 +26,28 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+template<class Type>
+Foam::foamVtkFormatter&
+Foam::foamVtkFormatter::xmlAttribute
+(
+ const word& k,
+ const Type& v,
+ const char quote
+)
+{
+ if (!inTag_)
+ {
+ WarningInFunction
+ << "xml attribute '" << k << "' but not within a tag!"
+ << endl;
+ }
+
+ os_ << ' ' << k << '=' << quote << v << quote;
+
+ return *this;
+}
+
+
template<class Type, int nComp>
Foam::foamVtkFormatter& Foam::foamVtkFormatter::openDataArray
(
diff --git a/src/fileFormats/vtk/format/foamVtkLegacyFormatter.C b/src/fileFormats/vtk/format/foamVtkLegacyFormatter.C
index 177249b306a84daf44531ffb39668beb836b9a0e..89525ab0baa0ebf2555548a517f0fce491d4c259 100644
--- a/src/fileFormats/vtk/format/foamVtkLegacyFormatter.C
+++ b/src/fileFormats/vtk/format/foamVtkLegacyFormatter.C
@@ -77,8 +77,9 @@ void Foam::foamVtkLegacyFormatter::writeSize(const uint64_t)
void Foam::foamVtkLegacyFormatter::write(const uint8_t val)
{
- // Can only handle integers
- int copy(val);
+ // Legacy can only handle 32-bit integers.
+ // Nonetheless promote to 'label' (32 or 64 bit) and deal with it later
+ label copy(val);
write(copy);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H
index c777ff623a45ed590d39b8f1c5751eb4b2a7904c..dd367ca3f8b616254b30c7661723bd6d444174e4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H
@@ -29,13 +29,13 @@ Group
Description
This boundary conditon averages the field over the "outlet" patch specified
- by name "outletPatchName" and applies this as the uniform value of the
+ by name "outletPatch" and applies this as the uniform value of the
field over this patch.
Usage
\table
Property | Description | Required | Default value
- outletPatchName | name of outlet patch | yes |
+ outletPatch | name of outlet patch | yes |
phi | flux field name | no | phi
\endtable
@@ -44,7 +44,7 @@ Usage
<patchName>
{
type outletMappedUniformInlet;
- outletPatchName aPatch;
+ outletPatch aPatch;
phi phi;
value uniform 0;
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
index dc37c38a43e20bc0122f10e9d2c9b3caf3a8c09e..42dec49fc3b1160a3c99e4449a4a4185f29ec2b7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
@@ -67,18 +67,13 @@ surfaceNormalFixedValueFvPatchVectorField
)
:
fixedValueFvPatchVectorField(p, iF),
- refValue_(ptf.refValue_, mapper)
+ refValue_(ptf.refValue_, mapper, 0.0)
{
- // Note: calculate product only on ptf to avoid multiplication on
- // unset values in reconstructPar.
- fvPatchVectorField::operator=
- (
- vectorField
- (
- ptf.refValue_*ptf.patch().nf(),
- mapper
- )
- );
+ // Note: refValue_ will have default value 0.0 for unmapped faces. This
+ // can temporarily happen during e.g. redistributePar. We should not
+ // access ptf.patch() instead since redistributePar has destroyed this
+ // at the time of mapping.
+ fvPatchVectorField::operator=(refValue_*patch().nf());
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
index e2bf45527fb26b37c546f9a6e85a5e6ca07e8c75..5a42c9e0d82b8d6c24fe7ab4124a1f21c846b182 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
@@ -1104,9 +1104,9 @@ void Foam::turbulentDFSEMInletFvPatchVectorField::write(Ostream& os) const
fvPatchField<vector>::write(os);
writeEntry("value", os);
os.writeKeyword("delta") << delta_ << token::END_STATEMENT << nl;
- writeEntryIfDifferent(os, "d", 1.0, d_);
- writeEntryIfDifferent(os, "kappa", 0.41, kappa_);
- writeEntryIfDifferent(os, "perturb", 1e-5, perturb_);
+ writeEntryIfDifferent<scalar>(os, "d", 1.0, d_);
+ writeEntryIfDifferent<scalar>(os, "kappa", 0.41, kappa_);
+ writeEntryIfDifferent<scalar>(os, "perturb", 1e-5, perturb_);
writeEntryIfDifferent<label>(os, "nCellPerEddy", 5, nCellPerEddy_);
writeEntryIfDifferent(os, "writeEddies", false, writeEddies_);
diff --git a/src/functionObjects/field/DESModelRegions/DESModelRegions.C b/src/functionObjects/field/DESModelRegions/DESModelRegions.C
index 360af5136c96772e9940329f47b0d1cd8a5d0e04..bb94a127677f96eb0000dc6c600151abfdb1e180 100644
--- a/src/functionObjects/field/DESModelRegions/DESModelRegions.C
+++ b/src/functionObjects/field/DESModelRegions/DESModelRegions.C
@@ -113,7 +113,7 @@ bool Foam::functionObjects::DESModelRegions::read(const dictionary& dict)
fvMeshFunctionObject::read(dict);
writeFile::read(dict);
- dict.readIfPresent("resultName", resultName_);
+ dict.readIfPresent("result", resultName_);
return true;
}
diff --git a/src/functionObjects/field/ddt2/ddt2.C b/src/functionObjects/field/ddt2/ddt2.C
index 7aeecd01e90d76ac011206c2bf7c38c42c36716d..a3876716585aa57bcea8897ca5cf0e57e0ee2029 100644
--- a/src/functionObjects/field/ddt2/ddt2.C
+++ b/src/functionObjects/field/ddt2/ddt2.C
@@ -112,7 +112,6 @@ Foam::functionObjects::ddt2::ddt2
)
:
fvMeshFunctionObject(name, runTime, dict),
- prevTimeIndex_(-1),
selectFields_(),
resultName_(word::null),
blacklist_(),
@@ -218,20 +217,12 @@ bool Foam::functionObjects::ddt2::execute()
<< "Unprocessed field " << ignored << endl;
}
- // Update time index
- prevTimeIndex_ = obr_.time().timeIndex();
-
return true;
}
bool Foam::functionObjects::ddt2::write()
{
- if (prevTimeIndex_ < obr_.time().timeIndex())
- {
- // Ensure written results reflect the current state
- execute();
- }
if (results_.size())
{
Log << type() << ' ' << name() << " write:" << endl;
diff --git a/src/functionObjects/field/ddt2/ddt2.H b/src/functionObjects/field/ddt2/ddt2.H
index bba1492e3e4fb870671465597e812a2df74ff035..21607ce2a34c98f72c87742e8f94b84dd1340119 100644
--- a/src/functionObjects/field/ddt2/ddt2.H
+++ b/src/functionObjects/field/ddt2/ddt2.H
@@ -101,9 +101,6 @@ class ddt2
{
// Private data
- //- Time at last execute, ensures write uses up-to-date values
- label prevTimeIndex_;
-
//- Name of fields to process
wordReList selectFields_;
diff --git a/src/functionObjects/field/fluxSummary/fluxSummary.C b/src/functionObjects/field/fluxSummary/fluxSummary.C
index 7a27f185272e0a30c783392827006f3726ba3107..cfe7a3e18c2beefe6e6b7192ba7d57b80bc02b85 100644
--- a/src/functionObjects/field/fluxSummary/fluxSummary.C
+++ b/src/functionObjects/field/fluxSummary/fluxSummary.C
@@ -623,7 +623,7 @@ bool Foam::functionObjects::fluxSummary::read(const dictionary& dict)
writeFile::read(dict);
mode_ = modeTypeNames_.read(dict.lookup("mode"));
- phiName_= dict.lookupOrDefault<word>("phiName", "phi");
+ phiName_= dict.lookupOrDefault<word>("phi", "phi");
dict.readIfPresent("scaleFactor", scaleFactor_);
dict.readIfPresent("tolerance", tolerance_);
diff --git a/src/functionObjects/field/streamLine/streamLineBase.C b/src/functionObjects/field/streamLine/streamLineBase.C
index 2a489fdc78ae8e6d2d245e93647011cd02704551..9b6daeee12c484a59d2d46a8b9b86e9115748915 100644
--- a/src/functionObjects/field/streamLine/streamLineBase.C
+++ b/src/functionObjects/field/streamLine/streamLineBase.C
@@ -558,7 +558,7 @@ bool Foam::functionObjects::streamLineBase::read(const dictionary& dict)
//Info<< " using interpolation " << interpolationScheme_ << endl;
- cloudName_ = dict.lookupOrDefault<word>("cloudName", type());
+ cloudName_ = dict.lookupOrDefault<word>("cloud", type());
dict.lookup("seedSampleSet") >> seedSet_;
const dictionary& coeffsDict = dict.subDict(seedSet_ + "Coeffs");
diff --git a/src/functionObjects/field/valueAverage/valueAverage.C b/src/functionObjects/field/valueAverage/valueAverage.C
index a5a7100aed61c3f3352784f6ac3ca4842bbf7c17..7b26468a4fb865e7155b189b5bfd3d15feb86558 100644
--- a/src/functionObjects/field/valueAverage/valueAverage.C
+++ b/src/functionObjects/field/valueAverage/valueAverage.C
@@ -70,7 +70,7 @@ Foam::functionObjects::valueAverage::valueAverage
:
regionFunctionObject(name, runTime, dict),
writeFile(obr_, name, typeName, dict),
- functionObjectName_("unknown-functionObjectName"),
+ functionObjectName_("unknown-functionObject"),
fieldNames_(),
window_(-1),
totalTime_(),
@@ -109,7 +109,7 @@ bool Foam::functionObjects::valueAverage::read(const dictionary& dict)
regionFunctionObject::read(dict);
writeFile::read(dict);
- dict.lookup("functionObjectName") >> functionObjectName_;
+ dict.lookup("functionObject") >> functionObjectName_;
dict.lookup("fields") >> fieldNames_;
window_ = dict.lookupOrDefault<scalar>("window", -1);
diff --git a/src/functionObjects/field/zeroGradient/zeroGradient.C b/src/functionObjects/field/zeroGradient/zeroGradient.C
index 53d41c23f89e0c08f18be6a57f44d2470788a8c8..ff07607652bf19fa5f3dab52c6dc2d5841998d8b 100644
--- a/src/functionObjects/field/zeroGradient/zeroGradient.C
+++ b/src/functionObjects/field/zeroGradient/zeroGradient.C
@@ -100,7 +100,6 @@ Foam::functionObjects::zeroGradient::zeroGradient
)
:
fvMeshFunctionObject(name, runTime, dict),
- prevTimeIndex_(-1),
selectFields_(),
resultName_(string::null),
results_()
@@ -175,20 +174,12 @@ bool Foam::functionObjects::zeroGradient::execute()
<< "Unprocessed field " << ignored << endl;
}
- // Update time index
- prevTimeIndex_ = obr_.time().timeIndex();
-
return true;
}
bool Foam::functionObjects::zeroGradient::write()
{
- if (prevTimeIndex_ < obr_.time().timeIndex())
- {
- // Ensure written results reflect the current state
- execute();
- }
if (results_.size())
{
Log << type() << ' ' << name() << " write:" << endl;
diff --git a/src/functionObjects/field/zeroGradient/zeroGradient.H b/src/functionObjects/field/zeroGradient/zeroGradient.H
index e4eb1c75b3dcaf2cf3381d9c8bb2f2678007e6ec..84243608243737ecb27b8735d2be2e19e84f1d43 100644
--- a/src/functionObjects/field/zeroGradient/zeroGradient.H
+++ b/src/functionObjects/field/zeroGradient/zeroGradient.H
@@ -95,9 +95,6 @@ class zeroGradient
{
// Private data
- //- Time at last execute, ensures write uses up-to-date values
- label prevTimeIndex_;
-
//- Name of fields to process
wordReList selectFields_;
diff --git a/src/functionObjects/graphics/runTimePostProcessing/Allwmake b/src/functionObjects/graphics/runTimePostProcessing/Allwmake
index 277a8c394f6f36ad02f89b0bab074c3f8121925e..9538323521da100a8679713d8eb5b7261fa33254 100755
--- a/src/functionObjects/graphics/runTimePostProcessing/Allwmake
+++ b/src/functionObjects/graphics/runTimePostProcessing/Allwmake
@@ -4,37 +4,58 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source the wmake functions
. $WM_DIR/scripts/wmakeFunctions
-# The source directory
-sourceDir=$PWD
-
-# Where are any generated files stored?
-findObjectDir $sourceDir
-depDir="$objectsDir"
+# Ensure CMake gets the correct C/C++ compilers
+[ -n "$WM_CC" ] && export CC="$WM_CC"
+[ -n "$WM_CXX" ] && export CXX="$WM_CXX"
echo
echo "======================================================================"
echo "${PWD##*/} : $PWD"
echo
+
+# CMake into objectsDir,
+# with an additional attempt if (possibly incorrect) CMakeCache.txt existed
+doCmake()
+{
+ local sourceDir="$1"
+
+ findObjectDir $sourceDir # Where are generated files stored?
+ test -f "$objectsDir/CMakeCache.txt"
+ retry=$? # CMakeCache.txt exists, but sources may have moved
+
+ mkdir -p $objectsDir && \
+ (
+ cd $objectsDir || exit 1
+
+ cmake $sourceDir || {
+ if [ $retry -eq 0 ]
+ then
+ echo "Removing CMakeCache.txt and attempt again"
+ rm -f CMakeCache.txt
+ cmake $sourceDir
+ else
+ exit 1
+ fi
+ } && make
+ )
+}
+
+
if [ -d "$VTK_DIR" -o -d "$ParaView_DIR" ]
then
- # ensure CMake gets the correct C/C++ compilers
- [ -n "$WM_CC" ] && export CC="$WM_CC"
- [ -n "$WM_CXX" ] && export CXX="$WM_CXX"
-
- if type cmake > /dev/null 2>&1
+ if [ "$targetType" != objects ]
then
- (
- mkdir -p $depDir \
- && cd $depDir \
- && cmake $sourceDir \
- && make
- ) || {
- echo
- echo "WARNING: incomplete build of VTK-based post-processing"
- }
- else
- echo "WARNING: skipped - needs cmake"
+ if type cmake > /dev/null 2>&1
+ then
+ doCmake $PWD || {
+ echo
+ echo " WARNING: incomplete build of VTK-based post-processing"
+ echo
+ }
+ else
+ echo "WARNING: skipped - needs cmake"
+ fi
fi
else
echo "WARNING: skipped - needs a VTK or a ParaView installation"
@@ -45,4 +66,4 @@ fi
echo "======================================================================"
echo
-# ----------------------------------------------------------------- end-of-file
+# -----------------------------------------------------------------------------
diff --git a/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C b/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C
index e88d6a7eb74d6f9107c6a67e0152bba9e6ae6f6f..f43b60c172d4d4fb0826f1ef1001ad8a4e6bc166 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C
@@ -514,7 +514,7 @@ Foam::functionObjects::fieldVisualisationBase::fieldVisualisationBase
:
parent_(parent),
colours_(colours),
- fieldName_(dict.lookup("fieldName")),
+ fieldName_(dict.lookup("field")),
colourBy_(cbColour),
colourMap_(cmRainbow),
range_()
diff --git a/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C b/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C
index 044ed7b51ea7ab724d18975ac260cb73935c6c32..a414f269c9ec130feb6e505b2d32cd142ad00850 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C
@@ -63,9 +63,9 @@ Foam::functionObjects::runTimePostPro::functionObjectCloud::functionObjectCloud
:
pointData(parent, dict, colours),
fieldVisualisationBase(parent, dict, colours),
- cloudName_(dict.lookup("cloudName")),
+ cloudName_(dict.lookup("cloud")),
functionObject_(dict.lookup("functionObject")),
- colourFieldName_(dict.lookup("colourFieldName")),
+ colourFieldName_(dict.lookup("colourField")),
actor_()
{
actor_ = vtkSmartPointer<vtkActor>::New();
diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.C b/src/functionObjects/solvers/scalarTransport/scalarTransport.C
index f9007e19a4b3c2f8add1d81b4ec0e3e590c77308..4e7cfb07762a6f5e65eb285af15df6f191444383 100644
--- a/src/functionObjects/solvers/scalarTransport/scalarTransport.C
+++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.C
@@ -296,7 +296,7 @@ bool Foam::functionObjects::scalarTransport::execute()
mesh_.lookupObject<surfaceScalarField>(phiName_)
);
}
- else if(UPhiName_ != "none")
+ else if (UPhiName_ != "none")
{
const volVectorField& Uphi =
mesh_.lookupObject<volVectorField>(UPhiName_);
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C b/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
index 8f0c5d72afafc0303b731cf7fe28b29a46fa8763..37e19ce07e77ef42f0cbd47f65337fb185962b1a 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
@@ -53,7 +53,7 @@ Foam::functionObjects::runTimeControls::averageCondition::averageCondition
)
:
runTimeCondition(name, obr, dict, state),
- functionObjectName_(dict.lookup("functionObjectName")),
+ functionObjectName_(dict.lookup("functionObject")),
fieldNames_(dict.lookup("fields")),
tolerance_(readScalar(dict.lookup("tolerance"))),
window_(dict.lookupOrDefault<scalar>("window", -1)),
diff --git a/src/fvOptions/interRegionOption/interRegionOption.C b/src/fvOptions/interRegionOption/interRegionOption.C
index cb848dc4d888d800abbbc6ca60e134f2526d9ec3..545601905589ac45075fc4ecbd3b0efa1880391f 100644
--- a/src/fvOptions/interRegionOption/interRegionOption.C
+++ b/src/fvOptions/interRegionOption/interRegionOption.C
@@ -102,7 +102,7 @@ Foam::fv::interRegionOption::interRegionOption
mesh
),
master_(coeffs_.lookupOrDefault<bool>("master", true)),
- nbrRegionName_(coeffs_.lookup("nbrRegionName")),
+ nbrRegionName_(coeffs_.lookup("nbrRegion")),
meshInterpPtr_()
{
if (active())
diff --git a/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
index 767f0224897946f812938474c9aa211cb623782b..b6c2be4abc6e7963f7a92e7d60a838618a863cf7 100644
--- a/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
+++ b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
@@ -106,7 +106,7 @@ Foam::fv::acousticDampingSource::acousticDampingSource
zeroGradientFvPatchField<vector>::typeName
)
),
- URefName_("unknown-URefName"),
+ URefName_("unknown-URef"),
x0_(Zero),
r1_(0),
r2_(0),
diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
index b0ecd8c43dd30cb0474b19253b4fb3f7deb75256..89de057f5d062c8f8a8f9ede39850f7b0de9ac7d 100644
--- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
+++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
@@ -304,9 +304,9 @@ bool Foam::fv::effectivenessHeatExchangerSource::read(const dictionary& dict)
{
if (cellSetOption::read(dict))
{
- UName_ = coeffs_.lookupOrDefault<word>("UName", "U");
- TName_ = coeffs_.lookupOrDefault<word>("TName", "T");
- phiName_ = coeffs_.lookupOrDefault<word>("phiName", "phi");
+ UName_ = coeffs_.lookupOrDefault<word>("U", "U");
+ TName_ = coeffs_.lookupOrDefault<word>("T", "T");
+ phiName_ = coeffs_.lookupOrDefault<word>("phi", "phi");
coeffs_.lookup("faceZone") >> faceZoneName_;
coeffs_.lookup("secondaryMassFlowRate") >> secondaryMassFlowRate_;
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
index 4190a1deb2be83a21ce312d78fa3fb6054a46ef0..af0894d4f496ffa035a30e3b8dd3e120506aae7a 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
@@ -207,10 +207,10 @@ Foam::fv::tabulatedNTUHeatTransfer::tabulatedNTUHeatTransfer
)
:
interRegionHeatTransferModel(name, modelType, dict, mesh),
- UName_(coeffs_.lookupOrDefault<word>("UName", "U")),
- UNbrName_(coeffs_.lookupOrDefault<word>("UNbrName", "U")),
- rhoName_(coeffs_.lookupOrDefault<word>("rhoName", "rho")),
- rhoNbrName_(coeffs_.lookupOrDefault<word>("rhoNbrName", "rho")),
+ UName_(coeffs_.lookupOrDefault<word>("U", "U")),
+ UNbrName_(coeffs_.lookupOrDefault<word>("UNbr", "U")),
+ rhoName_(coeffs_.lookupOrDefault<word>("rho", "rho")),
+ rhoNbrName_(coeffs_.lookupOrDefault<word>("rhoNbr", "rho")),
ntuTable_(),
geometryMode_(gmCalculated),
Ain_(-1),
@@ -275,10 +275,10 @@ bool Foam::fv::tabulatedNTUHeatTransfer::read(const dictionary& dict)
{
if (option::read(dict))
{
- coeffs_.readIfPresent("UName", UName_);
- coeffs_.readIfPresent("UNbrName", UNbrName_);
- coeffs_.readIfPresent("rhoName", rhoName_);
- coeffs_.readIfPresent("rhoNbrName", rhoNbrName_);
+ coeffs_.readIfPresent("U", UName_);
+ coeffs_.readIfPresent("UNbr", UNbrName_);
+ coeffs_.readIfPresent("rho", rhoName_);
+ coeffs_.readIfPresent("rhoNbr", rhoNbrName_);
// Force geometry re-initialisation
Ain_ = -1;
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H
index fb488418d4f885a49826d02c936231b88d6f679e..4e0e0170ce8494fac1f11594d2f6aaf20164dc23 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H
@@ -68,13 +68,13 @@ Description
tabulatedNTUHeatTransferCoeffs
{
interpolationMethod cellVolumeWeight;
- nbrRegionName air;
+ nbrRegion air;
master true;
fieldNames (h);
outOfBounds clamp;
fileName "ntuTable";
- nbrModelName airToCooler;
+ nbrModel airToCooler;
semiImplicit no;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
index 41b1555d383f1c7e9c1f7eaeae3a13809420f65e..c1fd0f678e0cb64ecc6c7333ebde0fe4ba3619f0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
@@ -40,7 +40,7 @@ Foam::PatchFlowRateInjection<CloudType>::PatchFlowRateInjection
)
:
InjectionModel<CloudType>(dict, owner, modelName,typeName),
- patchInjectionBase(owner.mesh(), this->coeffDict().lookup("patchName")),
+ patchInjectionBase(owner.mesh(), this->coeffDict().lookup("patch")),
phiName_(this->coeffDict().template lookupOrDefault<word>("phi", "phi")),
rhoName_(this->coeffDict().template lookupOrDefault<word>("rho", "rho")),
duration_(readScalar(this->coeffDict().lookup("duration"))),
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
index 58d67c726bd366f6f22703f96883c9f46e5f3157..13227e34ef4875770e6848976951da7a7fd3b2c9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
@@ -38,7 +38,7 @@ Foam::PatchInjection<CloudType>::PatchInjection
)
:
InjectionModel<CloudType>(dict, owner, modelName, typeName),
- patchInjectionBase(owner.mesh(), this->coeffDict().lookup("patchName")),
+ patchInjectionBase(owner.mesh(), this->coeffDict().lookup("patch")),
duration_(readScalar(this->coeffDict().lookup("duration"))),
parcelsPerSecond_
(
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
index edff573a0fe5106af218eca9bf1fffc5b977db20..ad6f3e1001c8868601bb81017b04575288c4e116 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
@@ -37,26 +37,17 @@ Foam::InterfaceForce<CloudType>::InterfaceForce
)
:
ParticleForce<CloudType>(owner, mesh, dict, typeName, true),
- alpaName_
- (
- this->coeffs().template lookup("alphaName")
- ),
- C_
- (
- readScalar(this->coeffs().lookup("C"))
- ),
+ alphaName_(this->coeffs().lookup("alpha")),
+ C_(readScalar(this->coeffs().lookup("C"))),
gradInterForceInterpPtr_(nullptr)
{}
template<class CloudType>
-Foam::InterfaceForce<CloudType>::InterfaceForce
-(
- const InterfaceForce& pf
-)
+Foam::InterfaceForce<CloudType>::InterfaceForce(const InterfaceForce& pf)
:
ParticleForce<CloudType>(pf),
- alpaName_(pf.alpaName_),
+ alphaName_(pf.alphaName_),
C_(pf.C_),
gradInterForceInterpPtr_(pf.gradInterForceInterpPtr_)
{}
@@ -84,7 +75,7 @@ void Foam::InterfaceForce<CloudType>::cacheFields(const bool store)
if (!fieldExists)
{
const volScalarField& alpha = this->mesh().template
- lookupObject<volScalarField>(alpaName_);
+ lookupObject<volScalarField>(alphaName_);
volVectorField* gradInterForcePtr =
new volVectorField(fName, fvc::grad(alpha*(1-alpha)));
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.H
index 15810b1ed558689a117bec53576ab05c7e17fc4f..58320e6e08c02afd25c175c6c631c494bf511470 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.H
@@ -57,13 +57,13 @@ class InterfaceForce
{
// Private data
- //- Name of VOF field
- const word alpaName_;
+ //- Name of phase fraction field
+ const word alphaName_;
//- Model constant
const scalar C_;
- //- gradInterForce interpolator
+ //- Interpolator for gradInterForce
autoPtr<interpolation<vector>> gradInterForceInterpPtr_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C
index 9630f242b28d292dff2e60addf237e663f1868b6..e023c1d0ea47ad93f6ae66ec7b4a4b021326931c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C
@@ -41,7 +41,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
(
this->coeffs().template lookupOrDefault<word>
(
- "linearAccelerationName",
+ "linearAcceleration",
"linearAcceleration"
)
),
@@ -50,7 +50,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
(
this->coeffs().template lookupOrDefault<word>
(
- "angularVelocityName",
+ "angularVelocity",
"angularVelocity"
)
),
@@ -59,7 +59,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
(
this->coeffs().template lookupOrDefault<word>
(
- "angularAccelerationName",
+ "angularAcceleration",
"angularAcceleration"
)
),
@@ -68,7 +68,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
(
this->coeffs().template lookupOrDefault<word>
(
- "centreOfRotationName",
+ "centreOfRotation",
"centreOfRotation"
)
),
diff --git a/src/meshTools/coordinateSystems/cartesianCS.H b/src/meshTools/coordinateSystems/cartesianCS.H
index cdfafc52e4b81e3185a900a09f195f07e9705255..d499f790b4700626f68421a78c60a496fed6fe83 100644
--- a/src/meshTools/coordinateSystems/cartesianCS.H
+++ b/src/meshTools/coordinateSystems/cartesianCS.H
@@ -25,7 +25,7 @@ Class
Foam::cartesianCS
Description
- Cylindrical coordinate system
+ Cartesian coordinate system
SourceFiles
cartesianCS.C
diff --git a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
index 1915de7ecca2cd06ef14045f4c0da769b182539e..aec02f8e06bb0795ee86aee91a31cea04ac5fa3a 100644
--- a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
+++ b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -26,6 +26,7 @@ License
#include "triSurfaceTools.H"
#include "triSurface.H"
+#include "MeshedSurface.H"
#include "OFstream.H"
#include "mergePoints.H"
#include "polyMesh.H"
@@ -2743,8 +2744,168 @@ void Foam::triSurfaceTools::calcInterpolationWeights
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Tracking:
+// Checking:
+
+bool Foam::triSurfaceTools::validTri
+(
+ const triSurface& surf,
+ const label facei
+)
+{
+ typedef labelledTri FaceType;
+ const FaceType& f = surf[facei];
+
+ // Simple check on indices ok.
+ forAll(f, fp)
+ {
+ if (f[fp] < 0 || f[fp] >= surf.points().size())
+ {
+ WarningInFunction
+ << "triangle " << facei << " vertices " << f
+ << " uses point indices outside point range 0.."
+ << surf.points().size()-1
+ << endl;
+ return false;
+ }
+ }
+
+ if (f[0] == f[1] || f[0] == f[2] || f[1] == f[2])
+ {
+ WarningInFunction
+ << "triangle " << facei
+ << " uses non-unique vertices " << f
+ << " coords:" << f.points(surf.points())
+ << endl;
+ return false;
+ }
+
+ // duplicate triangle check
+
+ const labelList& fFaces = surf.faceFaces()[facei];
+
+ // Check if faceNeighbours use same points as this face.
+ // Note: discards normal information - sides of baffle are merged.
+ forAll(fFaces, i)
+ {
+ label nbrFacei = fFaces[i];
+ if (nbrFacei <= facei)
+ {
+ // lower numbered faces already checked
+ continue;
+ }
+
+ const FaceType& nbrF = surf[nbrFacei];
+
+ // Same as calling triFace::compare(f, nbrF) == 1 only
+ if
+ (
+ (f[0] == nbrF[0] || f[0] == nbrF[1] || f[0] == nbrF[2])
+ && (f[1] == nbrF[0] || f[1] == nbrF[1] || f[1] == nbrF[2])
+ && (f[2] == nbrF[0] || f[2] == nbrF[1] || f[2] == nbrF[2])
+ )
+ {
+ WarningInFunction
+ << "triangle " << facei << " vertices " << f
+ << " has the same vertices as triangle " << nbrFacei
+ << " vertices " << nbrF
+ << " coords:" << f.points(surf.points())
+ << endl;
+
+ return false;
+ }
+ }
+
+ return true;
+}
+
+
+bool Foam::triSurfaceTools::validTri
+(
+ const MeshedSurface<face>& surf,
+ const label facei
+)
+{
+ typedef face FaceType;
+ const FaceType& f = surf[facei];
+
+ if (f.size() != 3)
+ {
+ WarningInFunction
+ << "face " << facei
+ << " is not a triangle, it has " << f.size()
+ << " indices"
+ << endl;
+ return false;
+ }
+
+ // Simple check on indices ok.
+ forAll(f, fp)
+ {
+ if (f[fp] < 0 || f[fp] >= surf.points().size())
+ {
+ WarningInFunction
+ << "triangle " << facei << " vertices " << f
+ << " uses point indices outside point range 0.."
+ << surf.points().size()-1
+ << endl;
+ return false;
+ }
+ }
+
+ if (f[0] == f[1] || f[0] == f[2] || f[1] == f[2])
+ {
+ WarningInFunction
+ << "triangle " << facei
+ << " uses non-unique vertices " << f
+ << " coords:" << f.points(surf.points())
+ << endl;
+ return false;
+ }
+
+ // duplicate triangle check
+
+ const labelList& fFaces = surf.faceFaces()[facei];
+
+ // Check if faceNeighbours use same points as this face.
+ // Note: discards normal information - sides of baffle are merged.
+ forAll(fFaces, i)
+ {
+ label nbrFacei = fFaces[i];
+
+ if (nbrFacei <= facei)
+ {
+ // lower numbered faces already checked
+ continue;
+ }
+
+ const FaceType& nbrF = surf[nbrFacei];
+
+ // Same as calling triFace::compare(f, nbrF) == 1 only
+ if
+ (
+ (f[0] == nbrF[0] || f[0] == nbrF[1] || f[0] == nbrF[2])
+ && (f[1] == nbrF[0] || f[1] == nbrF[1] || f[1] == nbrF[2])
+ && (f[2] == nbrF[0] || f[2] == nbrF[1] || f[2] == nbrF[2])
+ )
+ {
+ WarningInFunction
+ << "triangle " << facei << " vertices " << f
+ << " has the same vertices as triangle " << nbrFacei
+ << " vertices " << nbrF
+ << " coords:" << f.points(surf.points())
+ << endl;
+
+ return false;
+ }
+ }
+
+ return true;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Tracking:
// Test point on surface to see if is on face,edge or point.
Foam::surfaceLocation Foam::triSurfaceTools::classify
diff --git a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.H b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.H
index 24fd96322e62a63ea1657997b22fd4eafef24c72..46db7124cbafc8088864bf7621c9aeb2c006d885 100644
--- a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.H
+++ b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -50,11 +50,14 @@ namespace Foam
{
// Forward declaration of classes
-class triSurface;
class edge;
class labelledTri;
class polyBoundaryMesh;
class plane;
+class triSurface;
+class face;
+template<class Face> class MeshedSurface;
+
/*---------------------------------------------------------------------------*\
Class triSurfaceTools Declaration
@@ -516,6 +519,15 @@ public:
static triSurface delaunay2D(const List<vector2D>&);
+ // Surface checking functionality
+
+ //- Check single triangle for (topological) validity
+ static bool validTri(const triSurface&, const label facei);
+
+ //- Check single triangle for (topological) validity
+ static bool validTri(const MeshedSurface<face>&, const label facei);
+
+
// Tracking
//- Test point on plane of triangle to see if on edge or point or inside
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index de5557bcb55d59a53b6c5dde4b659690e681aee8..38cb229c7dfbbdb3fbeeb7677f4b0f5c85c8e91b 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -847,7 +847,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
"decomposeParDict",
searchableSurface::time().system(),
searchableSurface::time(),
- IOobject::MUST_READ_IF_MODIFIED,
+ IOobject::MUST_READ,
IOobject::NO_WRITE
)
)
diff --git a/src/parallel/reconstruct/reconstruct/processorMeshes.C b/src/parallel/reconstruct/reconstruct/processorMeshes.C
index 47bd1166d0b13f3cf909e3d07b796dcefa6e4951..ef9c6dde326fb39eaa5f26c75b10e8be483a3b25 100644
--- a/src/parallel/reconstruct/reconstruct/processorMeshes.C
+++ b/src/parallel/reconstruct/reconstruct/processorMeshes.C
@@ -35,11 +35,11 @@ void Foam::processorMeshes::read()
// and fields
forAll(databases_, proci)
{
- meshes_.set(proci, nullptr);
- pointProcAddressing_.set(proci, nullptr);
- faceProcAddressing_.set(proci, nullptr);
- cellProcAddressing_.set(proci, nullptr);
boundaryProcAddressing_.set(proci, nullptr);
+ cellProcAddressing_.set(proci, nullptr);
+ faceProcAddressing_.set(proci, nullptr);
+ pointProcAddressing_.set(proci, nullptr);
+ meshes_.set(proci, nullptr);
}
forAll(databases_, proci)
diff --git a/src/randomProcesses/Make/options b/src/randomProcesses/Make/options
index 4d1c505daed6c9e5189349b734e2965e25eb785b..233247dccd568389de98af7e15c0f20939bc698d 100644
--- a/src/randomProcesses/Make/options
+++ b/src/randomProcesses/Make/options
@@ -5,6 +5,8 @@ EXE_INC = \
-I$(LIB_SRC)/surfMesh/lnInclude
LIB_LIBS = \
- -L$(FFTW_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -lfftw3 \
+ -L$(FFTW_ARCH_PATH)/lib \
+ -L$(FFTW_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
+ -lfftw3 \
-lfiniteVolume \
-lsampling
diff --git a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C
index 21d52bb3dd8bf6eaf58f391e38d1c47bdd58e169..ae80887fe89f8d15fff01d275f050dd86d837e3b 100644
--- a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C
+++ b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C
@@ -94,17 +94,41 @@ Foam::label Foam::noiseModel::findStartTimeIndex
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::noiseModel::noiseModel(const dictionary& dict)
+Foam::noiseModel::noiseModel(const dictionary& dict, const bool readFields)
:
dict_(dict),
- rhoRef_(dict.lookupOrDefault<scalar>("rhoRef", 1)),
- nSamples_(dict.lookupOrDefault<label>("N", 65536)),
- fLower_(dict.lookupOrDefault<scalar>("fl", 25)),
- fUpper_(dict.lookupOrDefault<scalar>("fu", 10000)),
- startTime_(dict.lookupOrDefault<scalar>("startTime", 0)),
- windowModelPtr_(windowModel::New(dict, nSamples_)),
- graphFormat_(dict.lookupOrDefault<word>("graphFormat", "raw"))
+ rhoRef_(1),
+ nSamples_(65536),
+ fLower_(25),
+ fUpper_(10000),
+ startTime_(0),
+ windowModelPtr_(),
+ graphFormat_("raw")
{
+ if (readFields)
+ {
+ read(dict);
+ }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+Foam::noiseModel::~noiseModel()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+bool Foam::noiseModel::read(const dictionary& dict)
+{
+ dict.readIfPresent("rhoRef", rhoRef_);
+ dict.readIfPresent("N", nSamples_);
+ dict.readIfPresent("fl", fLower_);
+ dict.readIfPresent("fu", fUpper_);
+ dict.readIfPresent("startTime", startTime_);
+ dict.readIfPresent("graphFormat", graphFormat_);
+
// Check number of samples - must be a power of 2 for our FFT
bool powerOf2 = ((nSamples_ != 0) && !(nSamples_ & (nSamples_ - 1)));
if (!powerOf2)
@@ -139,13 +163,11 @@ Foam::noiseModel::noiseModel(const dictionary& dict)
<< exit(FatalIOError);
}
-}
+ windowModelPtr_ = windowModel::New(dict, nSamples_);
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-Foam::noiseModel::~noiseModel()
-{}
+ return true;
+}
// ************************************************************************* //
diff --git a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.H b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.H
index 28643cbf564fe1c48bc670ac7e4aaa5e5dbd5707..89c41edb84c927554f505235f19fe83668d1ced5 100644
--- a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.H
+++ b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.H
@@ -124,7 +124,7 @@ protected:
scalar checkUniformTimeStep
(
const scalarList& times
- ) const;
+ ) const;
//- Find and return start time index
label findStartTimeIndex
@@ -139,7 +139,7 @@ public:
//- Runtime type information
TypeName("noiseModel");
- //- Run time selection table
+ //- Run time selection table
declareRunTimeSelectionTable
(
autoPtr,
@@ -155,7 +155,7 @@ public:
static autoPtr<noiseModel> New(const dictionary& dict);
//- Constructor
- noiseModel(const dictionary& dict);
+ noiseModel(const dictionary& dict, const bool readFields = true);
//- Destructor
virtual ~noiseModel();
@@ -163,6 +163,9 @@ public:
// Public Member Functions
+ //- Read from dictionary
+ virtual bool read(const dictionary& dict);
+
//- Abstract call to calculate
virtual void calculate() = 0;
};
diff --git a/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.C b/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.C
index fc03d0300330d2ff6bee5c98593cf154e69358f1..9838f7176cda9578697c786e7d4ed7ea685482a1 100644
--- a/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.C
+++ b/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.C
@@ -43,14 +43,12 @@ addToRunTimeSelectionTable(noiseModel, pointNoise, dictionary);
void pointNoise::filterTimeData
(
- const Function1Types::CSV<scalar>& pData,
+ const scalarField& t0,
+ const scalarField& p0,
scalarField& t,
scalarField& p
-)
+) const
{
- const scalarField t0(pData.x());
- const scalarField p0(pData.y());
-
DynamicList<scalar> tf(t0.size());
DynamicList<scalar> pf(t0.size());
@@ -68,23 +66,15 @@ void pointNoise::filterTimeData
}
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-void pointNoise::calculate()
+void pointNoise::processData(const Function1Types::CSV<scalar>& data)
{
- // Point data only handled by master
- if (!Pstream::master())
- {
- return;
- }
+ Info<< "Reading data file " << data.fName() << endl;
- Info<< "Reading data file" << endl;
-
- Function1Types::CSV<scalar> pData("pressure", dict_, "Data");
+ const fileName fNameBase = data.fName().name(true);
// Time and pressure history data
scalarField t, p;
- filterTimeData(pData, t, p);
+ filterTimeData(data.x(), data.y(), t, p);
p *= rhoRef_;
Info<< " read " << t.size() << " values" << nl << endl;
@@ -96,7 +86,7 @@ void pointNoise::calculate()
windowModelPtr_->validate(t.size());
const windowModel& win = windowModelPtr_();
const scalar deltaf = 1.0/(deltaT*win.nSamples());
- fileName outDir(fileName("postProcessing")/"noise"/typeName);
+ fileName outDir(fileName("postProcessing")/"noise"/typeName/fNameBase);
// Create the fft
noiseFFT nfft(deltaT, p);
@@ -185,12 +175,45 @@ void pointNoise::calculate()
}
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+void pointNoise::calculate()
+{
+ // Point data only handled by master
+ if (!Pstream::master())
+ {
+ return;
+ }
+
+
+ if (inputFileNames_.size())
+ {
+ forAll(inputFileNames_, i)
+ {
+ const fileName fName = inputFileNames_[i].expand();
+ Function1Types::CSV<scalar> data("pressure", dict_, "Data", fName);
+ processData(data);
+ }
+ }
+ else
+ {
+ Function1Types::CSV<scalar> data("pressure", dict_, "Data");
+ processData(data);
+ }
+}
+
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-pointNoise::pointNoise(const dictionary& dict)
+pointNoise::pointNoise(const dictionary& dict, const bool readFields)
:
noiseModel(dict)
-{}
+{
+ if (readFields)
+ {
+ read(dict);
+ }
+}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
@@ -199,6 +222,18 @@ pointNoise::~pointNoise()
{}
+bool pointNoise::read(const dictionary& dict)
+{
+ if (noiseModel::read(dict))
+ {
+ dict.readIfPresent("inputFiles", inputFileNames_);
+ return true;
+ }
+
+ return false;
+}
+
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace noiseModels
diff --git a/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.H b/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.H
index 30bc669ae96433c3ba8cf689afb9304a79a21067..374678487f5089f83ec31bcdd7009a5372cf77de 100644
--- a/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.H
+++ b/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.H
@@ -76,8 +76,8 @@ SeeAlso
\*---------------------------------------------------------------------------*/
-#ifndef pointNoise_H
-#define pointNoise_H
+#ifndef noiseModels_pointNoise_H
+#define noiseModels_pointNoise_H
#include "noiseModel.H"
#include "CSV.H"
@@ -100,14 +100,24 @@ class pointNoise
protected:
+ // Protected data
+
+ //- Input file names - optional
+ List<fileName> inputFileNames_;
+
+
// Protected Member Functions
void filterTimeData
(
- const Function1Types::CSV<scalar>& pData,
+ const scalarField& t0,
+ const scalarField& p0,
scalarField& t,
scalarField& p
- );
+ ) const;
+
+ //- Process the CSV data
+ void processData(const Function1Types::CSV<scalar>& data);
public:
@@ -116,7 +126,7 @@ public:
TypeName("pointNoise");
//- Constructor
- pointNoise(const dictionary& dict);
+ pointNoise(const dictionary& dict, const bool readFields = true);
//- Destructor
virtual ~pointNoise();
@@ -124,6 +134,9 @@ public:
// Public Member Functions
+ //- Read from dictionary
+ virtual bool read(const dictionary& dict);
+
//- Calculate
virtual void calculate();
diff --git a/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C b/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C
index f24289c49573d6c7f861c487463197a0f4194f1a..1ff7e53ee74de1eca1632815ee6463abef8ee5d3 100644
--- a/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C
+++ b/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C
@@ -44,12 +44,9 @@ addToRunTimeSelectionTable(noiseModel, surfaceNoise, dictionary);
// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * //
-void surfaceNoise::initialise(const dictionary& dict)
+void surfaceNoise::initialise(const fileName& fName)
{
- dict.lookup("inputFile") >> inputFileName_;
- inputFileName_.expand();
-
- dict.readIfPresent("fftWriteInterval", fftWriteInterval_);
+ Info<< "Reading data file " << fName << endl;
label nAvailableTimes = 0;
@@ -57,17 +54,15 @@ void surfaceNoise::initialise(const dictionary& dict)
if (Pstream::master())
{
// Create the surface reader
- const word readerType(dict.lookup("reader"));
- readerPtr_.reset(surfaceReader::New(readerType, inputFileName_).ptr());
+ readerPtr_ = surfaceReader::New(readerType_, fName);
// Find the index of the pressure data
- const word pName(dict.lookupOrDefault<word>("pName", "p"));
const List<word> fieldNames(readerPtr_->fieldNames(0));
- pIndex_ = findIndex(fieldNames, pName);
+ pIndex_ = findIndex(fieldNames, pName_);
if (pIndex_ == -1)
{
FatalErrorInFunction
- << "Unable to find pressure field name " << pName
+ << "Unable to find pressure field name " << pName_
<< " in list of available fields: " << fieldNames
<< exit(FatalError);
}
@@ -76,12 +71,6 @@ void surfaceNoise::initialise(const dictionary& dict)
// - Could be done later, but since this utility can process a lot of
// data we can ensure that the user-input is correct prior to doing
// the heavy lifting
- const word writerType(dict.lookup("writer"));
- dictionary optDict
- (
- dict.subOrEmptyDict("writeOptions").subOrEmptyDict(writerType)
- );
- writerPtr_.reset(surfaceWriter::New(writerType, optDict).ptr());
// Set the time range
const instantList allTimes = readerPtr_->times();
@@ -404,18 +393,25 @@ Foam::scalar surfaceNoise::surfaceAverage
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-surfaceNoise::surfaceNoise(const dictionary& dict)
+surfaceNoise::surfaceNoise(const dictionary& dict, const bool readFields)
:
- noiseModel(dict),
- inputFileName_("unknown-inputFile"),
+ noiseModel(dict, false),
+ inputFileNames_(),
+ pName_("p"),
pIndex_(0),
times_(),
deltaT_(0),
startTimeIndex_(0),
nFace_(0),
- fftWriteInterval_(1)
+ fftWriteInterval_(1),
+ readerType_(word::null),
+ readerPtr_(nullptr),
+ writerPtr_(nullptr)
{
- initialise(dict);
+ if (readFields)
+ {
+ read(dict);
+ }
}
@@ -427,271 +423,316 @@ surfaceNoise::~surfaceNoise()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void surfaceNoise::calculate()
+bool surfaceNoise::read(const dictionary& dict)
{
- // Container for pressure time history data per face
- List<scalarField> pData;
-
- // Processor procFaceOffsets
- labelList procFaceOffset;
- if (Pstream::parRun())
+ if (noiseModel::read(dict))
{
- const label nProcs = Pstream::nProcs();
- const label nFacePerProc = floor(nFace_/nProcs) + 1;
-
- procFaceOffset.setSize(nProcs + 1, 0);
- for (label i = 1; i < procFaceOffset.size(); i++)
+ if (dict.found("inputFile"))
{
- procFaceOffset[i] = min(i*nFacePerProc, nFace_);
+ inputFileNames_.setSize(1);
+ dict.lookup("inputFile") >> inputFileNames_[0];
+ }
+ else
+ {
+ dict.lookup("inputFiles") >> inputFileNames_;
}
- }
- else
- {
- procFaceOffset.setSize(1, nFace_);
- }
- // Read pressure data from file
- readSurfaceData(procFaceOffset, pData);
+ dict.readIfPresent("fftWriteInterval", fftWriteInterval_);
+ dict.readIfPresent("p", pName_);
- // Process the pressure data, and store results as surface values per
- // frequency so that it can be output using the surface writer
+ dict.lookup("reader") >> readerType_;
- Info<< "Creating noise FFTs" << endl;
+ word writerType(dict.lookup("writer"));
+ dictionary optDict
+ (
+ dict.subOrEmptyDict("writeOptions").subOrEmptyDict(writerType)
+ );
- // Storage for FFT data
- const label nLocalFace = pData.size();
- const scalarField freq1(noiseFFT::frequencies(nSamples_, deltaT_));
- const label nFFT = freq1.size()/fftWriteInterval_;
- List<scalarField> surfPrmsf(nFFT);
- List<scalarField> surfPSDf(nFFT);
- forAll(surfPrmsf, freqI)
- {
- surfPrmsf[freqI].setSize(nLocalFace);
- surfPSDf[freqI].setSize(nLocalFace);
+ writerPtr_ = surfaceWriter::New(writerType, optDict);
+
+ return true;
}
- // Storage for 1/3 octave data
- labelList octave13BandIDs;
- scalarField octave13FreqCentre;
- noiseFFT::octaveBandInfo
- (
- freq1,
- fLower_,
- fUpper_,
- 3,
- octave13BandIDs,
- octave13FreqCentre
- );
+ return false;
+}
- label bandSize = 0;
- if (octave13BandIDs.empty())
- {
- WarningInFunction
- << "Ocatve band calculation failed (zero sized). "
- << "please check your input data"
- << endl;
- }
- else
- {
- bandSize = octave13BandIDs.size() - 1;
- }
- List<scalarField> surfPSD13f(bandSize);
- List<scalarField> surfPrms13f2(bandSize);
- forAll(surfPSD13f, freqI)
+void surfaceNoise::calculate()
+{
+ forAll(inputFileNames_, i)
{
- surfPSD13f[freqI].setSize(nLocalFace);
- surfPrms13f2[freqI].setSize(nLocalFace);
- }
+ fileName fName = inputFileNames_[i];
- const windowModel& win = windowModelPtr_();
+ initialise(fName.expand());
- forAll(pData, faceI)
- {
- const scalarField& p = pData[faceI];
+ // Container for pressure time history data per face
+ List<scalarField> pData;
- noiseFFT nfft(deltaT_, p);
- graph Prmsf(nfft.RMSmeanPf(win));
- graph PSDf(nfft.PSDf(win));
+ // Processor procFaceOffsets
+ labelList procFaceOffset;
+ if (Pstream::parRun())
+ {
+ const label nProcs = Pstream::nProcs();
+ const label nFacePerProc = floor(nFace_/nProcs) + 1;
- // Store the frequency results in slot for face of surface
- forAll(surfPrmsf, i)
+ procFaceOffset.setSize(nProcs + 1, 0);
+ for (label i = 1; i < procFaceOffset.size(); i++)
+ {
+ procFaceOffset[i] = min(i*nFacePerProc, nFace_);
+ }
+ }
+ else
{
- label freqI = (i + 1)*fftWriteInterval_ - 1;
- surfPrmsf[i][faceI] = Prmsf.y()[freqI];
- surfPSDf[i][faceI] = PSDf.y()[freqI];
+ procFaceOffset.setSize(1, nFace_);
}
- // PSD [Pa^2/Hz]
- graph PSD13f(nfft.octaves(PSDf, octave13BandIDs, false));
+ // Read pressure data from file
+ readSurfaceData(procFaceOffset, pData);
- // Integrated PSD = P(rms)^2 [Pa^2]
- graph Prms13f2(nfft.octaves(PSDf, octave13BandIDs, true));
+ // Process the pressure data, and store results as surface values per
+ // frequency so that it can be output using the surface writer
- // Store the 1/3 octave results in slot for face of surface
- forAll(surfPSD13f, freqI)
+ Info<< "Creating noise FFTs" << endl;
+
+ // Storage for FFT data
+ const label nLocalFace = pData.size();
+ const scalarField freq1(noiseFFT::frequencies(nSamples_, deltaT_));
+ const label nFFT = freq1.size()/fftWriteInterval_;
+ List<scalarField> surfPrmsf(nFFT);
+ List<scalarField> surfPSDf(nFFT);
+ forAll(surfPrmsf, freqI)
{
- surfPSD13f[freqI][faceI] = PSD13f.y()[freqI];
- surfPrms13f2[freqI][faceI] = Prms13f2.y()[freqI];
+ surfPrmsf[freqI].setSize(nLocalFace);
+ surfPSDf[freqI].setSize(nLocalFace);
}
- }
-
- // Output directory for graphs
- fileName outDir(fileName("postProcessing")/"noise"/typeName);
- const scalar deltaf = 1.0/(deltaT_*win.nSamples());
- Info<< "Writing fft surface data" << endl;
- {
- scalarField PrmsfAve(surfPrmsf.size(), 0);
- scalarField PSDfAve(surfPrmsf.size(), 0);
- scalarField fOut(surfPrmsf.size(), 0);
+ // Storage for 1/3 octave data
+ labelList octave13BandIDs;
+ scalarField octave13FreqCentre;
+ noiseFFT::octaveBandInfo
+ (
+ freq1,
+ fLower_,
+ fUpper_,
+ 3,
+ octave13BandIDs,
+ octave13FreqCentre
+ );
- forAll(surfPrmsf, i)
+ label bandSize = 0;
+ if (octave13BandIDs.empty())
{
- label freqI = i*fftWriteInterval_;
- fOut[i] = freq1[freqI];
- const word& fName = inputFileName_.name(true);
- const word gName = "fft";
- PrmsfAve[i] = writeSurfaceData
- (
- fName,
- gName,
- "Prmsf",
- freq1[freqI],
- surfPrmsf[i],
- procFaceOffset
- );
+ WarningInFunction
+ << "Ocatve band calculation failed (zero sized). "
+ << "please check your input data"
+ << endl;
+ }
+ else
+ {
+ bandSize = octave13BandIDs.size() - 1;
+ }
- PSDfAve[i] = writeSurfaceData
- (
- fName,
- gName,
- "PSDf",
- freq1[freqI],
- surfPSDf[i],
- procFaceOffset
- );
- writeSurfaceData
- (
- fName,
- gName,
- "PSD",
- freq1[freqI],
- noiseFFT::PSD(surfPSDf[i]),
- procFaceOffset
- );
- writeSurfaceData
- (
- fName,
- gName,
- "SPL",
- freq1[freqI],
- noiseFFT::SPL(surfPSDf[i]*deltaf),
- procFaceOffset
- );
+ List<scalarField> surfPSD13f(bandSize);
+ List<scalarField> surfPrms13f2(bandSize);
+ forAll(surfPSD13f, freqI)
+ {
+ surfPSD13f[freqI].setSize(nLocalFace);
+ surfPrms13f2[freqI].setSize(nLocalFace);
}
- graph Prmsfg
- (
- "Average Prms(f)",
- "f [Hz]",
- "P(f) [Pa]",
- fOut,
- PrmsfAve
- );
- Prmsfg.write(outDir, graph::wordify(Prmsfg.title()), graphFormat_);
+ const windowModel& win = windowModelPtr_();
- graph PSDfg
- (
- "Average PSD_f(f)",
- "f [Hz]",
- "PSD(f) [PaPa_Hz]",
- fOut,
- PSDfAve
- );
- PSDfg.write(outDir, graph::wordify(PSDfg.title()), graphFormat_);
+ forAll(pData, faceI)
+ {
+ const scalarField& p = pData[faceI];
- graph PSDg
- (
- "Average PSD_dB_Hz(f)",
- "f [Hz]",
- "PSD(f) [dB_Hz]",
- fOut,
- noiseFFT::PSD(PSDfAve)
- );
- PSDg.write(outDir, graph::wordify(PSDg.title()), graphFormat_);
+ noiseFFT nfft(deltaT_, p);
+ graph Prmsf(nfft.RMSmeanPf(win));
+ graph PSDf(nfft.PSDf(win));
- graph SPLg
+ // Store the frequency results in slot for face of surface
+ forAll(surfPrmsf, i)
+ {
+ label freqI = (i + 1)*fftWriteInterval_ - 1;
+ surfPrmsf[i][faceI] = Prmsf.y()[freqI];
+ surfPSDf[i][faceI] = PSDf.y()[freqI];
+ }
+
+ // PSD [Pa^2/Hz]
+ graph PSD13f(nfft.octaves(PSDf, octave13BandIDs, false));
+
+ // Integrated PSD = P(rms)^2 [Pa^2]
+ graph Prms13f2(nfft.octaves(PSDf, octave13BandIDs, true));
+
+ // Store the 1/3 octave results in slot for face of surface
+ forAll(surfPSD13f, freqI)
+ {
+ surfPSD13f[freqI][faceI] = PSD13f.y()[freqI];
+ surfPrms13f2[freqI][faceI] = Prms13f2.y()[freqI];
+ }
+ }
+
+ const word& fNameBase = fName.name(true);
+
+ // Output directory for graphs
+ fileName outDir
(
- "Average SPL_dB(f)",
- "f [Hz]",
- "SPL(f) [dB]",
- fOut,
- noiseFFT::SPL(PSDfAve*deltaf)
+ fileName("postProcessing")/"noise"/typeName/fNameBase
);
- SPLg.write(outDir, graph::wordify(SPLg.title()), graphFormat_);
- }
+ const scalar deltaf = 1.0/(deltaT_*win.nSamples());
+ Info<< "Writing fft surface data" << endl;
+ {
+ scalarField PrmsfAve(surfPrmsf.size(), 0);
+ scalarField PSDfAve(surfPrmsf.size(), 0);
+ scalarField fOut(surfPrmsf.size(), 0);
- Info<< "Writing one-third octave surface data" << endl;
- {
- scalarField PSDfAve(surfPSD13f.size(), 0);
- scalarField Prms13f2Ave(surfPSD13f.size(), 0);
+ forAll(surfPrmsf, i)
+ {
+ label freqI = i*fftWriteInterval_;
+ fOut[i] = freq1[freqI];
+ const word gName = "fft";
+ PrmsfAve[i] = writeSurfaceData
+ (
+ fNameBase,
+ gName,
+ "Prmsf",
+ freq1[freqI],
+ surfPrmsf[i],
+ procFaceOffset
+ );
+
+ PSDfAve[i] = writeSurfaceData
+ (
+ fNameBase,
+ gName,
+ "PSDf",
+ freq1[freqI],
+ surfPSDf[i],
+ procFaceOffset
+ );
+ writeSurfaceData
+ (
+ fNameBase,
+ gName,
+ "PSD",
+ freq1[freqI],
+ noiseFFT::PSD(surfPSDf[i]),
+ procFaceOffset
+ );
+ writeSurfaceData
+ (
+ fNameBase,
+ gName,
+ "SPL",
+ freq1[freqI],
+ noiseFFT::SPL(surfPSDf[i]*deltaf),
+ procFaceOffset
+ );
+ }
- forAll(surfPSD13f, i)
- {
- const word& fName = inputFileName_.name(true);
- const word gName = "oneThirdOctave";
- PSDfAve[i] = writeSurfaceData
+ graph Prmsfg
(
- fName,
- gName,
- "PSD13f",
- octave13FreqCentre[i],
- surfPSD13f[i],
- procFaceOffset
+ "Average Prms(f)",
+ "f [Hz]",
+ "P(f) [Pa]",
+ fOut,
+ PrmsfAve
);
- writeSurfaceData
+ Prmsfg.write(outDir, graph::wordify(Prmsfg.title()), graphFormat_);
+
+ graph PSDfg
(
- fName,
- gName,
- "PSD13",
- octave13FreqCentre[i],
- noiseFFT::PSD(surfPSD13f[i]),
- procFaceOffset
+ "Average PSD_f(f)",
+ "f [Hz]",
+ "PSD(f) [PaPa_Hz]",
+ fOut,
+ PSDfAve
);
- writeSurfaceData
+ PSDfg.write(outDir, graph::wordify(PSDfg.title()), graphFormat_);
+
+ graph PSDg
(
- fName,
- gName,
- "SPL13",
- octave13FreqCentre[i],
- noiseFFT::SPL(surfPrms13f2[i]),
- procFaceOffset
+ "Average PSD_dB_Hz(f)",
+ "f [Hz]",
+ "PSD(f) [dB_Hz]",
+ fOut,
+ noiseFFT::PSD(PSDfAve)
);
+ PSDg.write(outDir, graph::wordify(PSDg.title()), graphFormat_);
- Prms13f2Ave[i] = surfaceAverage(surfPrms13f2[i], procFaceOffset);
+ graph SPLg
+ (
+ "Average SPL_dB(f)",
+ "f [Hz]",
+ "SPL(f) [dB]",
+ fOut,
+ noiseFFT::SPL(PSDfAve*deltaf)
+ );
+ SPLg.write(outDir, graph::wordify(SPLg.title()), graphFormat_);
}
- graph PSD13g
- (
- "Average PSD13_dB_Hz(fm)",
- "fm [Hz]",
- "PSD(fm) [dB_Hz]",
- octave13FreqCentre,
- noiseFFT::PSD(PSDfAve)
- );
- PSD13g.write(outDir, graph::wordify(PSD13g.title()), graphFormat_);
- graph SPL13g
- (
- "Average SPL13_dB(fm)",
- "fm [Hz]",
- "SPL(fm) [dB]",
- octave13FreqCentre,
- noiseFFT::SPL(Prms13f2Ave)
- );
- SPL13g.write(outDir, graph::wordify(SPL13g.title()), graphFormat_);
+ Info<< "Writing one-third octave surface data" << endl;
+ {
+ scalarField PSDfAve(surfPSD13f.size(), 0);
+ scalarField Prms13f2Ave(surfPSD13f.size(), 0);
+
+ forAll(surfPSD13f, i)
+ {
+ const word gName = "oneThirdOctave";
+ PSDfAve[i] = writeSurfaceData
+ (
+ fNameBase,
+ gName,
+ "PSD13f",
+ octave13FreqCentre[i],
+ surfPSD13f[i],
+ procFaceOffset
+ );
+ writeSurfaceData
+ (
+ fNameBase,
+ gName,
+ "PSD13",
+ octave13FreqCentre[i],
+ noiseFFT::PSD(surfPSD13f[i]),
+ procFaceOffset
+ );
+ writeSurfaceData
+ (
+ fNameBase,
+ gName,
+ "SPL13",
+ octave13FreqCentre[i],
+ noiseFFT::SPL(surfPrms13f2[i]),
+ procFaceOffset
+ );
+
+ Prms13f2Ave[i] =
+ surfaceAverage(surfPrms13f2[i], procFaceOffset);
+ }
+
+ graph PSD13g
+ (
+ "Average PSD13_dB_Hz(fm)",
+ "fm [Hz]",
+ "PSD(fm) [dB_Hz]",
+ octave13FreqCentre,
+ noiseFFT::PSD(PSDfAve)
+ );
+ PSD13g.write(outDir, graph::wordify(PSD13g.title()), graphFormat_);
+
+ graph SPL13g
+ (
+ "Average SPL13_dB(fm)",
+ "fm [Hz]",
+ "SPL(fm) [dB]",
+ octave13FreqCentre,
+ noiseFFT::SPL(Prms13f2Ave)
+ );
+ SPL13g.write(outDir, graph::wordify(SPL13g.title()), graphFormat_);
+ }
}
}
diff --git a/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.H b/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.H
index 054944a1589765e455b203e958fb4a199842d58b..165a1cefd77963b882d10c4d44285eaa79c6258e 100644
--- a/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.H
+++ b/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.H
@@ -53,7 +53,7 @@ Description
}
// Input file
- inputFile "postProcessing/faceSource1/surface/patch/patch.case";
+ inputFiles ("postProcessing/faceSource1/surface/patch/patch.case");
// Write interval for FFT data, default = 1
fftWriteInterval 100;
@@ -83,8 +83,8 @@ SeeAlso
\*---------------------------------------------------------------------------*/
-#ifndef surfaceNoise_H
-#define surfaceNoise_H
+#ifndef noiseModels_surfaceNoise_H
+#define noiseModels_surfaceNoise_H
#include "noiseModel.H"
#include "labelList.H"
@@ -115,8 +115,11 @@ protected:
// Protected Data
- //- Input file name
- fileName inputFileName_;
+ //- Input file names
+ List<fileName> inputFileNames_;
+
+ //- Name of pressure field
+ word pName_;
//- Index of pressure field in reader field list
label pIndex_;
@@ -138,17 +141,20 @@ protected:
// result in a very large number of output files (1 per frequency)
label fftWriteInterval_;
+ //- Reader type
+ word readerType_;
+
//- Pointer to the surface reader
mutable autoPtr<surfaceReader> readerPtr_;
//- Pointer to the surface writer
- autoPtr<surfaceWriter> writerPtr_;
+ mutable autoPtr<surfaceWriter> writerPtr_;
// Protected Member Functions
//- Initialise
- void initialise(const dictionary& dict);
+ void initialise(const fileName& fName);
//- Read surface data
void readSurfaceData
@@ -183,7 +189,7 @@ public:
TypeName("surfaceNoise");
//- Constructor
- surfaceNoise(const dictionary& dict);
+ surfaceNoise(const dictionary& dict, const bool readFields = true);
//- Destructor
virtual ~surfaceNoise();
@@ -191,6 +197,9 @@ public:
// Public Member Functions
+ //- Read from dictionary
+ virtual bool read(const dictionary& dict);
+
//- Calculate
virtual void calculate();
};
diff --git a/src/regionModels/regionModel/regionModel/regionModel.C b/src/regionModels/regionModel/regionModel/regionModel.C
index 048bacd25c9c30b9c5be8e5f01d74e85273f80d4..97e4575fc3787b80159902ad6bf16303f819ccd3 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.C
+++ b/src/regionModels/regionModel/regionModel/regionModel.C
@@ -431,7 +431,7 @@ Foam::regionModels::regionModel::regionModel
outputPropertiesPtr_(nullptr),
primaryPatchIDs_(),
intCoupledPatchIDs_(),
- regionName_(lookup("regionName")),
+ regionName_(lookup("region")),
functions_(*this, subOrEmptyDict("functions"))
{
if (active_)
@@ -479,7 +479,7 @@ Foam::regionModels::regionModel::regionModel
outputPropertiesPtr_(nullptr),
primaryPatchIDs_(),
intCoupledPatchIDs_(),
- regionName_(dict.lookup("regionName")),
+ regionName_(dict.lookup("region")),
functions_(*this, subOrEmptyDict("functions"))
{
if (active_)
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
index 72d49c774c18806596f4b01fa2462e0917124bd8..bedaa4a9e5181bf72b7b87efdf9d1930169ec456 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
@@ -117,8 +117,8 @@ tmp<scalarField> curvatureSeparation::calcCosAngle
{
const fvMesh& mesh = owner().regionMesh();
const vectorField nf(mesh.Sf()/mesh.magSf());
- const unallocLabelList& own = mesh.owner();
- const unallocLabelList& nbr = mesh.neighbour();
+ const labelUList& own = mesh.owner();
+ const labelUList& nbr = mesh.neighbour();
scalarField phiMax(mesh.nCells(), -GREAT);
scalarField cosAngle(mesh.nCells(), 0.0);
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index e27bf3539286751d1bb5a1202b8f51666ed13189..0fa21926e752f401bc86d72cb5690c9e873faec8 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -789,7 +789,7 @@ tmp<volScalarField::Internal> thermoSingleLayer::Srho() const
toPrimary(filmPatchi, patchMass);
const label primaryPatchi = primaryPatchIDs()[i];
- const unallocLabelList& cells =
+ const labelUList& cells =
primaryMesh().boundaryMesh()[primaryPatchi].faceCells();
forAll(patchMass, j)
@@ -843,7 +843,7 @@ tmp<volScalarField::Internal> thermoSingleLayer::Srho
toPrimary(filmPatchi, patchMass);
const label primaryPatchi = primaryPatchIDs()[i];
- const unallocLabelList& cells =
+ const labelUList& cells =
primaryMesh().boundaryMesh()[primaryPatchi].faceCells();
forAll(patchMass, j)
@@ -893,7 +893,7 @@ tmp<volScalarField::Internal> thermoSingleLayer::Sh() const
toPrimary(filmPatchi, patchEnergy);
const label primaryPatchi = primaryPatchIDs()[i];
- const unallocLabelList& cells =
+ const labelUList& cells =
primaryMesh().boundaryMesh()[primaryPatchi].faceCells();
forAll(patchEnergy, j)
diff --git a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
index 70a3a0f2c1824b35519b7d771e8eb778acb9cb7b..34bdfe2f85fb546ac3b8b92dcfe9e6e7892171a0 100644
--- a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
+++ b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
@@ -38,8 +38,7 @@ namespace compressible
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-thermalBaffleFvPatchScalarField::
-thermalBaffleFvPatchScalarField
+thermalBaffleFvPatchScalarField::thermalBaffleFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
@@ -53,8 +52,7 @@ thermalBaffleFvPatchScalarField
{}
-thermalBaffleFvPatchScalarField::
-thermalBaffleFvPatchScalarField
+thermalBaffleFvPatchScalarField::thermalBaffleFvPatchScalarField
(
const thermalBaffleFvPatchScalarField& ptf,
const fvPatch& p,
@@ -76,8 +74,7 @@ thermalBaffleFvPatchScalarField
{}
-thermalBaffleFvPatchScalarField::
-thermalBaffleFvPatchScalarField
+thermalBaffleFvPatchScalarField::thermalBaffleFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
@@ -97,8 +94,7 @@ thermalBaffleFvPatchScalarField
if (thisMesh.name() == polyMesh::defaultRegion)
{
- const word regionName =
- dict_.lookupOrDefault<word>("regionName", "none");
+ const word regionName = dict_.lookupOrDefault<word>("region", "none");
const word baffleName("3DBaffle" + regionName);
@@ -121,8 +117,7 @@ thermalBaffleFvPatchScalarField
}
-thermalBaffleFvPatchScalarField::
-thermalBaffleFvPatchScalarField
+thermalBaffleFvPatchScalarField::thermalBaffleFvPatchScalarField
(
const thermalBaffleFvPatchScalarField& ptf,
const DimensionedField<scalar, volMesh>& iF
@@ -160,10 +155,9 @@ void thermalBaffleFvPatchScalarField::rmap
void thermalBaffleFvPatchScalarField::createPatchMesh()
{
-
const fvMesh& thisMesh = patch().boundaryMesh().mesh();
- word regionName = dict_.lookup("regionName");
+ word regionName = dict_.lookup("region");
List<polyPatch*> regionPatches(3);
List<word> patchNames(regionPatches.size());
@@ -270,9 +264,8 @@ void thermalBaffleFvPatchScalarField::write(Ostream& os) const
const fvMesh& thisMesh = patch().boundaryMesh().mesh();
- if (thisMesh.name() == polyMesh::defaultRegion && owner_)
+ if (owner_ && (thisMesh.name() == polyMesh::defaultRegion))
{
-
os.writeKeyword("extrudeModel");
os << word(dict_.lookup("extrudeModel"))
<< token::END_STATEMENT << nl;
@@ -293,9 +286,8 @@ void thermalBaffleFvPatchScalarField::write(Ostream& os) const
os.writeKeyword(extrudeModel);
os << dict_.subDict(extrudeModel) << nl;
- word regionName = dict_.lookup("regionName");
- os.writeKeyword("regionName") << regionName
- << token::END_STATEMENT << nl;
+ word regionName = dict_.lookup("region");
+ os.writeKeyword("region") << regionName << token::END_STATEMENT << nl;
bool active = readBool(dict_.lookup("active"));
os.writeKeyword("active") << active
diff --git a/src/renumber/SloanRenumber/Make/options b/src/renumber/SloanRenumber/Make/options
index 2c8f956a611718051304f5c066175e83e469ea3c..bf9567fef2bb19ea3d4d22470c56838adb5fa31f 100644
--- a/src/renumber/SloanRenumber/Make/options
+++ b/src/renumber/SloanRenumber/Make/options
@@ -5,7 +5,9 @@ EXE_INC = \
-I$(LIB_SRC)/renumber/renumberMethods/lnInclude
LIB_LIBS = \
- -L$(BOOST_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -lboost_system \
+ -L$(BOOST_ARCH_PATH)/lib \
+ -L$(BOOST_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
+ -lboost_system \
-lmeshTools \
-ldecompositionMethods \
-lrenumberMethods
diff --git a/src/sampling/cuttingPlane/cuttingPlane.C b/src/sampling/cuttingPlane/cuttingPlane.C
index 5cf7a37dd7cd39524ffb2da2afcaeaed6e436b61..22314049afddd82dd5dae3af0b60912be6397a7e 100644
--- a/src/sampling/cuttingPlane/cuttingPlane.C
+++ b/src/sampling/cuttingPlane/cuttingPlane.C
@@ -55,7 +55,7 @@ void Foam::cuttingPlane::calcCutCells
listSize = cellIdLabels.size();
}
- cutCells_.setSize(listSize);
+ meshCells_.setSize(listSize);
label cutcelli(0);
// Find the cut cells by detecting any cell that uses points with
@@ -70,9 +70,7 @@ void Foam::cuttingPlane::calcCutCells
}
const labelList& cEdges = cellEdges[celli];
-
label nCutEdges = 0;
-
forAll(cEdges, i)
{
const edge& e = edges[cEdges[i]];
@@ -87,8 +85,7 @@ void Foam::cuttingPlane::calcCutCells
if (nCutEdges > 2)
{
- cutCells_[cutcelli++] = celli;
-
+ meshCells_[cutcelli++] = celli;
break;
}
}
@@ -96,7 +93,7 @@ void Foam::cuttingPlane::calcCutCells
}
// Set correct list size
- cutCells_.setSize(cutcelli);
+ meshCells_.setSize(cutcelli);
}
@@ -114,7 +111,7 @@ void Foam::cuttingPlane::intersectEdges
// Per edge -1 or the label of the intersection point
edgePoint.setSize(edges.size());
- DynamicList<point> dynCuttingPoints(4*cutCells_.size());
+ DynamicList<point> dynCuttingPoints(4*meshCells_.size());
forAll(edges, edgeI)
{
@@ -258,15 +255,15 @@ void Foam::cuttingPlane::walkCellCuts
const pointField& cutPoints = this->points();
// use dynamic lists to handle triangulation and/or missed cuts
- DynamicList<face> dynCutFaces(cutCells_.size());
- DynamicList<label> dynCutCells(cutCells_.size());
+ DynamicList<face> dynCutFaces(meshCells_.size());
+ DynamicList<label> dynCutCells(meshCells_.size());
// scratch space for calculating the face vertices
DynamicList<label> faceVerts(10);
- forAll(cutCells_, i)
+ forAll(meshCells_, i)
{
- label celli = cutCells_[i];
+ label celli = meshCells_[i];
// Find the starting edge to walk from.
const labelList& cEdges = mesh.cellEdges()[celli];
@@ -330,20 +327,18 @@ void Foam::cuttingPlane::walkCellCuts
}
this->storedFaces().transfer(dynCutFaces);
- cutCells_.transfer(dynCutCells);
+ meshCells_.transfer(dynCutCells);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct without cutting
Foam::cuttingPlane::cuttingPlane(const plane& pln)
:
plane(pln)
{}
-// Construct from plane and mesh reference, restricted to a list of cells
Foam::cuttingPlane::cuttingPlane
(
const plane& pln,
@@ -369,7 +364,7 @@ void Foam::cuttingPlane::reCut
)
{
MeshStorage::clear();
- cutCells_.clear();
+ meshCells_.clear();
const scalarField dotProducts((mesh.points() - refPoint()) & normal());
@@ -391,7 +386,7 @@ void Foam::cuttingPlane::remapFaces
const labelUList& faceMap
)
{
- // recalculate the cells cut
+ // Recalculate the cells cut
if (notNull(faceMap) && faceMap.size())
{
MeshStorage::remapFaces(faceMap);
@@ -399,9 +394,9 @@ void Foam::cuttingPlane::remapFaces
List<label> newCutCells(faceMap.size());
forAll(faceMap, facei)
{
- newCutCells[facei] = cutCells_[faceMap[facei]];
+ newCutCells[facei] = meshCells_[faceMap[facei]];
}
- cutCells_.transfer(newCutCells);
+ meshCells_.transfer(newCutCells);
}
}
@@ -420,7 +415,7 @@ void Foam::cuttingPlane::operator=(const cuttingPlane& rhs)
static_cast<MeshStorage&>(*this) = rhs;
static_cast<plane&>(*this) = rhs;
- cutCells_ = rhs.cutCells();
+ meshCells_ = rhs.meshCells();
}
diff --git a/src/sampling/cuttingPlane/cuttingPlane.H b/src/sampling/cuttingPlane/cuttingPlane.H
index c6c3669ebd37c94d738e609268ef84845066d7c8..460e936f9928e72d91bb8625ce84954afd89becb 100644
--- a/src/sampling/cuttingPlane/cuttingPlane.H
+++ b/src/sampling/cuttingPlane/cuttingPlane.H
@@ -70,7 +70,7 @@ class cuttingPlane
// Private data
//- List of cells cut by the plane
- labelList cutCells_;
+ labelList meshCells_;
// Private Member Functions
@@ -121,7 +121,7 @@ protected:
// Protected Member Functions
- //- Recut mesh with existing planeDesc, restricted to a list of cells
+ //- Recut mesh with existing plane, restricted to a list of cells
void reCut
(
const primitiveMesh&,
@@ -157,15 +157,15 @@ public:
}
//- Return List of cells cut by the plane
- const labelList& cutCells() const
+ const labelList& meshCells() const
{
- return cutCells_;
+ return meshCells_;
}
//- Return true or false to question: have any cells been cut?
bool cut() const
{
- return cutCells_.size();
+ return meshCells_.size();
}
//- Sample the cell field
diff --git a/src/sampling/cuttingPlane/cuttingPlaneTemplates.C b/src/sampling/cuttingPlane/cuttingPlaneTemplates.C
index ba1c80eb72258ed2e2d6f66e2e54b857b43a0d06..b774e1e2542f8babcb67578555ceabc6d059d601 100644
--- a/src/sampling/cuttingPlane/cuttingPlaneTemplates.C
+++ b/src/sampling/cuttingPlane/cuttingPlaneTemplates.C
@@ -28,8 +28,6 @@ Description
#include "cuttingPlane.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
@@ -38,7 +36,7 @@ Foam::tmp<Foam::Field<Type>> Foam::cuttingPlane::sample
const Field<Type>& fld
) const
{
- return tmp<Field<Type>>(new Field<Type>(fld, cutCells()));
+ return tmp<Field<Type>>(new Field<Type>(fld, meshCells()));
}
diff --git a/src/sampling/probes/patchProbes.C b/src/sampling/probes/patchProbes.C
index 225ee132d39513f702b18312e3fb9016f6468635..80694beb77409fdfc84456cddb85178048efbc69 100644
--- a/src/sampling/probes/patchProbes.C
+++ b/src/sampling/probes/patchProbes.C
@@ -263,7 +263,7 @@ bool Foam::patchProbes::read(const dictionary& dict)
{
if (!dict.readIfPresent("patches", patchNames_))
{
- word patchName(dict.lookup("patchName"));
+ word patchName(dict.lookup("patch"));
patchNames_ = wordReList(1, wordRe(patchName));
}
return probes::read(dict);
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.C b/src/sampling/sampledSurface/isoSurface/isoSurface.C
index dc93fd1684247ee648ffe8441646232293160b02..d5d8b7fbde52cd827acde5d2a0c6327a813c611b 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.C
@@ -33,6 +33,7 @@ License
#include "OFstream.H"
#include "meshTools.H"
#include "triSurfaceSearch.H"
+#include "triSurfaceTools.H"
#include "surfaceIntersection.H"
#include "intersectedSurface.H"
#include "searchableBox.H"
@@ -1257,76 +1258,6 @@ void Foam::isoSurface::trimToBox
}
-bool Foam::isoSurface::validTri(const triSurface& surf, const label facei)
-{
- // Simple check on indices ok.
-
- const labelledTri& f = surf[facei];
-
- if
- (
- (f[0] < 0) || (f[0] >= surf.points().size())
- || (f[1] < 0) || (f[1] >= surf.points().size())
- || (f[2] < 0) || (f[2] >= surf.points().size())
- )
- {
- WarningInFunction
- << "triangle " << facei << " vertices " << f
- << " uses point indices outside point range 0.."
- << surf.points().size()-1 << endl;
-
- return false;
- }
-
- if ((f[0] == f[1]) || (f[0] == f[2]) || (f[1] == f[2]))
- {
- WarningInFunction
- << "triangle " << facei
- << " uses non-unique vertices " << f
- << endl;
- return false;
- }
-
- // duplicate triangle check
-
- const labelList& fFaces = surf.faceFaces()[facei];
-
- // Check if faceNeighbours use same points as this face.
- // Note: discards normal information - sides of baffle are merged.
- forAll(fFaces, i)
- {
- label nbrFacei = fFaces[i];
-
- if (nbrFacei <= facei)
- {
- // lower numbered faces already checked
- continue;
- }
-
- const labelledTri& nbrF = surf[nbrFacei];
-
- if
- (
- ((f[0] == nbrF[0]) || (f[0] == nbrF[1]) || (f[0] == nbrF[2]))
- && ((f[1] == nbrF[0]) || (f[1] == nbrF[1]) || (f[1] == nbrF[2]))
- && ((f[2] == nbrF[0]) || (f[2] == nbrF[1]) || (f[2] == nbrF[2]))
- )
- {
- WarningInFunction
- << "triangle " << facei << " vertices " << f
- << " fc:" << f.centre(surf.points())
- << " has the same vertices as triangle " << nbrFacei
- << " vertices " << nbrF
- << " fc:" << nbrF.centre(surf.points())
- << endl;
-
- return false;
- }
- }
- return true;
-}
-
-
Foam::triSurface Foam::isoSurface::subsetMesh
(
const triSurface& s,
@@ -1756,8 +1687,7 @@ Foam::isoSurface::isoSurface
forAll(*this, triI)
{
- // Copied from surfaceCheck
- validTri(*this, triI);
+ triSurfaceTools::validTri(*this, triI);
}
fileName stlFile = mesh_.time().path() + ".stl";
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.H b/src/sampling/sampledSurface/isoSurface/isoSurface.H
index 267cc04c9005e09f7ccc690b4f1c15d8e6459e2b..e947405566366af52706271de323ca69368163e9 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.H
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.H
@@ -377,9 +377,6 @@ class isoSurface
List<FixedList<scalar, 3>>& interpolationWeights
);
- //- Check single triangle for (topological) validity
- static bool validTri(const triSurface&, const label facei);
-
static triSurface subsetMesh
(
const triSurface& s,
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
index 977165958627c7953e5c8b89efeb32ea35f8fd93..47ec36069f096619001be0033126088e0d1c8d1c 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
@@ -29,6 +29,7 @@ License
#include "mergePoints.H"
#include "tetMatcher.H"
#include "syncTools.H"
+#include "triSurfaceTools.H"
#include "addToRunTimeSelectionTable.H"
#include "Time.H"
#include "triPoints.H"
@@ -1049,73 +1050,6 @@ Foam::triSurface Foam::isoSurfaceCell::stitchTriPoints
}
-bool Foam::isoSurfaceCell::validTri(const triSurface& surf, const label facei)
-{
- // Simple check on indices ok.
-
- const labelledTri& f = surf[facei];
-
- forAll(f, fp)
- {
- if (f[fp] < 0 || f[fp] >= surf.points().size())
- {
- WarningInFunction
- << "triangle " << facei << " vertices " << f
- << " uses point indices outside point range 0.."
- << surf.points().size()-1 << endl;
-
- return false;
- }
- }
-
- if ((f[0] == f[1]) || (f[0] == f[2]) || (f[1] == f[2]))
- {
- WarningInFunction
- << "triangle " << facei
- << " uses non-unique vertices " << f
- << endl;
- return false;
- }
-
- // duplicate triangle check
-
- const labelList& fFaces = surf.faceFaces()[facei];
-
- // Check if faceNeighbours use same points as this face.
- // Note: discards normal information - sides of baffle are merged.
- forAll(fFaces, i)
- {
- label nbrFacei = fFaces[i];
-
- if (nbrFacei <= facei)
- {
- // lower numbered faces already checked
- continue;
- }
-
- const labelledTri& nbrF = surf[nbrFacei];
-
- if
- (
- ((f[0] == nbrF[0]) || (f[0] == nbrF[1]) || (f[0] == nbrF[2]))
- && ((f[1] == nbrF[0]) || (f[1] == nbrF[1]) || (f[1] == nbrF[2]))
- && ((f[2] == nbrF[0]) || (f[2] == nbrF[1]) || (f[2] == nbrF[2]))
- )
- {
- WarningInFunction
- << "triangle " << facei << " vertices " << f
- << " coords:" << f.points(surf.points())
- << " has the same vertices as triangle " << nbrFacei
- << " vertices " << nbrF
- << endl;
-
- return false;
- }
- }
- return true;
-}
-
-
void Foam::isoSurfaceCell::calcAddressing
(
const triSurface& surf,
@@ -1569,8 +1503,7 @@ Foam::isoSurfaceCell::isoSurfaceCell
forAll(*this, triI)
{
- // Copied from surfaceCheck
- validTri(*this, triI);
+ triSurfaceTools::validTri(*this, triI);
}
}
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
index ec496319ec482808ad8d32a362c308a090b3d5e1..f848cc47366cdc6e7cb29dff72f96cb3cee043c6 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
@@ -272,9 +272,6 @@ class isoSurfaceCell
labelList& triMap // merged to unmerged triangle
) const;
- //- Check single triangle for (topological) validity
- static bool validTri(const triSurface&, const label);
-
//- Determine edge-face addressing
void calcAddressing
(
diff --git a/src/sampling/sampledSurface/sampledPlane/sampledPlane.H b/src/sampling/sampledSurface/sampledPlane/sampledPlane.H
index 4171cb3e36b27604b1b2979146573566ed7f72ba..8c8867070a0a8ba5b0dd42e20b9433a127897b92 100644
--- a/src/sampling/sampledSurface/sampledPlane/sampledPlane.H
+++ b/src/sampling/sampledSurface/sampledPlane/sampledPlane.H
@@ -169,7 +169,7 @@ public:
//- For every face original cell in mesh
const labelList& meshCells() const
{
- return cuttingPlane::cutCells();
+ return cuttingPlane::meshCells();
}
//- Sample field on surface
diff --git a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C
index 9d063409df601955d2bfe725957b545e10563c16..06b6339b5b7f7e525ddd3a853dd2c5c32938fc65 100644
--- a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C
+++ b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -72,8 +72,32 @@ Foam::MeshedSurfaceIOAllocator::MeshedSurfaceIOAllocator
{}
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+Foam::MeshedSurfaceIOAllocator::~MeshedSurfaceIOAllocator()
+{
+ clear();
+}
+
+
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+void Foam::MeshedSurfaceIOAllocator::setInstance(const fileName& inst)
+{
+ points_.instance() = inst;
+ faces_.instance() = inst;
+ zones_.instance() = inst;
+}
+
+
+void Foam::MeshedSurfaceIOAllocator::setWriteOption(IOobject::writeOption w)
+{
+ points_.writeOpt() = w;
+ faces_.writeOpt() = w;
+ zones_.writeOpt() = w;
+}
+
+
void Foam::MeshedSurfaceIOAllocator::clear()
{
points_.clear();
@@ -136,4 +160,20 @@ void Foam::MeshedSurfaceIOAllocator::reset
}
+bool Foam::MeshedSurfaceIOAllocator::writeObject
+(
+ IOstream::streamFormat fmt,
+ IOstream::versionNumber ver,
+ IOstream::compressionType cmp
+) const
+{
+ return
+ (
+ points_.writeObject(fmt, ver, cmp)
+ && faces_.writeObject(fmt, ver, cmp)
+ && zones_.writeObject(fmt, ver, cmp)
+ );
+}
+
+
// ************************************************************************* //
diff --git a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H
index 6c8aa07e2a843db822111bf2c62dc085e3c457ef..ed74141bb9ded321e473df1f021e08673feb2ea2 100644
--- a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H
+++ b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -106,8 +106,21 @@ public:
);
+ //- Destructor
+ virtual ~MeshedSurfaceIOAllocator();
+
+
// Member Functions
+ // Database
+
+ //- Set the instance for mesh files
+ void setInstance(const fileName&);
+
+ //- Adjust the write option for all components
+ void setWriteOption(IOobject::writeOption);
+
+
// Access
//- Non-const access to the points
@@ -177,6 +190,18 @@ public:
const Xfer<faceList>& faces,
const Xfer<surfZoneList>& zones
);
+
+
+ // Writing
+
+ //- Write using given format, version and compression
+ virtual bool writeObject
+ (
+ IOstream::streamFormat,
+ IOstream::versionNumber,
+ IOstream::compressionType
+ ) const;
+
};
diff --git a/src/surfMesh/surfMesh/surfMesh.C b/src/surfMesh/surfMesh/surfMesh.C
index c7eef6b72b10f0eadc32c8a9ae1f9653fc570c9f..f1ed76a7eb69f55bc7f1cf20412f46b2c558775f 100644
--- a/src/surfMesh/surfMesh/surfMesh.C
+++ b/src/surfMesh/surfMesh/surfMesh.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -229,18 +229,25 @@ Foam::surfMesh::~surfMesh()
void Foam::surfMesh::updatePointsRef()
{
- // Assign the reference to the points (this is truly ugly)
- reinterpret_cast<SubField<point>&>
+ // Assign the reference to the points (quite ugly)
+ // points() are returned as Field but are actually stored as SubField
+ reinterpret_cast<typename MeshReference::PointFieldType&>
(
const_cast<Field<point>&>(MeshReference::points())
- ) = reinterpret_cast<SubField<point>&>(this->storedPoints());
+ ).shallowCopy
+ (
+ this->storedPoints()
+ );
}
void Foam::surfMesh::updateFacesRef()
{
- // Assign the reference to the faces
- shallowCopy(this->storedFaces());
+ // Assign the reference to the faces (UList)
+ static_cast<MeshReference&>(*this).shallowCopy
+ (
+ this->storedFaces()
+ );
}
diff --git a/src/surfMesh/surfMesh/surfMesh.H b/src/surfMesh/surfMesh/surfMesh.H
index 64e7c0239a474e1603c0f00dd233116d21c92599..a839d79a70dac8591ccb12ef8a78d87fc7b218f4 100644
--- a/src/surfMesh/surfMesh/surfMesh.H
+++ b/src/surfMesh/surfMesh/surfMesh.H
@@ -186,7 +186,7 @@ public:
// Member Functions
- // Database
+ // Database
//- Return the local mesh directory (dbDir()/meshSubDir)
fileName meshDir() const;
@@ -200,10 +200,17 @@ public:
const fileName& facesInstance() const;
//- Set the instance for mesh files
- void setInstance(const fileName&);
+ void setInstance
+ (
+ const fileName&,
+ IOobject::writeOption = IOobject::AUTO_WRITE
+ );
+ //- Adjust the write option for all components
+ void setWriteOption(IOobject::writeOption);
- // Access
+
+ // Access
//- Return the number of raw points
virtual label nPoints() const;
@@ -263,7 +270,6 @@ public:
// time directories
virtual readUpdateState readUpdate();
- //- Update the mesh corresponding to given map
//- Remove surface zones
void removeZones();
@@ -291,16 +297,27 @@ public:
void transfer(MeshedSurface<face>&);
+ // Writing
+
//- Avoid masking the normal objectRegistry write
using surfaceRegistry::write;
+ //- Write all components using given format, version and compression
+ virtual bool writeObject
+ (
+ IOstream::streamFormat fmt,
+ IOstream::versionNumber ver,
+ IOstream::compressionType cmp
+ ) const;
+
//- Write to file
static void write(const fileName&, const surfMesh&);
//- Write to file
void write(const fileName&);
- // Storage management
+
+ // Storage management
//- Transfer contents to the Xfer container as a MeshedSurface
Xfer<MeshedSurface<face>> xfer();
@@ -322,6 +339,7 @@ public:
//- Remove all files from mesh instance()
void removeFiles() const;
+
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/surfMesh/surfMeshIO.C b/src/surfMesh/surfMesh/surfMeshIO.C
index f2a5c54245ab0bc8420b71db062b68bb3e497cad..ec0b9f6106ec68b54610cf04f8ec65e5f7a7541e 100644
--- a/src/surfMesh/surfMesh/surfMeshIO.C
+++ b/src/surfMesh/surfMesh/surfMeshIO.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -28,7 +28,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void Foam::surfMesh::setInstance(const fileName& inst)
+void Foam::surfMesh::setInstance(const fileName& inst, IOobject::writeOption w)
{
if (debug)
{
@@ -36,15 +36,16 @@ void Foam::surfMesh::setInstance(const fileName& inst)
}
instance() = inst;
+ Allocator::setInstance(inst);
- storedIOPoints().writeOpt() = IOobject::AUTO_WRITE;
- storedIOPoints().instance() = inst;
+ setWriteOption(w);
+}
- storedIOFaces().writeOpt() = IOobject::AUTO_WRITE;
- storedIOFaces().instance() = inst;
- storedIOZones().writeOpt() = IOobject::AUTO_WRITE;
- storedIOZones().instance() = inst;
+void Foam::surfMesh::setWriteOption(IOobject::writeOption w)
+{
+ writeOpt() = w;
+ Allocator::setWriteOption(w);
}
@@ -199,4 +200,15 @@ Foam::surfMesh::readUpdateState Foam::surfMesh::readUpdate()
}
+bool Foam::surfMesh::writeObject
+(
+ IOstream::streamFormat fmt,
+ IOstream::versionNumber ver,
+ IOstream::compressionType cmp
+) const
+{
+ return Allocator::writeObject(fmt, ver, cmp);
+}
+
+
// ************************************************************************* //
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C
index f092944850f4008b29d9968e8ea32286ff37ab4e..9dc88e2315b1438d3315a1550d7c35e7949254bb 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C
@@ -37,66 +37,65 @@ Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::DAC
chemistryReductionMethod<CompType, ThermoType>(dict, chemistry),
searchInitSet_(this->coeffsDict_.subDict("initialSet").size()),
zprime_(0),
- nbCLarge_(3),
- sC_(this->nSpecie_,0),
- sH_(this->nSpecie_,0),
- sO_(this->nSpecie_,0),
- sN_(this->nSpecie_,0),
+ nbCLarge_(this->coeffsDict_.template lookupOrDefault<label>("nbCLarge", 3)),
+ sC_(this->nSpecie_, 0),
+ sH_(this->nSpecie_, 0),
+ sO_(this->nSpecie_, 0),
+ sN_(this->nSpecie_, 0),
CO2Id_(-1),
COId_(-1),
HO2Id_(-1),
H2OId_(-1),
NOId_(-1),
- automaticSIS_(true),
- phiTol_(this->tolerance()),
- NOxThreshold_(1800),
- CO2Name_
+ automaticSIS_
(
- dict.subDict("reduction").lookupOrDefault<word>
+ this->coeffsDict_.template lookupOrDefault<Switch>
(
- "CO2Name","CO2"
+ "automaticSIS",
+ true
)
),
- COName_
+ phiTol_
(
- dict.subDict("reduction").lookupOrDefault<word>
+ this->coeffsDict_.template lookupOrDefault<scalar>
(
- "COName","CO"
+ "phiTol", this->tolerance()
)
),
- HO2Name_
+ NOxThreshold_
(
- dict.subDict("reduction").lookupOrDefault<word>
+ this->coeffsDict_.template lookupOrDefault<scalar>
(
- "HO2Name","HO2"
+ "NOxThreshold",
+ 1800
)
),
- H2OName_
+ CO2Name_(this->coeffsDict_.template lookupOrDefault<word>("CO2", "CO2")),
+ COName_(this->coeffsDict_.template lookupOrDefault<word>("CO", "CO")),
+ HO2Name_(this->coeffsDict_.template lookupOrDefault<word>("HO2", "HO2")),
+ H2OName_(this->coeffsDict_.template lookupOrDefault<word>("H2O", "H2O")),
+ NOName_(this->coeffsDict_.template lookupOrDefault<word>("NO", "NO")),
+ forceFuelInclusion_
(
- dict.subDict("reduction").lookupOrDefault<word>
+ this->coeffsDict_.template lookupOrDefault<Switch>
(
- "H2OName","H2O"
+ "forceFuelInclusion",
+ false
)
- ),
- NOName_
- (
- dict.subDict("reduction").lookupOrDefault<word>
- (
- "NOName","NO"
- )
- ),
- forceFuelInclusion_(false)
+ )
{
- label j=0;
+ label j = 0;
dictionary initSet = this->coeffsDict_.subDict("initialSet");
- for (label i=0; i<chemistry.nSpecie(); i++)
+
+ for (label i = 0; i < chemistry.nSpecie(); i++)
{
if (initSet.found(chemistry.Y()[i].name()))
{
searchInitSet_[j++] = i;
}
}
- if (j<searchInitSet_.size())
+
+ if (j < searchInitSet_.size())
{
FatalErrorInFunction
<< searchInitSet_.size()-j
@@ -105,28 +104,7 @@ Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::DAC
<< exit(FatalError);
}
- if (this->coeffsDict_.found("automaticSIS"))
- {
- automaticSIS_.readIfPresent("automaticSIS", this->coeffsDict_);
- }
- if (this->coeffsDict_.found("forceFuelInclusion"))
- {
- forceFuelInclusion_.readIfPresent
- (
- "forceFuelInclusion",this->coeffsDict_
- );
- }
-
- if (this->coeffsDict_.found("phiTol"))
- {
- phiTol_ = readScalar(this->coeffsDict_.lookup("phiTol"));
- }
-
- if (this->coeffsDict_.found("NOxThreshold"))
- {
- NOxThreshold_ = readScalar(this->coeffsDict_.lookup("NOxThreshold"));
- }
const List<List<specieElement>>& specieComposition =
chemistry.specieComp();
@@ -134,11 +112,12 @@ Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::DAC
{
const List<specieElement>& curSpecieComposition =
specieComposition[i];
+
// For all elements in the current species
forAll(curSpecieComposition, j)
{
- const specieElement& curElement =
- curSpecieComposition[j];
+ const specieElement& curElement = curSpecieComposition[j];
+
if (curElement.name() == "C")
{
sC_[i] = curElement.nAtoms();
@@ -157,7 +136,8 @@ Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::DAC
}
else
{
- Info<< "element not considered"<<endl;
+ Info<< " element " << curElement.name() << " not considered"
+ << endl;
}
}
if (this->chemistry_.Y()[i].name() == CO2Name_)
@@ -216,10 +196,6 @@ Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::DAC
<< exit(FatalError);
}
- if (this->coeffsDict_.found("nbCLarge"))
- {
- nbCLarge_ = readLabel(fuelDict.lookup("nbCLarge"));
- }
fuelSpeciesID_.setSize(fuelSpecies_.size());
fuelSpeciesProp_.setSize(fuelSpecies_.size());
@@ -287,9 +263,9 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
c1[this->nSpecie_+1] = p;
// Compute the rAB matrix
- RectangularMatrix<scalar> rABNum(this->nSpecie_,this->nSpecie_,0.0);
- scalarField PA(this->nSpecie_,0.0);
- scalarField CA(this->nSpecie_,0.0);
+ RectangularMatrix<scalar> rABNum(this->nSpecie_, this->nSpecie_, 0.0);
+ scalarField PA(this->nSpecie_, 0.0);
+ scalarField CA(this->nSpecie_, 0.0);
// Number of initialized rAB for each lines
Field<label> NbrABInit(this->nSpecie_,0);
@@ -319,8 +295,8 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
// of the species. It stores the species encountered in the reaction but
// use another list to see if this species has already been used
- DynamicList<scalar> wA(R.lhs().size()+R.rhs().size());
- DynamicList<label> wAID(R.lhs().size()+R.rhs().size());
+ DynamicList<scalar> wA(R.lhs().size() + R.rhs().size());
+ DynamicList<label> wAID(R.lhs().size() + R.rhs().size());
forAll(R.lhs(), s) // Compute rAB for all species in the left hand side
{
@@ -344,7 +320,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
// Disable for self reference (by definition rAA=0)
deltaBi[ss] = false;
- while(!usedIndex.empty())
+ while (!usedIndex.empty())
{
label curIndex = usedIndex.pop();
if (deltaBi[curIndex])
@@ -352,7 +328,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
// Disable to avoid counting it more than once
deltaBi[curIndex] = false;
// Test if this rAB is not initialized
- if (rABPos(ss, curIndex)==-1)
+ if (rABPos(ss, curIndex) == -1)
{
// It starts at rABPos(ss, sj)=0
rABPos(ss, curIndex) = NbrABInit[ss];
@@ -372,7 +348,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
bool found(false);
forAll(wAID, id)
{
- if (ss==wAID[id])
+ if (ss == wAID[id])
{
wA[id] += sl*omegai;
found = true;
@@ -385,7 +361,8 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
}
}
- forAll(R.rhs(), s) // Compute rAB for all species in the right hand side
+ // Compute rAB for all species in the right hand side
+ forAll(R.rhs(), s)
{
label ss = R.rhs()[s].index;
scalar sl = R.rhs()[s].stoichCoeff; // vAi = v''-v' => here v''
@@ -407,7 +384,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
// Disable for self reference (by definition rAA=0)
deltaBi[ss] = false;
- while(!usedIndex.empty())
+ while (!usedIndex.empty())
{
label curIndex = usedIndex.pop();
if (deltaBi[curIndex])
@@ -488,8 +465,8 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
label nElements = 4; // 4 main elements (C, H, O, N)
// Total number of C, H and O (in this order)
- scalarList Na(nElements,0.0);
- scalarList Nal(nElements,0.0); // for large hydrocarbons
+ scalarList Na(nElements, 0.0);
+ scalarList Nal(nElements, 0.0); // for large hydrocarbons
for (label i=0; i<this->nSpecie_; i++)
{
@@ -502,6 +479,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
{
continue;
}
+
Na[0] += sC_[i]*c[i];
Na[1] += sH_[i]*c[i];
Na[2] += sO_[i]*c[i];
@@ -523,12 +501,12 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
// 2Cl + Hl/2
// Equivalence ratio for fuel decomposition = ----------
// Ol(+O2)
- phiLarge = (2*Nal[0]+Nal[1]/2)/Nal[2];
+ phiLarge = (2*Nal[0] + Nal[1]/2)/Nal[2];
}
// Using the rAB matrix (numerator and denominator separated)
// compute the R value according to the search initiating set
- scalarField Rvalue(this->nSpecie_,0.0);
+ scalarField Rvalue(this->nSpecie_, 0.0);
label speciesNumber = 0;
// Set all species to inactive and activate them according
@@ -583,7 +561,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
if (forceFuelInclusion_)
{
- forAll(fuelSpeciesID_,i)
+ forAll(fuelSpeciesID_, i)
{
Q.push(fuelSpeciesID_[i]);
speciesNumber++;
@@ -607,7 +585,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
Rvalue[H2OId_] = 1.0;
if (forceFuelInclusion_)
{
- forAll(fuelSpeciesID_,i)
+ forAll(fuelSpeciesID_, i)
{
Q.push(fuelSpeciesID_[i]);
speciesNumber++;
@@ -617,7 +595,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
}
}
- if (T>NOxThreshold_ && NOId_!=-1)
+ if (T > NOxThreshold_ && NOId_ != -1)
{
Q.push(NOId_);
speciesNumber++;
@@ -641,7 +619,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
while (!Q.empty())
{
label u = Q.pop();
- scalar Den = max(PA[u],CA[u]);
+ scalar Den = max(PA[u], CA[u]);
if (Den!=0.0)
{
for (label v=0; v<NbrABInit[u]; v++)
@@ -709,7 +687,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
this->NsSimp_ = speciesNumber;
scalarField& simplifiedC(this->chemistry_.simplifiedC());
- simplifiedC.setSize(this->NsSimp_+2);
+ simplifiedC.setSize(this->NsSimp_ + 2);
DynamicList<label>& s2c(this->chemistry_.simplifiedToCompleteIndex());
s2c.setSize(this->NsSimp_);
Field<label>& c2s(this->chemistry_.completeToSimplifiedIndex());
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.H b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.H
index fc0f36a9a5a6e711e2c2cd6de4981edb3c4a7645..d42c830febf97890d3cfaa2b3b0edf1a65cd5dba 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.H
@@ -25,7 +25,7 @@ Class
Foam::chemistryReductionMethods::DAC
Description
- The Dynamic Adaptive Chemistry (DAC) method [1] simplify the chemistry
+ The Dynamic Adaptive Chemistry (DAC) method [1] simplifies the chemistry
using the matrix rAB defined by (DRGEP algorithm [2])
|sum_i=1->Nr vAi wi dBi|
@@ -40,13 +40,14 @@ Description
stoechiometric coefficient of species A in the ith reaction (vAi = v''-v')
, wi is the progress variable of reaction i and dBi equals 1 if reaction i
involves B and O otherwise.
- rAB show the error introduced to the production rates of A when B and all
+
+ rAB shows the error introduced to the production rates of A when B and all
the reactions including it are removed. It is computed as in [3] so that
the algorithm is O(Nr).
- DAC uses a initial set of species that represents the major parts of the
+ DAC uses an initial set of species that represent the major parts of the
combustion mechanism, i.e. H2/O2, fuel decomposition and CO2 production.
- Usualy, it includes the fuel, HO2 and CO. Then it computes the dependance
+ Usually, it includes the fuel, HO2 and CO. Then it computes the dependance
of these set to the other species. This is done by introducing R-value
defined by
@@ -122,6 +123,7 @@ class DAC
word CO2Name_, COName_, HO2Name_, H2OName_, NOName_;
Switch forceFuelInclusion_;
+
public:
//- Runtime type information
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/chemPointISAT/chemPointISAT.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/chemPointISAT/chemPointISAT.C
index 584ecf2d63ad49c6d84d0a4a02fb9a98084da979..aeaa4758cdeb1fab12f4acc66bfbdaf1522d4a5c 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/chemPointISAT/chemPointISAT.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/chemPointISAT/chemPointISAT.C
@@ -403,7 +403,7 @@ bool Foam::chemPointISAT<CompType, ThermoType>::inEOA(const scalarField& phiq)
label maxIndex = -1;
for (label i=0; i<completeSpaceSize(); i++)
{
- if(max < propEps[i])
+ if (max < propEps[i])
{
max = propEps[i];
maxIndex = i;
@@ -412,11 +412,11 @@ bool Foam::chemPointISAT<CompType, ThermoType>::inEOA(const scalarField& phiq)
word propName;
if (maxIndex >= completeSpaceSize()-2)
{
- if(maxIndex == completeSpaceSize()-2)
+ if (maxIndex == completeSpaceSize()-2)
{
propName = "T";
}
- else if(maxIndex == completeSpaceSize()-1)
+ else if (maxIndex == completeSpaceSize()-1)
{
propName = "p";
}
diff --git a/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
index 440c41e9f90c301bde8a789557f14018fefcbde2..f0c36d21ea2b41bf1dce15e916d98422af1942ee 100644
--- a/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
@@ -226,7 +226,7 @@ humidityTemperatureCoupledMixedFvPatchScalarField
TnbrName_(dict.lookupOrDefault<word>("Tnbr", "T")),
QrNbrName_(dict.lookupOrDefault<word>("QrNbr", "none")),
QrName_(dict.lookupOrDefault<word>("Qr", "none")),
- specieName_(dict.lookupOrDefault<word>("specieName", "none")),
+ specieName_(dict.lookupOrDefault<word>("specie", "none")),
liquid_(nullptr),
liquidDict_(),
mass_(patch().size(), 0.0),
@@ -749,7 +749,7 @@ void Foam::humidityTemperatureCoupledMixedFvPatchScalarField::write
os.writeKeyword("mode")<< massModeTypeNames_[mode_]
<< token::END_STATEMENT <<nl;
- writeEntryIfDifferent<word>(os, "specieName", "none", specieName_);
+ writeEntryIfDifferent<word>(os, "specie", "none", specieName_);
os.writeKeyword("carrierMolWeight")<< Mcomp_
<< token::END_STATEMENT <<nl;
diff --git a/src/triSurface/triSurface/surfacePatch/surfacePatch.C b/src/triSurface/triSurface/surfacePatch/surfacePatch.C
index e84f26d7f8b745746062b2dad1d6f04b5860c8a5..6b09d556230721e5585ea3b49a3e9afb850821c0 100644
--- a/src/triSurface/triSurface/surfacePatch/surfacePatch.C
+++ b/src/triSurface/triSurface/surfacePatch/surfacePatch.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -24,6 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "surfacePatch.H"
+#include "surfZone.H"
#include "dictionary.H"
#include "word.H"
@@ -38,7 +39,15 @@ namespace Foam
Foam::surfacePatch::surfacePatch()
:
- geometricSurfacePatch("", "", -1),
+ geometricSurfacePatch(word::null, word::null, -1),
+ size_(0),
+ start_(0)
+{}
+
+
+Foam::surfacePatch::surfacePatch(const label index)
+:
+ geometricSurfacePatch(word::null, word::null, index),
size_(0),
start_(0)
{}
@@ -83,7 +92,7 @@ Foam::surfacePatch::surfacePatch
{}
-Foam::surfacePatch::surfacePatch(const Foam::surfacePatch& sp)
+Foam::surfacePatch::surfacePatch(const surfacePatch& sp)
:
geometricSurfacePatch(sp),
size_(sp.size()),
@@ -114,6 +123,19 @@ void Foam::surfacePatch::writeDict(Ostream& os) const
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
+Foam::surfacePatch::operator Foam::surfZone() const
+{
+ return surfZone
+ (
+ this->name(),
+ this->size(),
+ this->start(),
+ this->index(),
+ this->geometricType()
+ );
+}
+
+
bool Foam::surfacePatch::operator!=(const surfacePatch& p) const
{
return !(*this == p);
diff --git a/src/triSurface/triSurface/surfacePatch/surfacePatch.H b/src/triSurface/triSurface/surfacePatch/surfacePatch.H
index 9e0b8786955a3acec62034142ddd42fe7c491bc7..43278798e75ae65b325eee2adeadc979da615e48 100644
--- a/src/triSurface/triSurface/surfacePatch/surfacePatch.H
+++ b/src/triSurface/triSurface/surfacePatch/surfacePatch.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -36,8 +36,6 @@ SourceFiles
#define surfacePatch_H
#include "geometricSurfacePatch.H"
-#include "word.H"
-#include "label.H"
#include "className.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -48,12 +46,13 @@ namespace Foam
// Forward declaration of friend functions and operators
class surfacePatch;
+class surfZone;
Ostream& operator<<(Ostream&, const surfacePatch&);
/*---------------------------------------------------------------------------*\
- Class surfacePatch Declaration
+ Class surfacePatch Declaration
\*---------------------------------------------------------------------------*/
class surfacePatch
@@ -79,6 +78,9 @@ public:
//- Construct null
surfacePatch();
+ //- Construct null with specified index
+ explicit surfacePatch(const label index);
+
//- Construct from components
surfacePatch
(
@@ -106,25 +108,25 @@ public:
// Member Functions
- //- Return start label of this patch in the polyMesh face list
+ //- Return start label of this patch in the face list
label start() const
{
return start_;
}
- //- Return start label of this patch in the polyMesh face list
+ //- Return start label of this patch in the face list
label& start()
{
return start_;
}
- //- Return size of this patch in the polyMesh face list
+ //- Return size of this patch in the face list
label size() const
{
return size_;
}
- //- Return size of this patch in the polyMesh face list
+ //- Return size of this patch in the face list
label& size()
{
return size_;
@@ -139,11 +141,17 @@ public:
// Member Operators
+ //- Conversion to surfZone representation
+ explicit operator surfZone() const;
+
+
+ //- Compare.
bool operator!=(const surfacePatch&) const;
- //- compare.
+ //- Compare.
bool operator==(const surfacePatch&) const;
+
// IOstream Operators
friend Ostream& operator<<(Ostream&, const surfacePatch&);
diff --git a/src/triSurface/triSurface/triSurface.C b/src/triSurface/triSurface/triSurface.C
index 307ae31de7e3183f8f9f32a48d6d99f9e633a879..289a47d1c7a6b5b46f2dc6914932454bb3e843fb 100644
--- a/src/triSurface/triSurface/triSurface.C
+++ b/src/triSurface/triSurface/triSurface.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -31,6 +31,7 @@ License
#include "boundBox.H"
#include "SortableList.H"
#include "PackedBoolList.H"
+#include "surfZoneList.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -488,7 +489,8 @@ void Foam::triSurface::write
// Returns patch info. Sets faceMap to the indexing according to patch
// numbers. Patch numbers start at 0.
-Foam::surfacePatchList Foam::triSurface::calcPatches(labelList& faceMap) const
+Foam::surfacePatchList
+Foam::triSurface::calcPatches(labelList& faceMap) const
{
// Sort according to region numbers of labelledTri
SortableList<label> sortedRegion(size());
@@ -533,30 +535,29 @@ Foam::surfacePatchList Foam::triSurface::calcPatches(labelList& faceMap) const
surfacePatch& newPatch = newPatches[newPatchi];
newPatch.index() = newPatchi;
-
- label oldPatchi = newPatchi;
-
- // start of patch
newPatch.start() = startFacei;
-
// Take over any information from existing patches
- if ((oldPatchi < patches_.size()) && (patches_[oldPatchi].name() != ""))
+ if
+ (
+ newPatchi < patches_.size()
+ && !patches_[newPatchi].name().empty()
+ )
{
- newPatch.name() = patches_[oldPatchi].name();
+ newPatch.name() = patches_[newPatchi].name();
}
else
{
- newPatch.name() = word("patch") + name(newPatchi);
+ newPatch.name() = word("patch") + Foam::name(newPatchi);
}
if
(
- (oldPatchi < patches_.size())
- && (patches_[oldPatchi].geometricType() != "")
+ newPatchi < patches_.size()
+ && !patches_[newPatchi].geometricType().empty()
)
{
- newPatch.geometricType() = patches_[oldPatchi].geometricType();
+ newPatch.geometricType() = patches_[newPatchi].geometricType();
}
else
{
@@ -829,6 +830,42 @@ void Foam::triSurface::cleanup(const bool verbose)
}
+Foam::List<Foam::surfZone>
+Foam::triSurface::sortedZones(labelList& faceMap) const
+{
+ surfacePatchList patches(calcPatches(faceMap));
+
+ surfZoneList zones(patches.size());
+ forAll(patches, patchi)
+ {
+ zones[patchi] = surfZone(patches[patchi]);
+ }
+
+ return zones;
+}
+
+
+void Foam::triSurface::triFaceFaces(List<face>& plainFaces) const
+{
+ plainFaces.setSize(size());
+
+ forAll(*this, facei)
+ {
+ plainFaces[facei] = operator[](facei).triFaceFace();
+ }
+}
+
+
+Foam::Xfer<Foam::List<Foam::point>>
+Foam::triSurface::xferPoints()
+{
+ // Topology changed because of transfer
+ clearOut();
+
+ return this->storedPoints().xfer();
+}
+
+
// Finds area, starting at facei, delimited by borderEdge. Marks all visited
// faces (from face-edge-face walk) with currentZone.
void Foam::triSurface::markZone
diff --git a/src/triSurface/triSurface/triSurface.H b/src/triSurface/triSurface/triSurface.H
index cfa253fbb3c9939273d123b5a58b69124ce4a2b7..ccf47c713e29bdc26f6990b5a221867cde3dd40b 100644
--- a/src/triSurface/triSurface/triSurface.H
+++ b/src/triSurface/triSurface/triSurface.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
- \\/ M anipulation |
+ \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -50,7 +50,7 @@ namespace Foam
class Time;
class IFstream;
-
+class surfZone;
// Forward declaration of friend functions and operators
@@ -354,6 +354,17 @@ public:
}
+ // Interoperability with other surface mesh classes
+
+ //- Sort faces according to zoneIds
+ // Returns a surfZoneList and sets faceMap to index within faces()
+ // (i.e. map from original,unsorted to sorted)
+ List<surfZone> sortedZones(labelList& faceMap) const;
+
+ //- Create a list of faces from the triFaces
+ void triFaceFaces(List<face>& plainFaceList) const;
+
+
// Edit
//- Move points
@@ -412,6 +423,10 @@ public:
) const;
+ //- Transfer stored points to an Xfer container
+ Xfer<List<point>> xferPoints();
+
+
// Write
//- Write to Ostream in simple FOAM format
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict
index b393b43b53655e47f3265027256c4afd96d330b5..c8dba9d60a05f8599a70746c1949cf96b977e8eb 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict
@@ -23,8 +23,8 @@ coupledFaces
coupledFacesSet
{
- wallPatchName baffleWall;
- cyclicMasterPatchName baffleCyclic_half0;
+ wallPatch baffleWall;
+ cyclicMasterPatch baffleCyclic_half0;
}
}
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/T b/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/T
index d6badd923f8777ca26aa447704b12f569cd29c96..7f7395413b968e116eca7ced698e67bc3116af51 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/T
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/T
@@ -44,7 +44,7 @@ boundaryField
"region0_to_.*"
{
type compressible::turbulentTemperatureRadCoupledMixed;
- neighbourFieldName T;
+ neighbourField T;
kappaMethod solidThermo;
QrNbr Qr;
Qr none;
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/pyrolysisZones
index 3092ba2020d4995a6195f93c9f68204f451ec534..5faa7ba0c3ea8834da2e93a348437be3a1f16d7b 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/pyrolysisZones
@@ -20,7 +20,7 @@ FoamFile
pyrolysisModel thermo;
- regionName panelRegion;
+ region panelRegion;
noPyrolysisCoeffs
{
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/surfaceFilmProperties
index 86de22e33ce32fc37dd60eb6cdae3b24a812a098..6efe72eb274eb6fd2c0729b00715edca67ba8f20 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/surfaceFilmProperties
@@ -11,12 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel none;
-regionName none;
+region none;
active false;
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
index 5fef5019a69588fb342b3e47d2e47145b40193aa..a3010f4c5504e25bc2e317cc1eabd7eff2b74d60 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
@@ -77,7 +77,7 @@ functions
writeControl timeStep;
writeInterval 200;
log true;
- patchName region0_to_panelRegion_wallPanel;
+ patch region0_to_panelRegion_wallPanel;
probeLocations
(
(0.15 0.0 0.01) // HF2
@@ -94,7 +94,7 @@ functions
writeControl timeStep;
writeInterval 200;
log true;
- patchName inlet;
+ patch inlet;
probeLocations
(
( 0.0 0.0 0.0 ) // HF1
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
index eb0432c914aea3a9fe5bdd31d10fe0ebbd0e6e25..11f9c8cee2bc4a11e469d3f8bdd62b1854943fe2 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
@@ -21,7 +21,7 @@ pyrolysis
pyrolysisModel reactingOneDim;
- regionName pyrolysisRegion;
+ region pyrolysisRegion;
reactingOneDimCoeffs
{
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
index 533b5c022e432c29efe6b3e66adeadb50e833015..9b3c6deeae2b1cc0032af3a91a90684d3333a8d3 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
@@ -11,7 +11,7 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -19,7 +19,7 @@ active true;
surfaceFilmModel thermoSingleLayer;
-regionName filmRegion;
+region filmRegion;
thermoSingleLayerCoeffs
{
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones
index 9741bf6aa2a24d99677473eacaa7d0910382d3f9..5de2a6e8162ff56635bb3abcd4df7a2ef110d209 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones
@@ -21,7 +21,7 @@ pyrolysis
pyrolysisModel reactingOneDim;
- regionName panelRegion;
+ region panelRegion;
reactingOneDimCoeffs
{
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/surfaceFilmProperties
index 0c06604be7219f6adb26289b0579134c6904278a..3dfc5162953ba3597cae2ebba4a241ce533ffbe7 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/surfaceFilmProperties
@@ -11,12 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel none;
-regionName none;
+region none;
active false;
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones
index 4074c3e862c3b603674372d333eeafd50589947b..a099495670d023da0a3f793e0de0533b8203f3a4 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones
@@ -21,7 +21,7 @@ FoamFile
pyrolysisModel reactingOneDim;
- regionName panelRegion;
+ region panelRegion;
reactingOneDimCoeffs
{
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties
index 5d869e9a24ba1cbae88bc26e34362d77584dd5cc..b4ae8c3b340e0e23c6460ffe2ec15c81641000e6 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties
@@ -11,7 +11,7 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -19,5 +19,5 @@ active false;
surfaceFilmModel none;
-regionName none;
+region none;
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones
index d0661cb34022a2e4ab06440101ed024549cbacd7..641f34fa0fd6543f9e450c7260b127e43eb191dd 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones
@@ -21,7 +21,7 @@ pyrolysis
pyrolysisModel none;
- regionName panelRegion;
+ region panelRegion;
reactingOneDimCoeffs
{
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties
index 0c06604be7219f6adb26289b0579134c6904278a..3dfc5162953ba3597cae2ebba4a241ce533ffbe7 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties
@@ -11,12 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel none;
-regionName none;
+region none;
active false;
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones
index d0661cb34022a2e4ab06440101ed024549cbacd7..641f34fa0fd6543f9e450c7260b127e43eb191dd 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones
@@ -21,7 +21,7 @@ pyrolysis
pyrolysisModel none;
- regionName panelRegion;
+ region panelRegion;
reactingOneDimCoeffs
{
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties
index 0c06604be7219f6adb26289b0579134c6904278a..e833ca17355621962b672ebd55514061599b3367 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties
@@ -11,12 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel none;
-regionName none;
+region none;
active false;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches
index 6536b870ee198ae4cd2fe889263f7381accf6831..bac87c7272f72946f8b15c02ad1c2b9a91ee8b70 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches
@@ -8,17 +8,17 @@
T
{
- type compressible::thermalBaffle;
- kappaMethod fluidThermo;
- value uniform 300;
+ type compressible::thermalBaffle;
+ kappaMethod fluidThermo;
+ value uniform 300;
- regionName ${baffleRegionName};
- active yes;
+ region ${baffleRegion};
+ active yes;
- # include "3DbaffleSolidThermo"
+ # include "3DbaffleSolidThermo"
- // New fvMesh (region) information
- # include "extrudeModel"
+ // New fvMesh (region) information
+ # include "extrudeModel"
}
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup
index 346318d87f38e5d1bcc50f5d6a182e631b97b284..b3e07455bb7d5407a0e4554a1a1d2e35aec5f204 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup
@@ -6,22 +6,22 @@
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-baffleRegionName baffle3DRegion;
+baffleRegion baffle3DRegion;
-masterPatchName baffle3DRegionMaster;
+masterPatch baffle3DRegionMaster;
-slavePatchName baffle3DRegionSlave;
+slavePatch baffle3DRegionSlave;
-oneD false;
+oneD false;
-nLayers 50;
+nLayers 50;
-thickness 0.02;
+thickness 0.02;
-Kappa 0.01;
+Kappa 0.01;
-Cp 15;
+Cp 15;
-rho 80;
+rho 80;
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T
index e1f36abd656a66e30f63dee1502802e76b361bea..2cfabccf8b10e2be3001e5e9a295542417ef5b79 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T
@@ -55,7 +55,7 @@ boundaryField
// Mode of operation: inert, condensation, vaporization,
// condensationAndEvaporation
mode condensationAndEvaporation;
- specieName H2O;
+ specie H2O;
carrierMolWeight 28.9 ;//Air from thermophysicalProperties
L 0.1;
Tvap 273; //Minimum temperature for evaporation
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes
index c7695aeec0f0984768d5543e006109ca8795ab0b..76ab4c70bd50377c8cacdc7e6c25226acf74faea 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes
@@ -47,6 +47,7 @@ laplacianSchemes
laplacian(rhorAUf,p_rgh) Gauss linear corrected;
laplacian(alphaEff,h) Gauss linear corrected;
laplacian(((rho*nut)+thermo:mu),H2O) Gauss linear corrected;
+ laplacian(DH2O,H2O) Gauss linear corrected;
}
interpolationSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
index 760323fa2a2d6bc1c7dc855f1d5c4bb2b1c618f6..065a7b8ed962eba3753bd9988f9410ee42273d8a 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
@@ -23,7 +23,7 @@ airToporous
constantHeatTransferCoeffs
{
interpolationMethod cellVolumeWeight;
- nbrRegionName porous;
+ nbrRegion porous;
master false;
nbrModel porousToair;
@@ -40,7 +40,7 @@ porosityBlockage
interRegionExplicitPorositySourceCoeffs
{
interpolationMethod cellVolumeWeight;
- nbrRegionName porous;
+ nbrRegion porous;
type DarcyForchheimer;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
index 7d8917bec1e949577037967bca7b92217d51d599..fffed7d171842ffa4ead7151242c0ff1969d1c8b 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
@@ -23,7 +23,7 @@ porousToair
constantHeatTransferCoeffs
{
interpolationMethod cellVolumeWeight;
- nbrRegionName air;
+ nbrRegion air;
master true;
nbrModel airToporous;
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/0/U b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/0/U
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395DFSEM/0/U
rename to tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/0/U
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/0/k b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/0/k
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395DFSEM/0/k
rename to tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/0/k
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/0/nut b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/0/nut
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395DFSEM/0/nut
rename to tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/0/nut
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/0/p b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/0/p
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395DFSEM/0/p
rename to tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/0/p
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/Allrun b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/Allrun
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395DFSEM/Allrun
rename to tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/Allrun
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/README b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/README
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395DFSEM/README
rename to tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/README
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/boundaryData/inlet/0/L b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/constant/boundaryData/inlet/0/L
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/boundaryData/inlet/0/L
rename to tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/constant/boundaryData/inlet/0/L
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/boundaryData/inlet/0/R b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/constant/boundaryData/inlet/0/R
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/boundaryData/inlet/0/R
rename to tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/constant/boundaryData/inlet/0/R
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/boundaryData/inlet/0/U b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/constant/boundaryData/inlet/0/U
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/boundaryData/inlet/0/U
rename to tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/constant/boundaryData/inlet/0/U
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/boundaryData/inlet/points b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/constant/boundaryData/inlet/points
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/boundaryData/inlet/points
rename to tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/constant/boundaryData/inlet/points
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/transportProperties b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/constant/transportProperties
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/transportProperties
rename to tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/constant/transportProperties
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/constant/turbulenceProperties
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395DFSEM/constant/turbulenceProperties
rename to tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/constant/turbulenceProperties
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/system/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395DFSEM/system/blockMeshDict
rename to tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/system/blockMeshDict
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/system/controlDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395DFSEM/system/controlDict
rename to tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/system/controlDict
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/system/decomposeParDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395DFSEM/system/decomposeParDict
rename to tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/system/decomposeParDict
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/fvSchemes b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/system/fvSchemes
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395DFSEM/system/fvSchemes
rename to tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/system/fvSchemes
diff --git a/tutorials/incompressible/pimpleFoam/channel395DFSEM/system/fvSolution b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/system/fvSolution
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/channel395DFSEM/system/fvSolution
rename to tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/system/fvSolution
diff --git a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict
index e93b8f3939f3be6e114862908bcd4517340a464f..f192cc20f99bf44af6a82cb0a12632f79ee1e891 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict
@@ -49,4 +49,5 @@ adjustTimeStep yes;
maxCo 5;
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict
index 4251bfa4faa6720fa1b0d7110fbb8f71a17d12b4..3cc5de831dd3605bd0b4cd765a8bb01fa37dad98 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict
@@ -58,7 +58,7 @@ functions
fields (p U);
lifeTime 10000;
nSubCycle 5;
- cloudName particleTracks;
+ cloud particleTracks;
seedSampleSet uniform;
uniformCoeffs
{
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runtimePostProcessing b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runtimePostProcessing
index 8ba9bf34dae55b76848e2029516cc3ccc4d4ea47..d7bc5d2289d4d645463aba5c64e72417123be7f3 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runtimePostProcessing
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runtimePostProcessing
@@ -57,7 +57,7 @@ postPro1
visible yes;
tubeRadius 0.01;
colourBy field;
- fieldName U;
+ field U;
range (0 20);
opacity 1;
scalarBar
@@ -97,7 +97,7 @@ postPro1
visible yes;
featureEdges no;
colourBy field;
- fieldName U;
+ field U;
range (0 30);
opacity 1;
scalarBar
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines
index 83ec2e4018a95f2cfe10187654278a0170a84ba9..47fc1a305d50de34219267894b565b0fba1a532a 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines
@@ -32,7 +32,7 @@ streamLines
nSubCycle 5;
// Cloud name to use
- cloudName particleTracks;
+ cloud particleTracks;
// Seeding method.
seedSampleSet uniform; //cloud; //triSurfaceMeshPointSet;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allrun b/tutorials/incompressible/simpleFoam/motorBike/Allrun
index f2d7ed6bb0f4d12f52191115084a78f20adc688b..c110f083ecd737c4e8180e63f5a5b7df9368f9b7 100755
--- a/tutorials/incompressible/simpleFoam/motorBike/Allrun
+++ b/tutorials/incompressible/simpleFoam/motorBike/Allrun
@@ -4,7 +4,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
+# Alternative decomposeParDict name:
decompDict="-decomposeParDict system/decomposeParDict.6"
+## Standard decomposeParDict name:
+# unset decompDict
# copy motorbike surface from resources directory
\cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
@@ -13,6 +16,14 @@ runApplication surfaceFeatureExtract
runApplication blockMesh
runApplication decomposePar $decompDict
+
+# Using distributedTriSurfaceMesh?
+if foamDictionary -entry geometry -value system/snappyHexMeshDict | \
+ grep -q distributedTriSurfaceMesh
+then
+ runParallel $decompDict surfaceRedistributePar motorBike.obj independent
+fi
+
runParallel $decompDict snappyHexMesh -overwrite
#- For non-parallel running: - set the initial fields
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict.6 b/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict.6
index 1f9924aa37b073084371f32b3edbe75f0f0cb1aa..db5f0cd2c283170f048d8113451c047d7f062452 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict.6
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict.6
@@ -22,13 +22,13 @@ method hierarchical;
simpleCoeffs
{
- n (4 1 1);
+ n (6 1 1);
delta 0.001;
}
hierarchicalCoeffs
{
- n (2 2 1);
+ n (3 2 1);
delta 0.001;
order xyz;
}
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
index 9578c6e11eeeb966b6bce06d7d3dfe8059d9c968..1e671e71b89ca2004af58765e532a4f1c04bfa1a 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
@@ -39,7 +39,7 @@ streamLines
// Cloud name to use
- cloudName particleTracks;
+ cloud particleTracks;
// Seeding method.
seedSampleSet uniform; //cloud; //triSurfaceMeshPointSet;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
index 467839631355e5ca224d386c6f1843997344ae97..9e6bfda88cc2304c2447afefa0d45f7761495a76 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
@@ -18,7 +18,7 @@ near
writeControl writeTime;
// Calculate every
- executeControl writeTime;
+ executeControl writeTime;
// Fields to be sampled. Per field original name and mapped field to
// create.
@@ -29,10 +29,10 @@ near
);
// Patches/groups to sample (regular expressions)
- patches (motorBikeGroup);
+ patches (motorBikeGroup);
// Distance to sample
- distance 0.001;
+ distance 0.001;
}
// Use UNear to track along wall
@@ -48,7 +48,7 @@ wallBoundedStreamLines
setFormat vtk; //gnuplot; //xmgr; //raw; //jplot;
// Velocity field to use for tracking.
- U UNear;
+ U UNear;
// Interpolation method. Default is cellPoint.
// interpolationScheme pointMVC;
@@ -65,7 +65,7 @@ wallBoundedStreamLines
lifeTime 100;
// Cloud name to use
- cloudName wallBoundedParticleTracks;
+ cloud wallBoundedParticleTracks;
// Seeding method.
seedSampleSet patchSeed; //cloud; //triSurfaceMeshPointSet;
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
index 46492576ed5db7966e3fa9fffc61be35711d7a96..498774b1087f2ccdb1f37a8357de7a5d16a41234 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
@@ -64,16 +64,16 @@ functions
trackForward true;
// Names of fields to sample. Should contain above velocity field!
- fields (p k U);
+ fields (p k U);
// Steps particles can travel before being removed
lifeTime 10000;
// Number of steps per cell (estimate). Set to 1 to disable subcycling.
- nSubCycle 5;
+ nSubCycle 5;
// Cloud name to use
- cloudName particleTracks;
+ cloud particleTracks;
// Seeding method.
seedSampleSet uniform; //cloud; //triSurfaceMeshPointSet;
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties
index e9a4d3ce5542aecda57e2597d867634a1e5e5fbb..c464c2fb190546b12d6ef74e9842d03af35c575a 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-continuousPhaseName air;
+continuousPhase air;
rho.air 1.2;
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties
index 7a8b38884665d9944b888ad6f778422dc362055c..7d479f3caa7505c4aaf545433f536689198b6f9c 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-continuousPhaseName air;
+continuousPhase air;
rho.air 1.2;
diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties
index e9a4d3ce5542aecda57e2597d867634a1e5e5fbb..c464c2fb190546b12d6ef74e9842d03af35c575a 100644
--- a/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-continuousPhaseName air;
+continuousPhase air;
rho.air 1.2;
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
index 3a685fa3552ca4d20342ef222bb101ad1fd79100..ef6d5c15f830e3a61cbb4a33d8f5dce7929af12a 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
@@ -72,7 +72,7 @@ subModels
massTotal 40;
SOI 1;
parcelBasisType mass;
- patchName inlet;
+ patch inlet;
duration 4;
parcelsPerSecond 100644;
U0 (-10 0 0);
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties
index 7a8b38884665d9944b888ad6f778422dc362055c..7d479f3caa7505c4aaf545433f536689198b6f9c 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-continuousPhaseName air;
+continuousPhase air;
rho.air 1.2;
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
index 67943e71f16dc1ae32b4c4ef755c8ba8d6492b78..aa34863b9b7a8791a035ceadc85e6b099a35a894 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
@@ -80,7 +80,7 @@ subModels
{
type patchInjection;
parcelBasisType fixed;
- patchName lowerInlet;
+ patch lowerInlet;
U0 (18.7939 6.8404 0);
nParticle 1;
parcelsPerSecond 1390885;
@@ -105,7 +105,7 @@ subModels
{
type patchInjection;
parcelBasisType fixed;
- patchName upperInlet;
+ patch upperInlet;
U0 (18.7939 -6.8404 0);
nParticle 1;
parcelsPerSecond 1390885;
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties
index e9a4d3ce5542aecda57e2597d867634a1e5e5fbb..c464c2fb190546b12d6ef74e9842d03af35c575a 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-continuousPhaseName air;
+continuousPhase air;
rho.air 1.2;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties
index af4915a63be30ad2490aefbbf7bfdc4cdd2eb306..13a5320893a59f48b67ef07b3a8f563814e10c50 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties
@@ -11,13 +11,13 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel thermoSingleLayer;
-regionName wallFilmRegion;
+region wallFilmRegion;
active true;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties
index efb2938c8199c8e69e94a9bcc52003de7b6c075d..7cf97c650497e854bb2d99cc3a2b63d64e1b012e 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties
@@ -11,13 +11,13 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel thermoSingleLayer;
-regionName wallFilmRegion;
+region wallFilmRegion;
active true;
@@ -108,7 +108,7 @@ thermoSingleLayerCoeffs
drippingInjectionCoeffs
{
- cloudName reactingCloud1;
+ cloud reactingCloud1;
deltaStable 0;
particlesPerParcel 100.0;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties
index ef488bebdd83c2d9880de3c8f619b07863e03e3b..f51e31b47edfc84b722dc51a0792f4461a143a49 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties
@@ -11,13 +11,13 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel kinematicSingleLayer;
-regionName wallFilmRegion;
+region wallFilmRegion;
active true;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties
index 0a3d88057d64fd5b278aa4db514bd1e6a23f59a5..b26b2d3c9aef69340154a48b11df8e40940eca7c 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties
@@ -11,13 +11,13 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel thermoSingleLayer;
-regionName wallFilmRegion;
+region wallFilmRegion;
active true;
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties
index 731fbd81ed365e17fa79c4bbcfcc9604b24da482..1263b4357db8879f89bdc0efb4009a4afd483f24 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-cloudName reactingCloud1;
+cloud reactingCloud1;
sampleFrequency 1;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties
index 731fbd81ed365e17fa79c4bbcfcc9604b24da482..1263b4357db8879f89bdc0efb4009a4afd483f24 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-cloudName reactingCloud1;
+cloud reactingCloud1;
sampleFrequency 1;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 2fa5343300f5be12c15e5330e50c50096eb5f268..d20347dc74d5b99ea5d47ff6ae1245f93970680c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -80,7 +80,7 @@ subModels
SOI 0.01;
massTotal 8;
parcelBasisType mass;
- patchName inletCentral;
+ patch inletCentral;
duration 10000;
parcelsPerSecond 1e5;
U0 (40 0 0);
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict
index d05adc58c130573b4d278360456f659cbed19b7d..07257081e177989166ae566beee85bc2b8f05c7d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-cloudName reactingCloud1Tracks;
+cloud reactingCloud1Tracks;
fields
(
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
index 1ff58d619cd61d9d914ada36d10519f9e267d805..e6e16bed97283ecbd750cb1b0ec27d34a4e87322 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
@@ -84,7 +84,7 @@ subModels
type patchInjection;
massFlowRate 0.8e-03;
parcelBasisType mass;
- patchName inletCentral;
+ patch inletCentral;
parcelsPerSecond 100;
duration 1; // NOTE: set to 1 for steady state
U0 (0 40 0);
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict
index d05adc58c130573b4d278360456f659cbed19b7d..07257081e177989166ae566beee85bc2b8f05c7d 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-cloudName reactingCloud1Tracks;
+cloud reactingCloud1Tracks;
fields
(
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 1ff58d619cd61d9d914ada36d10519f9e267d805..e6e16bed97283ecbd750cb1b0ec27d34a4e87322 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -84,7 +84,7 @@ subModels
type patchInjection;
massFlowRate 0.8e-03;
parcelBasisType mass;
- patchName inletCentral;
+ patch inletCentral;
parcelsPerSecond 100;
duration 1; // NOTE: set to 1 for steady state
U0 (0 40 0);
diff --git a/tutorials/mesh/parallel/filter/constant/particleTrackProperties b/tutorials/mesh/parallel/filter/constant/particleTrackProperties
index 731fbd81ed365e17fa79c4bbcfcc9604b24da482..1263b4357db8879f89bdc0efb4009a4afd483f24 100644
--- a/tutorials/mesh/parallel/filter/constant/particleTrackProperties
+++ b/tutorials/mesh/parallel/filter/constant/particleTrackProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-cloudName reactingCloud1;
+cloud reactingCloud1;
sampleFrequency 1;
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/calcRadiusField.C b/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/calcRadiusField.C
index a607777d034b1e10ee113e92e1acf979a19f96f2..ef1eb8396f6ce56f702b2919eb6300eca4396a44 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/calcRadiusField.C
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/calcRadiusField/calcRadiusField.C
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
radiusFieldXY.write();
- if(calcDirections)
+ if (calcDirections)
{
vectorIOField radialDirection
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
index 8372cf2fbdbf665c575f9d6e4a8cb8af8a1ccb7d..2a4fcbf4fb0e2d44f8db0a15a8474649280bd20e 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
@@ -66,7 +66,7 @@ subModels
interface
{
C -10;
- alphaName alpha.water;
+ alpha alpha.water;
}
}
@@ -79,7 +79,7 @@ subModels
SOI 0;
parcelBasisType fixed;//mass;
nParticle 1;
- patchName inlet;
+ patch inlet;
duration 1;
parcelsPerSecond 1e5;
U0 (0 0 0.1);
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/T.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/T.gas
index dcc261ce40c68e44fe29a07dfa3dc9f82aba4652..9cf3c15e7a91500c4a9f303e170e31283c11996c 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/T.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/T.gas
@@ -40,7 +40,7 @@ boundaryField
wall2
{
type copiedFixedValue;
- sourceFieldName T.liquid;
+ sourceField T.liquid;
value uniform 368;
}
defaultFaces
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0/T.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0/T.gas
index 31f188e880bd1dbf3b39a6a18c99646f5bd46128..6046345c2709407170df9e3d088e9d65d1743436 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0/T.gas
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/0/T.gas
@@ -40,7 +40,7 @@ boundaryField
wall2
{
type copiedFixedValue;
- sourceFieldName T.liquid;
+ sourceField T.liquid;
value uniform 368;
}
defaultFaces
diff --git a/tutorials/resources/geometry/motorBike-passenger-helmet.obj.gz b/tutorials/resources/geometry/motorBike-passenger-helmet.obj.gz
new file mode 100644
index 0000000000000000000000000000000000000000..4f7738d1244782dac214962479da94822a7f4199
Binary files /dev/null and b/tutorials/resources/geometry/motorBike-passenger-helmet.obj.gz differ
diff --git a/wmake/rules/General/ADIOS b/wmake/rules/General/ADIOS
new file mode 100644
index 0000000000000000000000000000000000000000..87bda2c75204b30516a278532120340376ee487e
--- /dev/null
+++ b/wmake/rules/General/ADIOS
@@ -0,0 +1,11 @@
+#-------------------------------*- makefile -*---------------------------------
+# ADIOS includes/libraries
+
+sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
+sinclude $(RULES)/mplib$(WM_MPLIB)
+
+# Obtain compile/link flags via adios_config
+ADIOS_INC := $(shell $(ADIOS_ARCH_PATH)/bin/adios_config -c)
+ADIOS_LIBS := $(shell $(ADIOS_ARCH_PATH)/bin/adios_config -l)
+
+#------------------------------------------------------------------------------
diff --git a/wmake/rules/General/CGAL b/wmake/rules/General/CGAL
index 83e8b1df1e9edcf44233b08cc898d79da5ff6797..2e7e3d5803a03aca10d5eb9007601c89cd930186 100644
--- a/wmake/rules/General/CGAL
+++ b/wmake/rules/General/CGAL
@@ -1,13 +1,15 @@
CGAL_INC = \
- -I$(CGAL_ARCH_PATH)/include \
- -I$(MPFR_ARCH_PATH)/include \
-I$(GMP_ARCH_PATH)/include \
+ -I$(MPFR_ARCH_PATH)/include \
-I$(BOOST_ARCH_PATH)/include \
+ -I$(CGAL_ARCH_PATH)/include \
-I/usr/include
CGAL_LIBS = \
- -L$(MPFR_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
-L$(GMP_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
+ -L$(MPFR_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
+ -L$(BOOST_ARCH_PATH)/lib \
-L$(BOOST_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
+ -L$(CGAL_ARCH_PATH)/lib \
-L$(CGAL_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
-lCGAL