diff --git a/applications/test/List/Test-List.C b/applications/test/List/Test-List.C index a09ac01ab6..c78ddaac88 100644 --- a/applications/test/List/Test-List.C +++ b/applications/test/List/Test-List.C @@ -606,14 +606,14 @@ int main(int argc, char *argv[]) } { - labelListList listlist(one(), identity(5)); + labelListList listlist(one{}, identity(5)); Info<<"list-list 1/val:" << listlist << nl; } { labelList content = identity(5); - labelListList listlist(one(), content); + labelListList listlist(one{}, content); Info<<"list-list 1/copy val:" << listlist <<" - from " << content << nl; } @@ -621,13 +621,13 @@ int main(int argc, char *argv[]) { labelList content = identity(5); - labelListList listlist(one(), std::move(content)); + labelListList listlist(one{}, std::move(content)); Info<<"list-list 1/move val:" << listlist <<" - from " << content << nl; } { - labelListList listlist(one(), Zero); + labelListList listlist(one{}, Zero); Info<<"list-list 1/move val:" << listlist << nl; } diff --git a/applications/test/constantFields/Make/files b/applications/test/constantFields/Make/files new file mode 100644 index 0000000000..02ad66be1b --- /dev/null +++ b/applications/test/constantFields/Make/files @@ -0,0 +1,3 @@ +Test-constantFields.C + +EXE = $(FOAM_USER_APPBIN)/Test-constantFields diff --git a/applications/test/constantFields/Make/options b/applications/test/constantFields/Make/options new file mode 100644 index 0000000000..d27c95d033 --- /dev/null +++ b/applications/test/constantFields/Make/options @@ -0,0 +1,7 @@ +EXE_INC = \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude + +EXE_LIBS = \ + -lfiniteVolume \ + -lmeshTools diff --git a/applications/test/constantFields/Test-constantFields.C b/applications/test/constantFields/Test-constantFields.C new file mode 100644 index 0000000000..af34d90db5 --- /dev/null +++ b/applications/test/constantFields/Test-constantFields.C @@ -0,0 +1,63 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | www.openfoam.com + \\/ M anipulation | +------------------------------------------------------------------------------- + Copyright (C) 2020 OpenCFD Ltd. +------------------------------------------------------------------------------- +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 . + +Application + Test-constantields + +Description + Simple compilation tests for constant fields + +\*---------------------------------------------------------------------------*/ + +#include "fvCFD.H" +#include "geometricOneField.H" +#include "geometricZeroField.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +int main(int argc, char *argv[]) +{ + #include "setRootCase.H" + + { + geometricZeroField fld0; + geometricOneField fld1; + + Info<< "dims 0: " << fld0.dimensions() << nl; + Info<< "internal 0: " << scalar(fld0.internalField()[0]) << nl; + Info<< "boundary 0: " << scalar(fld0.boundaryField()[0][0]) << nl; + + Info<< "dims 1: " << fld1.dimensions() << nl; + Info<< "internal 1: " << scalar(fld1.internalField()[0]) << nl; + Info<< "boundary 1: " << scalar(fld1.boundaryField()[0][0]) << nl; + } + + Info<< "\nDone\n" << endl; + + return 0; +} + + +// ************************************************************************* // diff --git a/applications/test/field1/Test-field1.C b/applications/test/field1/Test-field1.C index 77e046d161..2cd6bc6c01 100644 --- a/applications/test/field1/Test-field1.C +++ b/applications/test/field1/Test-field1.C @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -152,7 +152,7 @@ typename outerProduct1::type mySumSqr(const UList& f) int main(int argc, char *argv[]) { - scalarField sfield(10, one()); + scalarField sfield(10, one{}); forAll(sfield, i) { @@ -165,7 +165,7 @@ int main(int argc, char *argv[]) Info<< "negated: " << sfield << nl; // Does not compile (ambiguous) - // boolField lfield(10, one()); + // boolField lfield(10, one{}); boolField lfield(10, true); diff --git a/applications/test/tensorFieldFields1/Test-tensorFieldFields1.C b/applications/test/tensorFieldFields1/Test-tensorFieldFields1.C index 3c93f17753..ad9cf11ddf 100644 --- a/applications/test/tensorFieldFields1/Test-tensorFieldFields1.C +++ b/applications/test/tensorFieldFields1/Test-tensorFieldFields1.C @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -101,7 +101,7 @@ int main(int argc, char *argv[]) Info<< nl << "tensorFieldField" << nl; FieldField tff1(1); - tff1.set(0, new tensorField(1, t19)); + tff1.set(0, new tensorField(one{}, t19)); FixedList, 9> cmpts; allocComponents(cmpts, 1); @@ -178,7 +178,7 @@ int main(int argc, char *argv[]) Info<< nl << "symmTensorField" << nl; FieldField sf1(1); - sf1.set(0, new symmTensorField(1, symmTensor(1, 2, 3, 4, 5, 6))); + sf1.set(0, new symmTensorField(one{}, symmTensor(1, 2, 3, 4, 5, 6))); FixedList, 6> cmpts; allocComponents(cmpts, 1); @@ -224,7 +224,7 @@ int main(int argc, char *argv[]) Info<< nl << "sphericalTensorField" << nl; FieldField sf1(1); - sf1.set(0, new sphericalTensorField(1, sphericalTensor(4))); + sf1.set(0, new sphericalTensorField(one{}, sphericalTensor(4))); FixedList, 1> cmpts; allocComponents(cmpts, 1); diff --git a/applications/test/tensorFields1/Test-tensorFields1.C b/applications/test/tensorFields1/Test-tensorFields1.C index 9604704f25..c6e0598bd9 100644 --- a/applications/test/tensorFields1/Test-tensorFields1.C +++ b/applications/test/tensorFields1/Test-tensorFields1.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011 OpenFOAM Foundation - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -148,7 +148,7 @@ int main(int argc, char *argv[]) tensorField tf1(2, tensor(1, 2, 3, 4, 5, 6, 7, 8, 9)); tf1.last() = tf1.last().T(); - scalarField f1(2, one()); + scalarField f1(2, one{}); symmTensorField sf1(2, symmTensor::one); symmTensorField sf2(2, symmTensor::one); @@ -210,9 +210,9 @@ int main(int argc, char *argv[]) { Info<< nl << "sphericalTensorField" << nl; - scalarField f1(2, one()); - sphericalTensorField sf1(2, 1); - sphericalTensorField sf2(2, 2); + scalarField f1(2, one{}); + sphericalTensorField sf1(2, sphericalTensor(1)); + sphericalTensorField sf2(2, sphericalTensor(2)); tensorField tf1(2, tensor::one); Info<< (tf1 & sf2) << nl; diff --git a/src/OpenFOAM/containers/IndirectLists/IndirectList/IndirectList.H b/src/OpenFOAM/containers/IndirectLists/IndirectList/IndirectList.H index f79a9a6c27..63c43d4792 100644 --- a/src/OpenFOAM/containers/IndirectLists/IndirectList/IndirectList.H +++ b/src/OpenFOAM/containers/IndirectLists/IndirectList/IndirectList.H @@ -31,7 +31,7 @@ Description A List with indirect addressing. See also - Foam::UIndirectList for a version without any addressing allocation. + Foam::UIndirectList for a version without addressing allocation. SourceFiles IndirectListI.H @@ -63,19 +63,22 @@ public: // Constructors - //- Copy construct addressing, shallow copy values list reference + //- Copy construct addressing, shallow copy values reference inline IndirectList(const UList& values, const labelUList& addr); - //- Move construct addressing, shallow copy values list reference + //- Move construct addressing, shallow copy values reference inline IndirectList(const UList& values, labelList&& addr); - //- Copy construct addressing, shallow copy values list reference + //- Zero-sized addressing, shallow copy values reference + inline IndirectList(const UList& values, const Foam::zero); + + //- Copy construct addressing, shallow copy values reference inline IndirectList(const IndirectList& list); - //- Move construct addressing, shallow copy values list reference + //- Move construct addressing, shallow copy values reference inline IndirectList(IndirectList&& list); - //- Copy construct addressing, shallow copy values list reference + //- Copy construct addressing, shallow copy values reference inline explicit IndirectList(const UIndirectList& list); diff --git a/src/OpenFOAM/containers/IndirectLists/IndirectList/IndirectListI.H b/src/OpenFOAM/containers/IndirectLists/IndirectList/IndirectListI.H index 13e8dcd7c5..76b3415844 100644 --- a/src/OpenFOAM/containers/IndirectLists/IndirectList/IndirectListI.H +++ b/src/OpenFOAM/containers/IndirectLists/IndirectList/IndirectListI.H @@ -60,6 +60,22 @@ inline Foam::IndirectList::IndirectList {} +template +inline Foam::IndirectList::IndirectList +( + const UList& values, + const Foam::zero +) +: + IndirectListAddressing(labelList()), // zero-size addressing + UIndirectList + ( + values, + IndirectListAddressing::addressing() + ) +{} + + template inline Foam::IndirectList::IndirectList(const IndirectList& list) : diff --git a/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListBase.H b/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListBase.H index ac10191c7b..95fa0d3fe6 100644 --- a/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListBase.H +++ b/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListBase.H @@ -215,7 +215,7 @@ public: inline void operator=(const T& val); //- Assignment of all entries to zero - inline void operator=(const zero); + inline void operator=(const Foam::zero); //- Deep copy values from a list of the addressed elements // Fatal if list sizes are not identical diff --git a/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListBaseI.H b/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListBaseI.H index db117469e7..bc1aa07431 100644 --- a/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListBaseI.H +++ b/src/OpenFOAM/containers/IndirectLists/IndirectListBase/IndirectListBaseI.H @@ -156,7 +156,7 @@ inline void Foam::IndirectListBase::operator=(const T& val) template -inline void Foam::IndirectListBase::operator=(const zero) +inline void Foam::IndirectListBase::operator=(const Foam::zero) { // Or std::fill(this->begin(), this->end(), Zero); for (const label idx : addr_) diff --git a/src/OpenFOAM/containers/IndirectLists/UIndirectList/UIndirectList.H b/src/OpenFOAM/containers/IndirectLists/UIndirectList/UIndirectList.H index f252a7921d..8fc20ac6fe 100644 --- a/src/OpenFOAM/containers/IndirectLists/UIndirectList/UIndirectList.H +++ b/src/OpenFOAM/containers/IndirectLists/UIndirectList/UIndirectList.H @@ -71,13 +71,13 @@ public: // Constructors - //- Shallow copy values and addressing arrays + //- Shallow copy values and addressing UIndirectList(const UList& values, const labelUList& addr) : IndirectListBase(values, addr) {} - //- Copy construct (shallow copy of values and addressing arrays) + //- Copy construct (shallow copy values and addressing) UIndirectList(const UIndirectList& list) : UIndirectList(list.values(), list.addressing()) diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H index 2170385c51..9a81878b5d 100644 --- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H +++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H @@ -124,7 +124,7 @@ public: inline DynamicList(const label nElem, const T& val); //- Construct with given size initializing all elements to zero - inline DynamicList(const label nElem, const zero); + inline DynamicList(const label nElem, const Foam::zero); //- Copy construct. inline DynamicList(const DynamicList& lst); @@ -319,7 +319,7 @@ public: inline void operator=(const T& val); //- Assignment of all entries to zero - inline void operator=(const zero); + inline void operator=(const Foam::zero); //- Assignment to UList inline void operator=(const UList& lst); diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H index 6c0361c549..ac652d033d 100644 --- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H +++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H @@ -150,7 +150,7 @@ public: inline explicit FixedList(const T& val); //- Construct and initialize all entries to zero - inline explicit FixedList(const zero); + inline explicit FixedList(const Foam::zero); //- Copy construct from C-array inline explicit FixedList(const T list[N]); diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H index bb24c9a64e..e93be1b5fa 100644 --- a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H +++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H @@ -53,7 +53,7 @@ inline Foam::FixedList::FixedList(const T& val) template -inline Foam::FixedList::FixedList(const zero) +inline Foam::FixedList::FixedList(const Foam::zero) { for (unsigned i=0; i::List(const label len, const T& val) template -Foam::List::List(const label len, const zero) +Foam::List::List(const label len, const Foam::zero) : UList(nullptr, len) { @@ -157,7 +157,7 @@ Foam::List::List(const label len, const zero) template -Foam::List::List(const one, const T& val) +Foam::List::List(const Foam::one, const T& val) : UList(new T[1], 1) { @@ -166,7 +166,7 @@ Foam::List::List(const one, const T& val) template -Foam::List::List(const one, T&& val) +Foam::List::List(const Foam::one, T&& val) : UList(new T[1], 1) { @@ -175,7 +175,7 @@ Foam::List::List(const one, T&& val) template -Foam::List::List(const one, const zero) +Foam::List::List(const Foam::one, const Foam::zero) : UList(new T[1], 1) { diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H index 3f8b19d71e..fb07dc4b95 100644 --- a/src/OpenFOAM/containers/Lists/List/List.H +++ b/src/OpenFOAM/containers/Lists/List/List.H @@ -133,16 +133,16 @@ public: List(const label len, const T& val); //- Construct with given size initializing all elements to zero - List(const label len, const zero); + List(const label len, const Foam::zero); //- Construct with length=1, copying the value as the only content - List(const one, const T& val); + List(const Foam::one, const T& val); //- Construct with length=1, moving the value as the only content - List(const one, T&& val); + List(const Foam::one, T&& val); //- Construct with length=1, initializing content to zero - List(const one, const zero); + List(const Foam::one, const Foam::zero); //- Copy construct from list List(const List& a); @@ -283,7 +283,7 @@ public: inline void operator=(const T& val); //- Assignment of all entries to zero - inline void operator=(const zero); + inline void operator=(const Foam::zero); //- Move assignment. Takes constant time void operator=(List&& list); diff --git a/src/OpenFOAM/containers/Lists/List/ListI.H b/src/OpenFOAM/containers/Lists/List/ListI.H index f57187f979..a7b0aca30c 100644 --- a/src/OpenFOAM/containers/Lists/List/ListI.H +++ b/src/OpenFOAM/containers/Lists/List/ListI.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2017-2019 OpenCFD Ltd. + Copyright (C) 2017-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -242,7 +242,7 @@ inline void Foam::List::operator=(const T& val) template -inline void Foam::List::operator=(const zero) +inline void Foam::List::operator=(const Foam::zero) { UList::operator=(Zero); } diff --git a/src/OpenFOAM/containers/Lists/SortableList/SortableList.C b/src/OpenFOAM/containers/Lists/SortableList/SortableList.C index 4d3d755a2f..5d006387ee 100644 --- a/src/OpenFOAM/containers/Lists/SortableList/SortableList.C +++ b/src/OpenFOAM/containers/Lists/SortableList/SortableList.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2017-2019 OpenCFD Ltd. + Copyright (C) 2017-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -46,9 +46,9 @@ inline Foam::SortableList::SortableList(const label size) template -inline Foam::SortableList::SortableList(const label size, const zero) +inline Foam::SortableList::SortableList(const label size, const Foam::zero) : - List(size, zero()) + List(size, Zero) {} diff --git a/src/OpenFOAM/containers/Lists/SortableList/SortableList.H b/src/OpenFOAM/containers/Lists/SortableList/SortableList.H index 263c56e411..51da600d8e 100644 --- a/src/OpenFOAM/containers/Lists/SortableList/SortableList.H +++ b/src/OpenFOAM/containers/Lists/SortableList/SortableList.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2017-2019 OpenCFD Ltd. + Copyright (C) 2017-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -81,7 +81,7 @@ public: //- Construct zero-initialized with given size, sort later. // The indices remain empty until the list is sorted - inline SortableList(const label size, const zero); + inline SortableList(const label size, const Foam::zero); //- Construct given size and initial value, sorting later. // The indices remain empty until the list is sorted diff --git a/src/OpenFOAM/containers/Lists/SubList/SubList.H b/src/OpenFOAM/containers/Lists/SubList/SubList.H index 02ab2d896e..061028554c 100644 --- a/src/OpenFOAM/containers/Lists/SubList/SubList.H +++ b/src/OpenFOAM/containers/Lists/SubList/SubList.H @@ -135,7 +135,7 @@ public: inline void operator=(const T& val); //- Assign all entries to zero - inline void operator=(const zero); + inline void operator=(const Foam::zero); }; diff --git a/src/OpenFOAM/containers/Lists/SubList/SubListI.H b/src/OpenFOAM/containers/Lists/SubList/SubListI.H index 796f09371b..3ec6aa5fa3 100644 --- a/src/OpenFOAM/containers/Lists/SubList/SubListI.H +++ b/src/OpenFOAM/containers/Lists/SubList/SubListI.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2017-2019 OpenCFD Ltd. + Copyright (C) 2017-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -143,7 +143,7 @@ inline void Foam::SubList::operator=(const T& val) template -inline void Foam::SubList::operator=(const zero) +inline void Foam::SubList::operator=(const Foam::zero) { UList::operator=(Zero); } diff --git a/src/OpenFOAM/containers/Lists/UList/UList.C b/src/OpenFOAM/containers/Lists/UList/UList.C index 6564cf6642..118c4e1fc0 100644 --- a/src/OpenFOAM/containers/Lists/UList/UList.C +++ b/src/OpenFOAM/containers/Lists/UList/UList.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2017-2019 OpenCFD Ltd. + Copyright (C) 2017-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -172,7 +172,7 @@ void Foam::UList::operator=(const T& val) template -void Foam::UList::operator=(const zero) +void Foam::UList::operator=(const Foam::zero) { const label len = this->size(); diff --git a/src/OpenFOAM/containers/Lists/UList/UList.H b/src/OpenFOAM/containers/Lists/UList/UList.H index 19c8321dcd..4335993228 100644 --- a/src/OpenFOAM/containers/Lists/UList/UList.H +++ b/src/OpenFOAM/containers/Lists/UList/UList.H @@ -365,7 +365,7 @@ public: void operator=(const T& val); //- Assignment of all entries to zero - void operator=(const zero); + void operator=(const Foam::zero); // Random access iterator (non-const) diff --git a/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldField.H b/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldField.H index 809e213b69..c6d31e6aca 100644 --- a/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldField.H +++ b/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldField.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -59,15 +59,15 @@ public: // Constructors - //- Construct null - oneFieldField() = default; + //- Default construct + oneFieldField() noexcept = default; // Member Operators - oneField operator[](const label) const + oneField operator[](const label) const noexcept { - return oneField(); + return oneField{}; } }; diff --git a/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldFieldI.H b/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldFieldI.H deleted file mode 100644 index 7cec1b4541..0000000000 --- a/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldFieldI.H +++ /dev/null @@ -1 +0,0 @@ -#warning File removed - left for old dependency check only diff --git a/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldField.H b/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldField.H index 200affc60d..1a2aa0f5a5 100644 --- a/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldField.H +++ b/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldField.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -48,27 +48,26 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class zeroField Declaration + Class zeroFieldField Declaration \*---------------------------------------------------------------------------*/ class zeroFieldField : public zero { - public: // Constructors - //- Construct null - zeroFieldField() = default; + //- Default construct + zeroFieldField() noexcept = default; // Member Operators - zeroField operator[](const label) const + zeroField operator[](const label) const noexcept { - return zeroField(); + return zeroField{}; } }; diff --git a/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldFieldI.H b/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldFieldI.H deleted file mode 100644 index 7cec1b4541..0000000000 --- a/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldFieldI.H +++ /dev/null @@ -1 +0,0 @@ -#warning File removed - left for old dependency check only diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H index fcf932f3ed..75761896c6 100644 --- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H +++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2016-2019 OpenCFD Ltd. + Copyright (C) 2016-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -112,7 +112,7 @@ public: inline DynamicField(const label len, const T& val); //- Construct given size and initial value of zero - inline DynamicField(const label len, const zero); + inline DynamicField(const label len, const Foam::zero); //- Copy construct inline DynamicField(const DynamicField& list); diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H index 9737bbcab6..916c0944a1 100644 --- a/src/OpenFOAM/fields/Fields/Field/Field.H +++ b/src/OpenFOAM/fields/Fields/Field/Field.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2015-2019 OpenCFD Ltd. + Copyright (C) 2015-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -81,7 +81,6 @@ class Field public FieldBase, public List { - public: //- Component type @@ -114,7 +113,16 @@ public: inline Field(const label len, const Type& val); //- Construct given size and initial values of zero - inline Field(const label len, const zero); + inline Field(const label len, const Foam::zero); + + //- Construct with length=1, copying the value as the only content + inline Field(const Foam::one, const Type& val); + + //- Construct with length=1, moving the value as the only content + inline Field(const Foam::one, Type&& val); + + //- Construct with length=1, initializing content to zero + inline Field(const Foam::one, const Foam::zero); //- Copy construct inline Field(const Field& fld); @@ -379,7 +387,7 @@ public: //- Value assignment inline void operator=(const Type& val); - inline void operator=(const zero); + inline void operator=(const Foam::zero); template void operator=(const VectorSpace&); diff --git a/src/OpenFOAM/fields/Fields/Field/FieldI.H b/src/OpenFOAM/fields/Fields/Field/FieldI.H index 48984401da..111c87115e 100644 --- a/src/OpenFOAM/fields/Fields/Field/FieldI.H +++ b/src/OpenFOAM/fields/Fields/Field/FieldI.H @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2018-2019 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -49,12 +49,33 @@ inline Foam::Field::Field(const label len, const Type& val) template -inline Foam::Field::Field(const label len, const zero) +inline Foam::Field::Field(const label len, const Foam::zero) : List(len, Zero) {} +template +inline Foam::Field::Field(const Foam::one, const Type& val) +: + List(Foam::one{}, val) +{} + + +template +inline Foam::Field::Field(const Foam::one, Type&& val) +: + List(Foam::one{}, std::move(val)) +{} + + +template +inline Foam::Field::Field(const Foam::one, const Foam::zero) +: + List(Foam::one{}, Zero) +{} + + template inline Foam::Field::Field(const Field& fld) : @@ -181,7 +202,7 @@ inline void Foam::Field::operator=(const Type& val) template -inline void Foam::Field::operator=(const zero) +inline void Foam::Field::operator=(const Foam::zero) { List::operator=(Zero); } diff --git a/src/OpenFOAM/fields/Fields/Field/SubField.H b/src/OpenFOAM/fields/Fields/Field/SubField.H index 7eb0979024..324c326422 100644 --- a/src/OpenFOAM/fields/Fields/Field/SubField.H +++ b/src/OpenFOAM/fields/Fields/Field/SubField.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2018-2019 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -143,7 +143,7 @@ public: inline void operator=(const Type& val); //- Assign all entries to zero - inline void operator=(const zero); + inline void operator=(const Foam::zero); //- Copy assign via UList operator. Takes linear time. template diff --git a/src/OpenFOAM/fields/Fields/Field/SubFieldI.H b/src/OpenFOAM/fields/Fields/Field/SubFieldI.H index d14b9bc3dd..36afaf93fa 100644 --- a/src/OpenFOAM/fields/Fields/Field/SubFieldI.H +++ b/src/OpenFOAM/fields/Fields/Field/SubFieldI.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2017-2019 OpenCFD Ltd. + Copyright (C) 2017-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -161,7 +161,7 @@ inline void Foam::SubField::operator=(const Type& val) template -inline void Foam::SubField::operator=(const zero) +inline void Foam::SubField::operator=(const Foam::zero) { SubList::operator=(Zero); } diff --git a/src/OpenFOAM/fields/Fields/oneField/oneField.H b/src/OpenFOAM/fields/Fields/oneField/oneField.H index c940233995..523437756e 100644 --- a/src/OpenFOAM/fields/Fields/oneField/oneField.H +++ b/src/OpenFOAM/fields/Fields/oneField/oneField.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -57,30 +57,30 @@ class oneField { public: - // Public typedefs + // Public Typedefs typedef oneField FieldType; // Constructors - //- Construct null - oneField() = default; + //- Default construct + oneField() noexcept = default; // Member Functions - oneField field() const + oneField field() const noexcept { - return oneField(); + return oneField{}; } // Member Operators - one operator[](const label) const + one operator[](const label) const noexcept { - return one(); + return one{}; } }; @@ -91,6 +91,8 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// Global Operators + #include "oneFieldI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/Fields/oneField/oneFieldI.H b/src/OpenFOAM/fields/Fields/oneField/oneFieldI.H index bf0e4d0647..80708081e4 100644 --- a/src/OpenFOAM/fields/Fields/oneField/oneFieldI.H +++ b/src/OpenFOAM/fields/Fields/oneField/oneFieldI.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -31,17 +31,26 @@ namespace Foam // * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * // -inline const oneField& operator*(const oneField& of, const oneField&) +inline const oneField& operator* +( + const oneField& of, + const oneField& /*ignore*/ +) { return of; } -inline const oneField& operator/(const oneField& of, const oneField&) +inline const oneField& operator/ +( + const oneField& of, + const oneField& /*ignore*/ +) { return of; } + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace Foam diff --git a/src/OpenFOAM/fields/Fields/zeroField/zeroField.H b/src/OpenFOAM/fields/Fields/zeroField/zeroField.H index 0269daccc4..2969ec1393 100644 --- a/src/OpenFOAM/fields/Fields/zeroField/zeroField.H +++ b/src/OpenFOAM/fields/Fields/zeroField/zeroField.H @@ -59,33 +59,33 @@ public: // Constructors - //- Construct null - zeroField() = default; + //- Default construct + zeroField() noexcept = default; // Member Functions - zeroField field() const + zeroField field() const noexcept { - return zeroField(); + return zeroField{}; } // Member Operators - scalar operator[](const label) const + scalar operator[](const label) const noexcept { return scalar(0); } - zeroField operator()() const + zeroField operator()() const noexcept { - return zeroField(); + return zeroField{}; } - zeroField operator-() const + zeroField operator-() const noexcept { - return zeroField(); + return zeroField{}; } }; @@ -96,6 +96,8 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// Global Operators + #include "zeroFieldI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H index 9676fafde0..7e2bf6320c 100644 --- a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H +++ b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -56,86 +57,83 @@ class geometricOneField : public one { - public: - // Public typedefs + // Public Typedefs typedef oneField Internal; typedef oneField Patch; typedef oneFieldField Boundary; typedef one cmptType; + // Constructors - //- Construct null - geometricOneField() - {} + //- Default construct + geometricOneField() noexcept = default; + + + // Member Functions + + const dimensionSet& dimensions() const noexcept + { + return dimless; + } + + oneField field() const noexcept + { + return oneField{}; + } + + oneField oldTime() const noexcept + { + return oneField{}; + } + + Internal internalField() const noexcept + { + return Internal{}; + } + + Internal primitiveField() const noexcept + { + return Internal{}; + } + + Boundary boundaryField() const noexcept + { + return Boundary{}; + } + + // Same as internalField() + Internal v() const noexcept + { + return Internal{}; + } // Member Operators - inline const dimensionSet& dimensions() const; + one operator[](const label) const noexcept + { + return one{}; + } - inline one operator[](const label) const; - - inline oneField field() const; - - inline oneField oldTime() const; - - inline Internal operator()() const; - - inline Internal v() const; - - inline typename Internal::FieldType primitiveField() const; - - inline Boundary boundaryField() const; + Internal operator()() const noexcept + { + return Internal{}; + } }; -inline const geometricOneField& operator* -( - const geometricOneField&, - const geometricOneField& -); - -inline const geometricOneField::Internal& operator* -( - const geometricOneField::Internal&, - const geometricOneField& -); - -inline const geometricOneField::Internal& operator* -( - const geometricOneField&, - const geometricOneField::Internal& -); - -inline const geometricOneField& operator/ -( - const geometricOneField&, - const geometricOneField& -); - -inline const geometricOneField::Internal& operator/ -( - const geometricOneField::Internal&, - const geometricOneField& -); - -inline const geometricOneField::Internal& operator/ -( - const geometricOneField&, - const geometricOneField::Internal& -); - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// Global Operators + #include "geometricOneFieldI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H index dc78a4c9b1..3e3837f25b 100644 --- a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H +++ b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -25,120 +26,73 @@ License \*---------------------------------------------------------------------------*/ -#include "geometricOneField.H" +namespace Foam +{ + +// * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * // + +inline const geometricOneField& operator* +( + const geometricOneField& of, + const geometricOneField& /*ignore*/ +) +{ + return of; +} + + +inline const geometricOneField::Internal& operator* +( + const geometricOneField::Internal& of, + const geometricOneField& /*ignore*/ +) +{ + return of; +} + + +inline const geometricOneField::Internal& operator* +( + const geometricOneField& /*ignore*/, + const geometricOneField::Internal& of +) +{ + return of; +} + + +inline const geometricOneField& operator/ +( + const geometricOneField& of, + const geometricOneField& /*ignore*/ +) +{ + return of; +} + + +inline const geometricOneField::Internal& operator/ +( + const geometricOneField::Internal& of, + const geometricOneField& /*ignore*/ +) +{ + return of; +} + + +inline const geometricOneField::Internal& operator/ +( + const geometricOneField& /*ignore*/, + const geometricOneField::Internal& of +) +{ + return of; +} + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -inline const Foam::dimensionSet& Foam::geometricOneField::dimensions() const -{ - return dimless; -} - - -inline Foam::one Foam::geometricOneField::operator[](const label) const -{ - return one(); -} - - -inline Foam::oneField Foam::geometricOneField::field() const -{ - return oneField(); -} - - -inline Foam::oneField Foam::geometricOneField::oldTime() const -{ - return oneField(); -} - - -inline Foam::geometricOneField::Internal -Foam::geometricOneField::operator()() const -{ - return Internal(); -} - - -inline Foam::geometricOneField::Internal -Foam::geometricOneField::v() const -{ - return Internal(); -} - - -inline typename Foam::geometricOneField::Internal::FieldType -Foam::geometricOneField::primitiveField() const -{ - return typename Internal::FieldType(); -} - - -inline Foam::geometricOneField::Boundary -Foam::geometricOneField::boundaryField() const -{ - return Boundary(); -} - - -inline const Foam::geometricOneField& Foam::operator* -( - const geometricOneField& gof, - const geometricOneField& -) -{ - return gof; -} - - -inline const Foam::geometricOneField::Internal& Foam::operator* -( - const geometricOneField::Internal& of, - const geometricOneField& -) -{ - return of; -} - - -inline const Foam::geometricOneField::Internal& Foam::operator* -( - const geometricOneField&, - const geometricOneField::Internal& of -) -{ - return of; -} - - -inline const Foam::geometricOneField& Foam::operator/ -( - const geometricOneField& gof, - const geometricOneField& -) -{ - return gof; -} - - -inline const Foam::geometricOneField::Internal& Foam::operator/ -( - const geometricOneField::Internal& of, - const geometricOneField& -) -{ - return of; -} - - -inline const Foam::geometricOneField::Internal& Foam::operator/ -( - const geometricOneField&, - const geometricOneField::Internal& of -) -{ - return of; -} - +} // End namespace Foam // ************************************************************************* // diff --git a/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroField.H b/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroField.H index 8a86cb787b..957ed6f391 100644 --- a/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroField.H +++ b/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroField.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -56,10 +57,9 @@ class geometricZeroField : public zero { - public: - // Public typedefs + // Public Typedefs typedef zeroField Internal; typedef zeroField Patch; @@ -69,24 +69,60 @@ public: // Constructors - //- Construct null - geometricZeroField() - {} + //- Default construct + geometricZeroField() noexcept = default; + + + // Member Functions + + const dimensionSet& dimensions() const noexcept + { + return dimless; + } + + zeroField field() const noexcept + { + return zeroField{}; + } + + zeroField oldTime() const noexcept + { + return zeroField{}; + } + + Internal internalField() const noexcept + { + return Internal{}; + } + + Internal primitiveField() const noexcept + { + return Internal{}; + } + + Boundary boundaryField() const noexcept + { + return Boundary{}; + } + + // Same as internalField() + Internal v() const noexcept + { + return Internal{}; + } // Member Operators - inline const dimensionSet& dimensions() const; + scalar operator[](const label) const noexcept + { + return 0; + } - inline scalar operator[](const label) const; - - inline zeroField field() const; - - inline zeroField operator()() const; - - inline zeroField oldTime() const; - - inline zeroFieldField boundaryField() const; + Internal operator()() const noexcept + { + return Internal{}; + } }; @@ -96,6 +132,8 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// Global Operators + #include "geometricZeroFieldI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroFieldI.H b/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroFieldI.H index 311a19b99e..eeaa69743e 100644 --- a/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroFieldI.H +++ b/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroFieldI.H @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2011-2017 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -25,39 +25,16 @@ License \*---------------------------------------------------------------------------*/ -#include "geometricZeroField.H" +namespace Foam +{ + +// * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * // + +// None defined // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -inline const Foam::dimensionSet& Foam::geometricZeroField::dimensions() const -{ - return dimless; -} - -inline Foam::scalar Foam::geometricZeroField::operator[](const label) const -{ - return scalar(0); -} - -inline Foam::zeroField Foam::geometricZeroField::field() const -{ - return zeroField(); -} - -inline Foam::zeroField Foam::geometricZeroField::operator()() const -{ - return zeroField(); -} - -inline Foam::zeroField Foam::geometricZeroField::oldTime() const -{ - return zeroField(); -} - -inline Foam::zeroFieldField Foam::geometricZeroField::boundaryField() const -{ - return zeroFieldField(); -} +} // End namespace Foam // ************************************************************************* // diff --git a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C index 1d5146b4b7..df786419ce 100644 --- a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C +++ b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C @@ -38,7 +38,7 @@ Foam::DiagonalMatrix::DiagonalMatrix(const label n) template -Foam::DiagonalMatrix::DiagonalMatrix(const label n, const zero) +Foam::DiagonalMatrix::DiagonalMatrix(const label n, const Foam::zero) : List(n, Zero) {} diff --git a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H index e08800bd77..e9e80d4c23 100644 --- a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H +++ b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H @@ -82,7 +82,7 @@ public: explicit DiagonalMatrix(const label n); //- Construct from size and initialise all elems to zero - DiagonalMatrix(const label n, const zero); + DiagonalMatrix(const label n, const Foam::zero); //- Construct from size and initialise all elems to value DiagonalMatrix(const label n, const Type& val); diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.C b/src/OpenFOAM/matrices/Matrix/Matrix.C index 03beb2c502..0deb4c0dd5 100644 --- a/src/OpenFOAM/matrices/Matrix/Matrix.C +++ b/src/OpenFOAM/matrices/Matrix/Matrix.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -119,7 +119,7 @@ Foam::Matrix::Matrix(const label m, const label n) template -Foam::Matrix::Matrix(const label m, const label n, const zero) +Foam::Matrix::Matrix(const label m, const label n, const Foam::zero) : mRows_(m), nCols_(n), @@ -538,7 +538,7 @@ void Foam::Matrix::operator=(const Type& val) template -void Foam::Matrix::operator=(const zero) +void Foam::Matrix::operator=(const Foam::zero) { std::fill(begin(), end(), Zero); } diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.H b/src/OpenFOAM/matrices/Matrix/Matrix.H index 673258a7c7..861d0b6841 100644 --- a/src/OpenFOAM/matrices/Matrix/Matrix.H +++ b/src/OpenFOAM/matrices/Matrix/Matrix.H @@ -131,7 +131,7 @@ public: //- Construct with given number of rows/columns //- initializing all elements to zero - Matrix(const label m, const label n, const zero); + Matrix(const label m, const label n, const Foam::zero); //- Construct with given number of rows/columns //- initializing all elements to the given value @@ -142,7 +142,7 @@ public: //- Construct given number of rows/columns //- initializing all elements to zero - inline Matrix(const labelPair& dims, const zero); + inline Matrix(const labelPair& dims, const Foam::zero); //- Construct with given number of rows/columns //- initializing all elements to the given value @@ -417,7 +417,7 @@ public: void operator=(const MatrixBlock& Mb); //- Assignment of all elements to zero - void operator=(const zero); + void operator=(const Foam::zero); //- Assignment of all elements to the given value void operator=(const Type& val); diff --git a/src/OpenFOAM/matrices/Matrix/MatrixI.H b/src/OpenFOAM/matrices/Matrix/MatrixI.H index ab2909a673..6d96f4c0e4 100644 --- a/src/OpenFOAM/matrices/Matrix/MatrixI.H +++ b/src/OpenFOAM/matrices/Matrix/MatrixI.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -61,7 +61,7 @@ inline Foam::Matrix::Matrix(const labelPair& dims) template -inline Foam::Matrix::Matrix(const labelPair& dims, const zero) +inline Foam::Matrix::Matrix(const labelPair& dims, const Foam::zero) : Matrix(dims.first(), dims.second(), Zero) {} diff --git a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H index b5394f017a..367f6c5d10 100644 --- a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H +++ b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrix.H @@ -84,7 +84,12 @@ public: //- Construct given number of rows/columns //- initializing all elements to zero - inline RectangularMatrix(const label m, const label n, const zero); + inline RectangularMatrix + ( + const label m, + const label n, + const Foam::zero + ); //- Construct given number of rows/columns //- initializing all elements to the given value @@ -93,14 +98,18 @@ public: //- Construct for given number of rows/columns //- initializing all elements to zero, and diagonal to one template - inline RectangularMatrix(const labelPair& dims, const Identity); + inline RectangularMatrix + ( + const labelPair& dims, + const Identity + ); //- Construct given number of rows/columns by using a label pair inline explicit RectangularMatrix(const labelPair& dims); //- Construct given number of rows/columns by using a label pair //- and initializing all elements to zero - inline RectangularMatrix(const labelPair& dims, const zero); + inline RectangularMatrix(const labelPair& dims, const Foam::zero); //- Construct given number of rows/columns by using a label pair //- and initializing all elements to the given value @@ -127,7 +136,7 @@ public: // Member Operators //- Assign all elements to zero - inline void operator=(const zero); + inline void operator=(const Foam::zero); //- Assign all elements to value inline void operator=(const Type& val); diff --git a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H index 9b98e72caa..e316448310 100644 --- a/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H +++ b/src/OpenFOAM/matrices/RectangularMatrix/RectangularMatrixI.H @@ -54,7 +54,7 @@ inline Foam::RectangularMatrix::RectangularMatrix ( const label m, const label n, - const zero + const Foam::zero ) : Matrix, Type>(m, n, Zero) @@ -104,7 +104,7 @@ template inline Foam::RectangularMatrix::RectangularMatrix ( const labelPair& dims, - const zero + const Foam::zero ) : RectangularMatrix(dims.first(), dims.second(), Zero) @@ -172,7 +172,7 @@ Foam::RectangularMatrix::clone() const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // template -inline void Foam::RectangularMatrix::operator=(const zero) +inline void Foam::RectangularMatrix::operator=(const Foam::zero) { Matrix, Type>::operator=(Zero); } diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H index a79f2d9f42..8937cfc775 100644 --- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H +++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H @@ -87,7 +87,7 @@ public: //- Construct for given size (rows == cols) //- initializing all elements to zero - inline SquareMatrix(const label n, const zero); + inline SquareMatrix(const label n, const Foam::zero); //- Construct for given size (rows == cols) //- initializing all elements to the given value @@ -112,7 +112,7 @@ public: //- by using a labelPair (checked to be equal) //- and initializing all elements to zero // For constructor consistency with rectangular matrices - inline SquareMatrix(const labelPair& dims, const zero); + inline SquareMatrix(const labelPair& dims, const Foam::zero); //- Construct given number of rows/columns //- by using a labelPair (checked to be equal) @@ -122,7 +122,7 @@ public: //- Construct given number of rows/columns (checked to be equal) //- initializing all elements to zero - inline SquareMatrix(const label m, const label n, const zero); + inline SquareMatrix(const label m, const label n, const Foam::zero); //- Construct from const sub-matrix block template @@ -182,7 +182,7 @@ public: // Member Operators //- Assign all elements to zero - inline void operator=(const zero); + inline void operator=(const Foam::zero); //- Assign all elements to value inline void operator=(const Type& val); diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H index 61933881e1..f72d26fe77 100644 --- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H +++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrixI.H @@ -48,7 +48,7 @@ template inline Foam::SquareMatrix::SquareMatrix ( const label n, - const zero + const Foam::zero ) : Matrix, Type>(n, n, Zero) @@ -118,7 +118,7 @@ template inline Foam::SquareMatrix::SquareMatrix ( const labelPair& dims, - const zero + const Foam::zero ) : Matrix, Type>(dims, Zero) @@ -145,7 +145,7 @@ inline Foam::SquareMatrix::SquareMatrix ( const label m, const label n, - const zero + const Foam::zero ) : Matrix, Type>(m, n, Zero) @@ -291,7 +291,7 @@ inline bool Foam::SquareMatrix::tridiagonal() const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // template -inline void Foam::SquareMatrix::operator=(const zero) +inline void Foam::SquareMatrix::operator=(const Foam::zero) { Matrix, Type>::operator=(Zero); } diff --git a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H index c04ec0c855..81f9536632 100644 --- a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H +++ b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H @@ -81,7 +81,7 @@ public: //- Construct for given size (rows == cols) //- initializing all elements to zero - inline SymmetricSquareMatrix(const label n, const zero); + inline SymmetricSquareMatrix(const label n, const Foam::zero); //- Construct for given size (rows == cols) //- initializing all elements to the given value @@ -102,7 +102,7 @@ public: // Member Operators //- Assign all elements to zero - inline void operator=(const zero); + inline void operator=(const Foam::zero); //- Assign all elements to value inline void operator=(const Type& val); diff --git a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H index 31eff60765..f040dbdf19 100644 --- a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H +++ b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrixI.H @@ -48,7 +48,7 @@ template inline Foam::SymmetricSquareMatrix::SymmetricSquareMatrix ( const label n, - const zero + const Foam::zero ) : Matrix, Type>(n, n, Zero) @@ -103,7 +103,7 @@ Foam::SymmetricSquareMatrix::clone() const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // template -inline void Foam::SymmetricSquareMatrix::operator=(const zero) +inline void Foam::SymmetricSquareMatrix::operator=(const Foam::zero) { Matrix, Type>::operator=(Zero); } diff --git a/src/OpenFOAM/meshes/ijkMesh/IjkField.H b/src/OpenFOAM/meshes/ijkMesh/IjkField.H index 2b7f772f56..26a2ca348d 100644 --- a/src/OpenFOAM/meshes/ijkMesh/IjkField.H +++ b/src/OpenFOAM/meshes/ijkMesh/IjkField.H @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -81,7 +81,7 @@ public: inline IjkField(const labelVector& ijk, const Type& val); //- Construct with sizing information and initial values of zero - inline IjkField(const labelVector& ijk, const zero); + inline IjkField(const labelVector& ijk, const Foam::zero); //- Copy construct from components inline IjkField(const labelVector& ijk, const UList& list); @@ -161,7 +161,7 @@ public: //- Value assignment inline void operator=(const Type& val); - inline void operator=(const zero); + inline void operator=(const Foam::zero); }; diff --git a/src/OpenFOAM/meshes/ijkMesh/IjkFieldI.H b/src/OpenFOAM/meshes/ijkMesh/IjkFieldI.H index 69dc6b10ef..5cb9e48047 100644 --- a/src/OpenFOAM/meshes/ijkMesh/IjkFieldI.H +++ b/src/OpenFOAM/meshes/ijkMesh/IjkFieldI.H @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -75,7 +75,7 @@ template inline Foam::IjkField::IjkField ( const labelVector& ijk, - const zero + const Foam::zero ) : Field(cmptProduct(ijk), Zero), @@ -245,7 +245,7 @@ inline void Foam::IjkField::operator=(const Type& val) template -inline void Foam::IjkField::operator=(const zero) +inline void Foam::IjkField::operator=(const Foam::zero) { Field::operator=(Zero); } diff --git a/src/OpenFOAM/primitives/nullObject/nullObjectI.H b/src/OpenFOAM/primitives/nullObject/nullObjectI.H deleted file mode 100644 index 7cec1b4541..0000000000 --- a/src/OpenFOAM/primitives/nullObject/nullObjectI.H +++ /dev/null @@ -1 +0,0 @@ -#warning File removed - left for old dependency check only diff --git a/src/OpenFOAM/primitives/polynomialEqns/cubicEqn/cubicEqnI.H b/src/OpenFOAM/primitives/polynomialEqns/cubicEqn/cubicEqnI.H index d4e2ef433a..c770e64604 100644 --- a/src/OpenFOAM/primitives/polynomialEqns/cubicEqn/cubicEqnI.H +++ b/src/OpenFOAM/primitives/polynomialEqns/cubicEqn/cubicEqnI.H @@ -33,7 +33,7 @@ inline Foam::cubicEqn::cubicEqn() inline Foam::cubicEqn::cubicEqn(const Foam::zero) : - VectorSpace(Foam::zero()) + VectorSpace(Foam::zero{}) {} diff --git a/src/OpenFOAM/primitives/polynomialEqns/linearEqn/linearEqnI.H b/src/OpenFOAM/primitives/polynomialEqns/linearEqn/linearEqnI.H index 0f2fda0814..5daaea47a8 100644 --- a/src/OpenFOAM/primitives/polynomialEqns/linearEqn/linearEqnI.H +++ b/src/OpenFOAM/primitives/polynomialEqns/linearEqn/linearEqnI.H @@ -34,7 +34,7 @@ inline Foam::linearEqn::linearEqn() inline Foam::linearEqn::linearEqn(const Foam::zero) : - VectorSpace(Foam::zero()) + VectorSpace(Foam::zero{}) {} diff --git a/src/OpenFOAM/primitives/polynomialEqns/quadraticEqn/quadraticEqnI.H b/src/OpenFOAM/primitives/polynomialEqns/quadraticEqn/quadraticEqnI.H index 45f2f313eb..4dadc77b5d 100644 --- a/src/OpenFOAM/primitives/polynomialEqns/quadraticEqn/quadraticEqnI.H +++ b/src/OpenFOAM/primitives/polynomialEqns/quadraticEqn/quadraticEqnI.H @@ -33,7 +33,7 @@ inline Foam::quadraticEqn::quadraticEqn() inline Foam::quadraticEqn::quadraticEqn(const Foam::zero) : - VectorSpace(Foam::zero()) + VectorSpace(Foam::zero{}) {} diff --git a/src/OpenFOAM/primitives/ranges/MinMax/MinMax.H b/src/OpenFOAM/primitives/ranges/MinMax/MinMax.H index 07e895cfea..7792a242dd 100644 --- a/src/OpenFOAM/primitives/ranges/MinMax/MinMax.H +++ b/src/OpenFOAM/primitives/ranges/MinMax/MinMax.H @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -153,7 +153,7 @@ public: inline MinMax(const Pair& range); //- Construct with a single zero value - inline explicit MinMax(const zero); + inline explicit MinMax(const Foam::zero); //- Construct with a single initial value inline explicit MinMax(const T& val); diff --git a/src/OpenFOAM/primitives/ranges/MinMax/MinMaxI.H b/src/OpenFOAM/primitives/ranges/MinMax/MinMaxI.H index 06dab36c48..02d167f050 100644 --- a/src/OpenFOAM/primitives/ranges/MinMax/MinMaxI.H +++ b/src/OpenFOAM/primitives/ranges/MinMax/MinMaxI.H @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -79,7 +79,7 @@ inline Foam::MinMax::MinMax(const Pair& range) template -inline Foam::MinMax::MinMax(const zero) +inline Foam::MinMax::MinMax(const Foam::zero) : Tuple2(pTraits::zero, pTraits::zero) {} diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H index e12912607b..066d34860a 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolate.H @@ -189,9 +189,9 @@ namespace fvc ); //- Interpolate 'one' returning 'one' - inline one interpolate(const one&) + inline Foam::one interpolate(const Foam::one&) { - return one(); + return Foam::one{}; } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/forceSuSp/forceSuSp.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/forceSuSp/forceSuSp.H index 0c82746cb6..6644fa723a 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/forceSuSp/forceSuSp.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/forceSuSp/forceSuSp.H @@ -74,7 +74,7 @@ public: forceSuSp() = default; //- Construct zero-initialized content - inline forceSuSp(const zero); + inline forceSuSp(const Foam::zero); //- Construct given Tuple2 inline forceSuSp(const Tuple2& susp); diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/forceSuSp/forceSuSpI.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/forceSuSp/forceSuSpI.H index 8c13d855fb..c4ebbed8e7 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/forceSuSp/forceSuSpI.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/forceSuSp/forceSuSpI.H @@ -28,7 +28,7 @@ License // * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * * // -inline Foam::forceSuSp::forceSuSp(const zero) +inline Foam::forceSuSp::forceSuSp(const Foam::zero) : Tuple2(vector::zero, 0) {}