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

applications/utilities/parallelProcessing/decomposePar/decomposeParDict

@@ -21,6 +21,9 @@ FoamFile
 
 numberOfSubdomains   4;
 
+//preservePatches (inlet);
+//preserveFaceZones (heater solid1 solid3);
+
 method               simple;
 //method               hierarchical;
 //method               metis;
@@ -39,6 +42,17 @@ hierarchicalCoeffs
     order                xyz;
 }
 
+metisCoeffs
+{
+    //processorWeights 
+    //(
+    //    1
+    //    1
+    //    1
+    //    1
+    //);
+}
+
 manualCoeffs
 {
     dataFile             "decompositionData";

etc/bashrc

@@ -32,7 +32,7 @@
 #------------------------------------------------------------------------------
 
 export WM_PROJECT=OpenFOAM
-export WM_PROJECT_VERSION=dev
+#export WM_PROJECT_VERSION=dev
 
 #!!User:
 #    either set $FOAM_INST_DIR before sourcing this file or set

etc/cshrc

@@ -32,7 +32,7 @@
 #------------------------------------------------------------------------------
 
 setenv WM_PROJECT OpenFOAM
-setenv WM_PROJECT_VERSION dev
+#setenv WM_PROJECT_VERSION dev
 
 #!!User:
 #    either setenv FOAM_INST_DIR before sourcing this file or set

src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C

@@ -63,6 +63,17 @@ bool Foam::functionEntry::insert
         "primitiveEntry& entry, Istream& is)"
     );
 
+    if (!insertprimitiveEntryIstreamMemberFunctionTablePtr_)
+    {
+        cerr<<"functionEntry::insert"
+            << "(const word&, dictionary&, primitiveEntry&, Istream&)"
+            << " not yet initialized, function = "
+            << functionName.c_str() << std::endl;
+
+        // return true to keep reading anyhow
+        return true;
+    }
+
     insertprimitiveEntryIstreamMemberFunctionTable::iterator mfIter =
         insertprimitiveEntryIstreamMemberFunctionTablePtr_->find(functionName);
 
@@ -97,6 +108,17 @@ bool Foam::functionEntry::insert
         "(const word& functionName, dictionary& parentDict, Istream& is)"
     );
 
+    if (!insertdictionaryIstreamMemberFunctionTablePtr_)
+    {
+        cerr<<"functionEntry::insert"
+            << "(const word&, dictionary&, Istream&)"
+            << " not yet initialized, function = "
+            << functionName.c_str() << std::endl;
+
+        // Return true to keep reading
+        return true;
+    }
+
     insertdictionaryIstreamMemberFunctionTable::iterator mfIter =
         insertdictionaryIstreamMemberFunctionTablePtr_->find(functionName);
 

src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C

@@ -31,12 +31,19 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+const Foam::word Foam::functionEntries::includeEntry::typeName
+(
+    Foam::functionEntries::includeEntry::typeName_()
+);
+
+// Don't lookup the debug switch here as the debug switch dictionary
+// might include includeEntry
+int Foam::functionEntries::includeEntry::debug(0);
+
 namespace Foam
 {
 namespace functionEntries
 {
-    defineTypeNameAndDebug(includeEntry, 0);
-
     addToMemberFunctionSelectionTable
     (
         functionEntry,

src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.C

@@ -30,12 +30,19 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+const Foam::word Foam::functionEntries::inputModeEntry::typeName
+(
+    Foam::functionEntries::inputModeEntry::typeName_()
+);
+
+// Don't lookup the debug switch here as the debug switch dictionary
+// might include inputModeEntries
+int Foam::functionEntries::inputModeEntry::debug(0);
+
 namespace Foam
 {
 namespace functionEntries
 {
-    defineTypeNameAndDebug(inputModeEntry, 0);
-
     addToMemberFunctionSelectionTable
     (
         functionEntry,