Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,6 +75,19 @@ public:
 };
 
 
+inline const geometricOneField& operator*
+(
+    const geometricOneField&,
+    const geometricOneField&
+);
+
+inline const geometricOneField& operator/
+(
+    const geometricOneField&,
+    const geometricOneField&
+);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,4 +48,23 @@ inline Foam::oneFieldField Foam::geometricOneField::boundaryField() const
 }
 
 
+inline const Foam::geometricOneField& Foam::operator*
+(
+    const geometricOneField& gof,
+    const geometricOneField&
+)
+{
+    return gof;
+}
+
+inline const Foam::geometricOneField& Foam::operator/
+(
+    const geometricOneField& gof,
+    const geometricOneField&
+)
+{
+    return gof;
+}
+
+
 // ************************************************************************* //

src/OpenFOAM/primitives/one/oneI.H

@@ -32,6 +32,11 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+inline const one& operator*(const one& o, const one&)
+{
+    return o;
+}
+
 template<class Type>
 inline const Type& operator*(const Type& t, const one&)
 {
@@ -44,6 +49,12 @@ inline const Type& operator*(const one&, const Type& t)
     return t;
 }
 
+
+inline const one& operator/(const one& o, const one&)
+{
+    return o;
+}
+
 template<class Type>
 inline Type operator/(const one&, const Type& t)
 {

src/finiteVolume/finiteVolume/fvm/fvmDdt.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -99,6 +99,45 @@ ddt
 }
 
 
+template<class Type>
+tmp<fvMatrix<Type> >
+ddt
+(
+    const one&,
+    const one&,
+    const GeometricField<Type, fvPatchField, volMesh>& vf
+)
+{
+    return ddt(vf);
+}
+
+
+template<class Type>
+tmp<fvMatrix<Type> >
+ddt
+(
+    const one&,
+    const volScalarField& rho,
+    const GeometricField<Type, fvPatchField, volMesh>& vf
+)
+{
+    return ddt(rho, vf);
+}
+
+
+template<class Type>
+tmp<fvMatrix<Type> >
+ddt
+(
+    const volScalarField& alpha,
+    const one&,
+    const GeometricField<Type, fvPatchField, volMesh>& vf
+)
+{
+    return ddt(alpha, vf);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace fvm

src/finiteVolume/finiteVolume/fvm/fvmDdt.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,6 +76,30 @@ namespace fvm
         const volScalarField&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
+
+    template<class Type>
+    tmp<fvMatrix<Type> > ddt
+    (
+        const one&,
+        const one&,
+        const GeometricField<Type, fvPatchField, volMesh>&
+    );
+
+    template<class Type>
+    tmp<fvMatrix<Type> > ddt
+    (
+        const one&,
+        const volScalarField&,
+        const GeometricField<Type, fvPatchField, volMesh>&
+    );
+
+    template<class Type>
+    tmp<fvMatrix<Type> > ddt
+    (
+        const volScalarField&,
+        const one&,
+        const GeometricField<Type, fvPatchField, volMesh>&
+    );
 }