exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ubuntu-20.04 and gcc-9.3.0 port

Browse source
This commit is contained in:
Hrvoje Jasak 2021-07-05 17:26:05 +01:00
parent 70b064d0f3
commit 9ffbe794a9
84 changed files with 365 additions and 587 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.C
View file

@ -29,8 +29,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Foam::multiphaseAlphaContactAngleFvPatchScalarField::
interfaceThetaProps::interfaceThetaProps
Foam::interfaceThetaProps::interfaceThetaProps
(
Istream& is
)
@ -45,7 +44,7 @@ interfaceThetaProps::interfaceThetaProps
Foam::Istream& Foam::operator>>
(
Istream& is,
multiphaseAlphaContactAngleFvPatchScalarField::interfaceThetaProps& tp
interfaceThetaProps& tp
)
{
is >> tp.theta0_ >> tp.uTheta_ >> tp.thetaA_ >> tp.thetaR_;
@ -56,8 +55,7 @@ Foam::Istream& Foam::operator>>
Foam::Ostream& Foam::operator<<
(
Ostream& os,
const
multiphaseAlphaContactAngleFvPatchScalarField::interfaceThetaProps& tp
const interfaceThetaProps& tp
)
{
os << tp.theta0_ << token::SPACE

39
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.H
View file

@ -44,18 +44,26 @@ SourceFiles
namespace Foam
{
class interfaceThetaProps;
// Forward declaration of friend functions and operators
Istream& operator>>
(
Istream&,
interfaceThetaProps&
);
Ostream& operator<<
(
Ostream&,
const interfaceThetaProps&
);
/*---------------------------------------------------------------------------*\
Class multiphaseAlphaContactAngleFvPatch Declaration
Class interfaceThetaProps Declaration
\*---------------------------------------------------------------------------*/
class multiphaseAlphaContactAngleFvPatchScalarField
:
public zeroGradientFvPatchScalarField
class interfaceThetaProps
{
public:
class interfaceThetaProps
{
//- Equilibrium contact angle
scalar theta0_;
@ -69,7 +77,7 @@ public:
scalar thetaR_;
public:
public:
// Constructors
interfaceThetaProps()
@ -112,8 +120,19 @@ public:
friend Istream& operator>>(Istream&, interfaceThetaProps&);
friend Ostream& operator<<(Ostream&, const interfaceThetaProps&);
};
};
/*---------------------------------------------------------------------------*\
Class multiphaseAlphaContactAngleFvPatch Declaration
\*---------------------------------------------------------------------------*/
class multiphaseAlphaContactAngleFvPatchScalarField
:
public zeroGradientFvPatchScalarField
{
public:
// Public typedef
typedef HashTable
<
interfaceThetaProps,

13
applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
View file

@ -187,7 +187,6 @@ mtype {space}"MTYPE:"{space}
label curNumberOfNodes = 0;
label curNumberOfCells = 0;
label curGroupID = 0;
label nFlagsForStream = 0;
label curBoundaryPatch = 0;
label curPatchFace = 0;
%}
@ -427,7 +426,7 @@ mtype {space}"MTYPE:"{space}
if (curGroupID > 0)
{
FatalErrorIn("gambitToFoam::main")
FatalErrorInFunction
<< "<readCellStreamGroupID>{space}{label} : "
<< "trying to reset group ID while active"
<< abort(FatalError);
@ -479,7 +478,7 @@ mtype {space}"MTYPE:"{space}
IStringStream nFlagsStream(YYText());
nFlagsForStream = readLabel(nFlagsStream);
readLabel(nFlagsStream);
BEGIN(cellStreamTitle);
}
@ -511,7 +510,6 @@ mtype {space}"MTYPE:"{space}
// reset current group ID and a number of flags
curGroupID = 0;
nFlagsForStream = 0;
}
@ -523,7 +521,6 @@ mtype {space}"MTYPE:"{space}
// reset current group ID and a number of flags
curGroupID = 0;
nFlagsForStream = 0;
BEGIN(INITIAL);
}
@ -586,7 +583,7 @@ mtype {space}"MTYPE:"{space}
<boundaryPatchFaces>{spaceNl}{label}({scalarList}|\n) {
// Vertex-based boundary condition
FatalErrorIn("gambitToFoam::main")
FatalErrorInFunction
<< "<boundaryPatchFaces>{spaceNl}{label}{scalarList} : "
<< "boundary condition specified on vertices not supported"
<< abort(FatalError);
@ -643,12 +640,12 @@ int main(int argc, char *argv[])
# include "createTime.H"
fileName gambitFile(args.additionalArgs()[0]);
const fileName gambitFile(args.additionalArgs()[0]);
ifstream gambitStream(gambitFile.c_str());
if (!gambitStream)
{
FatalErrorIn("gambitToFoam::main")
FatalErrorInFunction
<< args.executable()
<< ": file " << gambitFile << " not found"
<< abort(FatalError);

15
etc/bashrc
View file

@ -96,17 +96,20 @@ export WM_THIRD_PARTY_DIR=$WM_PROJECT_DIR/ThirdParty
#
# For AllMake.stage2
export WM_THIRD_PARTY_USE_OPENMPI_188=1
#export WM_THIRD_PARTY_USE_OPENMPI_188=1
#export WM_THIRD_PARTY_USE_OPENMPI_400=1
#
# For AllMake.stage3
export WM_THIRD_PARTY_USE_METIS_510=1
export METIS_SYSTEM=1
#export WM_THIRD_PARTY_USE_METIS_510=1
export WM_THIRD_PARTY_USE_PARMGRIDGEN_10=1
export WM_THIRD_PARTY_USE_LIBCCMIO_261=1
#export WM_THIRD_PARTY_USE_LIBCCMIO_261=1
export WM_THIRD_PARTY_USE_MESQUITE_230=1
export WM_THIRD_PARTY_USE_SCOTCH_604=1
export WM_THIRD_PARTY_USE_PARMETIS_403=1
export SCOTCH_SYSTEM=1
#export WM_THIRD_PARTY_USE_SCOTCH_604=1
export PARMETIS_SYSTEM=1
#export WM_THIRD_PARTY_USE_PARMETIS_403=1
export WM_THIRD_PARTY_USE_PYFOAM_069=1
export WM_THIRD_PARTY_USE_HWLOC_201=1
@ -189,7 +192,7 @@ export WM_COMPILER_LIB_ARCH=
: ${WM_COMPILE_OPTION:=Opt}; export WM_COMPILE_OPTION
# WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI | MVAPICH2
: ${WM_MPLIB:=OPENMPI}; export WM_MPLIB
: ${WM_MPLIB:=SYSTEMOPENMPI}; export WM_MPLIB
# WM_NCOMPPROCS = <number of processes to use>
# Warning: Need to use a complete path for foamGetSystemInfo because the PATH

14
etc/cshrc
View file

@ -82,16 +82,19 @@ setenv WM_THIRD_PARTY_DIR $WM_PROJECT_DIR/ThirdParty
#
# For AllMake.stage2
setenv WM_THIRD_PARTY_USE_OPENMPI_188 1
#setenv WM_THIRD_PARTY_USE_OPENMPI_188 1
#
# For AllMake.stage3
setenv WM_THIRD_PARTY_USE_METIS_510 1
setenv METIS_SYSTEM 1
#setenv WM_THIRD_PARTY_USE_METIS_510 1
setenv WM_THIRD_PARTY_USE_PARMGRIDGEN_10 1
setenv WM_THIRD_PARTY_USE_LIBCCMIO_261 1
setenv WM_THIRD_PARTY_USE_MESQUITE_230 1
setenv WM_THIRD_PARTY_USE_SCOTCH_604 1
setenv WM_THIRD_PARTY_USE_PARMETIS_403 1
setenv SCOTCH_SYSTEM 1
#setenv WM_THIRD_PARTY_USE_SCOTCH_604 1
setenv PARMETIS_SYSTEM 1
#setenv WM_THIRD_PARTY_USE_PARMETIS_403 1
setenv WM_THIRD_PARTY_USE_PYFOAM_069 1
setenv WM_THIRD_PARTY_USE_HWLOC_201 1
@ -162,7 +165,8 @@ if ( ! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Opt
#setenv WM_COMPILE_OPTION Debug
# WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI | MVAPICH2
if ( ! $?WM_MPLIB ) setenv WM_MPLIB OPENMPI
setenv WM_MPLIB SYSTEMOPENMPI
#if ( ! $?WM_MPLIB ) setenv WM_MPLIB SYSTEMOPENMPI
# WM_NCOMPPROCS = <number of processes to use>
# Warning: Need to use a complete path for foamGetSystemInfo because the PATH

22
etc/settings.csh
View file

@ -201,7 +201,7 @@ case SYSTEMOPENMPI:
# make sure not the "old" mpi is used
# Not sure if this is necessary anymore.
# export OPAL_PREFIX=
# unsetenv OPAL_PREFIX
# Make sure OPENMPI_BIN_DIR is set and valid
if ($?OPENMPI_BIN_DIR != 0 ) then
@ -242,7 +242,7 @@ case SYSTEMOPENMPI:
setenv MPI_HOME `dirname $OPENMPI_BIN_DIR`
setenv MPI_ARCH_PATH $MPI_HOME
setenv OPAL_PREFIX $MPI_ARCH_PATH
#HJ setenv OPAL_PREFIX $MPI_ARCH_PATH
# We initialize the rest of the environment using mpicc --showme:
if ($?OPENMPI_INCLUDE_DIR == 0) then
@ -513,12 +513,24 @@ endif
# Metis library if available
# ~~~~~~~~~~~~~~~~~~~~~~~~~~
if ( $?METIS_SYSTEM) then
setenv METIS_DIR /usr
setenv METIS_BIN_DIR /usr/bin
setenv METIS_LIB_DIR /lib
setenv METIS_INCLUDE_DIR /usr/include
endif
if ( $?METIS_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_METIS_510 != 0 && -e $WM_THIRD_PARTY_DIR/packages/metis-5.1.0/platforms/$WM_OPTIONS ) then
_foamSource $WM_THIRD_PARTY_DIR/packages/metis-5.1.0/platforms/$WM_OPTIONS/etc/metis-5.1.0.csh
endif
# ParMetis library if available
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
if ( $?PARMETIS_SYSTEM) then
setenv PARMETIS_DIR /usr
setenv PARMETIS_BIN_DIR /usr/bin
setenv PARMETIS_LIB_DIR /lib
setenv PARMETIS_INCLUDE_DIR /usr/include
endif
if ( $?PARMETIS_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PARMETIS_403 != 0 && -e $WM_THIRD_PARTY_DIR/packages/parmetis-4.0.3/platforms/$WM_OPTIONS ) then
_foamSource $WM_THIRD_PARTY_DIR/packages/parmetis-4.0.3/platforms/$WM_OPTIONS/etc/parmetis-4.0.3.csh
endif
@ -538,6 +550,12 @@ endif
# Scotch library if available
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~
if ( $?SCOTCH_SYSTEM) then
setenv SCOTCH_DIR /usr
setenv SCOTCH_BIN_DIR /usr/bin
setenv SCOTCH_LIB_DIR /lib
setenv SCOTCH_INCLUDE_DIR /usr/include/scotch
endif
if ( $?SCOTCH_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_SCOTCH_604 != 0 && -e $WM_THIRD_PARTY_DIR/packages/scotch-6.0.4/platforms/$WM_OPTIONS ) then
_foamSource $WM_THIRD_PARTY_DIR/packages/scotch-6.0.4/platforms/$WM_OPTIONS/etc/scotch-6.0.4.csh
endif

23
etc/settings.sh
View file

@ -331,7 +331,7 @@ SYSTEMOPENMPI)
export MPI_HOME=`dirname $OPENMPI_BIN_DIR`
export MPI_ARCH_PATH=$MPI_HOME
export OPAL_PREFIX=$MPI_ARCH_PATH
#HJ export OPAL_PREFIX=$MPI_ARCH_PATH
# We initialize the rest of the environment using mpicc --showme:
[ ! -n "${OPENMPI_INCLUDE_DIR}" ] && export OPENMPI_INCLUDE_DIR="`mpicc --showme:incdirs`"
@ -616,6 +616,13 @@ export MPI_BUFFER_SIZE
# Load Metis library
# ~~~~~~~~~~~~~~~~~~
[ ! -z "$METIS_SYSTEM" ] && {
export METIS_DIR=/usr
export METIS_BIN_DIR=/usr/bin
export METIS_LIB_DIR=/lib
export METIS_INCLUDE_DIR=/usr/include
}
[ -z "$METIS_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_METIS_510 ] && [ -e $WM_THIRD_PARTY_DIR/packages/metis-5.1.0/platforms/$WM_OPTIONS ] && {
_foamSource $WM_THIRD_PARTY_DIR/packages/metis-5.1.0/platforms/$WM_OPTIONS/etc/metis-5.1.0.sh
}
@ -624,6 +631,13 @@ export MPI_BUFFER_SIZE
# Load ParMetis library
# ~~~~~~~~~~~~~~~~~~~~~
[ ! -z "$PARMETIS_SYSTEM" ] && {
export PARMETIS_DIR=/usr
export PARMETIS_BIN_DIR=/usr/bin
export PARMETIS_LIB_DIR=/lib
export PARMETIS_INCLUDE_DIR=/usr/include
}
[ -z "$PARMETIS_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_PARMETIS_403 ] && [ -e $WM_THIRD_PARTY_DIR/packages/parmetis-4.0.3/platforms/$WM_OPTIONS ] && {
_foamSource $WM_THIRD_PARTY_DIR/packages/parmetis-4.0.3/platforms/$WM_OPTIONS/etc/parmetis-4.0.3.sh
}
@ -648,6 +662,13 @@ export MPI_BUFFER_SIZE
# Load Scotch library
# ~~~~~~~~~~~~~~~~~~~
[ ! -z "$SCOTCH_SYSTEM" ] && {
export SCOTCH_DIR=/usr
export SCOTCH_BIN_DIR=/usr/bin
export SCOTCH_LIB_DIR=/lib
export SCOTCH_INCLUDE_DIR=/usr/include/scotch
}
[ -z "$SCOTCH_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_SCOTCH_604 ] && [ -e $WM_THIRD_PARTY_DIR/packages/scotch-6.0.4/platforms/$WM_OPTIONS ] && {
_foamSource $WM_THIRD_PARTY_DIR/packages/scotch-6.0.4/platforms/$WM_OPTIONS/etc/scotch-6.0.4.sh
}

14
src/dynamicMesh/dynamicMesh/directTopoChange/boundaryMesh/boundaryPatch.C
View file

@ -44,14 +44,6 @@ Foam::boundaryPatch::boundaryPatch
{}
Foam::boundaryPatch::boundaryPatch(const boundaryPatch& sp)
:
patchIdentifier(sp.name(), sp.index(), sp.physicalType()),
size_(sp.size()),
start_(sp.start())
{}
Foam::boundaryPatch::boundaryPatch
(
const word& name,
@ -71,12 +63,6 @@ Foam::autoPtr<Foam::boundaryPatch> Foam::boundaryPatch::clone() const
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::boundaryPatch::~boundaryPatch()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::boundaryPatch::write(Ostream& os) const

8
src/dynamicMesh/dynamicMesh/directTopoChange/boundaryMesh/boundaryPatch.H
View file

@ -85,16 +85,12 @@ public:
const label index
);
//- Construct as copy
boundaryPatch(const boundaryPatch&);
//- Clone
autoPtr<boundaryPatch> clone() const;
// Destructor
~boundaryPatch();
//- Destructor
~boundaryPatch() = default;
// Member Functions

3
src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/directions/directionInfo/directionInfo.H
View file

@ -145,9 +145,6 @@ public:
const vector& n
);
//- Construct as copy
inline directionInfo(const directionInfo&);
// Member Functions

8
src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/directions/directionInfo/directionInfoI.H
View file

@ -50,14 +50,6 @@ inline Foam::directionInfo::directionInfo
{}
// Construct as copy
inline Foam::directionInfo::directionInfo(const directionInfo& w2)
:
index_(w2.index()),
n_(w2.n())
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
inline bool Foam::directionInfo::valid() const

2
src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfo.H
View file

@ -89,8 +89,6 @@ public:
//- Construct from normal
inline wallNormalInfo(const vector& normal);
//- Construct as copy
inline wallNormalInfo(const wallNormalInfo&);
// Member Functions

7
src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfoI.H
View file

@ -69,13 +69,6 @@ inline Foam::wallNormalInfo::wallNormalInfo(const vector& normal)
{}
// Construct as copy
inline Foam::wallNormalInfo::wallNormalInfo(const wallNormalInfo& wpt)
:
normal_(wpt.normal())
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
inline const Foam::vector& Foam::wallNormalInfo::normal() const

7
src/dynamicMesh/dynamicTopoFvMesh/changeMap.H
View file

@ -90,6 +90,8 @@ class changeMap
public:
// Constructor
//- Construct null
changeMap()
:
index_(-1),
@ -105,6 +107,11 @@ public:
removedCells_(5)
{}
//- Copy constructor
// Bugfix, HJ, 5/Jul/2021
changeMap(const changeMap&) = default;
//- Access
// Entity index

14
src/engine/ignition/ignitionSite.C
View file

@ -124,20 +124,6 @@ bool ignitionSite::ignited() const
}
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
void ignitionSite::operator=(const ignitionSite& is)
{
location_ = is.location_;
diameter_ = is.diameter_;
time_ = is.time_;
duration_ = is.duration_;
strength_ = is.strength_;
cells_ = is.cells_;
cellVolumes_ = is.cellVolumes_;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam

5
src/engine/ignition/ignitionSite.H
View file

@ -168,11 +168,6 @@ public:
bool igniting() const;
bool ignited() const;
// Member Operators
void operator=(const ignitionSite&);
};

15
src/foam/containers/HashTables/HashSet/HashSet.C
View file

@ -79,6 +79,21 @@ inline bool Foam::HashSet<Key, Hash>::operator[](const Key& key) const
}
template<class Key, class Hash>
void Foam::HashSet<Key, Hash>::operator=(const HashSet<Key, Hash>& rhs)
{
// Check for assignment to self
if (this == &rhs)
{
FatalErrorInFunction
<< "attempted assignment to self"
<< abort(FatalError);
}
HashTable<nil, Key, Hash>::operator=(rhs);
}
template<class Key, class Hash>
bool Foam::HashSet<Key, Hash>::operator==(const HashSet<Key, Hash>& rhs) const
{

3
src/foam/containers/HashTables/HashSet/HashSet.H
View file

@ -156,6 +156,9 @@ public:
//- Return true if the entry exists, same as found()
inline bool operator[](const Key&) const;
//- Assignment operator
void operator=(const HashSet<Key, Hash>&);
//- Equality. Two hashtables are equal when their contents are equal.
// Independent of table size or order.
bool operator==(const HashSet<Key, Hash>&) const;

7
src/foam/containers/HashTables/Map/Map.H
View file

@ -91,6 +91,13 @@ public:
HashTable<T, label, Hash<label> >(map)
{}
// Member Operators
void operator=(const Map<T>& map)
{
HashTable<T, label, Hash<label>>::operator=(map);
}
};

8
src/foam/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
View file

@ -203,6 +203,10 @@ public:
//- Construct for a given DLListBase and link
inline iterator(DLListBase&, link*);
//- Construct as copy
inline iterator(const iterator&) = default;
// Member operators
inline void operator=(const iterator&);
@ -238,9 +242,13 @@ public:
//- Construct for a given DLListBase and link
inline const_iterator(const DLListBase&, const link*);
//- Construct from a const iterator
inline const_iterator(const const_iterator&) = default;
//- Construct from a non-const iterator
inline const_iterator(const iterator&);
// Member operators
inline void operator=(const const_iterator&);

7
src/foam/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
View file

@ -188,6 +188,10 @@ public:
//- Construct for a given SLListBase and link
inline iterator(SLListBase&, link*);
//- Construct as copy
inline iterator(const iterator&) = default;
// Member operators
inline void operator=(const iterator&);
@ -223,6 +227,9 @@ public:
//- Construct for a given SLListBase and link
inline const_iterator(const SLListBase&, const link*);
//- Construct from a const iterator
inline const_iterator(const const_iterator&) = default;
//- Construct from a non-const iterator
inline const_iterator(const iterator&);

3
src/foam/containers/Lists/FixedList/FixedList.H
View file

@ -204,6 +204,9 @@ public:
//- Return element of constant FixedList.
inline const T& operator[](const label) const;
//- Assignment to a FixedList
inline void operator=(const FixedList<T, Size>&);
//- Assignment from array operator. Takes linear time.
inline void operator=(const T v[Size]);

15
src/foam/containers/Lists/FixedList/FixedListI.H
View file

@ -131,7 +131,7 @@ inline void Foam::FixedList<T, Size>::checkStart(const label start) const
{
if (start < 0 || (start && unsigned(start) >= Size))
{
FatalErrorIn("FixedList<T, Size>::checkStart(const label)")
FatalErrorInFunction
<< "start " << start << " out of range 0 ... " << (Size-1)
<< abort(FatalError);
}
@ -144,8 +144,8 @@ inline void Foam::FixedList<T, Size>::checkSize(const label size) const
{
if (size < 0 || unsigned(size) > Size)
{
FatalErrorIn("FixedList<T, Size>::checkSize(const label)")
<< "size " << size << " out of range 0 ... " << (Size)
FatalErrorInFunction
<< "size " << size << " != " << Size
<< abort(FatalError);
}
}
@ -231,6 +231,15 @@ inline const T& Foam::FixedList<T, Size>::operator[](const label i) const
}
template<class T, unsigned Size>
inline void Foam::FixedList<T, Size>::operator=(const FixedList<T, Size>& lst)
{
for (unsigned i=0; i<Size; i++)
{
v_[i] = lst[i];
}
}
template<class T, unsigned Size>
inline void Foam::FixedList<T, Size>::operator=(const T lst[Size])
{

4
src/foam/containers/NamedEnum/NamedEnum.H
View file

@ -68,10 +68,10 @@ class NamedEnum
// Private Member Functions
//- Disallow default bitwise copy construct
NamedEnum(const NamedEnum&);
NamedEnum(const NamedEnum&) = delete;
//- Disallow default bitwise assignment
void operator=(const NamedEnum&);
void operator=(const NamedEnum&) = delete;
public:

3
src/foam/db/IOobject/IOobject.H
View file

@ -251,6 +251,9 @@ public:
bool registerObject = true
);
//- Copy construct
IOobject(const IOobject&) = default;
//- Clone
Foam::autoPtr<IOobject> clone() const
{

8
src/foam/db/IOobjects/IOdictionary/IOdictionary.C
View file

@ -180,6 +180,14 @@ Foam::IOdictionary::IOdictionary(const IOobject& io, Istream& is)
}
Foam::IOdictionary::IOdictionary(const IOdictionary& dict)
:
regIOobject(dict),
dictionary(dict)
{
}
// * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * * //
Foam::IOdictionary::~IOdictionary()

3
src/foam/db/IOobjects/IOdictionary/IOdictionary.H
View file

@ -83,6 +83,9 @@ public:
//- Construct given an IOobject and Istream
IOdictionary(const IOobject&, Istream&);
//- Copy constructor
IOdictionary(const IOdictionary&);
//- Destructor
virtual ~IOdictionary();

15
src/foam/db/IOstreams/Tstreams/ITstream.H
View file

@ -208,6 +208,21 @@ public:
//- Print description of IOstream to Ostream
void print(Ostream&) const;
// Member Operators
//- Assignment operator
void operator=(const ITstream& its)
{
Istream::operator=(its);
tokenList::operator=(its);
name_ = its.name_;
tokenIndex_ = 0;
setOpened();
setGood();
}
};

6
src/foam/dimensionSet/dimensionSet.C
View file

@ -74,6 +74,12 @@ Foam::dimensionSet::dimensionSet
}
Foam::dimensionSet::dimensionSet(const dimensionSet& ds)
{
reset(ds);
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::dimensionSet::dimensionless() const

12
src/foam/dimensionSet/dimensionSet.H
View file

@ -43,6 +43,7 @@ SourceFiles
#include "bool.H"
#include "dimensionedScalarFwd.H"
#include "className.H"
#include "autoPtr.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -139,7 +140,7 @@ public:
private:
// private data
// Private data
// dimensionSet stored as an array of dimension exponents
scalar exponents_[nDimensions];
@ -180,6 +181,15 @@ public:
//- Construct from Istream
dimensionSet(Istream&);
//- Construct as copy
dimensionSet(const dimensionSet& ds);
//- Construct and return a clone
autoPtr<dimensionSet> clone() const
{
return autoPtr<dimensionSet>(new dimensionSet(*this));
}
// Member functions

6
src/foam/fields/CoeffField/scalarCoeffField.C
View file

@ -294,6 +294,12 @@ void Foam::CoeffField<Foam::scalar>::addSubset
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
void Foam::CoeffField<Foam::scalar>::operator=(const CoeffField<scalar>& f)
{
scalarField::operator=(f.asScalar());
}
void Foam::CoeffField<Foam::scalar>::operator=(const scalarField& f)
{
scalarField::operator=(f);

1
src/foam/fields/CoeffField/scalarCoeffField.H
View file

@ -188,6 +188,7 @@ public:
// Member operators
void operator=(const CoeffField<scalar>&);
void operator=(const scalarField&);
void operator=(const tmp<scalarField>&);

6
src/foam/meshes/patchIdentifier/patchIdentifier.C
View file

@ -72,12 +72,6 @@ Foam::patchIdentifier::patchIdentifier
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::patchIdentifier::~patchIdentifier()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::patchIdentifier::inGroup(const word& name) const

2
src/foam/meshes/patchIdentifier/patchIdentifier.H
View file

@ -102,7 +102,7 @@ public:
//- Destructor
virtual ~patchIdentifier();
virtual ~patchIdentifier() = default;
// Member Functions

5
src/foam/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
View file

@ -367,8 +367,7 @@ void Foam::mapDistribute::distribute
else
{
FatalErrorInFunction
<< "Unknown communication schedule "
<< Pstream::commsTypeNames[commsType]
<< "Unknown communication schedule " << int(commsType)
<< abort(FatalError);
}
}
@ -709,7 +708,7 @@ void Foam::mapDistribute::distribute
else
{
FatalErrorInFunction
<< "Unknown communication schedule " << commsType
<< "Unknown communication schedule " << int(commsType)
<< abort(FatalError);
}
}

1
src/foam/primitives/complex/complex.H
View file

@ -126,7 +126,6 @@ public:
// Member operators
inline const complex& operator=(const complex&);
inline void operator+=(const complex&);
inline void operator-=(const complex&);
inline void operator*=(const complex&);

8
src/foam/primitives/complex/complexI.H
View file

@ -75,14 +75,6 @@ inline complex complex::conjugate() const
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
inline const complex& complex::operator=(const complex& c)
{
re = c.re;
im = c.im;
return *this;
}
inline void complex::operator+=(const complex& c)
{
re += c.re;

12
src/foam/primitives/functions/Polynomial/Polynomial.C
View file

@ -41,18 +41,6 @@ Foam::Polynomial<PolySize>::Polynomial()
}
template<int PolySize>
Foam::Polynomial<PolySize>::Polynomial
(
const Polynomial<PolySize>& poly
)
:
VectorSpace<Polynomial<PolySize>, scalar, PolySize>(poly),
logActive_(poly.logActive_),
logCoeff_(poly.logCoeff_)
{}
template<int PolySize>
Foam::Polynomial<PolySize>::Polynomial(const scalar coeffs[PolySize])
:

3
src/foam/primitives/functions/Polynomial/Polynomial.H
View file

@ -107,9 +107,6 @@ public:
//- Construct null, with all coefficients = 0.0
Polynomial();
//- Copy constructor
Polynomial(const Polynomial&);
//- Construct from C-array of coefficients
explicit Polynomial(const scalar coeffs[PolySize]);

3
src/foam/primitives/quaternion/quaternion.H
View file

@ -112,6 +112,9 @@ public:
//- Construct from Istream
quaternion(Istream&);
//- Copy construct
quaternion(const quaternion&) = default;
// Member functions

1
src/foam/primitives/septernion/septernion.H
View file

@ -126,7 +126,6 @@ public:
// Member operators
inline void operator=(const septernion&);
inline void operator*=(const septernion&);
inline void operator=(const vector&);

6
src/foam/primitives/septernion/septernionI.H
View file

@ -87,12 +87,6 @@ inline Foam::vector Foam::septernion::invTransform(const vector& v) const
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
inline void Foam::septernion::operator=(const septernion& tr)
{
t_ = tr.t_;
r_ = tr.r_;
}
inline void Foam::septernion::operator*=(const septernion& tr)
{
t_ += r().transform(tr.t());

17
src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
View file

@ -171,23 +171,6 @@ Foam::phaseProperties::phaseProperties()
{}
Foam::phaseProperties::phaseProperties(const phaseProperties& pp)
:
phase_(pp.phase_),
stateLabel_(pp.stateLabel_),
names_(pp.names_),
Y_(pp.Y_),
globalIds_(pp.globalIds_),
globalCarrierIds_(pp.globalCarrierIds_)
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::phaseProperties::~phaseProperties()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::phaseProperties::initialiseGlobalIds

5
src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
View file

@ -125,12 +125,9 @@ public:
//- Construct from Istream
phaseProperties(Istream&);
//- Construct as copy
phaseProperties(const phaseProperties&);
//- Destructor
~phaseProperties();
~phaseProperties() = default;
// Public member functions

3
src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointData.H
View file

@ -117,9 +117,6 @@ public:
const vector& v
);
//- Construct as copy
inline pointData(const pointData&);
// Member Functions

10
src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H
View file

@ -160,16 +160,6 @@ inline Foam::pointData::pointData
{}
// Construct as copy
inline Foam::pointData::pointData(const pointData& wpt)
:
origin_(wpt.origin()),
distSqr_(wpt.distSqr()),
s_(wpt.s()),
v_(wpt.v())
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
inline const Foam::point& Foam::pointData::origin() const

6
src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
View file

@ -172,12 +172,6 @@ Foam::blockDescriptor::blockDescriptor
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::blockDescriptor::~blockDescriptor()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
const Foam::pointField& Foam::blockDescriptor::blockPointField() const

10
src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
View file

@ -79,7 +79,7 @@ class blockDescriptor
Vector<label> meshDensity_;
//- Block edge points
List< List<point> > edgePoints_;
List<List<point> > edgePoints_;
//- Block edge weighting factors
scalarListList edgeWeights_;
@ -99,12 +99,6 @@ class blockDescriptor
void setEdge(label edgeI, label start, label end, label dim);
// Private Member Functions
//- Disallow default bitwise assignment
void operator=(const blockDescriptor&);
public:
// Constructors
@ -137,7 +131,7 @@ public:
//- Destructor
~blockDescriptor();
~blockDescriptor() = default;
// Member Functions

26
src/mesh/cfMesh/utilities/helperClasses/parallelHelpers/labelledPair/labelledPair.H
View file

@ -81,8 +81,7 @@ class labelledPair
{}
// Destructor
~labelledPair()
{}
~labelledPair() = default;
// Member functions
//- return pair label
@ -99,12 +98,6 @@ class labelledPair
// Member operators
inline void operator=(const labelledPair& lpp)
{
pLabel_ = lpp.pLabel_;
pair_ = lpp.pair_;
}
inline bool operator==
(
const labelledPair& lpp
@ -115,10 +108,23 @@ class labelledPair
const labelPair& op = lpp.pair_;
if( (pair_.first() == op.first()) && (pair_.second() == op.second()) )
if
(
(pair_.first() == op.first())
&& (pair_.second() == op.second())
)
{
return true;
if( (pair_.first() == op.second()) && (pair_.second() == op.first()) )
}
if
(
(pair_.first() == op.second())
&& (pair_.second() == op.first())
)
{
return true;
}
return false;
}

11
src/mesh/cfMesh/utilities/helperClasses/parallelHelpers/labelledPoint/labelledPoint.H
View file

@ -77,9 +77,8 @@ class labelledPoint
coords_(p)
{}
// Destructor
~labelledPoint()
{}
//- Destructor
~labelledPoint() = default;
// Member functions
//- return point label
@ -106,12 +105,6 @@ class labelledPoint
// Member operators
inline void operator=(const labelledPoint& lp)
{
pLabel_ = lp.pLabel_;
coords_ = lp.coords_;
}
inline bool operator==(const labelledPoint& lp) const
{
if( pLabel_ == lp.pLabel_ )

12
src/mesh/cfMesh/utilities/helperClasses/parallelHelpers/labelledPoint/refLabelledPoint.H
View file

@ -76,9 +76,9 @@ class refLabelledPoint
p_(p)
{}
// Destructor
~refLabelledPoint()
{}
//- Destructor
~refLabelledPoint() = default;
// Member functions
//- return label of the object it is associated to
@ -95,12 +95,6 @@ class refLabelledPoint
// Member operators
inline void operator=(const refLabelledPoint& lp)
{
objectLabel_ = lp.objectLabel_;
p_ = lp.p_;
}
inline bool operator==(const refLabelledPoint& lp) const
{
if( objectLabel_ == lp.objectLabel_ )

13
src/mesh/cfMesh/utilities/helperClasses/parallelHelpers/labelledPointScalar/labelledPointScalar.H
View file

@ -82,9 +82,9 @@ class labelledPointScalar
weight_(s)
{}
// Destructor
~labelledPointScalar()
{}
//- Destructor
~labelledPointScalar() = default;
// Member functions
//- return point label
@ -122,13 +122,6 @@ class labelledPointScalar
// Member operators
inline void operator=(const labelledPointScalar& lps)
{
pLabel_ = lps.pLabel_;
coords_ = lps.coords_;
weight_ = lps.weight_;
}
inline bool operator==(const labelledPointScalar& lps) const
{
if( pLabel_ == lps.pLabel_ )

10
src/mesh/cfMesh/utilities/meshes/polyMeshGen/boundaryPatch/processorBoundaryPatch.C
View file

@ -126,16 +126,6 @@ Istream& processorBoundaryPatch::operator>>(Istream& is)
return is;
}
void processorBoundaryPatch::operator=(const processorBoundaryPatch& wp)
{
name_ = wp.name_;
type_ = wp.type_;
nFaces_ = wp.nFaces_;
startFace_ = wp.startFace_;
myProcNo_ = wp.myProcNo_;
neighbProcNo_ = wp.neighbProcNo_;
}
bool processorBoundaryPatch::operator!=(const processorBoundaryPatch& wp) const
{
if( name_ != wp.name_ )

2
src/mesh/cfMesh/utilities/meshes/polyMeshGen/boundaryPatch/processorBoundaryPatch.H
View file

@ -148,8 +148,6 @@ public:
Istream& operator>>(Istream&);
void operator=(const processorBoundaryPatch&);
bool operator!=(const processorBoundaryPatch&) const;
};

14
src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeBasic.H
View file

@ -51,9 +51,11 @@ namespace Foam
\*---------------------------------------------------------------------------*/
class meshOctreeCubeBasic
: public meshOctreeCubeCoordinates
:
public meshOctreeCubeCoordinates
{
// Private data
//- cube type
direction cubeType_;
@ -80,10 +82,9 @@ public:
const short procNo = ALLPROCS
);
// Destructor
//- Destructor
~meshOctreeCubeBasic() = default;
~meshOctreeCubeBasic()
{}
// Enumerators
@ -98,6 +99,7 @@ public:
};
// Member functions
//- return type
inline direction cubeType() const;
@ -113,10 +115,6 @@ public:
//- return coordinates in the octree
inline const meshOctreeCubeCoordinates& coordinates() const;
// Member operators
inline void operator=(const meshOctreeCubeBasic&);
// Friend operators
friend inline Ostream& operator<<

9
src/mesh/cfMesh/utilities/octrees/meshOctree/meshOctreeCube/meshOctreeCubeBasicI.H
View file

@ -95,15 +95,6 @@ inline const meshOctreeCubeCoordinates& meshOctreeCubeBasic::coordinates() const
return *this;
}
inline void meshOctreeCubeBasic::operator=(const meshOctreeCubeBasic& ocb)
{
cubeType_ = ocb.cubeType_;
procNo_ = ocb.procNo_;
static_cast<meshOctreeCubeCoordinates&>(*this) =
static_cast<const meshOctreeCubeCoordinates&>(ocb);
}
inline Ostream& operator<<
(
Ostream& os,

12
src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/patchRefinement/patchRefinement.C
View file

@ -62,12 +62,6 @@ patchRefinement::patchRefinement(Istream& is)
{
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
patchRefinement::~patchRefinement()
{
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
word patchRefinement::patchName() const
@ -98,12 +92,6 @@ scalar patchRefinement::cellSize() const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
void patchRefinement::operator=(const patchRefinement& pr)
{
patchName_ = pr.patchName_;
cellSize_ = pr.cellSize_;
}
Istream& operator>>(Istream& is, patchRefinement& pr)
{
pr.patchName_ = word(is);

6
src/mesh/cfMesh/utilities/octrees/meshOctree/refinementControls/patchRefinement/patchRefinement.H
View file

@ -76,9 +76,8 @@ public:
//- contruct from stream
patchRefinement(Istream&);
// Destructor
~patchRefinement();
//- Destructor
~patchRefinement() = default;
// Member Functions
@ -90,7 +89,6 @@ public:
// Operators
void operator=(const patchRefinement&);
friend Istream& operator>>(Istream&, patchRefinement&);
friend Ostream& operator<<(Ostream&, const patchRefinement&);
friend bool operator==(const patchRefinement&, const patchRefinement&);

3
src/meshTools/PointEdgeWave/pointEdgePoint.H
View file

@ -110,9 +110,6 @@ public:
//- Construct from origin, distance
inline pointEdgePoint(const point& origin, const scalar distSqr);
//- Construct as copy
inline pointEdgePoint(const pointEdgePoint&);
// Member Functions

8
src/meshTools/PointEdgeWave/pointEdgePointI.H
View file

@ -132,14 +132,6 @@ inline Foam::pointEdgePoint::pointEdgePoint
{}
// Construct as copy
inline Foam::pointEdgePoint::pointEdgePoint(const pointEdgePoint& wpt)
:
origin_(wpt.origin()),
distSqr_(wpt.distSqr())
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
inline const Foam::point& Foam::pointEdgePoint::origin() const

3
src/meshTools/cellClassification/cellInfo.H
View file

@ -91,9 +91,6 @@ public:
//- Construct from cType
inline cellInfo(const label);
//- Construct as copy
inline cellInfo(const cellInfo&);
// Member Functions

12
src/meshTools/cellClassification/cellInfoI.H
View file

@ -44,7 +44,7 @@ inline bool Foam::cellInfo::update
|| (w2.type() == cellClassification::CUT)
)
{
FatalErrorIn("cellInfo::update(const cellInfo&)")
FatalErrorInFunction
<< "Problem: trying to propagate NOTSET or CUT type:" << w2.type()
<< " into cell/face with type:" << type() << endl
<< "thisFaceI:" << thisFaceI
@ -52,6 +52,7 @@ inline bool Foam::cellInfo::update
<< " neighbourFaceI:" << neighbourFaceI
<< " neighbourCellI:" << neighbourCellI
<< abort(FatalError);
return false;
}
@ -75,7 +76,7 @@ inline bool Foam::cellInfo::update
}
// Two conflicting types
FatalErrorIn("cellInfo::update(const cellInfo&)")
FatalErrorInFunction
<< "Problem: trying to propagate conflicting types:" << w2.type()
<< " into cell/face with type:" << type() << endl
<< "thisFaceI:" << thisFaceI
@ -104,13 +105,6 @@ inline Foam::cellInfo::cellInfo(const label type)
{}
// Construct as copy
inline Foam::cellInfo::cellInfo(const cellInfo& w2)
:
type_(w2.type())
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
inline bool Foam::cellInfo::valid() const

6
src/meshTools/cellDist/wallPoint/wallPoint.H
View file

@ -106,12 +106,6 @@ public:
const scalar distSqr
);
//- Construct as copy
inline wallPoint
(
const wallPoint&
);
// Member Functions

7
src/meshTools/cellDist/wallPoint/wallPointI.H
View file

@ -95,13 +95,6 @@ inline Foam::wallPoint::wallPoint(const point& origin, const scalar distSqr)
{}
// Construct as copy
inline Foam::wallPoint::wallPoint(const wallPoint& wpt)
:
origin_(wpt.origin()), distSqr_(wpt.distSqr())
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
inline const Foam::point& Foam::wallPoint::origin() const

9
src/meshTools/triSurface/triSurface/surfacePatch/surfacePatch.C
View file

@ -88,15 +88,6 @@ Foam::surfacePatch::surfacePatch
{}
// Construct as copy
Foam::surfacePatch::surfacePatch(const Foam::surfacePatch& sp)
:
geometricSurfacePatch(sp),
size_(sp.size()),
start_(sp.start())
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::surfacePatch::write(Ostream& os) const

5
src/meshTools/triSurface/triSurface/surfacePatch/surfacePatch.H
View file

@ -67,6 +67,7 @@ class surfacePatch
//- Start label of this patch in the triSurface face list
label start_;
public:
//- Runtime type information
@ -99,9 +100,6 @@ public:
const label index
);
//- Construct as copy
surfacePatch(const surfacePatch&);
// Member Functions
@ -143,6 +141,7 @@ public:
//- compare.
bool operator==(const surfacePatch&) const;
// IOstream Operators
friend Ostream& operator<<(Ostream&, const surfacePatch&);

25
src/overset/oversetMesh/donorAcceptor/donorAcceptor.H
View file

@ -171,10 +171,12 @@ public:
withinBB_(is)
{}
//- Copy constructor - default
//- Copy constructor
donorAcceptor(const donorAcceptor&) = default;
//- Destructor - default
//- Destructor
~donorAcceptor() = default;
// Member Functions
@ -387,25 +389,6 @@ public:
}
// Member Operators
void operator=(const donorAcceptor& rd)
{
acceptorCell_ = rd.acceptorCell_;
acceptorProcNo_ = rd.acceptorProcNo_;
acceptorPoint_ = rd.acceptorPoint_;
donorCell_ = rd.donorCell_;
donorProcNo_ = rd.donorProcNo_;
donorPoint_ = rd.donorPoint_;
extendedDonorCells_ = rd.extendedDonorCells_;
extendedDonorPoints_ = rd.extendedDonorPoints_;
withinBB_ = rd.withinBB_;
}
// Friend Operators
friend bool operator==

8
src/surfMesh/surfZone/surfZone/surfZone.C
View file

@ -85,14 +85,6 @@ Foam::surfZone::surfZone
{}
Foam::surfZone::surfZone(const surfZone& zone)
:
surfZoneIdentifier(zone, zone.index()),
size_(zone.size()),
start_(zone.start())
{}
Foam::surfZone::surfZone(const surfZone& zone, const label index)
:
surfZoneIdentifier(zone, index),

3
src/surfMesh/surfZone/surfZone/surfZone.H
View file

@ -105,9 +105,6 @@ public:
const label index
);
//- Construct as copy
surfZone(const surfZone&);
//- Construct from another zone, resetting the index
surfZone(const surfZone&, const label index);

17
src/tetFiniteElement/fields/elementPatchFields/elementPatchField/elementPatchField.C
View file

@ -53,23 +53,6 @@ elementPatchField<Type>::elementPatchField
{}
template<class Type>
elementPatchField<Type>::elementPatchField
(
const elementPatchField<Type>& ptf
)
:
PointPatchField
<
Foam::elementPatchField,
elementMesh,
tetPolyPatch,
Foam::DummyMatrix,
Type
>(ptf)
{}
template<class Type>
elementPatchField<Type>::elementPatchField
(

9
src/tetFiniteElement/fields/elementPatchFields/elementPatchField/elementPatchField.H
View file

@ -79,9 +79,6 @@ public:
const DimensionedField<Type, elementMesh>&
);
//- Construct as copy
elementPatchField(const elementPatchField<Type>&);
//- Construct and return a clone
virtual autoPtr<elementPatchField<Type> > clone() const
{
@ -111,10 +108,8 @@ public:
}
// Destructor
virtual ~elementPatchField()
{}
//- Destructor
virtual ~elementPatchField() = default;
// Member operators

6
src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C
View file

@ -88,12 +88,6 @@ Foam::radiation::absorptionCoeffs::coeffs
}
void Foam::radiation::absorptionCoeffs::initialise(Istream&)
{
absorptionCoeffs(Istream);
}
void Foam::radiation::absorptionCoeffs::initialise(const dictionary& dict)
{
dict.lookup("Tcommon") >> Tcommon_;

5
src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H
View file

@ -22,7 +22,7 @@ License
along with foam-extend. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::janafThermo
Foam::absorptionCoeffs
Description
Absorption coefficients class used in greyMeanAbsorptionEmission and
@ -110,9 +110,6 @@ public:
// Initialise from a dictionary
void initialise(const dictionary&);
// Initialise from an Istream
void initialise(Istream&);
// Access Functions

54
src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
View file

@ -126,9 +126,9 @@ Foam::scalar Foam::chemkinReader::molecularWeight
}
else
{
FatalErrorIn("chemkinReader::lex()")
FatalErrorInFunction
<< "Unknown element " << elementName
<< " on line " << lineNo_-1 << nl
<< " on line " << lineNo_ - 1 << nl
<< " specieComposition: " << specieComposition
<< exit(FatalError);
}
@ -147,10 +147,10 @@ void Foam::chemkinReader::checkCoeffs
{
if (reactionCoeffs.size() != nCoeffs)
{
FatalErrorIn("chemkinReader::checkCoeffs")
FatalErrorInFunction
<< "Wrong number of coefficients for the " << reactionRateName
<< " rate expression on line "
<< lineNo_-1 << ", should be "
<< lineNo_ - 1 << ", should be "
<< nCoeffs << " but " << reactionCoeffs.size() << " supplied." << nl
<< "Coefficients are "
<< reactionCoeffs << nl
@ -211,17 +211,17 @@ void Foam::chemkinReader::addReactionType
if (rType < 3)
{
FatalErrorIn("chemkinReader::addReactionType")
FatalErrorInFunction
<< "Reaction type " << reactionTypeNames[rType]
<< " on line " << lineNo_-1
<< " on line " << lineNo_ - 1
<< " not handled by this function"
<< exit(FatalError);
}
else
{
FatalErrorIn("chemkinReader::addReactionType")
FatalErrorInFunction
<< "Unknown reaction type " << rType
<< " on line " << lineNo_-1
<< " on line " << lineNo_ - 1
<< exit(FatalError);
}
}
@ -285,9 +285,9 @@ void Foam::chemkinReader::addPressureDependentReaction
if (TroeCoeffs.size() != 4 && TroeCoeffs.size() != 3)
{
FatalErrorIn("chemkinReader::addPressureDependentReaction")
FatalErrorInFunction
<< "Wrong number of coefficients for Troe rate expression"
" on line " << lineNo_-1 << ", should be 3 or 4 but "
" on line " << lineNo_ - 1 << ", should be 3 or 4 but "
<< TroeCoeffs.size() << " supplied." << nl
<< "Coefficients are "
<< TroeCoeffs << nl
@ -341,9 +341,9 @@ void Foam::chemkinReader::addPressureDependentReaction
if (SRICoeffs.size() != 5 && SRICoeffs.size() != 3)
{
FatalErrorIn("chemkinReader::addPressureDependentReaction")
FatalErrorInFunction
<< "Wrong number of coefficients for SRI rate expression"
" on line " << lineNo_-1 << ", should be 3 or 5 but "
" on line " << lineNo_ - 1 << ", should be 3 or 5 but "
<< SRICoeffs.size() << " supplied." << nl
<< "Coefficients are "
<< SRICoeffs << nl
@ -392,23 +392,13 @@ void Foam::chemkinReader::addPressureDependentReaction
default:
{
if (fofType < unknownFallOffFunctionType)
{
FatalErrorIn("chemkinReader::addPressureDependentReaction")
FatalErrorInFunction
<< "Fall-off function type "
<< fallOffFunctionNames[fofType]
<< " on line " << lineNo_-1
<< " on line " << lineNo_ - 1
<< " not implemented"
<< exit(FatalError);
}
else
{
FatalErrorIn("chemkinReader::addPressureDependentReaction")
<< "Unknown fall-off function type " << fofType
<< " on line " << lineNo_-1
<< exit(FatalError);
}
}
}
}
@ -742,8 +732,8 @@ void Foam::chemkinReader::addReaction
case unknownReactionRateType:
{
FatalErrorIn("chemkinReader::addReaction")
<< "Internal error on line " << lineNo_-1
FatalErrorInFunction
<< "Internal error on line " << lineNo_ - 1
<< ": reaction rate type has not been set"
<< exit(FatalError);
}
@ -753,17 +743,17 @@ void Foam::chemkinReader::addReaction
{
if (rrType < 9)
{
FatalErrorIn("chemkinReader::addReaction")
FatalErrorInFunction
<< "Reaction rate type " << reactionRateTypeNames[rrType]
<< " on line " << lineNo_-1
<< " on line " << lineNo_ - 1
<< " not implemented"
<< exit(FatalError);
}
else
{
FatalErrorIn("chemkinReader::addReaction")
FatalErrorInFunction
<< "Unknown reaction rate type " << rrType
<< " on line " << lineNo_-1
<< " on line " << lineNo_ - 1
<< exit(FatalError);
}
}
@ -774,11 +764,11 @@ void Foam::chemkinReader::addReaction
{
if (mag(nAtoms[i]) > SMALL)
{
FatalErrorIn("chemkinReader::addReaction")
FatalErrorInFunction
<< "Elemental imbalance in " << elementNames_[i]
<< " in reaction" << nl
<< reactions_.last() << nl
<< " on line " << lineNo_-1
<< " on line " << lineNo_ - 1
<< exit(FatalError);
}
}

4
src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
View file

@ -117,9 +117,6 @@ public:
//- Construct from Istream
icoPolynomial(Istream&);
//- Construct as copy
inline icoPolynomial(const icoPolynomial&);
//- Construct as named copy
inline icoPolynomial(const word& name, const icoPolynomial&);
@ -144,7 +141,6 @@ public:
// Member operators
inline icoPolynomial& operator=(const icoPolynomial&);
inline void operator+=(const icoPolynomial&);
inline void operator-=(const icoPolynomial&);

25
src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H
View file

@ -41,17 +41,6 @@ inline Foam::icoPolynomial<PolySize>::icoPolynomial
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<int PolySize>
inline Foam::icoPolynomial<PolySize>::icoPolynomial
(
const icoPolynomial<PolySize>& ip
)
:
specie(ip),
rhoPolynomial_(ip.rhoPolynomial_)
{}
template<int PolySize>
inline Foam::icoPolynomial<PolySize>::icoPolynomial
(
@ -108,20 +97,6 @@ inline Foam::scalar Foam::icoPolynomial<PolySize>::Z(scalar, scalar) const
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
template<int PolySize>
inline Foam::icoPolynomial<PolySize>& Foam::icoPolynomial<PolySize>::operator=
(
const icoPolynomial<PolySize>& ip
)
{
specie::operator=(ip);
rhoPolynomial_ = ip.rhoPolynomial_;
return *this;
}
template<int PolySize>
inline void Foam::icoPolynomial<PolySize>::operator+=
(

9
src/thermophysicalModels/specie/reaction/reactionsTemplates/IrreversibleReaction/IrreversibleReaction.H
View file

@ -57,15 +57,6 @@ class IrreversibleReaction
ReactionRate k_;
// Private Member Functions
//- Disallow default bitwise assignment
void operator=
(
const IrreversibleReaction<ReactionThermo, ReactionRate>&
);
public:
//- Runtime type information

10
src/thermophysicalModels/specie/reaction/reactionsTemplates/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
View file

@ -58,16 +58,6 @@ class NonEquilibriumReversibleReaction
ReactionRate rk_;
// Private Member Functions
//- Disallow default bitwise assignment
void operator=
(
const NonEquilibriumReversibleReaction
<ReactionThermo, ReactionRate>&
);
public:
//- Runtime type information

3
src/thermophysicalModels/specie/reaction/reactionsTemplates/Reaction/Reaction.H
View file

@ -127,9 +127,6 @@ private:
void setLRhs(Istream&);
void setThermo(const HashPtrTable<ReactionThermo>& thermoDatabase);
//- Disallow default bitwise assignment
void operator=(const Reaction<ReactionThermo>&);
public:

12
src/thermophysicalModels/specie/reaction/reactionsTemplates/ReversibleReaction/ReversibleReaction.H
View file

@ -57,12 +57,6 @@ class ReversibleReaction
ReactionRate k_;
// Private Member Functions
//- Disallow default bitwise assignment
void operator=(const ReversibleReaction<ReactionThermo, ReactionRate>&);
public:
//- Runtime type information
@ -119,10 +113,8 @@ public:
}
// Destructor
virtual ~ReversibleReaction()
{}
//- Destructor
virtual ~ReversibleReaction() = default;
// Member Functions

2
src/thermophysicalModels/specie/transport/const/constTransport.H
View file

@ -149,8 +149,6 @@ public:
// Member operators
inline constTransport& operator=(const constTransport&);
inline void operator+=(const constTransport&);
inline void operator-=(const constTransport&);

15
src/thermophysicalModels/specie/transport/const/constTransportI.H
View file

@ -146,21 +146,6 @@ inline scalar constTransport<thermo>::alpha
}
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
template<class thermo>
inline constTransport<thermo>& constTransport<thermo>::operator=
(
const constTransport<thermo>& ct
)
{
thermo::operator=(ct);
Mu = ct.Mu;
rPr = ct.rPr;
return *this;
}
template<class thermo>
inline void Foam::constTransport<thermo>::operator+=
(

2
src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H
View file

@ -171,8 +171,6 @@ public:
// Member operators
inline sutherlandTransport& operator=(const sutherlandTransport&);
inline void operator+=(const sutherlandTransport&);
inline void operator-=(const sutherlandTransport&);

15
src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H
View file

@ -196,21 +196,6 @@ inline scalar sutherlandTransport<thermo>::alpha
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
template<class thermo>
inline sutherlandTransport<thermo>& sutherlandTransport<thermo>::operator=
(
const sutherlandTransport<thermo>& st
)
{
thermo::operator=(st);
As = st.As;
Ts = st.Ts;
return *this;
}
template<class thermo>
inline void Foam::sutherlandTransport<thermo>::operator+=
(