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

src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,9 +25,8 @@ Class
     Foam::SolverPerformance
 
 Description
-    SolverPerformance is a general matrix class in which the coefficients are
-    stored as three arrays, one for the upper triangle, one for the
-    lower triangle and a third for the diagonal.
+    SolverPerformance is the class returned by the LduMatrix solver
+    containing performance statistics.
 
 SourceFiles
     SolverPerformance.C
@@ -72,13 +71,10 @@ Ostream& operator<<
 );
 
 
-
 /*---------------------------------------------------------------------------*\
                        Class SolverPerformance Declaration
 \*---------------------------------------------------------------------------*/
 
-//- Class returned by the solver
-//  containing performance statistics
 template<class Type>
 class SolverPerformance
 {

src/OpenFOAM/primitives/septernion/septernion.C

@@ -59,6 +59,17 @@ Foam::word Foam::name(const septernion& s)
 }
 
 
+Foam::septernion Foam::slerp
+(
+    const septernion& qa,
+    const septernion& qb,
+    const scalar t
+)
+{
+    return septernion((1.0-t)*qa.t()+t*qb.t(), slerp(qa.r(), qb.r(), t));
+}
+
+
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 Foam::Istream& Foam::operator>>(Istream& is, septernion& s)

src/OpenFOAM/primitives/septernion/septernion.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
@@ -157,6 +157,13 @@ inline septernion inv(const septernion& tr);
 //- Return a string representation of a septernion
 word name(const septernion&);
 
+//- Spherical linear interpolation of septernions. 0 for qa, 1 for qb
+septernion slerp
+(
+    const septernion& qa,
+    const septernion& qb,
+    const scalar t
+);
 
 //- Data associated with septernion type are contiguous
 template<>

src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H

@@ -64,7 +64,7 @@ class liquidProperties
         //- Critical pressure [Pa]
         scalar Pc_;
 
-        //- Critical volume [m^3/mol]
+        //- Critical volume [m^3/kmol]
         scalar Vc_;
 
         //- Critical compressibility factor []
@@ -185,7 +185,7 @@ public:
             //- Critical pressure [Pa]
             inline scalar Pc() const;
 
-            //- Critical volume [m^3/mol]
+            //- Critical volume [m^3/kmol]
             inline scalar Vc() const;
 
             //- Critical compressibilty factor