Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

applications/utilities/miscellaneous/foamDebugSwitches/Make/options

@@ -57,4 +57,5 @@ EXE_LIBS = \
     -lthermophysicalFunctions \
     -ltopoChangerFvMesh \
     -ltriSurface \
+    -ltwoPhaseInterfaceProperties \
     -lutilityFunctionObjects

applications/utilities/parallelProcessing/decomposePar/decomposePar.C

@@ -402,17 +402,17 @@ int main(int argc, char *argv[])
     PtrList< List<SLList<indexedParticle*>*> > cellParticles(cloudDirs.size());
 
     PtrList<PtrList<labelIOField> > lagrangianLabelFields(cloudDirs.size());
-    PtrList<PtrList<labelIOFieldField> > lagrangianLabelFieldFields
+    PtrList<PtrList<labelFieldCompactIOField> > lagrangianLabelFieldFields
     (
         cloudDirs.size()
     );
     PtrList<PtrList<scalarIOField> > lagrangianScalarFields(cloudDirs.size());
-    PtrList<PtrList<scalarIOFieldField> > lagrangianScalarFieldFields
+    PtrList<PtrList<scalarFieldCompactIOField> > lagrangianScalarFieldFields
     (
         cloudDirs.size()
     );
     PtrList<PtrList<vectorIOField> > lagrangianVectorFields(cloudDirs.size());
-    PtrList<PtrList<vectorIOFieldField> > lagrangianVectorFieldFields
+    PtrList<PtrList<vectorFieldCompactIOField> > lagrangianVectorFieldFields
     (
         cloudDirs.size()
     );
@@ -420,13 +420,14 @@ int main(int argc, char *argv[])
     (
         cloudDirs.size()
     );
-    PtrList<PtrList<sphericalTensorIOFieldField> >
+    PtrList<PtrList<sphericalTensorFieldCompactIOField> >
         lagrangianSphericalTensorFieldFields(cloudDirs.size());
     PtrList<PtrList<symmTensorIOField> > lagrangianSymmTensorFields
     (
         cloudDirs.size()
     );
-    PtrList<PtrList<symmTensorIOFieldField> > lagrangianSymmTensorFieldFields
+    PtrList<PtrList<symmTensorFieldCompactIOField> >
+    lagrangianSymmTensorFieldFields
     (
         cloudDirs.size()
     );
@@ -434,7 +435,7 @@ int main(int argc, char *argv[])
     (
         cloudDirs.size()
     );
-    PtrList<PtrList<tensorIOFieldField> > lagrangianTensorFieldFields
+    PtrList<PtrList<tensorFieldCompactIOField> > lagrangianTensorFieldFields
     (
         cloudDirs.size()
     );

applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H

@@ -37,7 +37,7 @@ SourceFiles
 #define lagrangianFieldDecomposer_H
 
 #include "Cloud.H"
-#include "IOFieldField.H"
+#include "CompactIOField.H"
 #include "indexedParticle.H"
 #include "passiveParticle.H"
 
@@ -111,9 +111,9 @@ public:
             const IOobjectList& lagrangianObjects,
             PtrList
             <
-                PtrList<IOFieldField<Field<Type>, Type> >
+                PtrList<CompactIOField<Field<Type>, Type> >
             >& lagrangianFields
-//            PtrList<IOFieldField<Field<Type>, Type > >& lagrangianFields
+//            PtrList<CompactIOField<Field<Type>, Type > >& lagrangianFields
         );
 
 
@@ -126,10 +126,10 @@ public:
         ) const;
 
         template<class Type>
-        tmp<IOFieldField<Field<Type>, Type> > decomposeFieldField
+        tmp<CompactIOField<Field<Type>, Type> > decomposeFieldField
         (
             const word& cloudName,
-            const IOFieldField<Field<Type>, Type>& field
+            const CompactIOField<Field<Type>, Type>& field
         ) const;
 
 

applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposerDecomposeFields.C

@@ -68,7 +68,7 @@ void Foam::lagrangianFieldDecomposer::readFieldFields
 (
     const label cloudI,
     const IOobjectList& lagrangianObjects,
-    PtrList<PtrList<IOFieldField<Field<Type>, Type> > >& lagrangianFields
+    PtrList<PtrList<CompactIOField<Field<Type>, Type> > >& lagrangianFields
 )
 {
     // Search list of objects for lagrangian fields
@@ -79,13 +79,17 @@ void Foam::lagrangianFieldDecomposer::readFieldFields
 
     IOobjectList lagrangianTypeObjectsB
     (
-        lagrangianObjects.lookupClass(IOFieldField<Field<Type>, Type>::typeName)
+        lagrangianObjects.lookupClass
+        (
+            CompactIOField<Field<Type>,
+            Type>::typeName
+        )
     );
 
     lagrangianFields.set
     (
         cloudI,
-        new PtrList<IOFieldField<Field<Type>, Type> >
+        new PtrList<CompactIOField<Field<Type>, Type> >
         (
             lagrangianTypeObjectsA.size() + lagrangianTypeObjectsB.size()
         )
@@ -98,7 +102,7 @@ void Foam::lagrangianFieldDecomposer::readFieldFields
         lagrangianFields[cloudI].set
         (
             lagrangianFieldi++,
-            new IOFieldField<Field<Type>, Type>(*iter())
+            new CompactIOField<Field<Type>, Type>(*iter())
         );
     }
 
@@ -107,7 +111,7 @@ void Foam::lagrangianFieldDecomposer::readFieldFields
         lagrangianFields[cloudI].set
         (
             lagrangianFieldi++,
-            new IOFieldField<Field<Type>, Type>(*iter())
+            new CompactIOField<Field<Type>, Type>(*iter())
         );
     }
 }
@@ -145,20 +149,20 @@ Foam::lagrangianFieldDecomposer::decomposeField
 
 
 template<class Type>
-Foam::tmp<Foam::IOFieldField<Foam::Field<Type>, Type> >
+Foam::tmp<Foam::CompactIOField<Foam::Field<Type>, Type> >
 Foam::lagrangianFieldDecomposer::decomposeFieldField
 (
     const word& cloudName,
-    const IOFieldField<Field<Type>, Type>& field
+    const CompactIOField<Field<Type>, Type>& field
 ) const
 {
     // Create and map the internal field values
     Field<Field<Type> > procField(field, particleIndices_);
 
     // Create the field for the processor
-    return tmp<IOFieldField<Field<Type>, Type> >
+    return tmp<CompactIOField<Field<Type>, Type> >
     (
-        new IOFieldField<Field<Type>, Type>
+        new CompactIOField<Field<Type>, Type>
         (
             IOobject
             (

applications/utilities/preProcessing/mapFields/MapLagrangianFields.H

@@ -37,7 +37,7 @@ Description
 #include "GeometricField.H"
 #include "meshToMesh.H"
 #include "IOobjectList.H"
-#include "IOFieldField.H"
+#include "CompactIOField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -106,9 +106,9 @@ void MapLagrangianFields
             // Read field (does not need mesh)
             IOField<Field<Type> > fieldSource(*fieldIter());
 
-            // Map - use IOFieldField to automatically write in
+            // Map - use CompactIOField to automatically write in
             // compact form for binary format.
-            IOFieldField<Field<Type>, Type> fieldTarget
+            CompactIOField<Field<Type>, Type> fieldTarget
             (
                 IOobject
                 (
@@ -135,7 +135,7 @@ void MapLagrangianFields
 
     {
         IOobjectList fieldFields =
-            objects.lookupClass(IOFieldField<Field<Type>, Type>::typeName);
+            objects.lookupClass(CompactIOField<Field<Type>, Type>::typeName);
 
         forAllIter(IOobjectList, fieldFields, fieldIter)
         {
@@ -143,10 +143,10 @@ void MapLagrangianFields
                 << fieldIter()->name() << endl;
 
             // Read field (does not need mesh)
-            IOFieldField<Field<Type>, Type> fieldSource(*fieldIter());
+            CompactIOField<Field<Type>, Type> fieldSource(*fieldIter());
 
             // Map
-            IOFieldField<Field<Type>, Type> fieldTarget
+            CompactIOField<Field<Type>, Type> fieldTarget
             (
                 IOobject
                 (