Merge remote-tracking branch 'origin/develop' into develop-pre-release

This commit is contained in:
mattijs
2018-05-31 17:34:16 +01:00
1098 changed files with 4845 additions and 3834 deletions

View File

@ -118,4 +118,34 @@ your `~/.spack/packages.yaml` file:
It appears that spack will otherwise ignore any paraview+qt version
and attempt to install a paraview~qt version instead.
---------------------------
Building on Darwin (Mac-OS)
---------------------------
Support for Darwin is incomplete, but has been provisioned for.
The following are typical (as of yet) unresolved issues.
* Scotch, ptscotch:
- The librt linkage is required for Linux, but not for Darwin.
Current resolution:
Edit or patch
src/parallel/decompose/ptscotchDecomp/Make/options
src/parallel/decompose/scotchDecomp/Make/options
to remove the '-lrt' library
* CGAL:
- ThirdParty CGAL will normally need to be compiled without mpfr/gmp.
This should be done manually prior to building OpenFOAM or other
ThirdParty. Eg,
cd $WM_THIRD_PARTY_DIR
./makeCGAL gmp-none mpfr-none
The erroneous references to gmp/mpfr library can be directly removed
from the wmake/rules/General/CGAL, but it is more advisable to
override them instead in the wmake/rules/darwin64Clang/CGAL file.
--

View File

@ -94,11 +94,11 @@ class basicSubGrid
// Private Member Functions
//- Disallow copy construct
basicSubGrid(const basicSubGrid&);
//- No copy construct
basicSubGrid(const basicSubGrid&) = delete;
//- Disallow default bitwise assignment
void operator=(const basicSubGrid&);
//- No copy assignment
void operator=(const basicSubGrid&) = delete;
public:

View File

@ -82,11 +82,11 @@ class basicSubGrid
// Private Member Functions
//- Disallow copy construct
basicSubGrid(const basicSubGrid&);
//- No copy construct
basicSubGrid(const basicSubGrid&) = delete;
//- Disallow default bitwise assignment
void operator=(const basicSubGrid&);
//- No copy assignment
void operator=(const basicSubGrid&) = delete;
public:

View File

@ -74,11 +74,11 @@ private:
// Private Member Functions
//- Disallow copy construct
PDRDragModel(const PDRDragModel&);
//- No copy construct
PDRDragModel(const PDRDragModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const PDRDragModel&);
//- No copy assignment
void operator=(const PDRDragModel&) = delete;
public:

View File

@ -108,11 +108,11 @@ class basic
// Private Member Functions
//- Disallow copy construct
basic(const basic&);
//- No copy construct
basic(const basic&) = delete;
//- Disallow default bitwise assignment
void operator=(const basic&);
//- No copy assignment
void operator=(const basic&) = delete;
public:

View File

@ -70,11 +70,11 @@ class Gulder
// Private Member Functions
//- Disallow copy construct
Gulder(const Gulder&);
//- No copy construct
Gulder(const Gulder&) = delete;
//- Disallow default bitwise assignment
void operator=(const Gulder&);
//- No copy assignment
void operator=(const Gulder&) = delete;
public:

View File

@ -66,11 +66,11 @@ class SCOPEBlend
// Private Member Functions
//- Disallow copy construct
SCOPEBlend(const SCOPEBlend&);
//- No copy construct
SCOPEBlend(const SCOPEBlend&) = delete;
//- Disallow default bitwise assignment
void operator=(const SCOPEBlend&);
//- No copy assignment
void operator=(const SCOPEBlend&) = delete;
public:

View File

@ -84,11 +84,11 @@ class SCOPEXiEq
// Private Member Functions
//- Disallow copy construct
SCOPEXiEq(const SCOPEXiEq&);
//- No copy construct
SCOPEXiEq(const SCOPEXiEq&) = delete;
//- Disallow default bitwise assignment
void operator=(const SCOPEXiEq&);
//- No copy assignment
void operator=(const SCOPEXiEq&) = delete;
public:

View File

@ -79,11 +79,11 @@ private:
// Private Member Functions
//- Disallow copy construct
XiEqModel(const XiEqModel&);
//- No copy construct
XiEqModel(const XiEqModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const XiEqModel&);
//- No copy assignment
void operator=(const XiEqModel&) = delete;
public:

View File

@ -65,11 +65,11 @@ class instability
// Private Member Functions
//- Disallow copy construct
instability(const instability&);
//- No copy construct
instability(const instability&) = delete;
//- Disallow default bitwise assignment
void operator=(const instability&);
//- No copy assignment
void operator=(const instability&) = delete;
public:

View File

@ -60,11 +60,11 @@ class KTS
// Private Member Functions
//- Disallow copy construct
KTS(const KTS&);
//- No copy construct
KTS(const KTS&) = delete;
//- Disallow default bitwise assignment
void operator=(const KTS&);
//- No copy assignment
void operator=(const KTS&) = delete;
public:

View File

@ -70,11 +70,11 @@ private:
// Private Member Functions
//- Disallow copy construct
XiGModel(const XiGModel&);
//- No copy construct
XiGModel(const XiGModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const XiGModel&);
//- No copy assignment
void operator=(const XiGModel&) = delete;
public:

View File

@ -69,11 +69,11 @@ class instabilityG
// Private Member Functions
//- Disallow copy construct
instabilityG(const instabilityG&);
//- No copy construct
instabilityG(const instabilityG&) = delete;
//- Disallow default bitwise assignment
void operator=(const instabilityG&);
//- No copy assignment
void operator=(const instabilityG&) = delete;
public:

View File

@ -130,11 +130,11 @@ private:
// Private Member Functions
//- Disallow copy construct
XiModel(const XiModel&);
//- No copy construct
XiModel(const XiModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const XiModel&);
//- No copy assignment
void operator=(const XiModel&) = delete;
public:

View File

@ -67,11 +67,11 @@ class algebraic
// Private Member Functions
//- Disallow copy construct
algebraic(const algebraic&);
//- No copy construct
algebraic(const algebraic&) = delete;
//- Disallow default bitwise assignment
void operator=(const algebraic&);
//- No copy assignment
void operator=(const algebraic&) = delete;
public:

View File

@ -55,11 +55,11 @@ class fixed
{
// Private Member Functions
//- Disallow copy construct
fixed(const fixed&);
//- No copy construct
fixed(const fixed&) = delete;
//- Disallow default bitwise assignment
void operator=(const fixed&);
//- No copy assignment
void operator=(const fixed&) = delete;
public:

View File

@ -67,11 +67,11 @@ class transport
// Private Member Functions
//- Disallow copy construct
transport(const transport&);
//- No copy construct
transport(const transport&) = delete;
//- Disallow default bitwise assignment
void operator=(const transport&);
//- No copy assignment
void operator=(const transport&) = delete;
public:

View File

@ -56,11 +56,11 @@ class VoFPatchTransfer
{
// Private member functions
//- Disallow default bitwise copy construct
VoFPatchTransfer(const VoFPatchTransfer&);
//- No copy construct
VoFPatchTransfer(const VoFPatchTransfer&) = delete;
//- Disallow default bitwise assignment
void operator=(const VoFPatchTransfer&);
//- No copy assignment
void operator=(const VoFPatchTransfer&) = delete;
protected:

View File

@ -135,11 +135,14 @@ class VoFSolidificationMeltingSource
template<class RhoFieldType>
void apply(const RhoFieldType& rho, fvMatrix<scalar>& eqn);
//- Disallow default bitwise copy construct
VoFSolidificationMeltingSource(const VoFSolidificationMeltingSource&);
//- No copy construct
VoFSolidificationMeltingSource
(
const VoFSolidificationMeltingSource&
) = delete;
//- Disallow default bitwise assignment
void operator=(const VoFSolidificationMeltingSource&);
//- No copy assignment
void operator=(const VoFSolidificationMeltingSource&) = delete;
public:

View File

@ -73,11 +73,11 @@ protected:
// Private Member Functions
//- Disallow copy construct
mixtureViscosityModel(const mixtureViscosityModel&);
//- No copy construct
mixtureViscosityModel(const mixtureViscosityModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const mixtureViscosityModel&);
//- No copy assignment
void operator=(const mixtureViscosityModel&) = delete;
public:

View File

@ -55,11 +55,11 @@ class relativeVelocityModel
//- Return the list of patchFieldTypes for Udm derived from U
wordList UdmPatchFieldTypes() const;
//- Disallow default bitwise copy construct
relativeVelocityModel(const relativeVelocityModel&);
//- No copy construct
relativeVelocityModel(const relativeVelocityModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const relativeVelocityModel&);
//- No copy assignment
void operator=(const relativeVelocityModel&) = delete;
protected:

View File

@ -68,14 +68,14 @@ protected:
// Private Member Functions
//- Disallow copy construct
//- No copy construct
temperaturePhaseChangeTwoPhaseMixture
(
const temperaturePhaseChangeTwoPhaseMixture&
);
) = delete;
//- Disallow default bitwise assignment
void operator=(const temperaturePhaseChangeTwoPhaseMixture&);
//- No copy assignment
void operator=(const temperaturePhaseChangeTwoPhaseMixture&) = delete;
public:

View File

@ -73,9 +73,15 @@ class threePhaseInterfaceProperties
// Private Member Functions
//- Disallow default bitwise copy construct and assignment
threePhaseInterfaceProperties(const threePhaseInterfaceProperties&);
void operator=(const threePhaseInterfaceProperties&);
//- No copy construct
threePhaseInterfaceProperties
(
const threePhaseInterfaceProperties&
) = delete;
//- No copy assignment
void operator=(const threePhaseInterfaceProperties&) = delete;
//- Correction for the boundary condition on the unit normal nHat on
// walls to produce the correct contact dynamic angle.

View File

@ -69,11 +69,11 @@ protected:
// Private Member Functions
//- Disallow copy construct
phaseChangeTwoPhaseMixture(const phaseChangeTwoPhaseMixture&);
//- No copy construct
phaseChangeTwoPhaseMixture(const phaseChangeTwoPhaseMixture&) = delete;
//- Disallow default bitwise assignment
void operator=(const phaseChangeTwoPhaseMixture&);
//- No copy assignment
void operator=(const phaseChangeTwoPhaseMixture&) = delete;
public:

View File

@ -52,11 +52,11 @@ class saturationModel
{
// Private Member Functions
//- Disallow default bitwise copy construct
saturationModel(const saturationModel&);
//- No copy construct
saturationModel(const saturationModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const saturationModel&);
//- No copy assignment
void operator=(const saturationModel&) = delete;
public:

View File

@ -58,11 +58,11 @@ class wallDependentModel
// Private Member Functions
//- Disallow default bitwise copy construct
wallDependentModel(const wallDependentModel&);
//- No copy construct
wallDependentModel(const wallDependentModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const wallDependentModel&);
//- No copy assignment
void operator=(const wallDependentModel&) = delete;
public:

View File

@ -78,11 +78,14 @@ class BlendedInterfacialModel
// Private Member Functions
//- Disallow default bitwise copy construct
BlendedInterfacialModel(const BlendedInterfacialModel<ModelType>&);
//- No copy construct
BlendedInterfacialModel
(
const BlendedInterfacialModel&
) = delete;
//- Disallow default bitwise assignment
void operator=(const BlendedInterfacialModel<ModelType>&);
//- No copy assignment
void operator=(const BlendedInterfacialModel<ModelType>&) = delete;
//- Correct coeff/value on fixed flux boundary conditions
template<class GeometricField>

View File

@ -57,11 +57,11 @@ class departureDiameterModel
{
// Private Member Functions
//- Disallow default bitwise copy construct
departureDiameterModel(const departureDiameterModel&);
//- No copy construct
departureDiameterModel(const departureDiameterModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const departureDiameterModel&);
//- No copy assignment
void operator=(const departureDiameterModel&) = delete;
public:

View File

@ -57,11 +57,11 @@ class departureFrequencyModel
{
// Private Member Functions
//- Disallow default bitwise copy construct
departureFrequencyModel(const departureFrequencyModel&);
//- No copy construct
departureFrequencyModel(const departureFrequencyModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const departureFrequencyModel&);
//- No copy assignment
void operator=(const departureFrequencyModel&) = delete;
public:

View File

@ -57,11 +57,11 @@ class nucleationSiteModel
{
// Private Member Functions
//- Disallow default bitwise copy construct
nucleationSiteModel(const nucleationSiteModel&);
//- No copy construct
nucleationSiteModel(const nucleationSiteModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const nucleationSiteModel&);
//- No copy assignment
void operator=(const nucleationSiteModel&) = delete;
public:

View File

@ -55,11 +55,11 @@ class partitioningModel
{
// Private Member Functions
//- Disallow default bitwise copy construct
partitioningModel(const partitioningModel&);
//- No copy construct
partitioningModel(const partitioningModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const partitioningModel&);
//- No copy assignment
void operator=(const partitioningModel&) = delete;
public:

View File

@ -52,11 +52,11 @@ class conductivityModel
{
// Private member functions
//- Disallow default bitwise copy construct
conductivityModel(const conductivityModel&);
//- No copy construct
conductivityModel(const conductivityModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const conductivityModel&);
//- No copy assignment
void operator=(const conductivityModel&) = delete;
protected:

View File

@ -53,11 +53,11 @@ class frictionalStressModel
{
// Private member functions
//- Disallow default bitwise copy construct
frictionalStressModel(const frictionalStressModel&);
//- No copy construct
frictionalStressModel(const frictionalStressModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const frictionalStressModel&);
//- No copy assignment
void operator=(const frictionalStressModel&) = delete;
protected:

View File

@ -52,11 +52,11 @@ class granularPressureModel
{
// Private member functions
//- Disallow default bitwise copy construct
granularPressureModel(const granularPressureModel&);
//- No copy construct
granularPressureModel(const granularPressureModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const granularPressureModel&);
//- No copy assignment
void operator=(const granularPressureModel&) = delete;
protected:

View File

@ -147,11 +147,11 @@ class kineticTheoryModel
void correctNut()
{}
//- Disallow default bitwise copy construct
kineticTheoryModel(const kineticTheoryModel&);
//- No copy construct
kineticTheoryModel(const kineticTheoryModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const kineticTheoryModel&);
//- No copy assignment
void operator=(const kineticTheoryModel&) = delete;
public:

View File

@ -52,11 +52,11 @@ class radialModel
{
// Private member functions
//- Disallow default bitwise copy construct
radialModel(const radialModel&);
//- No copy construct
radialModel(const radialModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const radialModel&);
//- No copy assignment
void operator=(const radialModel&) = delete;
protected:

View File

@ -54,11 +54,11 @@ class viscosityModel
{
// Private member functions
//- Disallow default bitwise copy construct
viscosityModel(const viscosityModel&);
//- No copy construct
viscosityModel(const viscosityModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const viscosityModel&);
//- No copy assignment
void operator=(const viscosityModel&) = delete;
protected:

View File

@ -102,11 +102,11 @@ class phasePressureModel
void correctNut()
{}
//- Disallow default bitwise copy construct
phasePressureModel(const phasePressureModel&);
//- No copy construct
phasePressureModel(const phasePressureModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const phasePressureModel&);
//- No copy assignment
void operator=(const phasePressureModel&) = delete;
public:

View File

@ -58,11 +58,11 @@ class wallDependentModel
// Private Member Functions
//- Disallow default bitwise copy construct
wallDependentModel(const wallDependentModel&);
//- No copy construct
wallDependentModel(const wallDependentModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const wallDependentModel&);
//- No copy assignment
void operator=(const wallDependentModel&) = delete;
public:

View File

@ -52,11 +52,11 @@ class conductivityModel
{
// Private member functions
//- Disallow default bitwise copy construct
conductivityModel(const conductivityModel&);
//- No copy construct
conductivityModel(const conductivityModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const conductivityModel&);
//- No copy assignment
void operator=(const conductivityModel&) = delete;
protected:

View File

@ -53,11 +53,11 @@ class frictionalStressModel
{
// Private member functions
//- Disallow default bitwise copy construct
frictionalStressModel(const frictionalStressModel&);
//- No copy construct
frictionalStressModel(const frictionalStressModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const frictionalStressModel&);
//- No copy assignment
void operator=(const frictionalStressModel&) = delete;
protected:

View File

@ -52,11 +52,11 @@ class granularPressureModel
{
// Private member functions
//- Disallow default bitwise copy construct
granularPressureModel(const granularPressureModel&);
//- No copy construct
granularPressureModel(const granularPressureModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const granularPressureModel&);
//- No copy assignment
void operator=(const granularPressureModel&) = delete;
protected:

View File

@ -147,11 +147,11 @@ class kineticTheoryModel
void correctNut()
{}
//- Disallow default bitwise copy construct
kineticTheoryModel(const kineticTheoryModel&);
//- No copy construct
kineticTheoryModel(const kineticTheoryModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const kineticTheoryModel&);
//- No copy assignment
void operator=(const kineticTheoryModel&) = delete;
public:

View File

@ -52,11 +52,11 @@ class radialModel
{
// Private member functions
//- Disallow default bitwise copy construct
radialModel(const radialModel&);
//- No copy construct
radialModel(const radialModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const radialModel&);
//- No copy assignment
void operator=(const radialModel&) = delete;
protected:

View File

@ -54,11 +54,11 @@ class viscosityModel
{
// Private member functions
//- Disallow default bitwise copy construct
viscosityModel(const viscosityModel&);
//- No copy construct
viscosityModel(const viscosityModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const viscosityModel&);
//- No copy assignment
void operator=(const viscosityModel&) = delete;
protected:

View File

@ -106,11 +106,11 @@ class phasePressureModel
void correctNut()
{}
//- Disallow default bitwise copy construct
phasePressureModel(const phasePressureModel&);
//- No copy construct
phasePressureModel(const phasePressureModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const phasePressureModel&);
//- No copy assignment
void operator=(const phasePressureModel&) = delete;
public:

View File

@ -81,11 +81,14 @@ class BlendedInterfacialModel
// Private Member Functions
//- Disallow default bitwise copy construct
BlendedInterfacialModel(const BlendedInterfacialModel<modelType>&);
//- No copy construct
BlendedInterfacialModel
(
const BlendedInterfacialModel&
) = delete;
//- Disallow default bitwise assignment
void operator=(const BlendedInterfacialModel<modelType>&);
//- No copy assignment
void operator=(const BlendedInterfacialModel<modelType>&) = delete;
//- Correct coeff/value on fixed flux boundary conditions
template<class GeometricField>

View File

@ -188,10 +188,10 @@ int main(int argc, char *argv[])
Info<< "setB : " << setB << endl;
labelPair pair(12, 15);
setB.setMany(pair);
setB.set(pair);
Info<< "setB : " << setB << endl;
setB.unsetMany(pair);
setB.unset(pair);
labelHashSet setC(1);
@ -257,7 +257,7 @@ int main(int argc, char *argv[])
someLst[elemI] = elemI*elemI;
}
label added = setD.setMany(someLst);
label added = setD.set(someLst);
Info<< "added " << added << " from " << someLst.size() << endl;
Info<< "setD : " << flatOutput(setD) << endl;

View File

@ -294,7 +294,7 @@ int main(int argc, char *argv[])
Info<< "\nclear/assign from labelList\n";
list4.clear();
list4.setMany(labelList{0, 1, 2, 3, 12, 13, 14, 19, 20, 21});
list4.set(labelList{0, 1, 2, 3, 12, 13, 14, 19, 20, 21});
report(list4, true);

View File

@ -113,8 +113,10 @@ private:
// Private Member Functions
//- Disallow bitwise copy/assignment
//- No copy construct
dictionaryTokens(const dictionaryTokens&) = delete;
//- No copy assignment
void operator=(const dictionaryTokens&) = delete;
@ -181,8 +183,10 @@ class dictionaryTokens::primitive_iterator
// Private Member Functions
//- Disallow bitwise copy/assignment
//- No copy construct
primitive_iterator(const primitive_iterator&) = delete;
//- No copy assignment
void operator=(const primitive_iterator&) = delete;
public:
@ -251,8 +255,10 @@ class dictionaryTokens::dictionary_iterator
// Private Member Functions
//- Disallow bitwise copy/assignment
//- No copy construct
dictionary_iterator(const dictionary_iterator&) = delete;
//- No copy assignment
void operator=(const dictionary_iterator&) = delete;

View File

@ -94,7 +94,7 @@ int main(int argc, char *argv[])
e4.start() = e4.end() = -1;
Info<< "insert from list\n";
labelHashSet newIndices({2, -1, 2, 1, 4, 1, 2, 3});
e4.insertMany(newIndices.toc());
e4.insert(newIndices.toc());
printInfo(e4);
e4.start() = e4.end() = -1;
@ -105,12 +105,12 @@ int main(int argc, char *argv[])
FixedList<label, 8> otherIndices{12, 2, -1, 1, 4, 1, 2, 3};
e4.start() = e4.end() = -1;
Info<< "insert from list: " << otherIndices << nl;
e4.insertMany(otherIndices);
e4.insert(otherIndices);
printInfo(e4);
e4.start() = e4.end();
Info<< "erase from list: " << otherIndices << nl;
Info<< "removed " << e4.eraseMany(otherIndices) << " values" << nl;
Info<< "removed " << e4.erase(otherIndices) << " values" << nl;
printInfo(e4);
for (label i : {-1, 0, 1, 3})

View File

@ -159,11 +159,11 @@ class router
DynamicList<label>& route
) const;
//- Disallow default bitwise copy construct
router(const router&);
//- No copy construct
router(const router&) = delete;
//- Disallow default bitwise assignment
void operator=(const router&);
//- No copy assignment
void operator=(const router&) = delete;
public:

View File

@ -374,7 +374,7 @@ void Foam::cellSplitter::setRefinement
const cell& cFaces = mesh_.cells()[celli];
faceUpToDate.unsetMany(cFaces);
faceUpToDate.unset(cFaces);
}
forAll(faceUpToDate, facei)

View File

@ -91,11 +91,11 @@ class cellSplitter
const Map<labelList>& cellToCells
) const;
//- Disallow default bitwise copy construct
cellSplitter(const cellSplitter&);
//- No copy construct
cellSplitter(const cellSplitter&) = delete;
//- Disallow default bitwise assignment
void operator=(const cellSplitter&);
//- No copy assignment
void operator=(const cellSplitter&) = delete;
public:

View File

@ -120,7 +120,7 @@ int main(int argc, char *argv[])
{
const labelList& pCells = mesh.pointCells()[meshPointi];
cutCells.insertMany(pCells);
cutCells.insert(pCells);
}
}
@ -153,7 +153,7 @@ int main(int argc, char *argv[])
const polyPatch& pp = mesh.boundaryMesh()[patchi];
const labelList& meshPoints = pp.meshPoints();
vertOnPatch.setMany(meshPoints);
vertOnPatch.set(meshPoints);
}
for (const label patchi : patchSet)

View File

@ -184,7 +184,7 @@ int main(int argc, char *argv[])
const DynamicList<label>& bin = bins[binI];
cellSet cells(mesh, "vol" + name(binI), bin.size());
cells.insertMany(bin);
cells.insert(bin);
Info<< " " << lowerLimits[binI] << " .. " << upperLimits[binI]
<< " : writing " << bin.size() << " cells to cellSet "

View File

@ -68,11 +68,11 @@ class edgeStats
direction getNormalDir(const twoDPointCorrector*) const;
//- Disallow default bitwise copy construct
edgeStats(const edgeStats&);
//- No copy construct
edgeStats(const edgeStats&) = delete;
//- Disallow default bitwise assignment
void operator=(const edgeStats&);
//- No copy assignment
void operator=(const edgeStats&) = delete;
public:

View File

@ -633,7 +633,7 @@ int main(int argc, char *argv[])
);
cellSet cutSet(mesh, "cutSet", cutCells.size());
cutSet.insertMany(cutCells);
cutSet.insert(cutCells);
// Gets cuts across cells from cuts through edges.
Info<< "Writing " << cutSet.size() << " cells to cut to cellSet "

View File

@ -74,11 +74,11 @@ class hexBlock
// Private Member Functions
//- Disallow default bitwise copy construct
hexBlock(const hexBlock&);
//- No copy construct
hexBlock(const hexBlock&) = delete;
//- Disallow default bitwise assignment
void operator=(const hexBlock&);
//- No copy assignment
void operator=(const hexBlock&) = delete;
//- Vertex addressing inside the block
inline label vtxLabel(label i, label j, label k) const;

View File

@ -961,7 +961,7 @@ int main(int argc, char *argv[])
forAll(dofVertIndices, patchi)
{
const labelList& foamVerts = dofVertIndices[patchi];
dofGroups[patchi].insertMany(foamVerts);
dofGroups[patchi].insert(foamVerts);
}
List<DynamicList<face>> dynPatchFaces(dofVertIndices.size());

View File

@ -67,11 +67,11 @@ class hexBlock
// Private Member Functions
//- Disallow default bitwise copy construct
hexBlock(const hexBlock&);
//- No copy construct
hexBlock(const hexBlock&) = delete;
//- Disallow default bitwise assignment
void operator=(const hexBlock&);
//- No copy assignment
void operator=(const hexBlock&) = delete;
//- Vertex addressing inside the block
inline label vtxLabel(label i, label j, label k) const;

View File

@ -344,7 +344,7 @@ void writePointCells
{
const labelList& cEdges = mesh.cellEdges()[pCells[i]];
allEdges.insertMany(cEdges);
allEdges.insert(cEdges);
}

View File

@ -795,7 +795,7 @@ int main(int argc, char *argv[])
forAll(addedCells, facei)
{
const labelList& aCells = addedCells[facei];
addedCellsSet.insertMany(aCells);
addedCellsSet.insert(aCells);
}
}
}

View File

@ -86,10 +86,10 @@ class extrudedMesh
);
//- Disallow default bitwise copy construct
//- No copy construct
extrudedMesh(const extrudedMesh&) = delete;
//- Disallow default bitwise assignment
//- No copy assignment
void operator=(const extrudedMesh&) = delete;

View File

@ -527,7 +527,7 @@ label findUncoveredPatchFace
{
// Make set of extruded faces.
labelHashSet extrudeFaceSet(extrudeMeshFaces.size());
extrudeFaceSet.insertMany(extrudeMeshFaces);
extrudeFaceSet.insert(extrudeMeshFaces);
const polyBoundaryMesh& pbm = mesh.boundaryMesh();
const labelList& eFaces = mesh.edgeFaces()[meshEdgeI];
@ -561,7 +561,7 @@ label findUncoveredCyclicPatchFace
{
// Make set of extruded faces.
labelHashSet extrudeFaceSet(extrudeMeshFaces.size());
extrudeFaceSet.insertMany(extrudeMeshFaces);
extrudeFaceSet.insert(extrudeMeshFaces);
const polyBoundaryMesh& pbm = mesh.boundaryMesh();
const labelList& eFaces = mesh.edgeFaces()[meshEdgeI];

View File

@ -87,11 +87,11 @@ class extrude2DMesh
//- Find extrusion direction
//void findExtrudeDirection();
//- Disallow default bitwise copy construct
extrude2DMesh(const extrude2DMesh&);
//- No copy construct
extrude2DMesh(const extrude2DMesh&) = delete;
//- Disallow default bitwise assignment
void operator=(const extrude2DMesh&);
//- No copy assignment
void operator=(const extrude2DMesh&) = delete;
public:

View File

@ -85,11 +85,11 @@ class patchToPoly2DMesh
void createPolyMeshComponents();
//- Disallow default bitwise copy construct
patchToPoly2DMesh(const patchToPoly2DMesh&);
//- No copy construct
patchToPoly2DMesh(const patchToPoly2DMesh&) = delete;
//- Disallow default bitwise assignment
void operator=(const patchToPoly2DMesh&);
//- No copy assignment
void operator=(const patchToPoly2DMesh&) = delete;
public:

View File

@ -70,11 +70,11 @@ class cv2DControls
// Private Member Functions
//- Disallow default bitwise copy construct
cv2DControls(const cv2DControls&);
//- No copy construct
cv2DControls(const cv2DControls&) = delete;
//- Disallow default bitwise assignment
void operator=(const cv2DControls&);
//- No copy assignment
void operator=(const cv2DControls&) = delete;
public:

View File

@ -142,11 +142,11 @@ private:
const List<DynamicList<label>>& patchOwners
) const;
//- Disallow default bitwise copy construct
DelaunayMesh(const DelaunayMesh<Triangulation>&);
//- No copy construct
DelaunayMesh(const DelaunayMesh<Triangulation>&) = delete;
//- Disallow default bitwise assignment
void operator=(const DelaunayMesh<Triangulation>&);
//- No copy assignment
void operator=(const DelaunayMesh<Triangulation>&) = delete;
public:

View File

@ -119,11 +119,14 @@ private:
labelPairHashSet& receivedVertices
);
//- Disallow default bitwise copy construct
DistributedDelaunayMesh(const DistributedDelaunayMesh<Triangulation>&);
//- No copy construct
DistributedDelaunayMesh
(
const DistributedDelaunayMesh&
) = delete;
//- Disallow default bitwise assignment
void operator=(const DistributedDelaunayMesh<Triangulation>&);
//- No copy assignment
void operator=(const DistributedDelaunayMesh<Triangulation>&) = delete;
public:

View File

@ -193,22 +193,4 @@ void Foam::PrintTable<KeyType, DataType>::print
}
// * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * //
template<class KeyType, class DataType>
void Foam::PrintTable<KeyType, DataType>::operator=
(
const PrintTable<KeyType, DataType>& rhs
)
{
// Check for assignment to self
if (this == &rhs)
{
FatalErrorInFunction
<< "Attempted assignment to self"
<< abort(FatalError);
}
}
// ************************************************************************* //

View File

@ -82,8 +82,8 @@ class PrintTable
// Private Member Functions
//- Disallow default bitwise assignment
void operator=(const PrintTable<KeyType, DataType>&);
//- No copy assignment
void operator=(const PrintTable<KeyType, DataType>&) = delete;
public:
@ -107,7 +107,7 @@ public:
// Member Functions
//- Add an entry (D) to the given key(K)
void add(const KeyType& K, const DataType& D);
inline void add(const KeyType& K, const DataType& D);
//- Print the table
void print

View File

@ -26,7 +26,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class KeyType, class DataType>
void Foam::PrintTable<KeyType, DataType>::add
inline void Foam::PrintTable<KeyType, DataType>::add
(
const KeyType& K,
const DataType& D
@ -35,8 +35,4 @@ void Foam::PrintTable<KeyType, DataType>::add
table_.set(K, D);
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// ************************************************************************* //

View File

@ -177,11 +177,14 @@ class backgroundMeshDecomposition
//- Build the surface patch and search tree
void buildPatchAndTree();
//- Disallow default bitwise copy construct
backgroundMeshDecomposition(const backgroundMeshDecomposition&);
//- No copy construct
backgroundMeshDecomposition
(
const backgroundMeshDecomposition&
) = delete;
//- Disallow default bitwise assignment
void operator=(const backgroundMeshDecomposition&);
//- No copy assignment
void operator=(const backgroundMeshDecomposition&) = delete;
public:

View File

@ -61,11 +61,11 @@ class cellAspectRatioControl
// Private Member Functions
//- Disallow default bitwise copy construct
cellAspectRatioControl(const cellAspectRatioControl&);
//- No copy construct
cellAspectRatioControl(const cellAspectRatioControl&) = delete;
//- Disallow default bitwise assignment
void operator=(const cellAspectRatioControl&);
//- No copy assignment
void operator=(const cellAspectRatioControl&) = delete;
public:

View File

@ -85,11 +85,11 @@ class cellShapeControl
// Private Member Functions
//- Disallow default bitwise copy construct
cellShapeControl(const cellShapeControl&);
//- No copy construct
cellShapeControl(const cellShapeControl&) = delete;
//- Disallow default bitwise assignment
void operator=(const cellShapeControl&);
//- No copy assignment
void operator=(const cellShapeControl&) = delete;
public:

View File

@ -83,11 +83,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
cellShapeControlMesh(const cellShapeControlMesh&);
//- No copy construct
cellShapeControlMesh(const cellShapeControlMesh&) = delete;
//- Disallow default bitwise assignment
void operator=(const cellShapeControlMesh&);
//- No copy assignment
void operator=(const cellShapeControlMesh&) = delete;
public:

View File

@ -71,11 +71,14 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
cellSizeAndAlignmentControl(const cellSizeAndAlignmentControl&);
//- No copy construct
cellSizeAndAlignmentControl
(
const cellSizeAndAlignmentControl&
) = delete;
//- Disallow default bitwise assignment
void operator=(const cellSizeAndAlignmentControl&);
//- No copy assignment
void operator=(const cellSizeAndAlignmentControl&) = delete;
public:

View File

@ -68,11 +68,14 @@ class cellSizeAndAlignmentControls
label& maxPriority
) const;
//- Disallow default bitwise copy construct
cellSizeAndAlignmentControls(const cellSizeAndAlignmentControls&);
//- No copy construct
cellSizeAndAlignmentControls
(
const cellSizeAndAlignmentControls&
) = delete;
//- Disallow default bitwise assignment
void operator=(const cellSizeAndAlignmentControls&);
//- No copy assignment
void operator=(const cellSizeAndAlignmentControls&) = delete;
public:

View File

@ -63,11 +63,11 @@ class fileControl
// Private Member Functions
//- Disallow default bitwise copy construct
fileControl(const fileControl&);
//- No copy construct
fileControl(const fileControl&) = delete;
//- Disallow default bitwise assignment
void operator=(const fileControl&);
//- No copy assignment
void operator=(const fileControl&) = delete;
public:

View File

@ -88,11 +88,11 @@ class searchableSurfaceControl
// const vectorField& ptNormals
// ) const;
//- Disallow default bitwise copy construct
searchableSurfaceControl(const searchableSurfaceControl&);
//- No copy construct
searchableSurfaceControl(const searchableSurfaceControl&) = delete;
//- Disallow default bitwise assignment
void operator=(const searchableSurfaceControl&);
//- No copy assignment
void operator=(const searchableSurfaceControl&) = delete;
public:

View File

@ -99,11 +99,11 @@ class controlMeshRefinement
pointHit findDiscontinuities(const linePointRef& l) const;
//- Disallow default bitwise copy construct
controlMeshRefinement(const controlMeshRefinement&);
//- No copy construct
controlMeshRefinement(const controlMeshRefinement&) = delete;
//- Disallow default bitwise assignment
void operator=(const controlMeshRefinement&);
//- No copy assignment
void operator=(const controlMeshRefinement&) = delete;
public:

View File

@ -91,11 +91,11 @@ class smoothAlignmentSolver
triad& t
) const;
//- Disallow default bitwise copy construct
smoothAlignmentSolver(const smoothAlignmentSolver&);
//- No copy construct
smoothAlignmentSolver(const smoothAlignmentSolver&) = delete;
//- Disallow default bitwise assignment
void operator=(const smoothAlignmentSolver&);
//- No copy assignment
void operator=(const smoothAlignmentSolver&) = delete;
public:

View File

@ -110,11 +110,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
cellSizeFunction(const cellSizeFunction&);
//- No copy construct
cellSizeFunction(const cellSizeFunction&) = delete;
//- Disallow default bitwise assignment
void operator=(const cellSizeFunction&);
//- No copy assignment
void operator=(const cellSizeFunction&) = delete;
public:

View File

@ -67,11 +67,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
cellSizeCalculationType(const cellSizeCalculationType&);
//- No copy construct
cellSizeCalculationType(const cellSizeCalculationType&) = delete;
//- Disallow default bitwise assignment
void operator=(const cellSizeCalculationType&);
//- No copy assignment
void operator=(const cellSizeCalculationType&) = delete;
public:

View File

@ -75,11 +75,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
surfaceCellSizeFunction(const surfaceCellSizeFunction&);
//- No copy construct
surfaceCellSizeFunction(const surfaceCellSizeFunction&) = delete;
//- Disallow default bitwise assignment
void operator=(const surfaceCellSizeFunction&);
//- No copy assignment
void operator=(const surfaceCellSizeFunction&) = delete;
public:

View File

@ -850,11 +850,11 @@ private:
void writePointPairs(const fileName& fName) const;
//- Disallow default bitwise copy construct
conformalVoronoiMesh(const conformalVoronoiMesh&);
//- No copy construct
conformalVoronoiMesh(const conformalVoronoiMesh&) = delete;
//- Disallow default bitwise assignment
void operator=(const conformalVoronoiMesh&);
//- No copy assignment
void operator=(const conformalVoronoiMesh&) = delete;
public:

View File

@ -1053,7 +1053,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
nInvalidPolyhedra++;
wrongFaces.insertMany(cells[cI]);
wrongFaces.insert(cells[cI]);
}
}
@ -1093,7 +1093,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
if (nInternalFaces[cI] <= 1)
{
oneInternalFaceCells++;
wrongFaces.insertMany(cells[cI]);
wrongFaces.insert(cells[cI]);
}
}
@ -1109,7 +1109,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
{
const face f = pMesh.faces()[facei];
ptToBeLimited.setMany(f);
ptToBeLimited.set(f);
}
// // Limit connected cells
@ -1126,7 +1126,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
// {
// label ptI = f[fPtI];
// const labelList& pC = ptCells[ptI];
// limitCells.insertMany(pC);
// limitCells.insert(pC);
// }
// }
@ -1136,7 +1136,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
// {
// const labelList& cP = cellPts[celli];
// ptToBeLimited.setMany(cP);
// ptToBeLimited.set(cP);
// }
@ -2542,7 +2542,7 @@ void Foam::conformalVoronoiMesh::removeUnusedPoints
{
const face& f = faces[fI];
ptUsed.setMany(f);
ptUsed.set(f);
}
label pointi = 0;
@ -2592,8 +2592,8 @@ Foam::labelList Foam::conformalVoronoiMesh::removeUnusedCells
// Scan all faces to find all of the cells that are used
cellUsed.setMany(owner);
cellUsed.setMany(neighbour);
cellUsed.set(owner);
cellUsed.set(neighbour);
label celli = 0;

View File

@ -1351,7 +1351,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::findRemainingProtrusionSet
for (const label pointi : protrudingBoundaryPoints)
{
const labelList& pCells = mesh.pointCells()[pointi];
protrudingCells.insertMany(pCells);
protrudingCells.insert(pCells);
}
label protrudingCellsSize = protrudingCells.size();

View File

@ -133,11 +133,11 @@ class featurePointConformer
//- Create the points that will conform to the feature
void createFeaturePoints(DynamicList<Vb>& pts);
//- Disallow default bitwise copy construct
featurePointConformer(const featurePointConformer&);
//- No copy construct
featurePointConformer(const featurePointConformer&) = delete;
//- Disallow default bitwise assignment
void operator=(const featurePointConformer&);
//- No copy assignment
void operator=(const featurePointConformer&) = delete;
public:

View File

@ -125,11 +125,11 @@ class conformationSurfaces
label& featureIndex
);
//- Disallow default bitwise copy construct
conformationSurfaces(const conformationSurfaces&);
//- No copy construct
conformationSurfaces(const conformationSurfaces&) = delete;
//- Disallow default bitwise assignment
void operator=(const conformationSurfaces&);
//- No copy assignment
void operator=(const conformationSurfaces&) = delete;
public:

View File

@ -209,11 +209,11 @@ class cvControls
// Private Member Functions
//- Disallow default bitwise copy construct
cvControls(const cvControls&);
//- No copy construct
cvControls(const cvControls&) = delete;
//- Disallow default bitwise assignment
void operator=(const cvControls&);
//- No copy assignment
void operator=(const cvControls&) = delete;
public:

View File

@ -68,11 +68,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
faceAreaWeightModel(const faceAreaWeightModel&);
//- No copy construct
faceAreaWeightModel(const faceAreaWeightModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const faceAreaWeightModel&);
//- No copy assignment
void operator=(const faceAreaWeightModel&) = delete;
public:

View File

@ -87,11 +87,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
initialPointsMethod(const initialPointsMethod&);
//- No copy construct
initialPointsMethod(const initialPointsMethod&) = delete;
//- Disallow default bitwise assignment
void operator=(const initialPointsMethod&);
//- No copy assignment
void operator=(const initialPointsMethod&) = delete;
public:

View File

@ -70,11 +70,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
relaxationModel(const relaxationModel&);
//- No copy construct
relaxationModel(const relaxationModel&) = delete;
//- Disallow default bitwise assignment
void operator=(const relaxationModel&);
//- No copy assignment
void operator=(const relaxationModel&) = delete;
public:

View File

@ -59,11 +59,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
searchableBoxFeatures(const searchableBoxFeatures&);
//- No copy construct
searchableBoxFeatures(const searchableBoxFeatures&) = delete;
//- Disallow default bitwise assignment
void operator=(const searchableBoxFeatures&);
//- No copy assignment
void operator=(const searchableBoxFeatures&) = delete;
public:

View File

@ -63,11 +63,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
searchablePlateFeatures(const searchablePlateFeatures&);
//- No copy construct
searchablePlateFeatures(const searchablePlateFeatures&) = delete;
//- Disallow default bitwise assignment
void operator=(const searchablePlateFeatures&);
//- No copy assignment
void operator=(const searchablePlateFeatures&) = delete;
public:

View File

@ -60,11 +60,11 @@ class searchableSurfaceFeatures
// Private Member Functions
//- Disallow default bitwise copy construct
searchableSurfaceFeatures(const searchableSurfaceFeatures&);
//- No copy construct
searchableSurfaceFeatures(const searchableSurfaceFeatures&) = delete;
//- Disallow default bitwise assignment
void operator=(const searchableSurfaceFeatures&);
//- No copy assignment
void operator=(const searchableSurfaceFeatures&) = delete;
public:

View File

@ -61,11 +61,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
triSurfaceMeshFeatures(const triSurfaceMeshFeatures&);
//- No copy construct
triSurfaceMeshFeatures(const triSurfaceMeshFeatures&) = delete;
//- Disallow default bitwise assignment
void operator=(const triSurfaceMeshFeatures&);
//- No copy assignment
void operator=(const triSurfaceMeshFeatures&) = delete;
public:

View File

@ -199,11 +199,11 @@ private:
// Private Member Functions
//- Disallow default bitwise copy construct
CV2D(const CV2D&);
//- No copy construct
CV2D(const CV2D&) = delete;
//- Disallow default bitwise assignment
void operator=(const CV2D&);
//- No copy assignment
void operator=(const CV2D&) = delete;
//- Insert point and return it's index

Some files were not shown because too many files have changed in this diff Show More