diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C index cad1b1aa9..a9c0d775b 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -69,47 +69,21 @@ localEulerDdtScheme::fvcDdt mesh() ); - if (mesh().moving()) - { - tmp> tdtdt + return tmp> + ( + new GeometricField ( - new GeometricField + ddtIOobject, + mesh(), + dimensioned ( - ddtIOobject, - mesh(), - dimensioned - ( - "0", - dt.dimensions()/dimTime, - Zero - ) - ) - ); - - tdtdt.ref().primitiveFieldRef() = - rDeltaT.primitiveField()*dt.value() - *(1.0 - mesh().Vsc0()/mesh().Vsc()); - - return tdtdt; - } - else - { - return tmp> - ( - new GeometricField - ( - ddtIOobject, - mesh(), - dimensioned - ( - "0", - dt.dimensions()/dimTime, - Zero - ), - calculatedFvPatchField::typeName - ) - ); - } + "0", + dt.dimensions()/dimTime, + Zero + ), + calculatedFvPatchField::typeName + ) + ); } @@ -129,38 +103,14 @@ localEulerDdtScheme::fvcDdt mesh() ); - if (mesh().moving()) - { - return tmp> + return tmp> + ( + new GeometricField ( - new GeometricField - ( - ddtIOobject, - mesh(), - rDeltaT.dimensions()*vf.dimensions(), - rDeltaT.primitiveField()* - ( - vf.primitiveField() - - vf.oldTime().primitiveField()*mesh().Vsc0()/mesh().Vsc() - ), - rDeltaT.boundaryField()* - ( - vf.boundaryField() - vf.oldTime().boundaryField() - ) - ) - ); - } - else - { - return tmp> - ( - new GeometricField - ( - ddtIOobject, - rDeltaT*(vf - vf.oldTime()) - ) - ); - } + ddtIOobject, + rDeltaT*(vf - vf.oldTime()) + ) + ); } @@ -181,38 +131,14 @@ localEulerDdtScheme::fvcDdt mesh() ); - if (mesh().moving()) - { - return tmp> + return tmp> + ( + new GeometricField ( - new GeometricField - ( - ddtIOobject, - mesh(), - rDeltaT.dimensions()*rho.dimensions()*vf.dimensions(), - rDeltaT.primitiveField()*rho.value()* - ( - vf.primitiveField() - - vf.oldTime().primitiveField()*mesh().Vsc0()/mesh().Vsc() - ), - rDeltaT.boundaryField()*rho.value()* - ( - vf.boundaryField() - vf.oldTime().boundaryField() - ) - ) - ); - } - else - { - return tmp> - ( - new GeometricField - ( - ddtIOobject, - rDeltaT*rho*(vf - vf.oldTime()) - ) - ); - } + ddtIOobject, + rDeltaT*rho*(vf - vf.oldTime()) + ) + ); } @@ -233,41 +159,14 @@ localEulerDdtScheme::fvcDdt mesh() ); - if (mesh().moving()) - { - return tmp> + return tmp> + ( + new GeometricField ( - new GeometricField - ( - ddtIOobject, - mesh(), - rDeltaT.dimensions()*rho.dimensions()*vf.dimensions(), - rDeltaT.primitiveField()* - ( - rho.primitiveField()*vf.primitiveField() - - rho.oldTime().primitiveField() - *vf.oldTime().primitiveField()*mesh().Vsc0()/mesh().Vsc() - ), - rDeltaT.boundaryField()* - ( - rho.boundaryField()*vf.boundaryField() - - rho.oldTime().boundaryField() - *vf.oldTime().boundaryField() - ) - ) - ); - } - else - { - return tmp> - ( - new GeometricField - ( - ddtIOobject, - rDeltaT*(rho*vf - rho.oldTime()*vf.oldTime()) - ) - ); - } + ddtIOobject, + rDeltaT*(rho*vf - rho.oldTime()*vf.oldTime()) + ) + ); } @@ -289,54 +188,18 @@ localEulerDdtScheme::fvcDdt mesh() ); - if (mesh().moving()) - { - return tmp> + return tmp> + ( + new GeometricField ( - new GeometricField - ( - ddtIOobject, - mesh(), - rDeltaT.dimensions() - *alpha.dimensions()*rho.dimensions()*vf.dimensions(), - rDeltaT.primitiveField()* - ( - alpha.primitiveField() - *rho.primitiveField() - *vf.primitiveField() - - - alpha.oldTime().primitiveField() - *rho.oldTime().primitiveField() - *vf.oldTime().primitiveField()*mesh().Vsc0()/mesh().Vsc() - ), - rDeltaT.boundaryField()* - ( - alpha.boundaryField() - *rho.boundaryField() - *vf.boundaryField() - - - alpha.oldTime().boundaryField() - *rho.oldTime().boundaryField() - *vf.oldTime().boundaryField() - ) - ) - ); - } - else - { - return tmp> - ( - new GeometricField - ( - ddtIOobject, - rDeltaT - *( - alpha*rho*vf - - alpha.oldTime()*rho.oldTime()*vf.oldTime() - ) - ) - ); - } + ddtIOobject, + rDeltaT + *( + alpha*rho*vf + - alpha.oldTime()*rho.oldTime()*vf.oldTime() + ) + ) + ); } @@ -388,15 +251,7 @@ localEulerDdtScheme::fvmDdt const scalarField& rDeltaT = localRDeltaT(); fvm.diag() = rDeltaT*mesh().Vsc(); - - if (mesh().moving()) - { - fvm.source() = rDeltaT*vf.oldTime().primitiveField()*mesh().Vsc0(); - } - else - { - fvm.source() = rDeltaT*vf.oldTime().primitiveField()*mesh().Vsc(); - } + fvm.source() = rDeltaT*vf.oldTime().primitiveField()*mesh().Vsc(); return tfvm; } @@ -424,16 +279,8 @@ localEulerDdtScheme::fvmDdt fvm.diag() = rDeltaT*rho.value()*mesh().Vsc(); - if (mesh().moving()) - { - fvm.source() = rDeltaT - *rho.value()*vf.oldTime().primitiveField()*mesh().Vsc0(); - } - else - { - fvm.source() = rDeltaT - *rho.value()*vf.oldTime().primitiveField()*mesh().Vsc(); - } + fvm.source() = + rDeltaT*rho.value()*vf.oldTime().primitiveField()*mesh().Vsc(); return tfvm; } @@ -461,18 +308,9 @@ localEulerDdtScheme::fvmDdt fvm.diag() = rDeltaT*rho.primitiveField()*mesh().Vsc(); - if (mesh().moving()) - { - fvm.source() = rDeltaT - *rho.oldTime().primitiveField() - *vf.oldTime().primitiveField()*mesh().Vsc0(); - } - else - { - fvm.source() = rDeltaT - *rho.oldTime().primitiveField() - *vf.oldTime().primitiveField()*mesh().Vsc(); - } + fvm.source() = rDeltaT + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc(); return tfvm; } @@ -502,20 +340,10 @@ localEulerDdtScheme::fvmDdt fvm.diag() = rDeltaT*alpha.primitiveField()*rho.primitiveField()*mesh().Vsc(); - if (mesh().moving()) - { - fvm.source() = rDeltaT - *alpha.oldTime().primitiveField() - *rho.oldTime().primitiveField() - *vf.oldTime().primitiveField()*mesh().Vsc0(); - } - else - { - fvm.source() = rDeltaT - *alpha.oldTime().primitiveField() - *rho.oldTime().primitiveField() - *vf.oldTime().primitiveField()*mesh().Vsc(); - } + fvm.source() = rDeltaT + *alpha.oldTime().primitiveField() + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc(); return tfvm; }