From 85d7964459f77ec46d6dad8194386d21dac6ae6e Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 29 Jan 2014 13:34:45 +0000
Subject: [PATCH] ENH: updated createZeroDirectory utility and renamed to
 createZeroFolder

---
 .../Make/files                                |  2 +-
 .../Make/options                              |  0
 .../boundaryInfo.C                            |  0
 .../boundaryInfo.H                            |  0
 .../boundaryTemplates.C                       |  0
 .../boundaryTemplates.H                       |  0
 .../caseInfo.C                                |  0
 .../caseInfo.H                                |  0
 .../createZeroDirectory.C                     | 52 ++++++++++++++-----
 .../solverTemplate.C                          |  0
 .../solverTemplate.H                          |  0
 11 files changed, 41 insertions(+), 13 deletions(-)
 rename applications/utilities/preProcessing/{createZeroDirectory => createZeroFolder}/Make/files (67%)
 rename applications/utilities/preProcessing/{createZeroDirectory => createZeroFolder}/Make/options (100%)
 rename applications/utilities/preProcessing/{createZeroDirectory => createZeroFolder}/boundaryInfo.C (100%)
 rename applications/utilities/preProcessing/{createZeroDirectory => createZeroFolder}/boundaryInfo.H (100%)
 rename applications/utilities/preProcessing/{createZeroDirectory => createZeroFolder}/boundaryTemplates.C (100%)
 rename applications/utilities/preProcessing/{createZeroDirectory => createZeroFolder}/boundaryTemplates.H (100%)
 rename applications/utilities/preProcessing/{createZeroDirectory => createZeroFolder}/caseInfo.C (100%)
 rename applications/utilities/preProcessing/{createZeroDirectory => createZeroFolder}/caseInfo.H (100%)
 rename applications/utilities/preProcessing/{createZeroDirectory => createZeroFolder}/createZeroDirectory.C (89%)
 rename applications/utilities/preProcessing/{createZeroDirectory => createZeroFolder}/solverTemplate.C (100%)
 rename applications/utilities/preProcessing/{createZeroDirectory => createZeroFolder}/solverTemplate.H (100%)

diff --git a/applications/utilities/preProcessing/createZeroDirectory/Make/files b/applications/utilities/preProcessing/createZeroFolder/Make/files
similarity index 67%
rename from applications/utilities/preProcessing/createZeroDirectory/Make/files
rename to applications/utilities/preProcessing/createZeroFolder/Make/files
index 379802af212..8e0519e99ea 100644
--- a/applications/utilities/preProcessing/createZeroDirectory/Make/files
+++ b/applications/utilities/preProcessing/createZeroFolder/Make/files
@@ -4,4 +4,4 @@ caseInfo.C
 solverTemplate.C
 createZeroDirectory.C
 
-EXE = $(FOAM_APPBIN)/createZeroDirectory
+EXE = $(FOAM_APPBIN)/createZeroFolder
diff --git a/applications/utilities/preProcessing/createZeroDirectory/Make/options b/applications/utilities/preProcessing/createZeroFolder/Make/options
similarity index 100%
rename from applications/utilities/preProcessing/createZeroDirectory/Make/options
rename to applications/utilities/preProcessing/createZeroFolder/Make/options
diff --git a/applications/utilities/preProcessing/createZeroDirectory/boundaryInfo.C b/applications/utilities/preProcessing/createZeroFolder/boundaryInfo.C
similarity index 100%
rename from applications/utilities/preProcessing/createZeroDirectory/boundaryInfo.C
rename to applications/utilities/preProcessing/createZeroFolder/boundaryInfo.C
diff --git a/applications/utilities/preProcessing/createZeroDirectory/boundaryInfo.H b/applications/utilities/preProcessing/createZeroFolder/boundaryInfo.H
similarity index 100%
rename from applications/utilities/preProcessing/createZeroDirectory/boundaryInfo.H
rename to applications/utilities/preProcessing/createZeroFolder/boundaryInfo.H
diff --git a/applications/utilities/preProcessing/createZeroDirectory/boundaryTemplates.C b/applications/utilities/preProcessing/createZeroFolder/boundaryTemplates.C
similarity index 100%
rename from applications/utilities/preProcessing/createZeroDirectory/boundaryTemplates.C
rename to applications/utilities/preProcessing/createZeroFolder/boundaryTemplates.C
diff --git a/applications/utilities/preProcessing/createZeroDirectory/boundaryTemplates.H b/applications/utilities/preProcessing/createZeroFolder/boundaryTemplates.H
similarity index 100%
rename from applications/utilities/preProcessing/createZeroDirectory/boundaryTemplates.H
rename to applications/utilities/preProcessing/createZeroFolder/boundaryTemplates.H
diff --git a/applications/utilities/preProcessing/createZeroDirectory/caseInfo.C b/applications/utilities/preProcessing/createZeroFolder/caseInfo.C
similarity index 100%
rename from applications/utilities/preProcessing/createZeroDirectory/caseInfo.C
rename to applications/utilities/preProcessing/createZeroFolder/caseInfo.C
diff --git a/applications/utilities/preProcessing/createZeroDirectory/caseInfo.H b/applications/utilities/preProcessing/createZeroFolder/caseInfo.H
similarity index 100%
rename from applications/utilities/preProcessing/createZeroDirectory/caseInfo.H
rename to applications/utilities/preProcessing/createZeroFolder/caseInfo.H
diff --git a/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C b/applications/utilities/preProcessing/createZeroFolder/createZeroDirectory.C
similarity index 89%
rename from applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C
rename to applications/utilities/preProcessing/createZeroFolder/createZeroDirectory.C
index 0de9eff1792..d016462da1f 100644
--- a/applications/utilities/preProcessing/createZeroDirectory/createZeroDirectory.C
+++ b/applications/utilities/preProcessing/createZeroFolder/createZeroDirectory.C
@@ -137,17 +137,19 @@ void createFieldFiles
         const_cast<word&>(IOdictionary::typeName) =
             getClassType(fieldTypes[i]);
 
-        IOdictionary field
-        (
-            IOobject
-            (
-                fieldNames[i],
-                "0",
-                regionName,
-                runTime,
-                IOobject::NO_READ
-            )
-        );
+//        IOdictionary field
+//        (
+//            IOobject
+//            (
+//                fieldNames[i],
+//                "0",
+//                regionName,
+//                runTime,
+//                IOobject::NO_READ
+//            )
+//        );
+
+        dictionary field;
 
         word regionPath = "/";
 
@@ -180,7 +182,33 @@ void createFieldFiles
 
         field.add("boundaryField", boundaryField);
 
-        field.regIOobject::writeObject
+        // expand all of the dictionary redirections and remove unnecessary
+        // entries
+        OStringStream os;
+        os  << field;
+
+        entry::disableFunctionEntries = 0;
+        dictionary field2(IStringStream(os.str())());
+        entry::disableFunctionEntries = 1;
+        field2.remove("#include");
+        field2.remove("initialConditions");
+        field2.remove("boundaryConditions");
+
+        // construct and write field dictionary
+        IOdictionary fieldOut
+        (
+            IOobject
+            (
+                fieldNames[i],
+                "0",
+                regionName,
+                runTime,
+                IOobject::NO_READ
+            ),
+            field2
+        );
+
+        fieldOut.regIOobject::writeObject
         (
             IOstream::ASCII,
             IOstream::currentVersion,
diff --git a/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.C b/applications/utilities/preProcessing/createZeroFolder/solverTemplate.C
similarity index 100%
rename from applications/utilities/preProcessing/createZeroDirectory/solverTemplate.C
rename to applications/utilities/preProcessing/createZeroFolder/solverTemplate.C
diff --git a/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.H b/applications/utilities/preProcessing/createZeroFolder/solverTemplate.H
similarity index 100%
rename from applications/utilities/preProcessing/createZeroDirectory/solverTemplate.H
rename to applications/utilities/preProcessing/createZeroFolder/solverTemplate.H
-- 
GitLab