diff --git a/applications/solvers/combustion/chemFoam/createSingleCellMesh.H b/applications/solvers/combustion/chemFoam/createSingleCellMesh.H index 9b9d0f376b..4968bc4281 100644 --- a/applications/solvers/combustion/chemFoam/createSingleCellMesh.H +++ b/applications/solvers/combustion/chemFoam/createSingleCellMesh.H @@ -25,10 +25,10 @@ fvMesh mesh runTime, IOobject::READ_IF_PRESENT ), - xferMove>(points), - faces.xfer(), - owner.xfer(), - neighbour.xfer() + move(points), + move(faces), + move(owner), + move(neighbour) ); List patches(1); diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C index 2b5791b24c..9c341110a4 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -261,7 +261,7 @@ Foam::InterfaceCompositionPhaseChangePhaseSystem::dmdt template -Foam::Xfer> +Foam::PtrList Foam::InterfaceCompositionPhaseChangePhaseSystem::dmdts() const { PtrList dmdts(BasePhaseSystem::dmdts()); @@ -302,7 +302,7 @@ Foam::InterfaceCompositionPhaseChangePhaseSystem::dmdts() const } } - return dmdts.xfer(); + return dmdts; } diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H index 57eef2d6f0..dc04cb8a79 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -133,7 +133,7 @@ public: virtual tmp dmdt(const phasePairKey& key) const; //- Return the mass transfer rates for each phase - virtual Xfer> dmdts() const; + virtual PtrList dmdts() const; //- Return the mass transfer matrices virtual autoPtr massTransfer() const; diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C index 42b6acb8eb..218748124e 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -451,7 +451,7 @@ Foam::MomentumTransferPhaseSystem::momentumTransferf() template -Foam::Xfer> +Foam::PtrList Foam::MomentumTransferPhaseSystem::AFfs() const { PtrList AFfs(this->phaseModels_.size()); @@ -485,12 +485,12 @@ Foam::MomentumTransferPhaseSystem::AFfs() const this->fillFields("AFf", dimDensity/dimTime, AFfs); } - return AFfs.xfer(); + return AFfs; } template -Foam::Xfer> +Foam::PtrList Foam::MomentumTransferPhaseSystem::phiFs ( const PtrList& rAUs @@ -626,12 +626,12 @@ Foam::MomentumTransferPhaseSystem::phiFs this->fillFields("phiF", dimForce/dimDensity/dimVelocity, phiFs); } - return phiFs.xfer(); + return phiFs; } template -Foam::Xfer> +Foam::PtrList Foam::MomentumTransferPhaseSystem::phiFfs ( const PtrList& rAUfs @@ -789,12 +789,12 @@ Foam::MomentumTransferPhaseSystem::phiFfs this->fillFields("phiFf", dimForce/dimDensity/dimVelocity, phiFfs); } - return phiFfs.xfer(); + return phiFfs; } template -Foam::Xfer> +Foam::PtrList Foam::MomentumTransferPhaseSystem::phiKdPhis ( const PtrList& rAUs @@ -831,12 +831,12 @@ Foam::MomentumTransferPhaseSystem::phiKdPhis ); } - return phiKdPhis.xfer(); + return phiKdPhis; } template -Foam::Xfer> +Foam::PtrList Foam::MomentumTransferPhaseSystem::phiKdPhifs ( const PtrList& rAUfs @@ -873,12 +873,12 @@ Foam::MomentumTransferPhaseSystem::phiKdPhifs ); } - return phiKdPhifs.xfer(); + return phiKdPhifs; } template -Foam::Xfer> +Foam::PtrList Foam::MomentumTransferPhaseSystem::KdUByAs ( const PtrList& rAUs @@ -909,12 +909,12 @@ Foam::MomentumTransferPhaseSystem::KdUByAs this->fillFields("KdUByA", dimVelocity, KdUByAs); } - return KdUByAs.xfer(); + return KdUByAs; } template -Foam::Xfer> +Foam::PtrList Foam::MomentumTransferPhaseSystem::ddtCorrByAs ( const PtrList& rAUs, @@ -1009,7 +1009,7 @@ Foam::MomentumTransferPhaseSystem::ddtCorrByAs } } - return ddtCorrByAs.xfer(); + return ddtCorrByAs; } diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H index 3191199c96..aa64f1de70 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -212,19 +212,19 @@ public: //- Return implicit force coefficients on the faces, for the face-based // algorithm. - virtual Xfer> AFfs() const; + virtual PtrList AFfs() const; //- Return the explicit force fluxes for the cell-based algorithm, that // do not depend on phase mass/volume fluxes, and can therefore be // evaluated outside the corrector loop. This includes things like // lift, turbulent dispersion, and wall lubrication. - virtual Xfer> phiFs + virtual PtrList phiFs ( const PtrList& rAUs ); //- As phiFs, but for the face-based algorithm - virtual Xfer> phiFfs + virtual PtrList phiFfs ( const PtrList& rAUfs ); @@ -232,13 +232,13 @@ public: //- Return the explicit drag force fluxes for the cell-based algorithm. // These depend on phase mass/volume fluxes, and must therefore be // evaluated inside the corrector loop. - virtual Xfer> phiKdPhis + virtual PtrList phiKdPhis ( const PtrList& rAUs ) const; //- As phiKdPhis, but for the face-based algorithm - virtual Xfer> phiKdPhifs + virtual PtrList phiKdPhifs ( const PtrList& rAUfs ) const; @@ -247,7 +247,7 @@ public: // algorithm. This is the cell-equivalent of phiKdPhis. These depend on // phase velocities, and must therefore be evaluated inside the // corrector loop. - virtual Xfer> KdUByAs + virtual PtrList KdUByAs ( const PtrList& rAUs ) const; @@ -268,7 +268,7 @@ public: //- Return the flux corrections for the cell-based algorithm. These // depend on phase mass/volume fluxes, and must therefore be evaluated // inside the corrector loop. - virtual Xfer> ddtCorrByAs + virtual PtrList ddtCorrByAs ( const PtrList& rAUs, const bool includeVirtualMass = false diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C index 724565c327..c4073c98c5 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -102,7 +102,7 @@ Foam::PhaseTransferPhaseSystem::dmdt template -Foam::Xfer> +Foam::PtrList Foam::PhaseTransferPhaseSystem::dmdts() const { PtrList dmdts(BasePhaseSystem::dmdts()); @@ -116,7 +116,7 @@ Foam::PhaseTransferPhaseSystem::dmdts() const this->addField(pair.phase2(), "dmdt", - rDmdt, dmdts); } - return dmdts.xfer(); + return dmdts; } diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H index 2bc2e7fda1..e161a9868c 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -105,7 +105,7 @@ public: virtual tmp dmdt(const phasePairKey& key) const; //- Return the mass transfer rates for each phase - virtual Xfer> dmdts() const; + virtual PtrList dmdts() const; //- Return the mass transfer matrices virtual autoPtr massTransfer() const; diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C index d1a273097d..4ef7f2f1d7 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -148,7 +148,7 @@ Foam::PopulationBalancePhaseSystem::dmdt template -Foam::Xfer> +Foam::PtrList Foam::PopulationBalancePhaseSystem::dmdts() const { PtrList dmdts(BasePhaseSystem::dmdts()); @@ -162,7 +162,7 @@ Foam::PopulationBalancePhaseSystem::dmdts() const this->addField(pair.phase2(), "dmdt", - pDmdt, dmdts); } - return dmdts.xfer(); + return dmdts; } diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H index 1432bd08b4..a761b8c562 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -96,7 +96,7 @@ public: virtual tmp dmdt(const phasePairKey& key) const; //- Return the mass transfer rates for each phase - virtual Xfer> dmdts() const; + virtual PtrList dmdts() const; //- Return the mass transfer matrices virtual autoPtr massTransfer() const; diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C index 74c43092df..ffeba45d14 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C @@ -188,7 +188,7 @@ Foam::ThermalPhaseChangePhaseSystem::dmdt template -Foam::Xfer> +Foam::PtrList Foam::ThermalPhaseChangePhaseSystem::dmdts() const { PtrList dmdts(BasePhaseSystem::dmdts()); @@ -211,7 +211,7 @@ Foam::ThermalPhaseChangePhaseSystem::dmdts() const this->addField(pair.phase2(), "dmdt", - wDmdt, dmdts); } - return dmdts.xfer(); + return dmdts; } diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H index 4b4d863d8c..47cfe694fd 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -121,7 +121,7 @@ public: virtual tmp dmdt(const phasePairKey& key) const; //- Return the mass transfer rates for each phase - virtual Xfer> dmdts() const; + virtual PtrList dmdts() const; //- Return the heat transfer matrices virtual autoPtr heatTransfer() const; diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C index 399d41e612..873b8c9778 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -342,11 +342,11 @@ Foam::tmp Foam::phaseSystem::dmdt } -Foam::Xfer> Foam::phaseSystem::dmdts() const +Foam::PtrList Foam::phaseSystem::dmdts() const { PtrList dmdts(this->phaseModels_.size()); - return dmdts.xfer(); + return dmdts; } diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H index a1ad7f7f5b..4239a08d78 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H @@ -441,7 +441,7 @@ public: virtual tmp dmdt(const phasePairKey& key) const; //- Return the mass transfer rates for each phase - virtual Xfer> dmdts() const; + virtual PtrList dmdts() const; // Transfers @@ -456,34 +456,34 @@ public: //- Return the implicit force coefficients for the face-based // algorithm - virtual Xfer> AFfs() const = 0; + virtual PtrList AFfs() const = 0; //- Return the force fluxes for the cell-based algorithm - virtual Xfer> phiFs + virtual PtrList phiFs ( const PtrList& rAUs ) = 0; //- Return the force fluxes for the face-based algorithm - virtual Xfer> phiFfs + virtual PtrList phiFfs ( const PtrList& rAUfs ) = 0; //- Return the force fluxes for the cell-based algorithm - virtual Xfer> phiKdPhis + virtual PtrList phiKdPhis ( const PtrList& rAUs ) const = 0; //- Return the force fluxes for the face-based algorithm - virtual Xfer> phiKdPhifs + virtual PtrList phiKdPhifs ( const PtrList& rAUfs ) const = 0; //- Return the explicit part of the drag force - virtual Xfer> KdUByAs + virtual PtrList KdUByAs ( const PtrList& rAUs ) const = 0; @@ -501,7 +501,7 @@ public: ) = 0; //- Return the flux corrections for the cell-based algorithm - virtual Xfer> ddtCorrByAs + virtual PtrList ddtCorrByAs ( const PtrList& rAUs, const bool includeVirtualMass = false diff --git a/applications/test/DynamicList/Test-DynamicList.C b/applications/test/DynamicList/Test-DynamicList.C index 91ae148908..6f0d3cab57 100644 --- a/applications/test/DynamicList/Test-DynamicList.C +++ b/applications/test/DynamicList/Test-DynamicList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -173,13 +173,13 @@ int main(int argc, char *argv[]) printInfo("dlC", dlC, true); - List