DimensionedField<scalar, volMesh> -> volScalarField::Internal

DimensionedField<vector, volMesh> -> volVectorField::Internal

src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C

@@ -121,9 +121,9 @@ const Foam::dimensionedVector& Foam::SRF::SRFModel::omega() const
 Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh>>
 Foam::SRF::SRFModel::Fcoriolis() const
 {
-    return tmp<DimensionedField<vector, volMesh>>
+    return tmp<volVectorField::Internal>
     (
-        new DimensionedField<vector, volMesh>
+        new volVectorField::Internal
         (
             IOobject
             (
@@ -142,9 +142,9 @@ Foam::SRF::SRFModel::Fcoriolis() const
 Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh>>
 Foam::SRF::SRFModel::Fcentrifugal() const
 {
-    return tmp<DimensionedField<vector, volMesh>>
+    return tmp<volVectorField::Internal>
     (
-        new DimensionedField<vector, volMesh>
+        new volVectorField::Internal
         (
             IOobject
             (

src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H

@@ -162,13 +162,13 @@ public:
             const dimensionedVector& omega() const;
 
             //- Return the coriolis force
-            tmp<DimensionedField<vector, volMesh>> Fcoriolis() const;
+            tmp<volVectorField::Internal> Fcoriolis() const;
 
             //- Return the centrifugal force
-            tmp<DimensionedField<vector, volMesh>> Fcentrifugal() const;
+            tmp<volVectorField::Internal> Fcentrifugal() const;
 
             //- Source term component for momentum equation
-            tmp<DimensionedField<vector, volMesh>> Su() const;
+            tmp<volVectorField::Internal> Su() const;
 
             //- Return velocity vector from positions
             vectorField velocity(const vectorField& positions) const;

src/finiteVolume/finiteVolume/fvm/fvmSup.C

@@ -99,7 +99,7 @@ template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::Sp
 (
-    const DimensionedField<scalar, volMesh>& sp,
+    const volScalarField::Internal& sp,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
@@ -125,7 +125,7 @@ template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::Sp
 (
-    const tmp<DimensionedField<scalar, volMesh>>& tsp,
+    const tmp<volScalarField::Internal>& tsp,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
@@ -191,7 +191,7 @@ template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::SuSp
 (
-    const DimensionedField<scalar, volMesh>& susp,
+    const volScalarField::Internal& susp,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
@@ -220,7 +220,7 @@ template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>>
 Foam::fvm::SuSp
 (
-    const tmp<DimensionedField<scalar, volMesh>>& tsusp,
+    const tmp<volScalarField::Internal>& tsusp,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {

src/finiteVolume/finiteVolume/fvm/fvmSup.H

@@ -86,14 +86,14 @@ namespace fvm
         template<class Type>
         tmp<fvMatrix<Type>> Sp
         (
-            const DimensionedField<scalar, volMesh>&,
+            const volScalarField::Internal&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
         template<class Type>
         tmp<fvMatrix<Type>> Sp
         (
-            const tmp<DimensionedField<scalar, volMesh>>&,
+            const tmp<volScalarField::Internal>&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
@@ -126,14 +126,14 @@ namespace fvm
         template<class Type>
         tmp<fvMatrix<Type>> SuSp
         (
-            const DimensionedField<scalar, volMesh>&,
+            const volScalarField::Internal&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 
         template<class Type>
         tmp<fvMatrix<Type>> SuSp
         (
-            const tmp<DimensionedField<scalar, volMesh>>&,
+            const tmp<volScalarField::Internal>&,
             const GeometricField<Type, fvPatchField, volMesh>&
         );
 

src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C

@@ -1177,7 +1177,7 @@ void Foam::fvMatrix<Type>::operator-=
 template<class Type>
 void Foam::fvMatrix<Type>::operator*=
 (
-    const DimensionedField<scalar, volMesh>& dsf
+    const volScalarField::Internal& dsf
 )
 {
     dimensions_ *= dsf.dimensions();
@@ -1207,7 +1207,7 @@ void Foam::fvMatrix<Type>::operator*=
 template<class Type>
 void Foam::fvMatrix<Type>::operator*=
 (
-    const tmp<DimensionedField<scalar, volMesh>>& tdsf
+    const tmp<volScalarField::Internal>& tdsf
 )
 {
     operator*=(tdsf());
@@ -2160,7 +2160,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
 template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 (
-    const DimensionedField<scalar, volMesh>& dsf,
+    const volScalarField::Internal& dsf,
     const fvMatrix<Type>& A
 )
 {
@@ -2172,7 +2172,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 (
-    const tmp<DimensionedField<scalar, volMesh>>& tdsf,
+    const tmp<volScalarField::Internal>& tdsf,
     const fvMatrix<Type>& A
 )
 {
@@ -2196,7 +2196,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 (
-    const DimensionedField<scalar, volMesh>& dsf,
+    const volScalarField::Internal& dsf,
     const tmp<fvMatrix<Type>>& tA
 )
 {
@@ -2208,7 +2208,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 template<class Type>
 Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
 (
-    const tmp<DimensionedField<scalar, volMesh>>& tdsf,
+    const tmp<volScalarField::Internal>& tdsf,
     const tmp<fvMatrix<Type>>& tA
 )
 {

src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H

@@ -471,8 +471,8 @@ public:
         void operator+=(const zero&);
         void operator-=(const zero&);
 
-        void operator*=(const DimensionedField<scalar, volMesh>&);
-        void operator*=(const tmp<DimensionedField<scalar, volMesh>>&);
+        void operator*=(const volScalarField::Internal&);
+        void operator*=(const tmp<volScalarField::Internal>&);
         void operator*=(const tmp<volScalarField>&);
 
         void operator*=(const dimensioned<scalar>&);
@@ -993,14 +993,14 @@ tmp<fvMatrix<Type>> operator-
 template<class Type>
 tmp<fvMatrix<Type>> operator*
 (
-    const DimensionedField<scalar, volMesh>&,
+    const volScalarField::Internal&,
     const fvMatrix<Type>&
 );
 
 template<class Type>
 tmp<fvMatrix<Type>> operator*
 (
-    const tmp<DimensionedField<scalar, volMesh>>&,
+    const tmp<volScalarField::Internal>&,
     const fvMatrix<Type>&
 );
 
@@ -1014,14 +1014,14 @@ tmp<fvMatrix<Type>> operator*
 template<class Type>
 tmp<fvMatrix<Type>> operator*
 (
-    const DimensionedField<scalar, volMesh>&,
+    const volScalarField::Internal&,
     const tmp<fvMatrix<Type>>&
 );
 
 template<class Type>
 tmp<fvMatrix<Type>> operator*
 (
-    const tmp<DimensionedField<scalar, volMesh>>&,
+    const tmp<volScalarField::Internal>&,
     const tmp<fvMatrix<Type>>&
 );
 

src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C

@@ -193,7 +193,7 @@ void Foam::fv::meanVelocityForce::addSup
     const label fieldi
 )
 {
-    DimensionedField<vector, volMesh> Su
+    volVectorField::Internal Su
     (
         IOobject
         (

src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C

@@ -26,7 +26,6 @@ License
 #include "SemiImplicitSource.H"
 #include "fvMesh.H"
 #include "fvMatrices.H"
-#include "DimensionedField.H"
 #include "fvmSup.H"
 
 // * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
@@ -142,7 +141,7 @@ void Foam::fv::SemiImplicitSource<Type>::addSup
 
     const GeometricField<Type, fvPatchField, volMesh>& psi = eqn.psi();
 
-    DimensionedField<Type, volMesh> Su
+    typename GeometricField<Type, fvPatchField, volMesh>::Internal Su
     (
         IOobject
         (
@@ -164,7 +163,7 @@ void Foam::fv::SemiImplicitSource<Type>::addSup
 
     UIndirectList<Type>(Su, cells_) = injectionRate_[fieldi].first()/VDash_;
 
-    DimensionedField<scalar, volMesh> Sp
+    volScalarField::Internal Sp
     (
         IOobject
         (

src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H

@@ -101,7 +101,7 @@ class DSMCCloud
         volScalarField sigmaTcRMax_;
 
         //- A field holding the remainder from the previous collision selections
-        DimensionedField<scalar, volMesh> collisionSelectionRemainder_;
+        volScalarField::Internal collisionSelectionRemainder_;
 
         //- Heat flux at surface field
         volScalarField q_;

src/lagrangian/coalCombustion/coalCloudList/coalCloudList.H

@@ -73,13 +73,13 @@ public:
         // Source terms
 
             //- Return const reference to momentum source
-            inline tmp<DimensionedField<vector, volMesh>> UTrans() const;
+            inline tmp<volVectorField::Internal> UTrans() const;
 
             //- Return tmp momentum source term
             inline tmp<fvVectorMatrix> SU(volVectorField& U) const;
 
             //- Sensible enthalpy transfer [J/kg]
-            inline tmp<DimensionedField<scalar, volMesh>> hsTrans() const;
+            inline tmp<volScalarField::Internal> hsTrans() const;
 
             //- Return sensible enthalpy source term [J/kg/m3/s]
             inline tmp<fvScalarMatrix> Sh(volScalarField& hs) const;
@@ -93,15 +93,15 @@ public:
             ) const;
 
             //- Return total mass transfer [kg/m3]
-            inline tmp<DimensionedField<scalar, volMesh>> rhoTrans() const;
+            inline tmp<volScalarField::Internal> rhoTrans() const;
 
             //- Return tmp total mass source for carrier phase
             //  - fully explicit
-            inline tmp<DimensionedField<scalar, volMesh>> Srho() const;
+            inline tmp<volScalarField::Internal> Srho() const;
 
             //- Return tmp total mass source for carrier phase specie i
             //  - fully explicit
-            inline tmp<DimensionedField<scalar, volMesh>> Srho
+            inline tmp<volScalarField::Internal> Srho
             (
                 const label i
             ) const;

src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H

@@ -30,9 +30,9 @@ License
 Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh>>
 Foam::coalCloudList::UTrans() const
 {
-    tmp<DimensionedField<vector, volMesh>> tfld
+    tmp<volVectorField::Internal> tfld
     (
-        new DimensionedField<vector, volMesh>
+        new volVectorField::Internal
         (
             IOobject
             (
@@ -47,7 +47,7 @@ Foam::coalCloudList::UTrans() const
         )
     );
 
-    DimensionedField<vector, volMesh>& fld = tfld.ref();
+    volVectorField::Internal& fld = tfld.ref();
 
     forAll(*this, i)
     {
@@ -78,9 +78,9 @@ Foam::tmp<Foam::fvVectorMatrix> Foam::coalCloudList::SU
 Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::coalCloudList::hsTrans() const
 {
-    tmp<DimensionedField<scalar, volMesh>> tfld
+    tmp<volScalarField::Internal> tfld
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -95,7 +95,7 @@ Foam::coalCloudList::hsTrans() const
         )
     );
 
-    DimensionedField<scalar, volMesh>& fld = tfld.ref();
+    volScalarField::Internal& fld = tfld.ref();
 
     forAll(*this, i)
     {
@@ -144,9 +144,9 @@ Foam::tmp<Foam::fvScalarMatrix> Foam::coalCloudList::SYi
 Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::coalCloudList::rhoTrans() const
 {
-    tmp<DimensionedField<scalar, volMesh>> tfld
+    tmp<volScalarField::Internal> tfld
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -161,7 +161,7 @@ Foam::coalCloudList::rhoTrans() const
         )
     );
 
-    DimensionedField<scalar, volMesh>& fld = tfld.ref();
+    volScalarField::Internal& fld = tfld.ref();
 
     forAll(*this, i)
     {
@@ -180,9 +180,9 @@ Foam::coalCloudList::rhoTrans() const
 Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::coalCloudList::Srho() const
 {
-    tmp<DimensionedField<scalar, volMesh>> tfld
+    tmp<volScalarField::Internal> tfld
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -197,7 +197,7 @@ Foam::coalCloudList::Srho() const
         )
     );
 
-    DimensionedField<scalar, volMesh>& fld = tfld.ref();
+    volScalarField::Internal& fld = tfld.ref();
 
     forAll(*this, i)
     {
@@ -214,9 +214,9 @@ Foam::coalCloudList::Srho
     const label i
 ) const
 {
-    tmp<DimensionedField<scalar, volMesh>> tfld
+    tmp<volScalarField::Internal> tfld
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -231,7 +231,7 @@ Foam::coalCloudList::Srho
         )
     );
 
-    DimensionedField<scalar, volMesh>& fld = tfld.ref();
+    volScalarField::Internal& fld = tfld.ref();
 
     forAll(*this, j)
     {

src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C

@@ -356,7 +356,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
     UIntegrator_(NULL),
     UTrans_
     (
-        new DimensionedField<vector, volMesh>
+        new volVectorField::Internal
         (
             IOobject
             (
@@ -372,7 +372,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
     ),
     UCoeff_
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -438,7 +438,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
     UIntegrator_(c.UIntegrator_->clone()),
     UTrans_
     (
-        new DimensionedField<vector, volMesh>
+        new volVectorField::Internal
         (
             IOobject
             (
@@ -454,7 +454,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
     ),
     UCoeff_
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (

src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H

@@ -228,10 +228,10 @@ protected:
         // Sources
 
             //- Momentum
-            autoPtr<DimensionedField<vector, volMesh>> UTrans_;
+            autoPtr<volVectorField::Internal> UTrans_;
 
             //- Coefficient for carrier phase U equation
-            autoPtr<DimensionedField<scalar, volMesh>> UCoeff_;
+            autoPtr<volScalarField::Internal> UCoeff_;
 
 
         // Initialisation
@@ -464,17 +464,17 @@ public:
                 // Momentum
 
                     //- Return reference to momentum source
-                    inline DimensionedField<vector, volMesh>& UTrans();
+                    inline volVectorField::Internal& UTrans();
 
                     //- Return const reference to momentum source
-                    inline const DimensionedField<vector, volMesh>&
+                    inline const volVectorField::Internal&
                         UTrans() const;
 
                      //- Return coefficient for carrier phase U equation
-                    inline DimensionedField<scalar, volMesh>& UCoeff();
+                    inline volScalarField::Internal& UCoeff();
 
                     //- Return const coefficient for carrier phase U equation
-                    inline const DimensionedField<scalar, volMesh>&
+                    inline const volScalarField::Internal&
                         UCoeff() const;
 
                     //- Return tmp momentum source term

src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H

@@ -431,7 +431,7 @@ Foam::KinematicCloud<CloudType>::SU(volVectorField& U) const
     {
         if (solution_.semiImplicit("U"))
         {
-            const DimensionedField<scalar, volMesh>
+            const volScalarField::Internal
                 Vdt(mesh_.V()*this->db().time().deltaT());
 
             return UTrans()/Vdt - fvm::Sp(UCoeff()/Vdt, U) + UCoeff()/Vdt*U;

src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C

@@ -121,7 +121,7 @@ Foam::ReactingCloud<CloudType>::ReactingCloud
         rhoTrans_.set
         (
             i,
-            new DimensionedField<scalar, volMesh>
+            new volScalarField::Internal
             (
                 IOobject
                 (
@@ -165,7 +165,7 @@ Foam::ReactingCloud<CloudType>::ReactingCloud
         rhoTrans_.set
         (
             i,
-            new DimensionedField<scalar, volMesh>
+            new volScalarField::Internal
             (
                 IOobject
                 (
@@ -290,7 +290,7 @@ void Foam::ReactingCloud<CloudType>::relaxSources
 {
     CloudType::relaxSources(cloudOldTime);
 
-    typedef DimensionedField<scalar, volMesh> dsfType;
+    typedef volScalarField::Internal dsfType;
 
     forAll(rhoTrans_, fieldi)
     {
@@ -306,7 +306,7 @@ void Foam::ReactingCloud<CloudType>::scaleSources()
 {
     CloudType::scaleSources();
 
-    typedef DimensionedField<scalar, volMesh> dsfType;
+    typedef volScalarField::Internal dsfType;
 
     forAll(rhoTrans_, fieldi)
     {

src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H

@@ -118,7 +118,7 @@ protected:
         // Sources
 
             //- Mass transfer fields - one per carrier phase specie
-            PtrList<DimensionedField<scalar, volMesh>> rhoTrans_;
+            PtrList<volScalarField::Internal> rhoTrans_;
 
 
     // Protected Member Functions
@@ -230,15 +230,15 @@ public:
                 //- Mass
 
                     //- Return reference to mass source for field i
-                    inline DimensionedField<scalar, volMesh>&
+                    inline volScalarField::Internal&
                         rhoTrans(const label i);
 
                     //- Return const access to mass source fields
-                    inline const PtrList<DimensionedField<scalar, volMesh>>&
+                    inline const PtrList<volScalarField::Internal>&
                         rhoTrans() const;
 
                     //- Return reference to mass source fields
-                    inline PtrList<DimensionedField<scalar, volMesh>>&
+                    inline PtrList<volScalarField::Internal>&
                         rhoTrans();
 
                     //- Return mass source term for specie i - specie eqn
@@ -249,12 +249,12 @@ public:
                     ) const;
 
                     //- Return tmp mass source for field i - fully explicit
-                    inline tmp<DimensionedField<scalar, volMesh>>
+                    inline tmp<volScalarField::Internal>
                         Srho(const label i) const;
 
                     //- Return tmp total mass source for carrier phase
                     //  - fully explicit
-                    inline tmp<DimensionedField<scalar, volMesh>> Srho() const;
+                    inline tmp<volScalarField::Internal> Srho() const;
 
                     //- Return total mass source term [kg/m3/s]
                     inline tmp<fvScalarMatrix> Srho(volScalarField& rho) const;

src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H

@@ -157,9 +157,9 @@ template<class CloudType>
 inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::ReactingCloud<CloudType>::Srho(const label i) const
 {
-    tmp<DimensionedField<scalar, volMesh>> tRhoi
+    tmp<volScalarField::Internal> tRhoi
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (
@@ -194,9 +194,9 @@ template<class CloudType>
 inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
 Foam::ReactingCloud<CloudType>::Srho() const
 {
-    tmp<DimensionedField<scalar, volMesh>> trhoTrans
+    tmp<volScalarField::Internal> trhoTrans
     (
-        new DimensionedField<scalar, volMesh>
+        new volScalarField::Internal
         (
             IOobject
             (

src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C

@@ -60,7 +60,7 @@ void Foam::ThermoCloud<CloudType>::setModels()
     {