Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
 
         while (simple.correctNonOrthogonal())
         {
-            solve
+            fvScalarMatrix TEqn
             (
                 fvm::ddt(T)
               + fvm::div(phi, T)
@@ -90,6 +90,11 @@ int main(int argc, char *argv[])
              ==
                 fvOptions(T)
             );
+
+            fvOptions.constrain(TEqn);
+
+            TEqn.solve();
+
         }
 
         runTime.write();

tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh

@@ -56,20 +56,23 @@ boundaryField
     {
         type            porousBafflePressure;
         patchType       cyclic;
-        jump            uniform 0;
-        value           uniform 0;
         D               1000;
         I               500;
         length          0.15;
+        uniformJump     true;
+        jump            uniform 0;
+        value           uniform 0;
     }
     porous_half1
     {
         type            porousBafflePressure;
         patchType       cyclic;
-        value           uniform 0;
         D               1000;
         I               500;
         length          0.15;
+        uniformJump     true;
+        jump            uniform 0;
+        value           uniform 0;
     }
 }
 

tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/createBafflesDict

@@ -52,6 +52,7 @@ baffles
                         D               1000;
                         I               500;
                         length          0.15;
+                        uniformJump     true;
                         jump            uniform 0;
                         value           uniform 0;
                     }

tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSchemes

@@ -37,7 +37,7 @@ divSchemes
 
 laplacianSchemes
 {
-    default         Gauss linear corrected;
+    default         Gauss linear orthogonal;
 }
 
 interpolationSchemes
@@ -47,7 +47,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         corrected;
+    default         orthogonal;
 }
 
 

tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict

@@ -17,7 +17,7 @@ FoamFile
 
 application     reactingTwoPhaseEulerFoam;
 
-startFrom       startTime;
+startFrom       latestTime;//startTime;
 
 startTime       0;
 
@@ -27,7 +27,7 @@ endTime         100;
 
 deltaT          0.005;
 
-writeControl    runTime;
+writeControl    adjustableRunTime;
 
 writeInterval   1;
 
@@ -45,7 +45,7 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
-adjustTimeStep  no;
+adjustTimeStep  yes;
 
 maxCo           0.5;
 

tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict

@@ -23,7 +23,7 @@ startTime       0;
 
 stopAt          endTime;
 
-endTime         20;
+endTime         10;
 
 deltaT          1e-4;