Merge branch 'master' of /home/dm4/OpenFOAM/repositories/OpenFOAM-dev

applications/utilities/preProcessing/createZeroFolder/Make/files

@@ -2,6 +2,6 @@ boundaryInfo.C
 boundaryTemplates.C
 caseInfo.C
 solverTemplate.C
-createZeroDirectory.C
+createZeroFolder.C
 
 EXE = $(FOAM_APPBIN)/createZeroFolder

etc/config/CGAL.csh

@@ -41,6 +41,10 @@ if ($?FOAM_VERBOSE && $?prompt) then
     echo "    $boost_version at $BOOST_ARCH_PATH"
 endif
 
+if ( -d "$CGAL_ARCH_PATH" ) then
+    _foamAddLib $CGAL_ARCH_PATH/lib
+endif
+
 if ( -d "$BOOST_ARCH_PATH" ) then
     _foamAddLib $BOOST_ARCH_PATH/lib
 endif

etc/config/CGAL.sh

@@ -42,6 +42,11 @@ then
     echo "    $boost_version at $BOOST_ARCH_PATH"
 fi
 
+if [ -d "$CGAL_ARCH_PATH" ]
+then
+    _foamAddLib $CGAL_ARCH_PATH/lib
+fi
+
 if [ -d "$BOOST_ARCH_PATH" ]
 then
     _foamAddLib $BOOST_ARCH_PATH/lib

etc/config/settings.csh

@@ -562,7 +562,7 @@ endif
 
 # cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
-unalias _foamAddPath _foamAddLib _foamAddMan
+#- keep _foamAddPath _foamAddLib _foamAddMan
 unset foamCompiler minBufferSize
 
 # ----------------------------------------------------------------- end-of-file

etc/config/settings.sh

@@ -569,6 +569,7 @@ export MPI_BUFFER_SIZE
 
 # cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
-unset _foamAddPath _foamAddLib _foamAddMan foamCompiler minBufferSize
+#keep _foamAddPath _foamAddLib _foamAddMan
+unset foamCompiler minBufferSize
 
 # ----------------------------------------------------------------- end-of-file

src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2014 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,7 +25,7 @@ Class
     Foam::Rosenbrock23
 
 Description
-    L-stable embedded Rosenbrock ODE solver of order (3)4.
+    L-stable embedded Rosenbrock ODE solver of order (2)3.
 
     References:
     \verbatim

tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/chemistryProperties

@@ -27,7 +27,7 @@ initialChemicalTimeStep 1e-07;
 
 odeCoeffs
 {
-    solver          SIBS;
+    solver          seulex;
     eps             0.05;
 }
 

tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties

@@ -27,7 +27,7 @@ initialChemicalTimeStep 1e-07;
 
 odeCoeffs
 {
-    solver          SIBS;
+    solver          seulex;
     absTol          1e-12;
     relTol          0.01;
 }

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties

@@ -33,7 +33,7 @@ EulerImplicitCoeffs
 
 odeCoeffs
 {
-    solver          SIBS;
+    solver          seulex;
     eps             0.05;
 }
 

tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties

@@ -33,7 +33,7 @@ EulerImplicitCoeffs
 
 odeCoeffs
 {
-    solver          RK;
+    solver          seulex;
     eps             0.05;
 }
 

tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties

@@ -33,7 +33,7 @@ EulerImplicitCoeffs
 
 odeCoeffs
 {
-    solver          RK;
+    solver          seulex;
     eps             0.05;
 }
 

tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties

@@ -27,7 +27,7 @@ initialChemicalTimeStep 1e-07;
 
 odeCoeffs
 {
-    solver          SIBS;
+    solver          seulex;
     eps             0.05;
 }