From 43ec5bc388bc4436c2b9ecbdcf49ab1e11b405b3 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 29 Jan 2014 17:07:50 +0000 Subject: [PATCH 1/5] Corrected doc --- src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.H b/src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.H index 1c740d7458..f7e0ac97a0 100644 --- a/src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.H +++ b/src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.H @@ -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 From 205efe86271dfb8c51194c994b4e4901de5f4888 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 29 Jan 2014 17:08:06 +0000 Subject: [PATCH 2/5] ODE solver: change SIBS -> seulex (SIBS is deprecated) --- .../constant/pyrolysisRegion/chemistryProperties | 2 +- .../constant/panelRegion/chemistryProperties | 2 +- .../simplifiedSiwek/constant/chemistryProperties | 2 +- .../reactingParcelFoam/filter/constant/chemistryProperties | 2 +- .../verticalChannel/constant/chemistryProperties | 2 +- .../sprayFoam/aachenBomb/constant/chemistryProperties | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/chemistryProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/chemistryProperties index 1366ff04bd..7cb5c41c06 100644 --- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/chemistryProperties +++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/pyrolysisRegion/chemistryProperties @@ -27,7 +27,7 @@ initialChemicalTimeStep 1e-07; odeCoeffs { - solver SIBS; + solver seulex; eps 0.05; } diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties index 5535bbdb93..df407c07ff 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/chemistryProperties +++ b/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; } diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties index 21cf68db59..2d6208654b 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties @@ -33,7 +33,7 @@ EulerImplicitCoeffs odeCoeffs { - solver SIBS; + solver seulex; eps 0.05; } diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties index 16abe88752..502724fef5 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/chemistryProperties @@ -33,7 +33,7 @@ EulerImplicitCoeffs odeCoeffs { - solver RK; + solver seulex; eps 0.05; } diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties index 16abe88752..502724fef5 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/chemistryProperties @@ -33,7 +33,7 @@ EulerImplicitCoeffs odeCoeffs { - solver RK; + solver seulex; eps 0.05; } diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties index ea16d954f1..999aba673f 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/chemistryProperties @@ -27,7 +27,7 @@ initialChemicalTimeStep 1e-07; odeCoeffs { - solver SIBS; + solver seulex; eps 0.05; } From 773f28a16f3a0023e4ea3b3e9a0c3ac9cdf9213c Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 29 Jan 2014 17:08:34 +0000 Subject: [PATCH 3/5] Updated header --- src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.H b/src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.H index f7e0ac97a0..ec9fb76504 100644 --- a/src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.H +++ b/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 From 24ebb9243df4956208876ae93263cf6ee38f66c0 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 29 Jan 2014 19:16:45 +0000 Subject: [PATCH 4/5] ENH: Added files missed during commit 85d7964 --- .../utilities/preProcessing/createZeroFolder/Make/files | 2 +- .../{createZeroDirectory.C => createZeroFolder.C} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename applications/utilities/preProcessing/createZeroFolder/{createZeroDirectory.C => createZeroFolder.C} (100%) diff --git a/applications/utilities/preProcessing/createZeroFolder/Make/files b/applications/utilities/preProcessing/createZeroFolder/Make/files index 8e0519e99e..df1304a884 100644 --- a/applications/utilities/preProcessing/createZeroFolder/Make/files +++ b/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 diff --git a/applications/utilities/preProcessing/createZeroFolder/createZeroDirectory.C b/applications/utilities/preProcessing/createZeroFolder/createZeroFolder.C similarity index 100% rename from applications/utilities/preProcessing/createZeroFolder/createZeroDirectory.C rename to applications/utilities/preProcessing/createZeroFolder/createZeroFolder.C From 85d60f68831d029f108982a45c3d0d2b9f2a5bee Mon Sep 17 00:00:00 2001 From: mattijs Date: Thu, 30 Jan 2014 09:05:10 +0000 Subject: [PATCH 5/5] BUG: etc: CGAL setup --- etc/config/CGAL.csh | 4 ++++ etc/config/CGAL.sh | 5 +++++ etc/config/settings.csh | 2 +- etc/config/settings.sh | 3 ++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/etc/config/CGAL.csh b/etc/config/CGAL.csh index 2e3f81f0e4..5f7dceecc2 100644 --- a/etc/config/CGAL.csh +++ b/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 diff --git a/etc/config/CGAL.sh b/etc/config/CGAL.sh index cc67908f10..dc8772dd16 100644 --- a/etc/config/CGAL.sh +++ b/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 diff --git a/etc/config/settings.csh b/etc/config/settings.csh index a316037710..244e52fdcf 100644 --- a/etc/config/settings.csh +++ b/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 diff --git a/etc/config/settings.sh b/etc/config/settings.sh index 487c550d24..4fa9120ec1 100644 --- a/etc/config/settings.sh +++ b/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