From 49faec23f90704bba0f57600d6e75fafd0bae12d Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 1 Sep 2009 19:35:59 +0100 Subject: [PATCH] added binary diffusion calc - uses molecular weight of binary pair --- src/thermophysicalModels/liquids/Ar/Ar.H | 3 +++ src/thermophysicalModels/liquids/Ar/ArI.H | 6 ++++++ src/thermophysicalModels/liquids/C10H22/C10H22.H | 3 +++ src/thermophysicalModels/liquids/C10H22/C10H22I.H | 6 ++++++ src/thermophysicalModels/liquids/C12H26/C12H26.H | 3 +++ src/thermophysicalModels/liquids/C12H26/C12H26I.H | 6 ++++++ src/thermophysicalModels/liquids/C13H28/C13H28.H | 3 +++ src/thermophysicalModels/liquids/C13H28/C13H28I.H | 6 ++++++ src/thermophysicalModels/liquids/C14H30/C14H30.H | 3 +++ src/thermophysicalModels/liquids/C14H30/C14H30I.H | 6 ++++++ src/thermophysicalModels/liquids/C16H34/C16H34.H | 3 +++ src/thermophysicalModels/liquids/C16H34/C16H34I.H | 6 ++++++ src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H | 3 +++ src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H | 6 ++++++ src/thermophysicalModels/liquids/C2H6/C2H6.H | 3 +++ src/thermophysicalModels/liquids/C2H6/C2H6I.H | 6 ++++++ src/thermophysicalModels/liquids/C2H6O/C2H6O.H | 3 +++ src/thermophysicalModels/liquids/C2H6O/C2H6OI.H | 6 ++++++ src/thermophysicalModels/liquids/C3H6O/C3H6O.H | 3 +++ src/thermophysicalModels/liquids/C3H6O/C3H6OI.H | 6 ++++++ src/thermophysicalModels/liquids/C3H8/C3H8.H | 3 +++ src/thermophysicalModels/liquids/C3H8/C3H8I.H | 6 ++++++ src/thermophysicalModels/liquids/C4H10O/C4H10O.H | 3 +++ src/thermophysicalModels/liquids/C4H10O/C4H10OI.H | 6 ++++++ src/thermophysicalModels/liquids/C6H14/C6H14.H | 3 +++ src/thermophysicalModels/liquids/C6H14/C6H14I.H | 6 ++++++ src/thermophysicalModels/liquids/C6H6/C6H6.H | 3 +++ src/thermophysicalModels/liquids/C6H6/C6H6I.H | 6 ++++++ src/thermophysicalModels/liquids/C7H16/C7H16.H | 3 +++ src/thermophysicalModels/liquids/C7H16/C7H16I.H | 6 ++++++ src/thermophysicalModels/liquids/C7H8/C7H8.H | 3 +++ src/thermophysicalModels/liquids/C7H8/C7H8I.H | 6 ++++++ src/thermophysicalModels/liquids/C8H10/C8H10.H | 3 +++ src/thermophysicalModels/liquids/C8H10/C8H10I.H | 6 ++++++ src/thermophysicalModels/liquids/C8H18/C8H18.H | 3 +++ src/thermophysicalModels/liquids/C8H18/C8H18I.H | 6 ++++++ src/thermophysicalModels/liquids/C9H20/C9H20.H | 3 +++ src/thermophysicalModels/liquids/C9H20/C9H20I.H | 6 ++++++ src/thermophysicalModels/liquids/CH3OH/CH3OH.H | 3 +++ src/thermophysicalModels/liquids/CH3OH/CH3OHI.H | 6 ++++++ src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H | 3 +++ src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H | 6 ++++++ src/thermophysicalModels/liquids/H2O/H2O.H | 3 +++ src/thermophysicalModels/liquids/H2O/H2OI.H | 6 ++++++ src/thermophysicalModels/liquids/IC8H18/IC8H18.H | 3 +++ src/thermophysicalModels/liquids/IC8H18/IC8H18I.H | 6 ++++++ src/thermophysicalModels/liquids/IDEA/IDEA.H | 3 +++ src/thermophysicalModels/liquids/IDEA/IDEAI.H | 6 ++++++ src/thermophysicalModels/liquids/MB/MB.H | 3 +++ src/thermophysicalModels/liquids/MB/MBI.H | 6 ++++++ src/thermophysicalModels/liquids/N2/N2.H | 3 +++ src/thermophysicalModels/liquids/N2/N2I.H | 6 ++++++ src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H | 3 +++ src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H | 8 ++++++++ src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H | 3 +++ src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H | 6 ++++++ src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H | 4 ++++ src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H | 7 +++++++ src/thermophysicalModels/liquids/liquid/liquid.H | 3 +++ src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H | 4 ++++ src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H | 7 +++++++ .../APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H | 8 ++++++++ 62 files changed, 287 insertions(+) diff --git a/src/thermophysicalModels/liquids/Ar/Ar.H b/src/thermophysicalModels/liquids/Ar/Ar.H index 39e8f0f960..dff4470831 100644 --- a/src/thermophysicalModels/liquids/Ar/Ar.H +++ b/src/thermophysicalModels/liquids/Ar/Ar.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/Ar/ArI.H b/src/thermophysicalModels/liquids/Ar/ArI.H index 72ba64c1a8..f1a4aa24f8 100644 --- a/src/thermophysicalModels/liquids/Ar/ArI.H +++ b/src/thermophysicalModels/liquids/Ar/ArI.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::Ar::D(scalar p, scalar T) const } +inline Foam::scalar Foam::Ar::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/C10H22/C10H22.H b/src/thermophysicalModels/liquids/C10H22/C10H22.H index 88ee972321..6e6804b014 100644 --- a/src/thermophysicalModels/liquids/C10H22/C10H22.H +++ b/src/thermophysicalModels/liquids/C10H22/C10H22.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/C10H22/C10H22I.H b/src/thermophysicalModels/liquids/C10H22/C10H22I.H index bdbc395f1f..e79745b6db 100644 --- a/src/thermophysicalModels/liquids/C10H22/C10H22I.H +++ b/src/thermophysicalModels/liquids/C10H22/C10H22I.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::C10H22::D(scalar p, scalar T) const } +inline Foam::scalar Foam::C10H22::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/C12H26/C12H26.H b/src/thermophysicalModels/liquids/C12H26/C12H26.H index 9c3cba2ac2..01ca933f8e 100644 --- a/src/thermophysicalModels/liquids/C12H26/C12H26.H +++ b/src/thermophysicalModels/liquids/C12H26/C12H26.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/C12H26/C12H26I.H b/src/thermophysicalModels/liquids/C12H26/C12H26I.H index 0edb1e981a..f11b325533 100644 --- a/src/thermophysicalModels/liquids/C12H26/C12H26I.H +++ b/src/thermophysicalModels/liquids/C12H26/C12H26I.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::C12H26::D(scalar p, scalar T) const } +inline Foam::scalar Foam::C12H26::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/C13H28/C13H28.H b/src/thermophysicalModels/liquids/C13H28/C13H28.H index d97300f1d1..dbae5d0ca6 100644 --- a/src/thermophysicalModels/liquids/C13H28/C13H28.H +++ b/src/thermophysicalModels/liquids/C13H28/C13H28.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/C13H28/C13H28I.H b/src/thermophysicalModels/liquids/C13H28/C13H28I.H index 333905a9f3..557898017e 100644 --- a/src/thermophysicalModels/liquids/C13H28/C13H28I.H +++ b/src/thermophysicalModels/liquids/C13H28/C13H28I.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::C13H28::D(scalar p, scalar T) const } +inline Foam::scalar Foam::C13H28::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/C14H30/C14H30.H b/src/thermophysicalModels/liquids/C14H30/C14H30.H index 183ee026de..65e06ac6b4 100644 --- a/src/thermophysicalModels/liquids/C14H30/C14H30.H +++ b/src/thermophysicalModels/liquids/C14H30/C14H30.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/C14H30/C14H30I.H b/src/thermophysicalModels/liquids/C14H30/C14H30I.H index 6c64cab8c4..3d977890dc 100644 --- a/src/thermophysicalModels/liquids/C14H30/C14H30I.H +++ b/src/thermophysicalModels/liquids/C14H30/C14H30I.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::C14H30::D(scalar p, scalar T) const } +inline Foam::scalar Foam::C14H30::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/C16H34/C16H34.H b/src/thermophysicalModels/liquids/C16H34/C16H34.H index 5f2b883163..9a486ba41b 100644 --- a/src/thermophysicalModels/liquids/C16H34/C16H34.H +++ b/src/thermophysicalModels/liquids/C16H34/C16H34.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/C16H34/C16H34I.H b/src/thermophysicalModels/liquids/C16H34/C16H34I.H index 66a19bb3d4..e3fc33a016 100644 --- a/src/thermophysicalModels/liquids/C16H34/C16H34I.H +++ b/src/thermophysicalModels/liquids/C16H34/C16H34I.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::C16H34::D(scalar p, scalar T) const } +inline Foam::scalar Foam::C16H34::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H b/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H index 88a7099446..0cab3020c4 100644 --- a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H +++ b/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H b/src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H index cf051eea9c..b23ab9f4a6 100644 --- a/src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H +++ b/src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::C2H5OH::D(scalar p, scalar T) const } +inline Foam::scalar Foam::C2H5OH::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/C2H6/C2H6.H b/src/thermophysicalModels/liquids/C2H6/C2H6.H index 728c362732..bd213ab41e 100644 --- a/src/thermophysicalModels/liquids/C2H6/C2H6.H +++ b/src/thermophysicalModels/liquids/C2H6/C2H6.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/C2H6/C2H6I.H b/src/thermophysicalModels/liquids/C2H6/C2H6I.H index a788413b0e..5ebc99786d 100644 --- a/src/thermophysicalModels/liquids/C2H6/C2H6I.H +++ b/src/thermophysicalModels/liquids/C2H6/C2H6I.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::C2H6::D(scalar p, scalar T) const } +inline Foam::scalar Foam::C2H6::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/C2H6O/C2H6O.H b/src/thermophysicalModels/liquids/C2H6O/C2H6O.H index 690f68d9e4..5baa101b99 100644 --- a/src/thermophysicalModels/liquids/C2H6O/C2H6O.H +++ b/src/thermophysicalModels/liquids/C2H6O/C2H6O.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/C2H6O/C2H6OI.H b/src/thermophysicalModels/liquids/C2H6O/C2H6OI.H index 5e2b7cadc7..794b495979 100644 --- a/src/thermophysicalModels/liquids/C2H6O/C2H6OI.H +++ b/src/thermophysicalModels/liquids/C2H6O/C2H6OI.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::C2H6O::D(scalar p, scalar T) const } +inline Foam::scalar Foam::C2H6O::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/C3H6O/C3H6O.H b/src/thermophysicalModels/liquids/C3H6O/C3H6O.H index b08db3fc0b..bfca7d5a26 100644 --- a/src/thermophysicalModels/liquids/C3H6O/C3H6O.H +++ b/src/thermophysicalModels/liquids/C3H6O/C3H6O.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H b/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H index a02afbde38..9b6928c992 100644 --- a/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H +++ b/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H @@ -101,4 +101,10 @@ inline Foam::scalar Foam::C3H6O::D(scalar p, scalar T) const } +inline Foam::scalar Foam::C3H6O::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/C3H8/C3H8.H b/src/thermophysicalModels/liquids/C3H8/C3H8.H index 27477b01c6..73e0268e6e 100644 --- a/src/thermophysicalModels/liquids/C3H8/C3H8.H +++ b/src/thermophysicalModels/liquids/C3H8/C3H8.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/C3H8/C3H8I.H b/src/thermophysicalModels/liquids/C3H8/C3H8I.H index 7ba1f47a74..013935c41b 100644 --- a/src/thermophysicalModels/liquids/C3H8/C3H8I.H +++ b/src/thermophysicalModels/liquids/C3H8/C3H8I.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::C3H8::D(scalar p, scalar T) const } +inline Foam::scalar Foam::C3H8::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/C4H10O/C4H10O.H b/src/thermophysicalModels/liquids/C4H10O/C4H10O.H index b2da446849..d0055e3593 100644 --- a/src/thermophysicalModels/liquids/C4H10O/C4H10O.H +++ b/src/thermophysicalModels/liquids/C4H10O/C4H10O.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/C4H10O/C4H10OI.H b/src/thermophysicalModels/liquids/C4H10O/C4H10OI.H index bc067ebaff..b9eedfda55 100644 --- a/src/thermophysicalModels/liquids/C4H10O/C4H10OI.H +++ b/src/thermophysicalModels/liquids/C4H10O/C4H10OI.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::C4H10O::D(scalar p, scalar T) const } +inline Foam::scalar Foam::C4H10O::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/C6H14/C6H14.H b/src/thermophysicalModels/liquids/C6H14/C6H14.H index 919d68bfd6..a250804137 100644 --- a/src/thermophysicalModels/liquids/C6H14/C6H14.H +++ b/src/thermophysicalModels/liquids/C6H14/C6H14.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/C6H14/C6H14I.H b/src/thermophysicalModels/liquids/C6H14/C6H14I.H index 144648c0a7..076914fb2a 100644 --- a/src/thermophysicalModels/liquids/C6H14/C6H14I.H +++ b/src/thermophysicalModels/liquids/C6H14/C6H14I.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::C6H14::D(scalar p, scalar T) const } +inline Foam::scalar Foam::C6H14::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/C6H6/C6H6.H b/src/thermophysicalModels/liquids/C6H6/C6H6.H index cc9c5ac1f1..f404e22e98 100644 --- a/src/thermophysicalModels/liquids/C6H6/C6H6.H +++ b/src/thermophysicalModels/liquids/C6H6/C6H6.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/C6H6/C6H6I.H b/src/thermophysicalModels/liquids/C6H6/C6H6I.H index 3aca0ee525..6205801ca9 100644 --- a/src/thermophysicalModels/liquids/C6H6/C6H6I.H +++ b/src/thermophysicalModels/liquids/C6H6/C6H6I.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::C6H6::D(scalar p, scalar T) const } +inline Foam::scalar Foam::C6H6::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/C7H16/C7H16.H b/src/thermophysicalModels/liquids/C7H16/C7H16.H index 617cffb04b..b186035160 100644 --- a/src/thermophysicalModels/liquids/C7H16/C7H16.H +++ b/src/thermophysicalModels/liquids/C7H16/C7H16.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/C7H16/C7H16I.H b/src/thermophysicalModels/liquids/C7H16/C7H16I.H index 27eb0761e1..9908b72174 100644 --- a/src/thermophysicalModels/liquids/C7H16/C7H16I.H +++ b/src/thermophysicalModels/liquids/C7H16/C7H16I.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::C7H16::D(scalar p, scalar T) const } +inline Foam::scalar Foam::C7H16::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/C7H8/C7H8.H b/src/thermophysicalModels/liquids/C7H8/C7H8.H index 8d0afcf8cb..1eaab1c348 100644 --- a/src/thermophysicalModels/liquids/C7H8/C7H8.H +++ b/src/thermophysicalModels/liquids/C7H8/C7H8.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/C7H8/C7H8I.H b/src/thermophysicalModels/liquids/C7H8/C7H8I.H index 02813a18f8..6a8e4c8762 100644 --- a/src/thermophysicalModels/liquids/C7H8/C7H8I.H +++ b/src/thermophysicalModels/liquids/C7H8/C7H8I.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::C7H8::D(scalar p, scalar T) const } +inline Foam::scalar Foam::C7H8::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/C8H10/C8H10.H b/src/thermophysicalModels/liquids/C8H10/C8H10.H index 6301c555cc..c9cc72ac0e 100644 --- a/src/thermophysicalModels/liquids/C8H10/C8H10.H +++ b/src/thermophysicalModels/liquids/C8H10/C8H10.H @@ -152,6 +152,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/C8H10/C8H10I.H b/src/thermophysicalModels/liquids/C8H10/C8H10I.H index 58ee6c81a9..09bb1750d2 100644 --- a/src/thermophysicalModels/liquids/C8H10/C8H10I.H +++ b/src/thermophysicalModels/liquids/C8H10/C8H10I.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::C8H10::D(scalar p, scalar T) const } +inline Foam::scalar Foam::C8H10::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/C8H18/C8H18.H b/src/thermophysicalModels/liquids/C8H18/C8H18.H index 20f4f5aa11..9b3db0de3f 100644 --- a/src/thermophysicalModels/liquids/C8H18/C8H18.H +++ b/src/thermophysicalModels/liquids/C8H18/C8H18.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/C8H18/C8H18I.H b/src/thermophysicalModels/liquids/C8H18/C8H18I.H index 3844155a37..9a6258e68d 100644 --- a/src/thermophysicalModels/liquids/C8H18/C8H18I.H +++ b/src/thermophysicalModels/liquids/C8H18/C8H18I.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::C8H18::D(scalar p, scalar T) const } +inline Foam::scalar Foam::C8H18::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/C9H20/C9H20.H b/src/thermophysicalModels/liquids/C9H20/C9H20.H index be28728d4f..b8b90c8d5f 100644 --- a/src/thermophysicalModels/liquids/C9H20/C9H20.H +++ b/src/thermophysicalModels/liquids/C9H20/C9H20.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/C9H20/C9H20I.H b/src/thermophysicalModels/liquids/C9H20/C9H20I.H index d478264307..0417380dab 100644 --- a/src/thermophysicalModels/liquids/C9H20/C9H20I.H +++ b/src/thermophysicalModels/liquids/C9H20/C9H20I.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::C9H20::D(scalar p, scalar T) const } +inline Foam::scalar Foam::C9H20::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/CH3OH/CH3OH.H b/src/thermophysicalModels/liquids/CH3OH/CH3OH.H index 11deb6a861..87770ab0fe 100644 --- a/src/thermophysicalModels/liquids/CH3OH/CH3OH.H +++ b/src/thermophysicalModels/liquids/CH3OH/CH3OH.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/CH3OH/CH3OHI.H b/src/thermophysicalModels/liquids/CH3OH/CH3OHI.H index 28c56dde54..2ca785c910 100644 --- a/src/thermophysicalModels/liquids/CH3OH/CH3OHI.H +++ b/src/thermophysicalModels/liquids/CH3OH/CH3OHI.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::CH3OH::D(scalar p, scalar T) const } +inline Foam::scalar Foam::CH3OH::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H index bcfbbd62ef..8818596e59 100644 --- a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H +++ b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H b/src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H index b04233aad1..b1aa667864 100644 --- a/src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H +++ b/src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H @@ -102,5 +102,11 @@ inline Foam::scalar Foam::CH4N2O::D(scalar p, scalar T) const } +inline Foam::scalar Foam::CH4N2O::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/H2O/H2O.H b/src/thermophysicalModels/liquids/H2O/H2O.H index 92287b2216..5b7e4f1715 100644 --- a/src/thermophysicalModels/liquids/H2O/H2O.H +++ b/src/thermophysicalModels/liquids/H2O/H2O.H @@ -152,6 +152,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/H2O/H2OI.H b/src/thermophysicalModels/liquids/H2O/H2OI.H index bc5c4bff5a..5032fcc341 100644 --- a/src/thermophysicalModels/liquids/H2O/H2OI.H +++ b/src/thermophysicalModels/liquids/H2O/H2OI.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::H2O::D(scalar p, scalar T) const } +inline Foam::scalar Foam::H2O::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/IC8H18/IC8H18.H b/src/thermophysicalModels/liquids/IC8H18/IC8H18.H index 48de18edbe..3833578a07 100644 --- a/src/thermophysicalModels/liquids/IC8H18/IC8H18.H +++ b/src/thermophysicalModels/liquids/IC8H18/IC8H18.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/IC8H18/IC8H18I.H b/src/thermophysicalModels/liquids/IC8H18/IC8H18I.H index ac53685cb8..9e0cecf277 100644 --- a/src/thermophysicalModels/liquids/IC8H18/IC8H18I.H +++ b/src/thermophysicalModels/liquids/IC8H18/IC8H18I.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::IC8H18::D(scalar p, scalar T) const } +inline Foam::scalar Foam::IC8H18::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/IDEA/IDEA.H b/src/thermophysicalModels/liquids/IDEA/IDEA.H index a51aa86cbf..58f1a45d4d 100644 --- a/src/thermophysicalModels/liquids/IDEA/IDEA.H +++ b/src/thermophysicalModels/liquids/IDEA/IDEA.H @@ -175,6 +175,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/IDEA/IDEAI.H b/src/thermophysicalModels/liquids/IDEA/IDEAI.H index 865d7babfe..fd236ccb00 100644 --- a/src/thermophysicalModels/liquids/IDEA/IDEAI.H +++ b/src/thermophysicalModels/liquids/IDEA/IDEAI.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::IDEA::D(scalar p, scalar T) const } +inline Foam::scalar Foam::IDEA::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/MB/MB.H b/src/thermophysicalModels/liquids/MB/MB.H index e9e4703e3d..ef1047582a 100644 --- a/src/thermophysicalModels/liquids/MB/MB.H +++ b/src/thermophysicalModels/liquids/MB/MB.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/MB/MBI.H b/src/thermophysicalModels/liquids/MB/MBI.H index 058d2c9f26..c4c8f126c6 100644 --- a/src/thermophysicalModels/liquids/MB/MBI.H +++ b/src/thermophysicalModels/liquids/MB/MBI.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::MB::D(scalar p, scalar T) const } +inline Foam::scalar Foam::MB::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/N2/N2.H b/src/thermophysicalModels/liquids/N2/N2.H index 3595320ce8..61ce2f50cb 100644 --- a/src/thermophysicalModels/liquids/N2/N2.H +++ b/src/thermophysicalModels/liquids/N2/N2.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/N2/N2I.H b/src/thermophysicalModels/liquids/N2/N2I.H index 757f99d293..c4ae9e25be 100644 --- a/src/thermophysicalModels/liquids/N2/N2I.H +++ b/src/thermophysicalModels/liquids/N2/N2I.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::N2::D(scalar p, scalar T) const } +inline Foam::scalar Foam::N2::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H index 7489d6a0e4..e8cceb248a 100644 --- a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H +++ b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H index 4cf642cc0b..68b2759081 100644 --- a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H +++ b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H @@ -102,4 +102,12 @@ inline Foam::scalar Foam::aC10H7CH3::D(scalar p, scalar T) const } + + +inline Foam::scalar Foam::aC10H7CH3::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H index add7fa7e93..ee07c95228 100644 --- a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H +++ b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H @@ -153,6 +153,9 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H index 1be40b2f2d..7d8a29062a 100644 --- a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H +++ b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H @@ -102,4 +102,10 @@ inline Foam::scalar Foam::bC10H7CH3::D(scalar p, scalar T) const } +inline Foam::scalar Foam::bC10H7CH3::D(scalar p, scalar T, scalar Wb) const +{ + return D_.f(p, T, Wb); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H index d6f59b9568..e1ac389d51 100644 --- a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H +++ b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H @@ -151,6 +151,10 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + // Note: behaves the same as D(p, T) + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H b/src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H index 3ec8bd368d..1c65174759 100644 --- a/src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H +++ b/src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H @@ -102,5 +102,12 @@ inline Foam::scalar Foam::iC3H8O::D(scalar p, scalar T) const } +inline Foam::scalar Foam::iC3H8O::D(scalar p, scalar T, scalar) const +{ + // Use 'standard' NSRDS D(p, T) function + return D(p, T); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/liquid/liquid.H b/src/thermophysicalModels/liquids/liquid/liquid.H index 053d36027b..c0f52c11c3 100644 --- a/src/thermophysicalModels/liquids/liquid/liquid.H +++ b/src/thermophysicalModels/liquids/liquid/liquid.H @@ -243,6 +243,9 @@ public: //- Vapour diffussivity [m2/s] virtual scalar D(scalar p, scalar T) const = 0; + //- Vapour diffussivity [m2/s] with specified binary pair + virtual scalar D(scalar p, scalar T, scalar Wb) const = 0; + // I-O diff --git a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H b/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H index 27601bc548..055eeb264d 100644 --- a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H +++ b/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H @@ -151,6 +151,10 @@ public: //- Vapour diffussivity [m2/s] inline scalar D(scalar p, scalar T) const; + //- Vapour diffussivity [m2/s] with specified binary pair + // Note: behaves the same as D(p, T) + inline scalar D(scalar p, scalar T, scalar Wb) const; + // I-O diff --git a/src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H b/src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H index ec850eddf8..d5305d2d58 100644 --- a/src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H +++ b/src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H @@ -102,5 +102,12 @@ inline Foam::scalar Foam::nC3H8O::D(scalar p, scalar T) const } +inline Foam::scalar Foam::nC3H8O::D(scalar p, scalar T, scalar) const +{ + // Use 'standard' NSRDS D(p, T) function + return D(p, T); +} + + // ************************************************************************* // diff --git a/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H b/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H index 7f95e450e3..506aac64c7 100644 --- a/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H +++ b/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H @@ -103,6 +103,14 @@ public: return 3.6059e-3*(pow(1.8*T, 1.75))*alpha_/(p*beta_); } + //- API vapour mass diffusivity function using properties from + // construction - with specified binary pair + scalar f(scalar p, scalar T, scalar Wa) const + { + const scalar alphaBinary = sqrt(1/wf_ + 1/Wa); + return 3.6059e-3*(pow(1.8*T, 1.75))*alphaBinary/(p*beta_); + } + //- Write the function coefficients void writeData(Ostream& os) const {