Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-2.3.x

src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C

@@ -275,7 +275,7 @@ bool Foam::KinematicParcel<ParcelType>::move
     const scalar maxCo = td.cloud().solution().maxCo();
 
     scalar tEnd = (1.0 - p.stepFraction())*trackTime;
-    const scalar dtMax = tEnd;
+    const scalar dtMax = maxCo*trackTime;
 
     bool tracking = true;
     label nTrackingStalled = 0;

src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,20 +76,8 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
         }
         else
         {
-            is.read
+            label size = long(&UTurb_) - long(&active_) + sizeof(UTurb_);
-            (
+            is.read(reinterpret_cast<char*>(&active_), size);
-                reinterpret_cast<char*>(&active_),
-                sizeof(active_)
-              + sizeof(typeId_)
-              + sizeof(nParticle_)
-              + sizeof(d_)
-              + sizeof(dTarget_)
-              + sizeof(U_)
-              + sizeof(rho_)
-              + sizeof(age_)
-              + sizeof(tTurb_)
-              + sizeof(UTurb_)
-            );
         }
     }
 
@@ -248,20 +236,9 @@ Foam::Ostream& Foam::operator<<
     else
     {
         os  << static_cast<const ParcelType&>(p);
-        os.write
+
-        (
+        label size = long(&p.UTurb_) - long(&p.active_) + sizeof(p.UTurb_);
-            reinterpret_cast<const char*>(&p.active_),
+        os.write(reinterpret_cast<const char*>(&p.active_), size);
-            sizeof(p.active())
-          + sizeof(p.typeId())
-          + sizeof(p.nParticle())
-          + sizeof(p.d())
-          + sizeof(p.dTarget())
-          + sizeof(p.U())
-          + sizeof(p.rho())
-          + sizeof(p.age())
-          + sizeof(p.tTurb())
-          + sizeof(p.UTurb())
-        );
     }
 
     // Check state of Ostream

src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,12 +58,8 @@ Foam::ThermoParcel<ParcelType>::ThermoParcel
         }
         else
         {
-            is.read
+            label size = long(&Cp_) - long(&T_) + sizeof(Cp_);
-            (
+            is.read(reinterpret_cast<char*>(&T_), size);
-                reinterpret_cast<char*>(&T_),
-              + sizeof(T_)
-              + sizeof(Cp_)
-            );
         }
     }
 
@@ -149,11 +145,9 @@ Foam::Ostream& Foam::operator<<
     else
     {
         os  << static_cast<const ParcelType&>(p);
-        os.write
+
-        (
+        label size = long(&p.Cp_) - long(&p.T_) + sizeof(p.Cp_);
-            reinterpret_cast<const char*>(&p.T_),
+        os.write(reinterpret_cast<const char*>(&p.T_), size);
-            sizeof(p.T()) + sizeof(p.Cp())
-        );
     }
 
     // Check state of Ostream