diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.H b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.H
index fba2f2ed98843da080fc18469ea75d09513de1fd..b4d375eefcfd6d7cbf9e55c1ebe905120a6be2e1 100644
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.H
+++ b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchField.H
@@ -37,16 +37,17 @@ Usage
\endtable
Note
- Can also just use uniformFixedValueFvPatchField with an expression
- for the PatchFunction1.
+ This boundary condition is deprecated in favour of
+ Foam::uniformFixedValueFvPatchField
+ with expression entries.
SourceFiles
exprFixedValueFvPatchField.C
\*---------------------------------------------------------------------------*/
-#ifndef exprFixedValueFvPatchField_H
-#define exprFixedValueFvPatchField_H
+#ifndef FoamDeprecated_exprFixedValueFvPatchField_H
+#define FoamDeprecated_exprFixedValueFvPatchField_H
#include "fixedValueFvPatchField.H"
#include "patchExprFieldBase.H"
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchFields.C b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchFields.C
index 5695a23af92259cdd71a90f05bb6c0ddf6d2264d..6ea6507b9928e271dec1755d99ff5b4cff4049b5 100644
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchFields.C
+++ b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchFields.C
@@ -25,7 +25,8 @@ License
\*---------------------------------------------------------------------------*/
-#include "exprFixedValueFvPatchFields.H"
+#include "exprFixedValueFvPatchField.H"
+#include "fieldTypes.H"
#include "volFields.H"
#include "addToRunTimeSelectionTable.H"
@@ -36,6 +37,7 @@ namespace Foam
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+makePatchTypeFieldTypedefs(exprFixedValue);
makePatchFields(exprFixedValue);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchFields.H b/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchFields.H
deleted file mode 100644
index cab541738ed23f8bbd6e25bd6d90bb2a47c5fbf9..0000000000000000000000000000000000000000
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprFixedValueFvPatchFields.H
+++ /dev/null
@@ -1,51 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | www.openfoam.com
- \\/ M anipulation |
--------------------------------------------------------------------------------
- Copyright (C) 2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-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 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
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef exprFixedValueFvPatchFields_H
-#define exprFixedValueFvPatchFields_H
-
-#include "exprFixedValueFvPatchField.H"
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeFieldTypedefs(exprFixedValue);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.C b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.C
index acfa22fd2c31cb56849df22d536df1985589975d..80e4db62ba8ebefd2413fa4f6e15fd7000ece872 100644
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.C
+++ b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.C
@@ -109,6 +109,10 @@ Foam::exprMixedFvPatchField<Type>::exprMixedFvPatchField
),
driver_(this->patch(), dict_)
{
+ DeprecatedInFunction(2212)
+ << "Use uniformMixed with Function1 expressions instead." << nl
+ << " This boundary condition will be removed in the future" << endl;
+
setDebug();
DebugInFunction << nl;
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.H b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.H
index 6d395e078fe7d5b4fead1c1342012515d78cb409..437d0dc4c58fd5f980d05085f98a8980f5ddbad9 100644
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.H
+++ b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchField.H
@@ -38,21 +38,19 @@ Usage
\endtable
Note
- For fixed-value boundary conditions, can also just use
- uniformFixedValueFvPatchField with an expression for the
- PatchFunction1, or a exprMixedFvPatchField.
-
- For gradient boundary conditions, can also just use
- uniformFixedGradientFvPatchField with an expression for the
- PatchFunction1.
+ This boundary condition is deprecated in favour of
+ Foam::uniformMixedFvPatchField,
+ Foam::uniformFixedValueFvPatchField,
+ Foam::uniformFixedGradientFvPatchField
+ with expression entries.
SourceFiles
exprMixedFvPatchField.C
\*---------------------------------------------------------------------------*/
-#ifndef exprMixedFvPatchField_H
-#define exprMixedFvPatchField_H
+#ifndef FoamDeprecated_exprMixedFvPatchField_H
+#define FoamDeprecated_exprMixedFvPatchField_H
#include "mixedFvPatchField.H"
#include "patchExprFieldBase.H"
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchFields.C b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchFields.C
index 730fee6baa92632203cb6a48f1c7ba7cd8f74491..de7626578ac039816e0db7dcad5fe09b2c69b110 100644
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchFields.C
+++ b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchFields.C
@@ -25,7 +25,8 @@ License
\*---------------------------------------------------------------------------*/
-#include "exprMixedFvPatchFields.H"
+#include "exprMixedFvPatchField.H"
+#include "fieldTypes.H"
#include "volFields.H"
#include "addToRunTimeSelectionTable.H"
@@ -36,6 +37,7 @@ namespace Foam
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+makePatchTypeFieldTypedefs(exprMixed);
makePatchFields(exprMixed);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchFields.H b/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchFields.H
deleted file mode 100644
index 40531f0295a2c90ad287b3c27b62f05eff595c6b..0000000000000000000000000000000000000000
--- a/src/finiteVolume/expressions/fields/fvPatchFields/exprMixedFvPatchFields.H
+++ /dev/null
@@ -1,51 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | www.openfoam.com
- \\/ M anipulation |
--------------------------------------------------------------------------------
- Copyright (C) 2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-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 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
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef exprMixedFvPatchFields_H
-#define exprMixedFvPatchFields_H
-
-#include "exprMixedFvPatchField.H"
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeFieldTypedefs(exprMixed);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //