From 9b44034d8c46cf8344725a50cbcf9e6eacb26025 Mon Sep 17 00:00:00 2001 From: henry Date: Mon, 20 Jul 2009 11:02:57 +0100 Subject: [PATCH 1/3] Changed more references to wmake/utilbin to wmake/bin. --- bin/foamPack | 4 ++-- bin/foamPackBin | 2 +- bin/foamPackSource | 2 +- wmake/rules/General/sourceToDep | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/foamPack b/bin/foamPack index 3f35f5b57d..a719f9e23e 100755 --- a/bin/foamPack +++ b/bin/foamPack @@ -89,8 +89,8 @@ find -H $packDir \ -e "\@$packDir/lib/@d" \ -e '\@/\.git/@d' \ -e '\@applications/bin/@d' \ - -e '\@wmake/utilbin/@d' \ - -e '\@/t/@d' \ + -e '\@wmake/bin/@d' \ + -e '\@/t/@d' \ -e '\@Make[.A-Za-z]*/[^/]*/@d' \ -e '\@doc/[Dd]oxygen/html@d' \ -e '\@doc/[Dd]oxygen/latex@d' \ diff --git a/bin/foamPackBin b/bin/foamPackBin index 5a60b405a9..00d60ba5f0 100755 --- a/bin/foamPackBin +++ b/bin/foamPackBin @@ -76,7 +76,7 @@ dirList=$( $packDir/lib/$arch \ $packDir/applications/bin/$arch \ $packDir/wmake/rules \ - $packDir/wmake/utilbin/$baseArch \ + $packDir/wmake/bin/$baseArch \ ; do [ -d $dir ] && echo $dir diff --git a/bin/foamPackSource b/bin/foamPackSource index b5e34c8a04..dbb1860bca 100755 --- a/bin/foamPackSource +++ b/bin/foamPackSource @@ -82,7 +82,7 @@ find -H $packDir \ -e '\@/\.git/@d' \ -e '\@/\.tags/@d' \ -e '\@applications/bin/@d' \ - -e '\@wmake/utilbin/@d' \ + -e '\@wmake/bin/@d' \ -e '\@/t/@d' \ -e '\@/Make[.A-Za-z]*/[^/]*/@d'\ -e '\@/platforms/@d' \ diff --git a/wmake/rules/General/sourceToDep b/wmake/rules/General/sourceToDep index f98c8f8cf4..14e95d6eb1 100644 --- a/wmake/rules/General/sourceToDep +++ b/wmake/rules/General/sourceToDep @@ -1,6 +1,6 @@ .SUFFIXES: .c .cc .cxx .cpp .C .F .f .dep -MKDEP = $(UTILBIN)/wmkdep -I$(*D) $(LIB_HEADER_DIRS) +MKDEP = $(BIN)/wmkdep -I$(*D) $(LIB_HEADER_DIRS) .c.dep: $(MAKE_DEP) From ae1fda27bf23ba746fb05cd926b803eafdf4e6fc Mon Sep 17 00:00:00 2001 From: henry Date: Mon, 20 Jul 2009 11:03:52 +0100 Subject: [PATCH 2/3] Removed spurious -f options. --- src/Allwmake | 4 ++-- src/turbulenceModels/LES/Allwmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Allwmake b/src/Allwmake index e374ba62e8..f2b2adf037 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -5,8 +5,8 @@ set -x # update OpenFOAM version strings if required wmakePrintBuild -check || /bin/rm -f OpenFOAM/Make/$WM_OPTIONS/global.? 2>/dev/null -wmakeLnInclude -f OpenFOAM -wmakeLnInclude -f OSspecific/$WM_OSTYPE +wmakeLnInclude OpenFOAM +wmakeLnInclude OSspecific/$WM_OSTYPE Pstream/Allwmake wmake libo OSspecific/$WM_OSTYPE diff --git a/src/turbulenceModels/LES/Allwmake b/src/turbulenceModels/LES/Allwmake index a80c71ab57..00f3bf3ada 100755 --- a/src/turbulenceModels/LES/Allwmake +++ b/src/turbulenceModels/LES/Allwmake @@ -2,7 +2,7 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmakeLnInclude -f ../incompressible/LES +wmakeLnInclude ../incompressible/LES wmake libso LESfilters wmake libso LESdeltas From 51cd94767570effb60035c3a8e866e75a87c0aa3 Mon Sep 17 00:00:00 2001 From: henry Date: Mon, 20 Jul 2009 12:53:53 +0100 Subject: [PATCH 3/3] Added new entry from Mattijs and general tidy-up. --- ReleaseNotes-1.6 | 97 ++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 52 deletions(-) diff --git a/ReleaseNotes-1.6 b/ReleaseNotes-1.6 index b7466be689..7227dac4fe 100644 --- a/ReleaseNotes-1.6 +++ b/ReleaseNotes-1.6 @@ -56,9 +56,8 @@ *** Dictionary improvements/changes + Dictionaries can use words (unquoted) or regular expressions (quoted) for their keywords. When searching, an exact match has priority over a regular - expression match. -MJ: If multiple regular expressions they get matched in reverse order. - + expression match. Multiple regular expressions are matched in reverse + order. + The default =#inputMode= is now '=merge=', which corresponds to the most general usage. The =#inputMode warn= corresponds to the previous default behaviour. @@ -291,53 +290,46 @@ MJ: If multiple regular expressions they get matched in reverse order. * Tutorial restructuring to reflect solver application structure -* Post-processing ---------------------------------------------------- [MATTIJS] +* Post-processing * sampling on iso-surfaces, interpolated or non-interpolated * sampling on surface defined by distance to surface (distanceSurface) * cutting planes on non-convex cells * Output to any surface geometry format supported by the =surfMesh= library. * *New* Solvers - + =buoyantBoussinesqSimpleFoam= - Steady state heat transfer solver using a Boussinesq approximation for - buoyancy, with laminar, RAS or LES turbulence modelling - + =buoyantBoussinesqPisoFoam= - Transient heat transfer solver using a Boussinesq approximation for - buoyancy, with laminar, RAS or LES turbulence modelling - + =coalChemistryFoam= - Transient, reacting lagrangian solver, employing a coal cloud and a thermo - cloud, with chemistry, and laminar, RAS or LES turbulence modelling - + =porousExplicitSourceReactingParcelFoam= - Transient, reacting lagrangian solver, employing a single phase reacting - cloud, with porous media, explicit mass sources, and laminar, RAS or LES - turbulence modelling - + =rhoReactingFoam= - Density-based thermodynamics variant of the reactingFoam solver, i.e. now - applicable to liquid systems - + =dsmcFoam= - DSMC (Direct Simulation Monte-Carlo) solver for rarefied gas dynamics - simulations, able to simulate mixtures of an arbitrary number of gas species. - The variable hard sphere collision model with Larsen-Borgnakke internal - energy redistribution (see "Molecular Gas Dynamics and the Direct Simulation - of Gas Flows" G.A. Bird, 1994) is available; other run-time selectable - collision models can be easily added. + + =buoyantBoussinesqSimpleFoam= Steady state heat transfer solver using a + Boussinesq approximation for buoyancy, with laminar, RAS or LES turbulence + modelling + + =buoyantBoussinesqPisoFoam= Transient heat transfer solver using a + Boussinesq approximation for buoyancy, with laminar, RAS or LES turbulence + modelling + + =coalChemistryFoam= Transient, reacting lagrangian solver, employing a coal + cloud and a thermo cloud, with chemistry, and laminar, RAS or LES turbulence + modelling + + =porousExplicitSourceReactingParcelFoam= Transient, reacting lagrangian + solver, employing a single phase reacting cloud, with porous media, explicit + mass sources, and laminar, RAS or LES turbulence modelling + + =rhoReactingFoam= Density-based thermodynamics variant of the reactingFoam + solver, i.e. now applicable to liquid systems + + =dsmcFoam= DSMC (Direct Simulation Monte-Carlo) solver for rarefied gas + dynamics simulations, able to simulate mixtures of an arbitrary number of + gas species. The variable hard sphere collision model with Larsen-Borgnakke + internal energy redistribution (see "Molecular Gas Dynamics and the Direct + Simulation of Gas Flows" G.A. Bird, 1994) is available; other run-time + selectable collision models can be easily added. * Updated solvers - + =mdFoam= - Molecular Dynamics (MD) solver able to simulate a mixture of an arbitrary - number of mono-atomic and small, rigid polyatomic (i.e. H2O, N2) molecular - species, with 6 degree of freedom motion, in complex geometries. A molecule - of any species can be built by specifying its sites of mass and charge. All - molecules interact with short-range dispersion forces and pairwise - electrostatic interactions using methods described in: - Fennell and Gezelter, J. Chem. Phys. 124, 234104 (2006) - + =mdEquilibrationFoam= - Similar to mdFoam, but employs velocity scaling to adjust the simulation - temperature to a target value. Useful to equilibrate a case before - simulation. - - + =chtMultiRegionFoam= - New boundary condition allows independent decomposition of coupled regions - without any constraint on the decomposition. + + =mdFoam= Molecular Dynamics (MD) solver able to simulate a mixture of an + arbitrary number of mono-atomic and small, rigid polyatomic (i.e. H2O, N2) + molecular species, with 6 degree of freedom motion, in complex geometries. A + molecule of any species can be built by specifying its sites of mass and + charge. All molecules interact with short-range dispersion forces and + pairwise electrostatic interactions using methods described in: Fennell and + Gezelter, J. Chem. Phys. 124, 234104 (2006) + + =mdEquilibrationFoam= Similar to mdFoam, but employs velocity scaling to + adjust the simulation temperature to a target value. Useful to equilibrate a + case before simulation. + + =chtMultiRegionFoam= New boundary condition allows independent decomposition + of coupled regions without any constraint on the decomposition. * Function objects @@ -384,15 +376,16 @@ MJ: If multiple regular expressions they get matched in reverse order. be useful when post-processing results incrementally. + =snappyHexMesh= has lower memory footprint. New distributed triangulated - surface type for meshing surfaces with extremely large triangle count. + surface type for meshing surfaces with extremely large triangle count. + Now supports multi-region meshing of arbitrarily complex regions. ** *New* utilities + =particleTracks= - generate particle tracks for lagrangian calculations + =dsmcInitialise= - preprocessing utility to create initial configurations of DSMC particles in a geometry - + =surfaceRedistributePar= - preprocessing utility to create distributed - triangulated surface. + triangulated surface. + *** *New* foamCalc functions + =interpolate= - performs fvc::interpolate() + =randomise= - randomises a by a given perturbation @@ -400,12 +393,12 @@ MJ: If multiple regular expressions they get matched in reverse order. ** Usage + =timeSelector= can now combine =-time ranges= and =-latestTime= options - (e.g. -time '0.01:0.09', -time '0.01:'). - More reliable behaviour for cases missing /constant// or /0// - directories. When the =-noZero= option is enabled, =-latestTime= will not - select the =0/= directory unless the =-zeroTime= option is given. - This helps avoid ill effects caused by accidentally using the - /0// directory in certain utilities (eg, =reconstructPar=). + (e.g. -time '0.01:0.09', -time '0.01:'). More reliable behaviour for cases + missing /constant// or /0// directories. When the =-noZero= option is + enabled, =-latestTime= will not select the =0/= directory unless the + =-zeroTime= option is given. This helps avoid ill effects caused by + accidentally using the /0// directory in certain utilities (eg, + =reconstructPar=). + =-region= option added to more utilities. ** Improvements to Paraview reader module