Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -137,7 +137,7 @@ Foam::IOdictionary::IOdictionary(const IOobject& io)
     }
 
     // Everyone check or just master
-    bool masterOnly = 
+    bool masterOnly =
         regIOobject::fileModificationChecking == timeStampMaster
      || regIOobject::fileModificationChecking == inotifyMaster;
 
@@ -195,7 +195,7 @@ Foam::IOdictionary::IOdictionary(const IOobject& io, const dictionary& dict)
     }
 
     // Everyone check or just master
-    bool masterOnly = 
+    bool masterOnly =
         regIOobject::fileModificationChecking == timeStampMaster
      || regIOobject::fileModificationChecking == inotifyMaster;
 
@@ -239,6 +239,15 @@ Foam::IOdictionary::IOdictionary(const IOobject& io, const dictionary& dict)
 }
 
 
+Foam::IOdictionary::IOdictionary(const IOobject& io, Istream& is)
+:
+    regIOobject(io),
+    dictionary(is)
+{
+    dictionary::name() = IOobject::objectPath();
+}
+
+
 // * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
 
 Foam::IOdictionary::~IOdictionary()

src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,6 +75,9 @@ public:
         //- Construct given an IOobject and dictionary
         IOdictionary(const IOobject&, const dictionary&);
 
+        //- Construct given an IOobject and Istream
+        IOdictionary(const IOobject&, Istream&);
+
 
     //- Destructor
     virtual ~IOdictionary();

src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,17 +95,22 @@ Foam::tmp
 >
 Foam::GeometricField<Type, PatchField, GeoMesh>::readField(Istream& is)
 {
-    if (is.version() < 2.0)
+    return readField
-    {
+    (
-        FatalIOErrorIn
+        IOdictionary
         (
-            "GeometricField<Type, PatchField, GeoMesh>::readField(Istream&)",
+            IOobject
+            (
+                this->name(),
+                this->time().timeName(),
+                this->db(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            ),
             is
-        )   << "IO versions < 2.0 are not supported."
+        )
-            << exit(FatalIOError);
+    );
-    }
-
-    return readField(dictionary(is));
 }
 
 
@@ -384,45 +389,6 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 }
 
 
-template<class Type, template<class> class PatchField, class GeoMesh>
-Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
-(
-    const IOobject& io,
-    const Mesh& mesh,
-    Istream& is
-)
-:
-    DimensionedField<Type, GeoMesh>(io, mesh, dimless, false),
-    timeIndex_(this->time().timeIndex()),
-    field0Ptr_(NULL),
-    fieldPrevIterPtr_(NULL),
-    boundaryField_(*this, readField(is))
-{
-    // Check compatibility between field and mesh
-
-    if (this->size() != GeoMesh::size(this->mesh()))
-    {
-        FatalIOErrorIn
-        (
-            "GeometricField<Type, PatchField, GeoMesh>::GeometricField"
-            "(const IOobject&, const Mesh&, Istream&)",
-            is
-        )   << "   number of field elements = " << this->size()
-            << " number of mesh elements = " << GeoMesh::size(this->mesh())
-            << exit(FatalIOError);
-    }
-
-    readOldTimeIfPresent();
-
-    if (debug)
-    {
-        Info<< "Finishing read-construct of "
-               "GeometricField<Type, PatchField, GeoMesh>"
-            << endl << this->info() << endl;
-    }
-}
-
-
 template<class Type, template<class> class PatchField, class GeoMesh>
 Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 (

src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -325,14 +325,6 @@ public:
             const Mesh&
         );
 
-        //- Construct and read from given stream
-        GeometricField
-        (
-            const IOobject&,
-            const Mesh&,
-            Istream&
-        );
-
         //- Construct from dictionary
         GeometricField
         (