diff --git a/src/OpenFOAM/fields/Fields/scalarField/scalarField.C b/src/OpenFOAM/fields/Fields/scalarField/scalarField.C index 75af8d2b94..c7f151c90d 100644 --- a/src/OpenFOAM/fields/Fields/scalarField/scalarField.C +++ b/src/OpenFOAM/fields/Fields/scalarField/scalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2011-2017 OpenFOAM Foundation @@ -161,7 +161,9 @@ UNARY_FUNCTION(scalar, scalar, y1) UNARY_FUNCTION(scalar, scalar, degToRad) UNARY_FUNCTION(scalar, scalar, radToDeg) UNARY_FUNCTION(scalar, scalar, atmToPa) +UNARY_FUNCTION(scalar, scalar, barToPa) UNARY_FUNCTION(scalar, scalar, paToAtm) +UNARY_FUNCTION(scalar, scalar, paToBar) #define BesselFunc(func) \ diff --git a/src/OpenFOAM/fields/Fields/scalarField/scalarField.H b/src/OpenFOAM/fields/Fields/scalarField/scalarField.H index 07dcc34250..db6e2e98ba 100644 --- a/src/OpenFOAM/fields/Fields/scalarField/scalarField.H +++ b/src/OpenFOAM/fields/Fields/scalarField/scalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2011-2017 OpenFOAM Foundation @@ -139,7 +139,9 @@ UNARY_FUNCTION(scalar, scalar, y1) UNARY_FUNCTION(scalar, scalar, degToRad) UNARY_FUNCTION(scalar, scalar, radToDeg) UNARY_FUNCTION(scalar, scalar, atmToPa) +UNARY_FUNCTION(scalar, scalar, barToPa) UNARY_FUNCTION(scalar, scalar, paToAtm) +UNARY_FUNCTION(scalar, scalar, paToBar) #define BesselFunc(func) \ void func(scalarField& Res, const int n, const UList& sf); \ diff --git a/src/OpenFOAM/global/constants/mathematical/mathematicalConstants.H b/src/OpenFOAM/global/constants/mathematical/mathematicalConstants.H index 28f78b9941..50032e7d9c 100644 --- a/src/OpenFOAM/global/constants/mathematical/mathematicalConstants.H +++ b/src/OpenFOAM/global/constants/mathematical/mathematicalConstants.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2017 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2011-2016 OpenFOAM Foundation diff --git a/src/OpenFOAM/global/unitConversion/unitConversion.H b/src/OpenFOAM/global/unitConversion/unitConversion.H index c5f40d5359..4687f93037 100644 --- a/src/OpenFOAM/global/unitConversion/unitConversion.H +++ b/src/OpenFOAM/global/unitConversion/unitConversion.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2017-2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2011 OpenFOAM Foundation @@ -99,12 +99,25 @@ inline constexpr scalar atmToPa(const scalar atm) noexcept return (atm*101325.0); } -//- Conversion from atm to Pa +//- Conversion from bar to Pa +inline constexpr scalar barToPa(const scalar bar) noexcept +{ + return (bar*100000.0); +} + + +//- Conversion from Pa to atm inline constexpr scalar paToAtm(const scalar pa) noexcept { return (pa/101325.0); } +//- Conversion from Pa to bar +inline constexpr scalar paToBar(const scalar pa) noexcept +{ + return (pa/100000.0); +} + //- User literal for degrees to radians conversion (integers) inline constexpr scalar operator "" _deg(unsigned long long int deg) noexcept