Updated kivaTest to run without restart at CA = -15 degs

using coded function object to change time step at CA = -15 degs
puneet336 · May 20, 2015 · 9585db0 · 9585db0
1 parent 7b66c4d
commit 9585db0
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 203 deletions.
diff --git a/tutorials/combustion/engineFoam/kivaTest/Allclean b/tutorials/combustion/engineFoam/kivaTest/Allclean
@@ -5,9 +5,11 @@ cd ${0%/*} || exit 1    # run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 mv ./-180 temp180
-rm -rf 0
-cp system/controlDict.1st system/controlDict
 cleanCase
+
+rm -rf 0 > /dev/null 2>&1
+rm -f constant/polyMesh/boundary > /dev/null 2>&1
+
 mv temp180 ./-180
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/combustion/engineFoam/kivaTest/Allrun b/tutorials/combustion/engineFoam/kivaTest/Allrun
@@ -9,12 +9,6 @@ application=`getApplication`
 
 runApplication kivaToFoam -file otape17
 
-cp system/controlDict.1st system/controlDict
 runApplication $application
-mv log.$application log.$application.1
-
-cp system/controlDict.2nd system/controlDict
-runApplication $application
-mv log.$application log.$application.2
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary b/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary.org b/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary.org
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict b/tutorials/combustion/engineFoam/kivaTest/system/controlDict
@@ -23,7 +23,7 @@ startTime       -180;
 
 stopAt          endTime;
 
-endTime         -15;
+endTime         60;
 
 deltaT          0.25;
 
@@ -51,5 +51,26 @@ maxCo           0.2;
 
 maxDeltaT       1;
 
+functions
+{
+    timeStep
+    {
+        type coded;
+        functionObjectLibs ("libutilityFunctionObjects.so");
+        redirectType setDeltaT;
+
+        code
+        #{
+            const Time& runTime = mesh().time();
+            if (runTime.timeToUserTime(runTime.value()) >= -15.0)
+            {
+                const_cast<Time&>(runTime).setDeltaT
+                (
+                    runTime.userTimeToTime(0.025)
+                );
+            }
+        #};
+    }
+}
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd