mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-12-28 03:37:59 +00:00
Merge branch 'master' into particleInteractions
Conflicts: src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.C src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.C
This commit is contained in:
graham
@ -128,9 +128,8 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~basicSubGrid();
|
||||
//- Destructor
|
||||
virtual ~basicSubGrid();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -107,9 +107,8 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~basicSubGrid();
|
||||
//- Destructor
|
||||
virtual ~basicSubGrid();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -137,9 +137,8 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~PDRDragModel();
|
||||
//- Destructor
|
||||
virtual ~PDRDragModel();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -135,9 +135,8 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~basic();
|
||||
//- Destructor
|
||||
virtual ~basic();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -86,9 +86,8 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~Gulder();
|
||||
//- Destructor
|
||||
virtual ~Gulder();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -91,9 +91,8 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~SCOPEBlend();
|
||||
//- Destructor
|
||||
virtual ~SCOPEBlend();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -96,9 +96,8 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~SCOPEXiEq();
|
||||
//- Destructor
|
||||
virtual ~SCOPEXiEq();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -132,9 +132,8 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~XiEqModel();
|
||||
//- Destructor
|
||||
virtual ~XiEqModel();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -90,9 +90,8 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~instability();
|
||||
//- Destructor
|
||||
virtual ~instability();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -85,9 +85,8 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~KTS();
|
||||
//- Destructor
|
||||
virtual ~KTS();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -129,9 +129,8 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~XiGModel();
|
||||
//- Destructor
|
||||
virtual ~XiGModel();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -94,9 +94,8 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~instabilityG();
|
||||
//- Destructor
|
||||
virtual ~instabilityG();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -200,9 +200,8 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~XiModel();
|
||||
//- Destructor
|
||||
virtual ~XiModel();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -95,9 +95,8 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~algebraic();
|
||||
//- Destructor
|
||||
virtual ~algebraic();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -83,9 +83,8 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~fixed();
|
||||
//- Destructor
|
||||
virtual ~fixed();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -95,9 +95,8 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~transport();
|
||||
//- Destructor
|
||||
virtual ~transport();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -194,7 +194,7 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
//- Destructor
|
||||
~SCOPE();
|
||||
|
||||
|
||||
|
||||
@ -88,9 +88,8 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~infinitelyFastChemistry();
|
||||
//- Destructor
|
||||
virtual ~infinitelyFastChemistry();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -83,9 +83,8 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~noCombustion();
|
||||
//- Destructor
|
||||
virtual ~noCombustion();
|
||||
|
||||
// Member Functions
|
||||
|
||||
|
||||
@ -77,9 +77,8 @@ public:
|
||||
regionProperties(const Time& runTime);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
~regionProperties();
|
||||
//- Destructor
|
||||
~regionProperties();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -84,7 +84,7 @@
|
||||
|
||||
multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
|
||||
|
||||
forAll (Y, i)
|
||||
forAll(Y, i)
|
||||
{
|
||||
fields.add(Y[i]);
|
||||
}
|
||||
|
||||
@ -8,10 +8,10 @@
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
|
||||
OpenFOAM is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by the
|
||||
Free Software Foundation; either version 2 of the License, or (at your
|
||||
option) any later version.
|
||||
OpenFOAM is free software: you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
||||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
@ -19,8 +19,7 @@ License
|
||||
for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with OpenFOAM; if not, write to the Free Software Foundation,
|
||||
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Global
|
||||
rhoEqn
|
||||
|
||||
@ -94,10 +94,9 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
~threePhaseMixture()
|
||||
{}
|
||||
//- Destructor
|
||||
~threePhaseMixture()
|
||||
{}
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -96,10 +96,9 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~Kunz()
|
||||
{}
|
||||
//- Destructor
|
||||
virtual ~Kunz()
|
||||
{}
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -90,10 +90,9 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~Merkle()
|
||||
{}
|
||||
//- Destructor
|
||||
virtual ~Merkle()
|
||||
{}
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -103,10 +103,9 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~SchnerrSauer()
|
||||
{}
|
||||
//- Destructor
|
||||
virtual ~SchnerrSauer()
|
||||
{}
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -121,10 +121,9 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~phaseChangeTwoPhaseMixture()
|
||||
{}
|
||||
//- Destructor
|
||||
virtual ~phaseChangeTwoPhaseMixture()
|
||||
{}
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
@ -209,10 +209,9 @@ public:
|
||||
);
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
~multiphaseMixture()
|
||||
{}
|
||||
//- Destructor
|
||||
~multiphaseMixture()
|
||||
{}
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
Reference in New Issue
Block a user