Ubuntu-20.04 and gcc-9.3.0 port
This commit is contained in:
parent
70b064d0f3
commit
9ffbe794a9
84 changed files with 365 additions and 587 deletions
|
@ -29,8 +29,7 @@ License
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||||
|
|
||||||
Foam::multiphaseAlphaContactAngleFvPatchScalarField::
|
Foam::interfaceThetaProps::interfaceThetaProps
|
||||||
interfaceThetaProps::interfaceThetaProps
|
|
||||||
(
|
(
|
||||||
Istream& is
|
Istream& is
|
||||||
)
|
)
|
||||||
|
@ -45,7 +44,7 @@ interfaceThetaProps::interfaceThetaProps
|
||||||
Foam::Istream& Foam::operator>>
|
Foam::Istream& Foam::operator>>
|
||||||
(
|
(
|
||||||
Istream& is,
|
Istream& is,
|
||||||
multiphaseAlphaContactAngleFvPatchScalarField::interfaceThetaProps& tp
|
interfaceThetaProps& tp
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
is >> tp.theta0_ >> tp.uTheta_ >> tp.thetaA_ >> tp.thetaR_;
|
is >> tp.theta0_ >> tp.uTheta_ >> tp.thetaA_ >> tp.thetaR_;
|
||||||
|
@ -56,8 +55,7 @@ Foam::Istream& Foam::operator>>
|
||||||
Foam::Ostream& Foam::operator<<
|
Foam::Ostream& Foam::operator<<
|
||||||
(
|
(
|
||||||
Ostream& os,
|
Ostream& os,
|
||||||
const
|
const interfaceThetaProps& tp
|
||||||
multiphaseAlphaContactAngleFvPatchScalarField::interfaceThetaProps& tp
|
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
os << tp.theta0_ << token::SPACE
|
os << tp.theta0_ << token::SPACE
|
||||||
|
|
|
@ -44,8 +44,86 @@ SourceFiles
|
||||||
namespace Foam
|
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 interfaceThetaProps
|
||||||
|
{
|
||||||
|
//- Equilibrium contact angle
|
||||||
|
scalar theta0_;
|
||||||
|
|
||||||
|
//- Dynamic contact angle velocity scale
|
||||||
|
scalar uTheta_;
|
||||||
|
|
||||||
|
//- Limiting advancing contact angle
|
||||||
|
scalar thetaA_;
|
||||||
|
|
||||||
|
//- Limiting receeding contact angle
|
||||||
|
scalar thetaR_;
|
||||||
|
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
// Constructors
|
||||||
|
interfaceThetaProps()
|
||||||
|
{}
|
||||||
|
|
||||||
|
interfaceThetaProps(Istream&);
|
||||||
|
|
||||||
|
|
||||||
|
// Member functions
|
||||||
|
|
||||||
|
//- Return the equilibrium contact angle theta0
|
||||||
|
scalar theta0(bool matched=true) const
|
||||||
|
{
|
||||||
|
if (matched) return theta0_;
|
||||||
|
else return 180.0 - theta0_;
|
||||||
|
}
|
||||||
|
|
||||||
|
//- Return the dynamic contact angle velocity scale
|
||||||
|
scalar uTheta() const
|
||||||
|
{
|
||||||
|
return uTheta_;
|
||||||
|
}
|
||||||
|
|
||||||
|
//- Return the limiting advancing contact angle
|
||||||
|
scalar thetaA(bool matched=true) const
|
||||||
|
{
|
||||||
|
if (matched) return thetaA_;
|
||||||
|
else return 180.0 - thetaA_;
|
||||||
|
}
|
||||||
|
|
||||||
|
//- Return the limiting receeding contact angle
|
||||||
|
scalar thetaR(bool matched=true) const
|
||||||
|
{
|
||||||
|
if (matched) return thetaR_;
|
||||||
|
else return 180.0 - thetaR_;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// IO functions
|
||||||
|
|
||||||
|
friend Istream& operator>>(Istream&, interfaceThetaProps&);
|
||||||
|
friend Ostream& operator<<(Ostream&, const interfaceThetaProps&);
|
||||||
|
};
|
||||||
|
|
||||||
|
/*---------------------------------------------------------------------------*\
|
||||||
|
Class multiphaseAlphaContactAngleFvPatch Declaration
|
||||||
\*---------------------------------------------------------------------------*/
|
\*---------------------------------------------------------------------------*/
|
||||||
|
|
||||||
class multiphaseAlphaContactAngleFvPatchScalarField
|
class multiphaseAlphaContactAngleFvPatchScalarField
|
||||||
|
@ -54,66 +132,7 @@ class multiphaseAlphaContactAngleFvPatchScalarField
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
class interfaceThetaProps
|
// Public typedef
|
||||||
{
|
|
||||||
//- Equilibrium contact angle
|
|
||||||
scalar theta0_;
|
|
||||||
|
|
||||||
//- Dynamic contact angle velocity scale
|
|
||||||
scalar uTheta_;
|
|
||||||
|
|
||||||
//- Limiting advancing contact angle
|
|
||||||
scalar thetaA_;
|
|
||||||
|
|
||||||
//- Limiting receeding contact angle
|
|
||||||
scalar thetaR_;
|
|
||||||
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
// Constructors
|
|
||||||
interfaceThetaProps()
|
|
||||||
{}
|
|
||||||
|
|
||||||
interfaceThetaProps(Istream&);
|
|
||||||
|
|
||||||
|
|
||||||
// Member functions
|
|
||||||
|
|
||||||
//- Return the equilibrium contact angle theta0
|
|
||||||
scalar theta0(bool matched=true) const
|
|
||||||
{
|
|
||||||
if (matched) return theta0_;
|
|
||||||
else return 180.0 - theta0_;
|
|
||||||
}
|
|
||||||
|
|
||||||
//- Return the dynamic contact angle velocity scale
|
|
||||||
scalar uTheta() const
|
|
||||||
{
|
|
||||||
return uTheta_;
|
|
||||||
}
|
|
||||||
|
|
||||||
//- Return the limiting advancing contact angle
|
|
||||||
scalar thetaA(bool matched=true) const
|
|
||||||
{
|
|
||||||
if (matched) return thetaA_;
|
|
||||||
else return 180.0 - thetaA_;
|
|
||||||
}
|
|
||||||
|
|
||||||
//- Return the limiting receeding contact angle
|
|
||||||
scalar thetaR(bool matched=true) const
|
|
||||||
{
|
|
||||||
if (matched) return thetaR_;
|
|
||||||
else return 180.0 - thetaR_;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// IO functions
|
|
||||||
|
|
||||||
friend Istream& operator>>(Istream&, interfaceThetaProps&);
|
|
||||||
friend Ostream& operator<<(Ostream&, const interfaceThetaProps&);
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef HashTable
|
typedef HashTable
|
||||||
<
|
<
|
||||||
interfaceThetaProps,
|
interfaceThetaProps,
|
||||||
|
|
|
@ -187,7 +187,6 @@ mtype {space}"MTYPE:"{space}
|
||||||
label curNumberOfNodes = 0;
|
label curNumberOfNodes = 0;
|
||||||
label curNumberOfCells = 0;
|
label curNumberOfCells = 0;
|
||||||
label curGroupID = 0;
|
label curGroupID = 0;
|
||||||
label nFlagsForStream = 0;
|
|
||||||
label curBoundaryPatch = 0;
|
label curBoundaryPatch = 0;
|
||||||
label curPatchFace = 0;
|
label curPatchFace = 0;
|
||||||
%}
|
%}
|
||||||
|
@ -427,7 +426,7 @@ mtype {space}"MTYPE:"{space}
|
||||||
|
|
||||||
if (curGroupID > 0)
|
if (curGroupID > 0)
|
||||||
{
|
{
|
||||||
FatalErrorIn("gambitToFoam::main")
|
FatalErrorInFunction
|
||||||
<< "<readCellStreamGroupID>{space}{label} : "
|
<< "<readCellStreamGroupID>{space}{label} : "
|
||||||
<< "trying to reset group ID while active"
|
<< "trying to reset group ID while active"
|
||||||
<< abort(FatalError);
|
<< abort(FatalError);
|
||||||
|
@ -479,7 +478,7 @@ mtype {space}"MTYPE:"{space}
|
||||||
|
|
||||||
IStringStream nFlagsStream(YYText());
|
IStringStream nFlagsStream(YYText());
|
||||||
|
|
||||||
nFlagsForStream = readLabel(nFlagsStream);
|
readLabel(nFlagsStream);
|
||||||
|
|
||||||
BEGIN(cellStreamTitle);
|
BEGIN(cellStreamTitle);
|
||||||
}
|
}
|
||||||
|
@ -511,7 +510,6 @@ mtype {space}"MTYPE:"{space}
|
||||||
|
|
||||||
// reset current group ID and a number of flags
|
// reset current group ID and a number of flags
|
||||||
curGroupID = 0;
|
curGroupID = 0;
|
||||||
nFlagsForStream = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -523,7 +521,6 @@ mtype {space}"MTYPE:"{space}
|
||||||
|
|
||||||
// reset current group ID and a number of flags
|
// reset current group ID and a number of flags
|
||||||
curGroupID = 0;
|
curGroupID = 0;
|
||||||
nFlagsForStream = 0;
|
|
||||||
|
|
||||||
BEGIN(INITIAL);
|
BEGIN(INITIAL);
|
||||||
}
|
}
|
||||||
|
@ -586,7 +583,7 @@ mtype {space}"MTYPE:"{space}
|
||||||
<boundaryPatchFaces>{spaceNl}{label}({scalarList}|\n) {
|
<boundaryPatchFaces>{spaceNl}{label}({scalarList}|\n) {
|
||||||
|
|
||||||
// Vertex-based boundary condition
|
// Vertex-based boundary condition
|
||||||
FatalErrorIn("gambitToFoam::main")
|
FatalErrorInFunction
|
||||||
<< "<boundaryPatchFaces>{spaceNl}{label}{scalarList} : "
|
<< "<boundaryPatchFaces>{spaceNl}{label}{scalarList} : "
|
||||||
<< "boundary condition specified on vertices not supported"
|
<< "boundary condition specified on vertices not supported"
|
||||||
<< abort(FatalError);
|
<< abort(FatalError);
|
||||||
|
@ -643,12 +640,12 @@ int main(int argc, char *argv[])
|
||||||
|
|
||||||
# include "createTime.H"
|
# include "createTime.H"
|
||||||
|
|
||||||
fileName gambitFile(args.additionalArgs()[0]);
|
const fileName gambitFile(args.additionalArgs()[0]);
|
||||||
ifstream gambitStream(gambitFile.c_str());
|
ifstream gambitStream(gambitFile.c_str());
|
||||||
|
|
||||||
if (!gambitStream)
|
if (!gambitStream)
|
||||||
{
|
{
|
||||||
FatalErrorIn("gambitToFoam::main")
|
FatalErrorInFunction
|
||||||
<< args.executable()
|
<< args.executable()
|
||||||
<< ": file " << gambitFile << " not found"
|
<< ": file " << gambitFile << " not found"
|
||||||
<< abort(FatalError);
|
<< abort(FatalError);
|
||||||
|
|
15
etc/bashrc
15
etc/bashrc
|
@ -96,17 +96,20 @@ export WM_THIRD_PARTY_DIR=$WM_PROJECT_DIR/ThirdParty
|
||||||
|
|
||||||
#
|
#
|
||||||
# For AllMake.stage2
|
# 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
|
#export WM_THIRD_PARTY_USE_OPENMPI_400=1
|
||||||
|
|
||||||
#
|
#
|
||||||
# For AllMake.stage3
|
# 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_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_MESQUITE_230=1
|
||||||
export WM_THIRD_PARTY_USE_SCOTCH_604=1
|
export SCOTCH_SYSTEM=1
|
||||||
export WM_THIRD_PARTY_USE_PARMETIS_403=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_PYFOAM_069=1
|
||||||
export WM_THIRD_PARTY_USE_HWLOC_201=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_COMPILE_OPTION:=Opt}; export WM_COMPILE_OPTION
|
||||||
|
|
||||||
# WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI | MVAPICH2
|
# 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>
|
# WM_NCOMPPROCS = <number of processes to use>
|
||||||
# Warning: Need to use a complete path for foamGetSystemInfo because the PATH
|
# Warning: Need to use a complete path for foamGetSystemInfo because the PATH
|
||||||
|
|
14
etc/cshrc
14
etc/cshrc
|
@ -82,16 +82,19 @@ setenv WM_THIRD_PARTY_DIR $WM_PROJECT_DIR/ThirdParty
|
||||||
|
|
||||||
#
|
#
|
||||||
# For AllMake.stage2
|
# For AllMake.stage2
|
||||||
setenv WM_THIRD_PARTY_USE_OPENMPI_188 1
|
#setenv WM_THIRD_PARTY_USE_OPENMPI_188 1
|
||||||
|
|
||||||
#
|
#
|
||||||
# For AllMake.stage3
|
# 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_PARMGRIDGEN_10 1
|
||||||
setenv WM_THIRD_PARTY_USE_LIBCCMIO_261 1
|
setenv WM_THIRD_PARTY_USE_LIBCCMIO_261 1
|
||||||
setenv WM_THIRD_PARTY_USE_MESQUITE_230 1
|
setenv WM_THIRD_PARTY_USE_MESQUITE_230 1
|
||||||
setenv WM_THIRD_PARTY_USE_SCOTCH_604 1
|
setenv SCOTCH_SYSTEM 1
|
||||||
setenv WM_THIRD_PARTY_USE_PARMETIS_403 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_PYFOAM_069 1
|
||||||
setenv WM_THIRD_PARTY_USE_HWLOC_201 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
|
#setenv WM_COMPILE_OPTION Debug
|
||||||
|
|
||||||
# WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI | MVAPICH2
|
# 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>
|
# WM_NCOMPPROCS = <number of processes to use>
|
||||||
# Warning: Need to use a complete path for foamGetSystemInfo because the PATH
|
# Warning: Need to use a complete path for foamGetSystemInfo because the PATH
|
||||||
|
|
|
@ -201,7 +201,7 @@ case SYSTEMOPENMPI:
|
||||||
|
|
||||||
# make sure not the "old" mpi is used
|
# make sure not the "old" mpi is used
|
||||||
# Not sure if this is necessary anymore.
|
# Not sure if this is necessary anymore.
|
||||||
# export OPAL_PREFIX=
|
# unsetenv OPAL_PREFIX
|
||||||
|
|
||||||
# Make sure OPENMPI_BIN_DIR is set and valid
|
# Make sure OPENMPI_BIN_DIR is set and valid
|
||||||
if ($?OPENMPI_BIN_DIR != 0 ) then
|
if ($?OPENMPI_BIN_DIR != 0 ) then
|
||||||
|
@ -242,7 +242,7 @@ case SYSTEMOPENMPI:
|
||||||
|
|
||||||
setenv MPI_HOME `dirname $OPENMPI_BIN_DIR`
|
setenv MPI_HOME `dirname $OPENMPI_BIN_DIR`
|
||||||
setenv MPI_ARCH_PATH $MPI_HOME
|
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:
|
# We initialize the rest of the environment using mpicc --showme:
|
||||||
if ($?OPENMPI_INCLUDE_DIR == 0) then
|
if ($?OPENMPI_INCLUDE_DIR == 0) then
|
||||||
|
@ -513,12 +513,24 @@ endif
|
||||||
|
|
||||||
# Metis library if available
|
# 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
|
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
|
_foamSource $WM_THIRD_PARTY_DIR/packages/metis-5.1.0/platforms/$WM_OPTIONS/etc/metis-5.1.0.csh
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ParMetis library if available
|
# 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
|
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
|
_foamSource $WM_THIRD_PARTY_DIR/packages/parmetis-4.0.3/platforms/$WM_OPTIONS/etc/parmetis-4.0.3.csh
|
||||||
endif
|
endif
|
||||||
|
@ -538,6 +550,12 @@ endif
|
||||||
|
|
||||||
# Scotch library if available
|
# 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
|
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
|
_foamSource $WM_THIRD_PARTY_DIR/packages/scotch-6.0.4/platforms/$WM_OPTIONS/etc/scotch-6.0.4.csh
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -331,7 +331,7 @@ SYSTEMOPENMPI)
|
||||||
|
|
||||||
export MPI_HOME=`dirname $OPENMPI_BIN_DIR`
|
export MPI_HOME=`dirname $OPENMPI_BIN_DIR`
|
||||||
export MPI_ARCH_PATH=$MPI_HOME
|
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:
|
# We initialize the rest of the environment using mpicc --showme:
|
||||||
[ ! -n "${OPENMPI_INCLUDE_DIR}" ] && export OPENMPI_INCLUDE_DIR="`mpicc --showme:incdirs`"
|
[ ! -n "${OPENMPI_INCLUDE_DIR}" ] && export OPENMPI_INCLUDE_DIR="`mpicc --showme:incdirs`"
|
||||||
|
@ -616,6 +616,13 @@ export MPI_BUFFER_SIZE
|
||||||
|
|
||||||
# Load Metis library
|
# 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 ] && {
|
[ -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
|
_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
|
# 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 ] && {
|
[ -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
|
_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
|
# 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 ] && {
|
[ -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
|
_foamSource $WM_THIRD_PARTY_DIR/packages/scotch-6.0.4/platforms/$WM_OPTIONS/etc/scotch-6.0.4.sh
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
Foam::boundaryPatch::boundaryPatch
|
||||||
(
|
(
|
||||||
const word& name,
|
const word& name,
|
||||||
|
@ -71,12 +63,6 @@ Foam::autoPtr<Foam::boundaryPatch> Foam::boundaryPatch::clone() const
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
|
|
||||||
|
|
||||||
Foam::boundaryPatch::~boundaryPatch()
|
|
||||||
{}
|
|
||||||
|
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||||
|
|
||||||
void Foam::boundaryPatch::write(Ostream& os) const
|
void Foam::boundaryPatch::write(Ostream& os) const
|
||||||
|
|
|
@ -85,16 +85,12 @@ public:
|
||||||
const label index
|
const label index
|
||||||
);
|
);
|
||||||
|
|
||||||
//- Construct as copy
|
|
||||||
boundaryPatch(const boundaryPatch&);
|
|
||||||
|
|
||||||
//- Clone
|
//- Clone
|
||||||
autoPtr<boundaryPatch> clone() const;
|
autoPtr<boundaryPatch> clone() const;
|
||||||
|
|
||||||
|
|
||||||
// Destructor
|
//- Destructor
|
||||||
|
~boundaryPatch() = default;
|
||||||
~boundaryPatch();
|
|
||||||
|
|
||||||
|
|
||||||
// Member Functions
|
// Member Functions
|
||||||
|
|
|
@ -145,9 +145,6 @@ public:
|
||||||
const vector& n
|
const vector& n
|
||||||
);
|
);
|
||||||
|
|
||||||
//- Construct as copy
|
|
||||||
inline directionInfo(const directionInfo&);
|
|
||||||
|
|
||||||
|
|
||||||
// Member Functions
|
// Member Functions
|
||||||
|
|
||||||
|
|
|
@ -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 * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||||
|
|
||||||
inline bool Foam::directionInfo::valid() const
|
inline bool Foam::directionInfo::valid() const
|
||||||
|
|
|
@ -89,8 +89,6 @@ public:
|
||||||
//- Construct from normal
|
//- Construct from normal
|
||||||
inline wallNormalInfo(const vector& normal);
|
inline wallNormalInfo(const vector& normal);
|
||||||
|
|
||||||
//- Construct as copy
|
|
||||||
inline wallNormalInfo(const wallNormalInfo&);
|
|
||||||
|
|
||||||
// Member Functions
|
// Member Functions
|
||||||
|
|
||||||
|
|
|
@ -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 * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||||
|
|
||||||
inline const Foam::vector& Foam::wallNormalInfo::normal() const
|
inline const Foam::vector& Foam::wallNormalInfo::normal() const
|
||||||
|
|
|
@ -90,20 +90,27 @@ class changeMap
|
||||||
public:
|
public:
|
||||||
|
|
||||||
// Constructor
|
// Constructor
|
||||||
changeMap()
|
|
||||||
:
|
//- Construct null
|
||||||
index_(-1),
|
changeMap()
|
||||||
pIndex_(-1),
|
:
|
||||||
type_(-1),
|
index_(-1),
|
||||||
addedPoints_(5),
|
pIndex_(-1),
|
||||||
addedEdges_(5),
|
type_(-1),
|
||||||
addedFaces_(5),
|
addedPoints_(5),
|
||||||
addedCells_(5),
|
addedEdges_(5),
|
||||||
removedPoints_(5),
|
addedFaces_(5),
|
||||||
removedEdges_(5),
|
addedCells_(5),
|
||||||
removedFaces_(5),
|
removedPoints_(5),
|
||||||
removedCells_(5)
|
removedEdges_(5),
|
||||||
{}
|
removedFaces_(5),
|
||||||
|
removedCells_(5)
|
||||||
|
{}
|
||||||
|
|
||||||
|
//- Copy constructor
|
||||||
|
// Bugfix, HJ, 5/Jul/2021
|
||||||
|
changeMap(const changeMap&) = default;
|
||||||
|
|
||||||
|
|
||||||
//- Access
|
//- Access
|
||||||
|
|
||||||
|
|
|
@ -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
|
} // End namespace Foam
|
||||||
|
|
|
@ -168,11 +168,6 @@ public:
|
||||||
bool igniting() const;
|
bool igniting() const;
|
||||||
|
|
||||||
bool ignited() const;
|
bool ignited() const;
|
||||||
|
|
||||||
|
|
||||||
// Member Operators
|
|
||||||
|
|
||||||
void operator=(const ignitionSite&);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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>
|
template<class Key, class Hash>
|
||||||
bool Foam::HashSet<Key, Hash>::operator==(const HashSet<Key, Hash>& rhs) const
|
bool Foam::HashSet<Key, Hash>::operator==(const HashSet<Key, Hash>& rhs) const
|
||||||
{
|
{
|
||||||
|
|
|
@ -156,6 +156,9 @@ public:
|
||||||
//- Return true if the entry exists, same as found()
|
//- Return true if the entry exists, same as found()
|
||||||
inline bool operator[](const Key&) const;
|
inline bool operator[](const Key&) const;
|
||||||
|
|
||||||
|
//- Assignment operator
|
||||||
|
void operator=(const HashSet<Key, Hash>&);
|
||||||
|
|
||||||
//- Equality. Two hashtables are equal when their contents are equal.
|
//- Equality. Two hashtables are equal when their contents are equal.
|
||||||
// Independent of table size or order.
|
// Independent of table size or order.
|
||||||
bool operator==(const HashSet<Key, Hash>&) const;
|
bool operator==(const HashSet<Key, Hash>&) const;
|
||||||
|
|
|
@ -91,6 +91,13 @@ public:
|
||||||
HashTable<T, label, Hash<label> >(map)
|
HashTable<T, label, Hash<label> >(map)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
|
||||||
|
// Member Operators
|
||||||
|
|
||||||
|
void operator=(const Map<T>& map)
|
||||||
|
{
|
||||||
|
HashTable<T, label, Hash<label>>::operator=(map);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -203,6 +203,10 @@ public:
|
||||||
//- Construct for a given DLListBase and link
|
//- Construct for a given DLListBase and link
|
||||||
inline iterator(DLListBase&, link*);
|
inline iterator(DLListBase&, link*);
|
||||||
|
|
||||||
|
//- Construct as copy
|
||||||
|
inline iterator(const iterator&) = default;
|
||||||
|
|
||||||
|
|
||||||
// Member operators
|
// Member operators
|
||||||
|
|
||||||
inline void operator=(const iterator&);
|
inline void operator=(const iterator&);
|
||||||
|
@ -238,9 +242,13 @@ public:
|
||||||
//- Construct for a given DLListBase and link
|
//- Construct for a given DLListBase and link
|
||||||
inline const_iterator(const DLListBase&, const 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
|
//- Construct from a non-const iterator
|
||||||
inline const_iterator(const iterator&);
|
inline const_iterator(const iterator&);
|
||||||
|
|
||||||
|
|
||||||
// Member operators
|
// Member operators
|
||||||
|
|
||||||
inline void operator=(const const_iterator&);
|
inline void operator=(const const_iterator&);
|
||||||
|
|
|
@ -188,6 +188,10 @@ public:
|
||||||
//- Construct for a given SLListBase and link
|
//- Construct for a given SLListBase and link
|
||||||
inline iterator(SLListBase&, link*);
|
inline iterator(SLListBase&, link*);
|
||||||
|
|
||||||
|
//- Construct as copy
|
||||||
|
inline iterator(const iterator&) = default;
|
||||||
|
|
||||||
|
|
||||||
// Member operators
|
// Member operators
|
||||||
|
|
||||||
inline void operator=(const iterator&);
|
inline void operator=(const iterator&);
|
||||||
|
@ -223,6 +227,9 @@ public:
|
||||||
//- Construct for a given SLListBase and link
|
//- Construct for a given SLListBase and link
|
||||||
inline const_iterator(const SLListBase&, const 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
|
//- Construct from a non-const iterator
|
||||||
inline const_iterator(const iterator&);
|
inline const_iterator(const iterator&);
|
||||||
|
|
||||||
|
|
|
@ -204,6 +204,9 @@ public:
|
||||||
//- Return element of constant FixedList.
|
//- Return element of constant FixedList.
|
||||||
inline const T& operator[](const label) const;
|
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.
|
//- Assignment from array operator. Takes linear time.
|
||||||
inline void operator=(const T v[Size]);
|
inline void operator=(const T v[Size]);
|
||||||
|
|
||||||
|
|
|
@ -131,7 +131,7 @@ inline void Foam::FixedList<T, Size>::checkStart(const label start) const
|
||||||
{
|
{
|
||||||
if (start < 0 || (start && unsigned(start) >= Size))
|
if (start < 0 || (start && unsigned(start) >= Size))
|
||||||
{
|
{
|
||||||
FatalErrorIn("FixedList<T, Size>::checkStart(const label)")
|
FatalErrorInFunction
|
||||||
<< "start " << start << " out of range 0 ... " << (Size-1)
|
<< "start " << start << " out of range 0 ... " << (Size-1)
|
||||||
<< abort(FatalError);
|
<< abort(FatalError);
|
||||||
}
|
}
|
||||||
|
@ -144,8 +144,8 @@ inline void Foam::FixedList<T, Size>::checkSize(const label size) const
|
||||||
{
|
{
|
||||||
if (size < 0 || unsigned(size) > Size)
|
if (size < 0 || unsigned(size) > Size)
|
||||||
{
|
{
|
||||||
FatalErrorIn("FixedList<T, Size>::checkSize(const label)")
|
FatalErrorInFunction
|
||||||
<< "size " << size << " out of range 0 ... " << (Size)
|
<< "size " << size << " != " << Size
|
||||||
<< abort(FatalError);
|
<< 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>
|
template<class T, unsigned Size>
|
||||||
inline void Foam::FixedList<T, Size>::operator=(const T lst[Size])
|
inline void Foam::FixedList<T, Size>::operator=(const T lst[Size])
|
||||||
{
|
{
|
||||||
|
|
|
@ -68,10 +68,10 @@ class NamedEnum
|
||||||
// Private Member Functions
|
// Private Member Functions
|
||||||
|
|
||||||
//- Disallow default bitwise copy construct
|
//- Disallow default bitwise copy construct
|
||||||
NamedEnum(const NamedEnum&);
|
NamedEnum(const NamedEnum&) = delete;
|
||||||
|
|
||||||
//- Disallow default bitwise assignment
|
//- Disallow default bitwise assignment
|
||||||
void operator=(const NamedEnum&);
|
void operator=(const NamedEnum&) = delete;
|
||||||
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -251,6 +251,9 @@ public:
|
||||||
bool registerObject = true
|
bool registerObject = true
|
||||||
);
|
);
|
||||||
|
|
||||||
|
//- Copy construct
|
||||||
|
IOobject(const IOobject&) = default;
|
||||||
|
|
||||||
//- Clone
|
//- Clone
|
||||||
Foam::autoPtr<IOobject> clone() const
|
Foam::autoPtr<IOobject> clone() const
|
||||||
{
|
{
|
||||||
|
|
|
@ -180,6 +180,14 @@ Foam::IOdictionary::IOdictionary(const IOobject& io, Istream& is)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Foam::IOdictionary::IOdictionary(const IOdictionary& dict)
|
||||||
|
:
|
||||||
|
regIOobject(dict),
|
||||||
|
dictionary(dict)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * * //
|
||||||
|
|
||||||
Foam::IOdictionary::~IOdictionary()
|
Foam::IOdictionary::~IOdictionary()
|
||||||
|
|
|
@ -83,6 +83,9 @@ public:
|
||||||
//- Construct given an IOobject and Istream
|
//- Construct given an IOobject and Istream
|
||||||
IOdictionary(const IOobject&, Istream&);
|
IOdictionary(const IOobject&, Istream&);
|
||||||
|
|
||||||
|
//- Copy constructor
|
||||||
|
IOdictionary(const IOdictionary&);
|
||||||
|
|
||||||
|
|
||||||
//- Destructor
|
//- Destructor
|
||||||
virtual ~IOdictionary();
|
virtual ~IOdictionary();
|
||||||
|
|
|
@ -208,6 +208,21 @@ public:
|
||||||
|
|
||||||
//- Print description of IOstream to Ostream
|
//- Print description of IOstream to Ostream
|
||||||
void print(Ostream&) const;
|
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();
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -74,6 +74,12 @@ Foam::dimensionSet::dimensionSet
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Foam::dimensionSet::dimensionSet(const dimensionSet& ds)
|
||||||
|
{
|
||||||
|
reset(ds);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||||
|
|
||||||
bool Foam::dimensionSet::dimensionless() const
|
bool Foam::dimensionSet::dimensionless() const
|
||||||
|
|
|
@ -43,6 +43,7 @@ SourceFiles
|
||||||
#include "bool.H"
|
#include "bool.H"
|
||||||
#include "dimensionedScalarFwd.H"
|
#include "dimensionedScalarFwd.H"
|
||||||
#include "className.H"
|
#include "className.H"
|
||||||
|
#include "autoPtr.H"
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||||
|
|
||||||
|
@ -139,7 +140,7 @@ public:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
// private data
|
// Private data
|
||||||
|
|
||||||
// dimensionSet stored as an array of dimension exponents
|
// dimensionSet stored as an array of dimension exponents
|
||||||
scalar exponents_[nDimensions];
|
scalar exponents_[nDimensions];
|
||||||
|
@ -180,6 +181,15 @@ public:
|
||||||
//- Construct from Istream
|
//- Construct from Istream
|
||||||
dimensionSet(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
|
// Member functions
|
||||||
|
|
||||||
|
|
|
@ -294,6 +294,12 @@ void Foam::CoeffField<Foam::scalar>::addSubset
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * 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)
|
void Foam::CoeffField<Foam::scalar>::operator=(const scalarField& f)
|
||||||
{
|
{
|
||||||
scalarField::operator=(f);
|
scalarField::operator=(f);
|
||||||
|
|
|
@ -188,6 +188,7 @@ public:
|
||||||
|
|
||||||
// Member operators
|
// Member operators
|
||||||
|
|
||||||
|
void operator=(const CoeffField<scalar>&);
|
||||||
void operator=(const scalarField&);
|
void operator=(const scalarField&);
|
||||||
void operator=(const tmp<scalarField>&);
|
void operator=(const tmp<scalarField>&);
|
||||||
|
|
||||||
|
|
|
@ -72,12 +72,6 @@ Foam::patchIdentifier::patchIdentifier
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
|
|
||||||
|
|
||||||
Foam::patchIdentifier::~patchIdentifier()
|
|
||||||
{}
|
|
||||||
|
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||||
|
|
||||||
bool Foam::patchIdentifier::inGroup(const word& name) const
|
bool Foam::patchIdentifier::inGroup(const word& name) const
|
||||||
|
|
|
@ -102,7 +102,7 @@ public:
|
||||||
|
|
||||||
|
|
||||||
//- Destructor
|
//- Destructor
|
||||||
virtual ~patchIdentifier();
|
virtual ~patchIdentifier() = default;
|
||||||
|
|
||||||
|
|
||||||
// Member Functions
|
// Member Functions
|
||||||
|
|
|
@ -367,8 +367,7 @@ void Foam::mapDistribute::distribute
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
FatalErrorInFunction
|
FatalErrorInFunction
|
||||||
<< "Unknown communication schedule "
|
<< "Unknown communication schedule " << int(commsType)
|
||||||
<< Pstream::commsTypeNames[commsType]
|
|
||||||
<< abort(FatalError);
|
<< abort(FatalError);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -709,7 +708,7 @@ void Foam::mapDistribute::distribute
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
FatalErrorInFunction
|
FatalErrorInFunction
|
||||||
<< "Unknown communication schedule " << commsType
|
<< "Unknown communication schedule " << int(commsType)
|
||||||
<< abort(FatalError);
|
<< abort(FatalError);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -126,7 +126,6 @@ public:
|
||||||
|
|
||||||
// Member operators
|
// Member operators
|
||||||
|
|
||||||
inline const complex& operator=(const complex&);
|
|
||||||
inline void operator+=(const complex&);
|
inline void operator+=(const complex&);
|
||||||
inline void operator-=(const complex&);
|
inline void operator-=(const complex&);
|
||||||
inline void operator*=(const complex&);
|
inline void operator*=(const complex&);
|
||||||
|
|
|
@ -75,14 +75,6 @@ inline complex complex::conjugate() const
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * 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)
|
inline void complex::operator+=(const complex& c)
|
||||||
{
|
{
|
||||||
re += c.re;
|
re += c.re;
|
||||||
|
|
|
@ -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>
|
template<int PolySize>
|
||||||
Foam::Polynomial<PolySize>::Polynomial(const scalar coeffs[PolySize])
|
Foam::Polynomial<PolySize>::Polynomial(const scalar coeffs[PolySize])
|
||||||
:
|
:
|
||||||
|
|
|
@ -107,9 +107,6 @@ public:
|
||||||
//- Construct null, with all coefficients = 0.0
|
//- Construct null, with all coefficients = 0.0
|
||||||
Polynomial();
|
Polynomial();
|
||||||
|
|
||||||
//- Copy constructor
|
|
||||||
Polynomial(const Polynomial&);
|
|
||||||
|
|
||||||
//- Construct from C-array of coefficients
|
//- Construct from C-array of coefficients
|
||||||
explicit Polynomial(const scalar coeffs[PolySize]);
|
explicit Polynomial(const scalar coeffs[PolySize]);
|
||||||
|
|
||||||
|
|
|
@ -112,6 +112,9 @@ public:
|
||||||
//- Construct from Istream
|
//- Construct from Istream
|
||||||
quaternion(Istream&);
|
quaternion(Istream&);
|
||||||
|
|
||||||
|
//- Copy construct
|
||||||
|
quaternion(const quaternion&) = default;
|
||||||
|
|
||||||
|
|
||||||
// Member functions
|
// Member functions
|
||||||
|
|
||||||
|
|
|
@ -126,7 +126,6 @@ public:
|
||||||
|
|
||||||
// Member operators
|
// Member operators
|
||||||
|
|
||||||
inline void operator=(const septernion&);
|
|
||||||
inline void operator*=(const septernion&);
|
inline void operator*=(const septernion&);
|
||||||
|
|
||||||
inline void operator=(const vector&);
|
inline void operator=(const vector&);
|
||||||
|
|
|
@ -87,12 +87,6 @@ inline Foam::vector Foam::septernion::invTransform(const vector& v) const
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
|
||||||
|
|
||||||
inline void Foam::septernion::operator=(const septernion& tr)
|
|
||||||
{
|
|
||||||
t_ = tr.t_;
|
|
||||||
r_ = tr.r_;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void Foam::septernion::operator*=(const septernion& tr)
|
inline void Foam::septernion::operator*=(const septernion& tr)
|
||||||
{
|
{
|
||||||
t_ += r().transform(tr.t());
|
t_ += r().transform(tr.t());
|
||||||
|
|
|
@ -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 * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||||
|
|
||||||
void Foam::phaseProperties::initialiseGlobalIds
|
void Foam::phaseProperties::initialiseGlobalIds
|
||||||
|
|
|
@ -125,12 +125,9 @@ public:
|
||||||
//- Construct from Istream
|
//- Construct from Istream
|
||||||
phaseProperties(Istream&);
|
phaseProperties(Istream&);
|
||||||
|
|
||||||
//- Construct as copy
|
|
||||||
phaseProperties(const phaseProperties&);
|
|
||||||
|
|
||||||
|
|
||||||
//- Destructor
|
//- Destructor
|
||||||
~phaseProperties();
|
~phaseProperties() = default;
|
||||||
|
|
||||||
|
|
||||||
// Public member functions
|
// Public member functions
|
||||||
|
|
|
@ -117,9 +117,6 @@ public:
|
||||||
const vector& v
|
const vector& v
|
||||||
);
|
);
|
||||||
|
|
||||||
//- Construct as copy
|
|
||||||
inline pointData(const pointData&);
|
|
||||||
|
|
||||||
|
|
||||||
// Member Functions
|
// Member Functions
|
||||||
|
|
||||||
|
|
|
@ -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 * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||||
|
|
||||||
inline const Foam::point& Foam::pointData::origin() const
|
inline const Foam::point& Foam::pointData::origin() const
|
||||||
|
|
|
@ -172,12 +172,6 @@ Foam::blockDescriptor::blockDescriptor
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
|
|
||||||
|
|
||||||
Foam::blockDescriptor::~blockDescriptor()
|
|
||||||
{}
|
|
||||||
|
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||||
|
|
||||||
const Foam::pointField& Foam::blockDescriptor::blockPointField() const
|
const Foam::pointField& Foam::blockDescriptor::blockPointField() const
|
||||||
|
|
|
@ -79,7 +79,7 @@ class blockDescriptor
|
||||||
Vector<label> meshDensity_;
|
Vector<label> meshDensity_;
|
||||||
|
|
||||||
//- Block edge points
|
//- Block edge points
|
||||||
List< List<point> > edgePoints_;
|
List<List<point> > edgePoints_;
|
||||||
|
|
||||||
//- Block edge weighting factors
|
//- Block edge weighting factors
|
||||||
scalarListList edgeWeights_;
|
scalarListList edgeWeights_;
|
||||||
|
@ -99,12 +99,6 @@ class blockDescriptor
|
||||||
void setEdge(label edgeI, label start, label end, label dim);
|
void setEdge(label edgeI, label start, label end, label dim);
|
||||||
|
|
||||||
|
|
||||||
// Private Member Functions
|
|
||||||
|
|
||||||
//- Disallow default bitwise assignment
|
|
||||||
void operator=(const blockDescriptor&);
|
|
||||||
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
// Constructors
|
// Constructors
|
||||||
|
@ -137,7 +131,7 @@ public:
|
||||||
|
|
||||||
|
|
||||||
//- Destructor
|
//- Destructor
|
||||||
~blockDescriptor();
|
~blockDescriptor() = default;
|
||||||
|
|
||||||
|
|
||||||
// Member Functions
|
// Member Functions
|
||||||
|
|
|
@ -47,7 +47,7 @@ namespace Foam
|
||||||
{
|
{
|
||||||
|
|
||||||
/*---------------------------------------------------------------------------*\
|
/*---------------------------------------------------------------------------*\
|
||||||
Class labelledPair Declaration
|
Class labelledPair Declaration
|
||||||
\*---------------------------------------------------------------------------*/
|
\*---------------------------------------------------------------------------*/
|
||||||
|
|
||||||
class labelledPair
|
class labelledPair
|
||||||
|
@ -81,8 +81,7 @@ class labelledPair
|
||||||
{}
|
{}
|
||||||
|
|
||||||
// Destructor
|
// Destructor
|
||||||
~labelledPair()
|
~labelledPair() = default;
|
||||||
{}
|
|
||||||
|
|
||||||
// Member functions
|
// Member functions
|
||||||
//- return pair label
|
//- return pair label
|
||||||
|
@ -99,13 +98,7 @@ class labelledPair
|
||||||
|
|
||||||
// Member operators
|
// Member operators
|
||||||
|
|
||||||
inline void operator=(const labelledPair& lpp)
|
inline bool operator==
|
||||||
{
|
|
||||||
pLabel_ = lpp.pLabel_;
|
|
||||||
pair_ = lpp.pair_;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool operator==
|
|
||||||
(
|
(
|
||||||
const labelledPair& lpp
|
const labelledPair& lpp
|
||||||
) const
|
) const
|
||||||
|
@ -115,10 +108,23 @@ class labelledPair
|
||||||
|
|
||||||
const labelPair& op = lpp.pair_;
|
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;
|
return true;
|
||||||
if( (pair_.first() == op.second()) && (pair_.second() == op.first()) )
|
}
|
||||||
|
|
||||||
|
if
|
||||||
|
(
|
||||||
|
(pair_.first() == op.second())
|
||||||
|
&& (pair_.second() == op.first())
|
||||||
|
)
|
||||||
|
{
|
||||||
return true;
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -77,9 +77,8 @@ class labelledPoint
|
||||||
coords_(p)
|
coords_(p)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
// Destructor
|
//- Destructor
|
||||||
~labelledPoint()
|
~labelledPoint() = default;
|
||||||
{}
|
|
||||||
|
|
||||||
// Member functions
|
// Member functions
|
||||||
//- return point label
|
//- return point label
|
||||||
|
@ -106,12 +105,6 @@ class labelledPoint
|
||||||
|
|
||||||
// Member operators
|
// Member operators
|
||||||
|
|
||||||
inline void operator=(const labelledPoint& lp)
|
|
||||||
{
|
|
||||||
pLabel_ = lp.pLabel_;
|
|
||||||
coords_ = lp.coords_;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool operator==(const labelledPoint& lp) const
|
inline bool operator==(const labelledPoint& lp) const
|
||||||
{
|
{
|
||||||
if( pLabel_ == lp.pLabel_ )
|
if( pLabel_ == lp.pLabel_ )
|
||||||
|
|
|
@ -76,9 +76,9 @@ class refLabelledPoint
|
||||||
p_(p)
|
p_(p)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
// Destructor
|
//- Destructor
|
||||||
~refLabelledPoint()
|
~refLabelledPoint() = default;
|
||||||
{}
|
|
||||||
|
|
||||||
// Member functions
|
// Member functions
|
||||||
//- return label of the object it is associated to
|
//- return label of the object it is associated to
|
||||||
|
@ -95,12 +95,6 @@ class refLabelledPoint
|
||||||
|
|
||||||
// Member operators
|
// Member operators
|
||||||
|
|
||||||
inline void operator=(const refLabelledPoint& lp)
|
|
||||||
{
|
|
||||||
objectLabel_ = lp.objectLabel_;
|
|
||||||
p_ = lp.p_;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool operator==(const refLabelledPoint& lp) const
|
inline bool operator==(const refLabelledPoint& lp) const
|
||||||
{
|
{
|
||||||
if( objectLabel_ == lp.objectLabel_ )
|
if( objectLabel_ == lp.objectLabel_ )
|
||||||
|
|
|
@ -82,9 +82,9 @@ class labelledPointScalar
|
||||||
weight_(s)
|
weight_(s)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
// Destructor
|
//- Destructor
|
||||||
~labelledPointScalar()
|
~labelledPointScalar() = default;
|
||||||
{}
|
|
||||||
|
|
||||||
// Member functions
|
// Member functions
|
||||||
//- return point label
|
//- return point label
|
||||||
|
@ -122,13 +122,6 @@ class labelledPointScalar
|
||||||
|
|
||||||
// Member operators
|
// Member operators
|
||||||
|
|
||||||
inline void operator=(const labelledPointScalar& lps)
|
|
||||||
{
|
|
||||||
pLabel_ = lps.pLabel_;
|
|
||||||
coords_ = lps.coords_;
|
|
||||||
weight_ = lps.weight_;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool operator==(const labelledPointScalar& lps) const
|
inline bool operator==(const labelledPointScalar& lps) const
|
||||||
{
|
{
|
||||||
if( pLabel_ == lps.pLabel_ )
|
if( pLabel_ == lps.pLabel_ )
|
||||||
|
|
|
@ -126,16 +126,6 @@ Istream& processorBoundaryPatch::operator>>(Istream& is)
|
||||||
return 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
|
bool processorBoundaryPatch::operator!=(const processorBoundaryPatch& wp) const
|
||||||
{
|
{
|
||||||
if( name_ != wp.name_ )
|
if( name_ != wp.name_ )
|
||||||
|
|
|
@ -148,8 +148,6 @@ public:
|
||||||
|
|
||||||
Istream& operator>>(Istream&);
|
Istream& operator>>(Istream&);
|
||||||
|
|
||||||
void operator=(const processorBoundaryPatch&);
|
|
||||||
|
|
||||||
bool operator!=(const processorBoundaryPatch&) const;
|
bool operator!=(const processorBoundaryPatch&) const;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -51,9 +51,11 @@ namespace Foam
|
||||||
\*---------------------------------------------------------------------------*/
|
\*---------------------------------------------------------------------------*/
|
||||||
|
|
||||||
class meshOctreeCubeBasic
|
class meshOctreeCubeBasic
|
||||||
: public meshOctreeCubeCoordinates
|
:
|
||||||
|
public meshOctreeCubeCoordinates
|
||||||
{
|
{
|
||||||
// Private data
|
// Private data
|
||||||
|
|
||||||
//- cube type
|
//- cube type
|
||||||
direction cubeType_;
|
direction cubeType_;
|
||||||
|
|
||||||
|
@ -80,10 +82,9 @@ public:
|
||||||
const short procNo = ALLPROCS
|
const short procNo = ALLPROCS
|
||||||
);
|
);
|
||||||
|
|
||||||
// Destructor
|
//- Destructor
|
||||||
|
~meshOctreeCubeBasic() = default;
|
||||||
|
|
||||||
~meshOctreeCubeBasic()
|
|
||||||
{}
|
|
||||||
|
|
||||||
// Enumerators
|
// Enumerators
|
||||||
|
|
||||||
|
@ -98,6 +99,7 @@ public:
|
||||||
};
|
};
|
||||||
|
|
||||||
// Member functions
|
// Member functions
|
||||||
|
|
||||||
//- return type
|
//- return type
|
||||||
inline direction cubeType() const;
|
inline direction cubeType() const;
|
||||||
|
|
||||||
|
@ -113,10 +115,6 @@ public:
|
||||||
//- return coordinates in the octree
|
//- return coordinates in the octree
|
||||||
inline const meshOctreeCubeCoordinates& coordinates() const;
|
inline const meshOctreeCubeCoordinates& coordinates() const;
|
||||||
|
|
||||||
// Member operators
|
|
||||||
|
|
||||||
inline void operator=(const meshOctreeCubeBasic&);
|
|
||||||
|
|
||||||
// Friend operators
|
// Friend operators
|
||||||
|
|
||||||
friend inline Ostream& operator<<
|
friend inline Ostream& operator<<
|
||||||
|
|
|
@ -95,15 +95,6 @@ inline const meshOctreeCubeCoordinates& meshOctreeCubeBasic::coordinates() const
|
||||||
return *this;
|
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<<
|
inline Ostream& operator<<
|
||||||
(
|
(
|
||||||
Ostream& os,
|
Ostream& os,
|
||||||
|
|
|
@ -62,12 +62,6 @@ patchRefinement::patchRefinement(Istream& is)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
|
|
||||||
|
|
||||||
patchRefinement::~patchRefinement()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||||
|
|
||||||
word patchRefinement::patchName() const
|
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)
|
Istream& operator>>(Istream& is, patchRefinement& pr)
|
||||||
{
|
{
|
||||||
pr.patchName_ = word(is);
|
pr.patchName_ = word(is);
|
||||||
|
|
|
@ -76,9 +76,8 @@ public:
|
||||||
//- contruct from stream
|
//- contruct from stream
|
||||||
patchRefinement(Istream&);
|
patchRefinement(Istream&);
|
||||||
|
|
||||||
// Destructor
|
//- Destructor
|
||||||
|
~patchRefinement() = default;
|
||||||
~patchRefinement();
|
|
||||||
|
|
||||||
|
|
||||||
// Member Functions
|
// Member Functions
|
||||||
|
@ -90,7 +89,6 @@ public:
|
||||||
|
|
||||||
// Operators
|
// Operators
|
||||||
|
|
||||||
void operator=(const patchRefinement&);
|
|
||||||
friend Istream& operator>>(Istream&, patchRefinement&);
|
friend Istream& operator>>(Istream&, patchRefinement&);
|
||||||
friend Ostream& operator<<(Ostream&, const patchRefinement&);
|
friend Ostream& operator<<(Ostream&, const patchRefinement&);
|
||||||
friend bool operator==(const patchRefinement&, const patchRefinement&);
|
friend bool operator==(const patchRefinement&, const patchRefinement&);
|
||||||
|
|
|
@ -110,9 +110,6 @@ public:
|
||||||
//- Construct from origin, distance
|
//- Construct from origin, distance
|
||||||
inline pointEdgePoint(const point& origin, const scalar distSqr);
|
inline pointEdgePoint(const point& origin, const scalar distSqr);
|
||||||
|
|
||||||
//- Construct as copy
|
|
||||||
inline pointEdgePoint(const pointEdgePoint&);
|
|
||||||
|
|
||||||
|
|
||||||
// Member Functions
|
// Member Functions
|
||||||
|
|
||||||
|
|
|
@ -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 * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||||
|
|
||||||
inline const Foam::point& Foam::pointEdgePoint::origin() const
|
inline const Foam::point& Foam::pointEdgePoint::origin() const
|
||||||
|
|
|
@ -91,9 +91,6 @@ public:
|
||||||
//- Construct from cType
|
//- Construct from cType
|
||||||
inline cellInfo(const label);
|
inline cellInfo(const label);
|
||||||
|
|
||||||
//- Construct as copy
|
|
||||||
inline cellInfo(const cellInfo&);
|
|
||||||
|
|
||||||
|
|
||||||
// Member Functions
|
// Member Functions
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@ inline bool Foam::cellInfo::update
|
||||||
|| (w2.type() == cellClassification::CUT)
|
|| (w2.type() == cellClassification::CUT)
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
FatalErrorIn("cellInfo::update(const cellInfo&)")
|
FatalErrorInFunction
|
||||||
<< "Problem: trying to propagate NOTSET or CUT type:" << w2.type()
|
<< "Problem: trying to propagate NOTSET or CUT type:" << w2.type()
|
||||||
<< " into cell/face with type:" << type() << endl
|
<< " into cell/face with type:" << type() << endl
|
||||||
<< "thisFaceI:" << thisFaceI
|
<< "thisFaceI:" << thisFaceI
|
||||||
|
@ -52,6 +52,7 @@ inline bool Foam::cellInfo::update
|
||||||
<< " neighbourFaceI:" << neighbourFaceI
|
<< " neighbourFaceI:" << neighbourFaceI
|
||||||
<< " neighbourCellI:" << neighbourCellI
|
<< " neighbourCellI:" << neighbourCellI
|
||||||
<< abort(FatalError);
|
<< abort(FatalError);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -75,7 +76,7 @@ inline bool Foam::cellInfo::update
|
||||||
}
|
}
|
||||||
|
|
||||||
// Two conflicting types
|
// Two conflicting types
|
||||||
FatalErrorIn("cellInfo::update(const cellInfo&)")
|
FatalErrorInFunction
|
||||||
<< "Problem: trying to propagate conflicting types:" << w2.type()
|
<< "Problem: trying to propagate conflicting types:" << w2.type()
|
||||||
<< " into cell/face with type:" << type() << endl
|
<< " into cell/face with type:" << type() << endl
|
||||||
<< "thisFaceI:" << thisFaceI
|
<< "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 * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||||
|
|
||||||
inline bool Foam::cellInfo::valid() const
|
inline bool Foam::cellInfo::valid() const
|
||||||
|
|
|
@ -106,12 +106,6 @@ public:
|
||||||
const scalar distSqr
|
const scalar distSqr
|
||||||
);
|
);
|
||||||
|
|
||||||
//- Construct as copy
|
|
||||||
inline wallPoint
|
|
||||||
(
|
|
||||||
const wallPoint&
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
// Member Functions
|
// Member Functions
|
||||||
|
|
||||||
|
|
|
@ -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 * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||||
|
|
||||||
inline const Foam::point& Foam::wallPoint::origin() const
|
inline const Foam::point& Foam::wallPoint::origin() const
|
||||||
|
|
|
@ -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 * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||||
|
|
||||||
void Foam::surfacePatch::write(Ostream& os) const
|
void Foam::surfacePatch::write(Ostream& os) const
|
||||||
|
|
|
@ -67,6 +67,7 @@ class surfacePatch
|
||||||
//- Start label of this patch in the triSurface face list
|
//- Start label of this patch in the triSurface face list
|
||||||
label start_;
|
label start_;
|
||||||
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
//- Runtime type information
|
//- Runtime type information
|
||||||
|
@ -99,9 +100,6 @@ public:
|
||||||
const label index
|
const label index
|
||||||
);
|
);
|
||||||
|
|
||||||
//- Construct as copy
|
|
||||||
surfacePatch(const surfacePatch&);
|
|
||||||
|
|
||||||
|
|
||||||
// Member Functions
|
// Member Functions
|
||||||
|
|
||||||
|
@ -143,6 +141,7 @@ public:
|
||||||
//- compare.
|
//- compare.
|
||||||
bool operator==(const surfacePatch&) const;
|
bool operator==(const surfacePatch&) const;
|
||||||
|
|
||||||
|
|
||||||
// IOstream Operators
|
// IOstream Operators
|
||||||
|
|
||||||
friend Ostream& operator<<(Ostream&, const surfacePatch&);
|
friend Ostream& operator<<(Ostream&, const surfacePatch&);
|
||||||
|
|
|
@ -171,10 +171,12 @@ public:
|
||||||
withinBB_(is)
|
withinBB_(is)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
//- Copy constructor - default
|
//- Copy constructor
|
||||||
|
donorAcceptor(const donorAcceptor&) = default;
|
||||||
|
|
||||||
|
|
||||||
//- Destructor - default
|
//- Destructor
|
||||||
|
~donorAcceptor() = default;
|
||||||
|
|
||||||
|
|
||||||
// Member Functions
|
// 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 Operators
|
||||||
|
|
||||||
friend bool operator==
|
friend bool operator==
|
||||||
|
|
|
@ -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)
|
Foam::surfZone::surfZone(const surfZone& zone, const label index)
|
||||||
:
|
:
|
||||||
surfZoneIdentifier(zone, index),
|
surfZoneIdentifier(zone, index),
|
||||||
|
|
|
@ -105,9 +105,6 @@ public:
|
||||||
const label index
|
const label index
|
||||||
);
|
);
|
||||||
|
|
||||||
//- Construct as copy
|
|
||||||
surfZone(const surfZone&);
|
|
||||||
|
|
||||||
//- Construct from another zone, resetting the index
|
//- Construct from another zone, resetting the index
|
||||||
surfZone(const surfZone&, const label index);
|
surfZone(const surfZone&, const label index);
|
||||||
|
|
||||||
|
|
|
@ -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>
|
template<class Type>
|
||||||
elementPatchField<Type>::elementPatchField
|
elementPatchField<Type>::elementPatchField
|
||||||
(
|
(
|
||||||
|
|
|
@ -79,9 +79,6 @@ public:
|
||||||
const DimensionedField<Type, elementMesh>&
|
const DimensionedField<Type, elementMesh>&
|
||||||
);
|
);
|
||||||
|
|
||||||
//- Construct as copy
|
|
||||||
elementPatchField(const elementPatchField<Type>&);
|
|
||||||
|
|
||||||
//- Construct and return a clone
|
//- Construct and return a clone
|
||||||
virtual autoPtr<elementPatchField<Type> > clone() const
|
virtual autoPtr<elementPatchField<Type> > clone() const
|
||||||
{
|
{
|
||||||
|
@ -111,10 +108,8 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Destructor
|
//- Destructor
|
||||||
|
virtual ~elementPatchField() = default;
|
||||||
virtual ~elementPatchField()
|
|
||||||
{}
|
|
||||||
|
|
||||||
|
|
||||||
// Member operators
|
// Member operators
|
||||||
|
|
|
@ -88,12 +88,6 @@ Foam::radiation::absorptionCoeffs::coeffs
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void Foam::radiation::absorptionCoeffs::initialise(Istream&)
|
|
||||||
{
|
|
||||||
absorptionCoeffs(Istream);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void Foam::radiation::absorptionCoeffs::initialise(const dictionary& dict)
|
void Foam::radiation::absorptionCoeffs::initialise(const dictionary& dict)
|
||||||
{
|
{
|
||||||
dict.lookup("Tcommon") >> Tcommon_;
|
dict.lookup("Tcommon") >> Tcommon_;
|
||||||
|
|
|
@ -22,7 +22,7 @@ License
|
||||||
along with foam-extend. If not, see <http://www.gnu.org/licenses/>.
|
along with foam-extend. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
Class
|
Class
|
||||||
Foam::janafThermo
|
Foam::absorptionCoeffs
|
||||||
|
|
||||||
Description
|
Description
|
||||||
Absorption coefficients class used in greyMeanAbsorptionEmission and
|
Absorption coefficients class used in greyMeanAbsorptionEmission and
|
||||||
|
@ -110,9 +110,6 @@ public:
|
||||||
// Initialise from a dictionary
|
// Initialise from a dictionary
|
||||||
void initialise(const dictionary&);
|
void initialise(const dictionary&);
|
||||||
|
|
||||||
// Initialise from an Istream
|
|
||||||
void initialise(Istream&);
|
|
||||||
|
|
||||||
|
|
||||||
// Access Functions
|
// Access Functions
|
||||||
|
|
||||||
|
|
|
@ -126,9 +126,9 @@ Foam::scalar Foam::chemkinReader::molecularWeight
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
FatalErrorIn("chemkinReader::lex()")
|
FatalErrorInFunction
|
||||||
<< "Unknown element " << elementName
|
<< "Unknown element " << elementName
|
||||||
<< " on line " << lineNo_-1 << nl
|
<< " on line " << lineNo_ - 1 << nl
|
||||||
<< " specieComposition: " << specieComposition
|
<< " specieComposition: " << specieComposition
|
||||||
<< exit(FatalError);
|
<< exit(FatalError);
|
||||||
}
|
}
|
||||||
|
@ -147,10 +147,10 @@ void Foam::chemkinReader::checkCoeffs
|
||||||
{
|
{
|
||||||
if (reactionCoeffs.size() != nCoeffs)
|
if (reactionCoeffs.size() != nCoeffs)
|
||||||
{
|
{
|
||||||
FatalErrorIn("chemkinReader::checkCoeffs")
|
FatalErrorInFunction
|
||||||
<< "Wrong number of coefficients for the " << reactionRateName
|
<< "Wrong number of coefficients for the " << reactionRateName
|
||||||
<< " rate expression on line "
|
<< " rate expression on line "
|
||||||
<< lineNo_-1 << ", should be "
|
<< lineNo_ - 1 << ", should be "
|
||||||
<< nCoeffs << " but " << reactionCoeffs.size() << " supplied." << nl
|
<< nCoeffs << " but " << reactionCoeffs.size() << " supplied." << nl
|
||||||
<< "Coefficients are "
|
<< "Coefficients are "
|
||||||
<< reactionCoeffs << nl
|
<< reactionCoeffs << nl
|
||||||
|
@ -211,17 +211,17 @@ void Foam::chemkinReader::addReactionType
|
||||||
|
|
||||||
if (rType < 3)
|
if (rType < 3)
|
||||||
{
|
{
|
||||||
FatalErrorIn("chemkinReader::addReactionType")
|
FatalErrorInFunction
|
||||||
<< "Reaction type " << reactionTypeNames[rType]
|
<< "Reaction type " << reactionTypeNames[rType]
|
||||||
<< " on line " << lineNo_-1
|
<< " on line " << lineNo_ - 1
|
||||||
<< " not handled by this function"
|
<< " not handled by this function"
|
||||||
<< exit(FatalError);
|
<< exit(FatalError);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
FatalErrorIn("chemkinReader::addReactionType")
|
FatalErrorInFunction
|
||||||
<< "Unknown reaction type " << rType
|
<< "Unknown reaction type " << rType
|
||||||
<< " on line " << lineNo_-1
|
<< " on line " << lineNo_ - 1
|
||||||
<< exit(FatalError);
|
<< exit(FatalError);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -285,9 +285,9 @@ void Foam::chemkinReader::addPressureDependentReaction
|
||||||
|
|
||||||
if (TroeCoeffs.size() != 4 && TroeCoeffs.size() != 3)
|
if (TroeCoeffs.size() != 4 && TroeCoeffs.size() != 3)
|
||||||
{
|
{
|
||||||
FatalErrorIn("chemkinReader::addPressureDependentReaction")
|
FatalErrorInFunction
|
||||||
<< "Wrong number of coefficients for Troe rate expression"
|
<< "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
|
<< TroeCoeffs.size() << " supplied." << nl
|
||||||
<< "Coefficients are "
|
<< "Coefficients are "
|
||||||
<< TroeCoeffs << nl
|
<< TroeCoeffs << nl
|
||||||
|
@ -341,9 +341,9 @@ void Foam::chemkinReader::addPressureDependentReaction
|
||||||
|
|
||||||
if (SRICoeffs.size() != 5 && SRICoeffs.size() != 3)
|
if (SRICoeffs.size() != 5 && SRICoeffs.size() != 3)
|
||||||
{
|
{
|
||||||
FatalErrorIn("chemkinReader::addPressureDependentReaction")
|
FatalErrorInFunction
|
||||||
<< "Wrong number of coefficients for SRI rate expression"
|
<< "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
|
<< SRICoeffs.size() << " supplied." << nl
|
||||||
<< "Coefficients are "
|
<< "Coefficients are "
|
||||||
<< SRICoeffs << nl
|
<< SRICoeffs << nl
|
||||||
|
@ -392,22 +392,12 @@ void Foam::chemkinReader::addPressureDependentReaction
|
||||||
|
|
||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
if (fofType < unknownFallOffFunctionType)
|
FatalErrorInFunction
|
||||||
{
|
<< "Fall-off function type "
|
||||||
FatalErrorIn("chemkinReader::addPressureDependentReaction")
|
<< fallOffFunctionNames[fofType]
|
||||||
<< "Fall-off function type "
|
<< " on line " << lineNo_ - 1
|
||||||
<< fallOffFunctionNames[fofType]
|
<< " not implemented"
|
||||||
<< " on line " << lineNo_-1
|
<< exit(FatalError);
|
||||||
<< " 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:
|
case unknownReactionRateType:
|
||||||
{
|
{
|
||||||
FatalErrorIn("chemkinReader::addReaction")
|
FatalErrorInFunction
|
||||||
<< "Internal error on line " << lineNo_-1
|
<< "Internal error on line " << lineNo_ - 1
|
||||||
<< ": reaction rate type has not been set"
|
<< ": reaction rate type has not been set"
|
||||||
<< exit(FatalError);
|
<< exit(FatalError);
|
||||||
}
|
}
|
||||||
|
@ -753,17 +743,17 @@ void Foam::chemkinReader::addReaction
|
||||||
{
|
{
|
||||||
if (rrType < 9)
|
if (rrType < 9)
|
||||||
{
|
{
|
||||||
FatalErrorIn("chemkinReader::addReaction")
|
FatalErrorInFunction
|
||||||
<< "Reaction rate type " << reactionRateTypeNames[rrType]
|
<< "Reaction rate type " << reactionRateTypeNames[rrType]
|
||||||
<< " on line " << lineNo_-1
|
<< " on line " << lineNo_ - 1
|
||||||
<< " not implemented"
|
<< " not implemented"
|
||||||
<< exit(FatalError);
|
<< exit(FatalError);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
FatalErrorIn("chemkinReader::addReaction")
|
FatalErrorInFunction
|
||||||
<< "Unknown reaction rate type " << rrType
|
<< "Unknown reaction rate type " << rrType
|
||||||
<< " on line " << lineNo_-1
|
<< " on line " << lineNo_ - 1
|
||||||
<< exit(FatalError);
|
<< exit(FatalError);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -774,11 +764,11 @@ void Foam::chemkinReader::addReaction
|
||||||
{
|
{
|
||||||
if (mag(nAtoms[i]) > SMALL)
|
if (mag(nAtoms[i]) > SMALL)
|
||||||
{
|
{
|
||||||
FatalErrorIn("chemkinReader::addReaction")
|
FatalErrorInFunction
|
||||||
<< "Elemental imbalance in " << elementNames_[i]
|
<< "Elemental imbalance in " << elementNames_[i]
|
||||||
<< " in reaction" << nl
|
<< " in reaction" << nl
|
||||||
<< reactions_.last() << nl
|
<< reactions_.last() << nl
|
||||||
<< " on line " << lineNo_-1
|
<< " on line " << lineNo_ - 1
|
||||||
<< exit(FatalError);
|
<< exit(FatalError);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -117,9 +117,6 @@ public:
|
||||||
//- Construct from Istream
|
//- Construct from Istream
|
||||||
icoPolynomial(Istream&);
|
icoPolynomial(Istream&);
|
||||||
|
|
||||||
//- Construct as copy
|
|
||||||
inline icoPolynomial(const icoPolynomial&);
|
|
||||||
|
|
||||||
//- Construct as named copy
|
//- Construct as named copy
|
||||||
inline icoPolynomial(const word& name, const icoPolynomial&);
|
inline icoPolynomial(const word& name, const icoPolynomial&);
|
||||||
|
|
||||||
|
@ -144,7 +141,6 @@ public:
|
||||||
|
|
||||||
// Member operators
|
// Member operators
|
||||||
|
|
||||||
inline icoPolynomial& operator=(const icoPolynomial&);
|
|
||||||
inline void operator+=(const icoPolynomial&);
|
inline void operator+=(const icoPolynomial&);
|
||||||
inline void operator-=(const icoPolynomial&);
|
inline void operator-=(const icoPolynomial&);
|
||||||
|
|
||||||
|
|
|
@ -41,17 +41,6 @@ inline Foam::icoPolynomial<PolySize>::icoPolynomial
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||||
|
|
||||||
template<int PolySize>
|
|
||||||
inline Foam::icoPolynomial<PolySize>::icoPolynomial
|
|
||||||
(
|
|
||||||
const icoPolynomial<PolySize>& ip
|
|
||||||
)
|
|
||||||
:
|
|
||||||
specie(ip),
|
|
||||||
rhoPolynomial_(ip.rhoPolynomial_)
|
|
||||||
{}
|
|
||||||
|
|
||||||
|
|
||||||
template<int PolySize>
|
template<int PolySize>
|
||||||
inline Foam::icoPolynomial<PolySize>::icoPolynomial
|
inline Foam::icoPolynomial<PolySize>::icoPolynomial
|
||||||
(
|
(
|
||||||
|
@ -108,20 +97,6 @@ inline Foam::scalar Foam::icoPolynomial<PolySize>::Z(scalar, scalar) const
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * 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>
|
template<int PolySize>
|
||||||
inline void Foam::icoPolynomial<PolySize>::operator+=
|
inline void Foam::icoPolynomial<PolySize>::operator+=
|
||||||
(
|
(
|
||||||
|
|
|
@ -57,15 +57,6 @@ class IrreversibleReaction
|
||||||
ReactionRate k_;
|
ReactionRate k_;
|
||||||
|
|
||||||
|
|
||||||
// Private Member Functions
|
|
||||||
|
|
||||||
//- Disallow default bitwise assignment
|
|
||||||
void operator=
|
|
||||||
(
|
|
||||||
const IrreversibleReaction<ReactionThermo, ReactionRate>&
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
//- Runtime type information
|
//- Runtime type information
|
||||||
|
|
|
@ -44,7 +44,7 @@ namespace Foam
|
||||||
{
|
{
|
||||||
|
|
||||||
/*---------------------------------------------------------------------------*\
|
/*---------------------------------------------------------------------------*\
|
||||||
Class NonEquilibriumReversibleReaction Declaration
|
Class NonEquilibriumReversibleReaction Declaration
|
||||||
\*---------------------------------------------------------------------------*/
|
\*---------------------------------------------------------------------------*/
|
||||||
|
|
||||||
template<class ReactionThermo, class ReactionRate>
|
template<class ReactionThermo, class ReactionRate>
|
||||||
|
@ -58,16 +58,6 @@ class NonEquilibriumReversibleReaction
|
||||||
ReactionRate rk_;
|
ReactionRate rk_;
|
||||||
|
|
||||||
|
|
||||||
// Private Member Functions
|
|
||||||
|
|
||||||
//- Disallow default bitwise assignment
|
|
||||||
void operator=
|
|
||||||
(
|
|
||||||
const NonEquilibriumReversibleReaction
|
|
||||||
<ReactionThermo, ReactionRate>&
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
//- Runtime type information
|
//- Runtime type information
|
||||||
|
|
|
@ -127,9 +127,6 @@ private:
|
||||||
void setLRhs(Istream&);
|
void setLRhs(Istream&);
|
||||||
void setThermo(const HashPtrTable<ReactionThermo>& thermoDatabase);
|
void setThermo(const HashPtrTable<ReactionThermo>& thermoDatabase);
|
||||||
|
|
||||||
//- Disallow default bitwise assignment
|
|
||||||
void operator=(const Reaction<ReactionThermo>&);
|
|
||||||
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
|
|
|
@ -57,12 +57,6 @@ class ReversibleReaction
|
||||||
ReactionRate k_;
|
ReactionRate k_;
|
||||||
|
|
||||||
|
|
||||||
// Private Member Functions
|
|
||||||
|
|
||||||
//- Disallow default bitwise assignment
|
|
||||||
void operator=(const ReversibleReaction<ReactionThermo, ReactionRate>&);
|
|
||||||
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
//- Runtime type information
|
//- Runtime type information
|
||||||
|
@ -119,10 +113,8 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Destructor
|
//- Destructor
|
||||||
|
virtual ~ReversibleReaction() = default;
|
||||||
virtual ~ReversibleReaction()
|
|
||||||
{}
|
|
||||||
|
|
||||||
|
|
||||||
// Member Functions
|
// Member Functions
|
||||||
|
|
|
@ -149,8 +149,6 @@ public:
|
||||||
|
|
||||||
// Member operators
|
// Member operators
|
||||||
|
|
||||||
inline constTransport& operator=(const constTransport&);
|
|
||||||
|
|
||||||
inline void operator+=(const constTransport&);
|
inline void operator+=(const constTransport&);
|
||||||
|
|
||||||
inline void operator-=(const constTransport&);
|
inline void operator-=(const constTransport&);
|
||||||
|
|
|
@ -146,21 +146,6 @@ inline scalar constTransport<thermo>::alpha
|
||||||
}
|
}
|
||||||
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * 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>
|
template<class thermo>
|
||||||
inline void Foam::constTransport<thermo>::operator+=
|
inline void Foam::constTransport<thermo>::operator+=
|
||||||
(
|
(
|
||||||
|
|
|
@ -171,8 +171,6 @@ public:
|
||||||
|
|
||||||
// Member operators
|
// Member operators
|
||||||
|
|
||||||
inline sutherlandTransport& operator=(const sutherlandTransport&);
|
|
||||||
|
|
||||||
inline void operator+=(const sutherlandTransport&);
|
inline void operator+=(const sutherlandTransport&);
|
||||||
|
|
||||||
inline void operator-=(const sutherlandTransport&);
|
inline void operator-=(const sutherlandTransport&);
|
||||||
|
|
|
@ -196,21 +196,6 @@ inline scalar sutherlandTransport<thermo>::alpha
|
||||||
|
|
||||||
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * 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>
|
template<class thermo>
|
||||||
inline void Foam::sutherlandTransport<thermo>::operator+=
|
inline void Foam::sutherlandTransport<thermo>::operator+=
|
||||||
(
|
(
|
||||||
|
|
Reference in a new issue