exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'nextRelease' into 'master'.

Browse source
This commit is contained in:
Robert Keser 2016-12-13 11:13:52 +01:00
commit 8bc571ee46
11659 changed files with 95689 additions and 28668 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.gitignore vendored
View file

@ -13,6 +13,9 @@
# file-browser settings - anywhere # file-browser settings - anywhere
.directory .directory
# KDevelop include-path files - anywhere
.kdev_include_paths
# CVS recovered versions - anywhere # CVS recovered versions - anywhere
.#* .#*
@ -104,8 +107,8 @@ etc/cshrc
etc/bashrc etc/bashrc
etc/settings.csh etc/settings.csh
etc/settings.sh etc/settings.sh
etc/pref.csh etc/prefs.csh
etc/pref.sh etc/prefs.sh
# make sure that this settings file is not used # make sure that this settings file is not used
etc/bashrc.preset etc/bashrc.preset

4
Allwmake.mingw
View file

@ -2,7 +2,7 @@
#----------------------------------*-sh-*-------------------------------------- #----------------------------------*-sh-*--------------------------------------
# ========= | # ========= |
# \\ / F ield | foam-extend: Open Source CFD # \\ / F ield | foam-extend: Open Source CFD
# \\ / O peration | Version: 3.2 # \\ / O peration | Version: 4.0
# \\ / A nd | Web: http://www.foam-extend.org # \\ / A nd | Web: http://www.foam-extend.org
# \\/ M anipulation | For copyright notice see file Copyright # \\/ M anipulation | For copyright notice see file Copyright
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
@ -69,8 +69,10 @@ echo "Build foam-extend ... (see `pwd`/Allwmake.log)"
./Allwmake > Allwmake.log 2>&1 ./Allwmake > Allwmake.log 2>&1
echo "Copying MinGW dependencies to $FOAM_APPBIN ..." echo "Copying MinGW dependencies to $FOAM_APPBIN ..."
cp -p $MINGW_HOME/bin/libgcc_s_seh-1.dll $FOAM_APPBIN cp -p $MINGW_HOME/bin/libgcc_s_seh-1.dll $FOAM_APPBIN
cp -p $MINGW_HOME/bin/libgomp-1.dll $FOAM_APPBIN
cp -p $MINGW_HOME/bin/libstdc++-6.dll $FOAM_APPBIN cp -p $MINGW_HOME/bin/libstdc++-6.dll $FOAM_APPBIN
cp -p $MINGW_HOME/bin/libwinpthread-1.dll $FOAM_APPBIN cp -p $MINGW_HOME/bin/libwinpthread-1.dll $FOAM_APPBIN
cp -p $WM_THIRD_PARTY_DIR/packages/pthreads-w32-2-9-1-release/Pre-built.2/dll/x64/pthreadGC2.dll $FOAM_APPBIN
echo "Creating release package ... (see `pwd`/createWindowsBinaryPackage.log)" echo "Creating release package ... (see `pwd`/createWindowsBinaryPackage.log)"
./bin/createWindowsBinaryPackage > createWindowsBinaryPackage.log 2>&1 ./bin/createWindowsBinaryPackage > createWindowsBinaryPackage.log 2>&1

4
CMakeLists.txt
View file

@ -1,7 +1,7 @@
# /*-------------------------------------------------------------------------*\ # /*-------------------------------------------------------------------------*\
# ========= | # ========= |
# \\ / F ield | foam-extend: Open Source CFD # \\ / F ield | foam-extend: Open Source CFD
# \\ / O peration | Version: 3.2 # \\ / O peration | Version: 4.0
# \\ / A nd | Web: http://www.foam-extend.org # \\ / A nd | Web: http://www.foam-extend.org
# \\/ M anipulation | For copyright notice see file Copyright # \\/ M anipulation | For copyright notice see file Copyright
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@ -36,7 +36,7 @@
cmake_minimum_required (VERSION 2.8) cmake_minimum_required (VERSION 2.8)
PROJECT(foam-extend-3.2) PROJECT(foam-extend-4.0)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Utility functions # Utility functions

4
CTestConfig.cmake
View file

@ -10,12 +10,12 @@
# on the foam-extend CDash service hosted on SourceForge.Net # on the foam-extend CDash service hosted on SourceForge.Net
# See here: http://foam-extend.sourceforge.net/CDash/index.php # See here: http://foam-extend.sourceforge.net/CDash/index.php
# #
set(CTEST_PROJECT_NAME "foam-extend-3.2") set(CTEST_PROJECT_NAME "foam-extend-4.0")
set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC") set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
set(CTEST_DROP_METHOD "http") set(CTEST_DROP_METHOD "http")
set(CTEST_DROP_SITE "foam-extend.sourceforge.net") set(CTEST_DROP_SITE "foam-extend.sourceforge.net")
set(CTEST_DROP_LOCATION "/CDash/submit.php?project=foam-extend-3.2") set(CTEST_DROP_LOCATION "/CDash/submit.php?project=foam-extend-4.0")
set(CTEST_DROP_SITE_CDASH TRUE) set(CTEST_DROP_SITE_CDASH TRUE)
# We can override those variables for local sites so you can use # We can override those variables for local sites so you can use

14
ListOfContributors
View file

@ -36,14 +36,17 @@ Contents:
Pierre-Olivier Dallaire Pierre-Olivier Dallaire
Carsten Dehning Carsten Dehning
Norman Del Puppo Norman Del Puppo
Ilaria De Dominicis
Eugene De Villiers Eugene De Villiers
Jovani Favero Jovani Favero
Andreas Feymark Andreas Feymark
Flavio Galeazzo Flavio Galeazzo
Maria Garcia Camprubi Maria Garcia Camprubi
Inno Gatin
Christoph Goniva Christoph Goniva
Chris Greenshields Chris Greenshields
Bernhard Gschaider Bernhard Gschaider
Cesare Guardino
Andy Heather Andy Heather
David Hill David Hill
Peter Janas Peter Janas
@ -51,14 +54,17 @@ Contents:
Klas Jareteg Klas Jareteg
Franjo Juretic Franjo Juretic
Aleksandar Karac Aleksandar Karac
Robert Keser
Dennis Kingsley Dennis Kingsley
Nikola Kornev Nikola Kornev
Hannes Kroger Hannes Kroger
Michael Leonard Michael Leonard
Niels Linnemann Niels Linnemann
Christian Lucas
Tommaso Lucchini Tommaso Lucchini
Luca Mangani Luca Mangani
Dubravko Matijasevic Dubravko Matijasevic
Alexey Matveichev
David McAuliffe David McAuliffe
Sandeep Menon Sandeep Menon
Håkan Nilsson Håkan Nilsson
@ -74,15 +80,15 @@ Contents:
David Schmidt David Schmidt
Daniel Schmode Daniel Schmode
Hua Shan Hua Shan
Vanja Skuric
Richard Smith (Symscape) Richard Smith (Symscape)
Hilary Spencer Hilary Spencer
Darrin Stephens Darrin Stephens
Gavin Tabor Gavin Tabor
Tian Tang Tian Tang
Zeljko Tukovic Zeljko Tukovic
Niklas Wikstrom Tessa Uroic
Vanja Skuric
Alexander Vakhrushev Alexander Vakhrushev
Inno Gatin
Alexey Matveichev
Vuko Vukcevic Vuko Vukcevic
Niklas Wikstrom

2
Macros/tensorOperator.sty
View file

@ -1,7 +1,7 @@
%----------------------------------------------------------------------------- %-----------------------------------------------------------------------------
% ========= | % ========= |
% \\ / F ield | foam-extend: Open Source CFD % \\ / F ield | foam-extend: Open Source CFD
% \\ / O peration | Version: 3.2 % \\ / O peration | Version: 4.0
% \\ / A nd | Web: http://www.foam-extend.org % \\ / A nd | Web: http://www.foam-extend.org
% \\/ M anipulation | For copyright notice see file Copyright % \\/ M anipulation | For copyright notice see file Copyright
%------------------------------------------------------------------------------ %------------------------------------------------------------------------------

60
README_RealGasBranch Normal file
View file

@ -0,0 +1,60 @@
Features
/*************************************Libraries**************************************************/
1. Included cubic equations of state for pure fluid.
--> Redlich Kwong --> class = redlichKwong
--> Peng Robinson --> class = pengRobinson
--> Soave Redlich Kwong --> class = soaveRedlichKwong
--> Aungier Redlich Kwong --> class = aungierRedlichKwong
2. Included cubic equations of state for mixtures.
TODO: connect the classes to the reaction models
-->class = mixtureRedlichKwong
-->class = mixturePengRobinson
-->class = mixtureSoaveRedlichKwong
-->class = aungierSoaveRedlichKwong
3. Included a new Thermo model
--> enthalpy calculated using NASA heat capacity polynomical
Added real gas correction in class
class = nasaHeatCapacityPolynomial
4. Minor changed in thermo related models so that they can be used with real gas classes
--> class = realGasSpecieThermo
--> class = sutherland
--> class = const
--> class = basicMixture
--> class = basicPsiThermo
5. Added enthalpy and internal energy thermodynamic class based on basicPsiThermo for real gases
--> enthalpy based thermo model, class = realGasHThermo
--> internal energy based thermo model, class = realGasEThermo
6. Added high precision water properties (IAPWS97) based on freeSteam (external program, not included)
Classes will not be compiled by Allwmake file
Classes will compile without freeSteam. Freesteam is loaded at runTime (see Tutorial)
--> classes = externalMedia/IAPWS_Waterproperties
/*************************************Solver**************************************************/
1. Changed pressure equation of rhoPisoFoam. Orginal pressure equation assumes perfect gas
(linear relationship between pressure and density)
--> new solver = realFluidPisoFoam
/*************************************Tutorials**************************************************/
1. pure fluid real gas mixture tutorial
--> realFluidPisoFoam/ras/backStep
2. IAPWS97 water properties tutorial
freeSteam must be installed for this tutorial
additional classes loaded in controlDict
--> realFluidPisoFoam/ras/cavity_IAPWS97
/*************************************Change log**************************************************/
git commit: "add branch ReadMe file"
--> added this file

145
ReleaseNotes
View file

@ -1,13 +1,13 @@
# -*- mode: org; -*- # -*- mode: org; -*-
# #
#+TITLE: *Release notes for foam-extend-3.2* #+TITLE: *Release notes for foam-extend-4.0*
#+AUTHOR: foam-extend administrators: #+AUTHOR: foam-extend administrators:
#+AUTHOR: Hrvoje Jasak #+AUTHOR: Hrvoje Jasak
#+AUTHOR: Håkan Nilsson #+AUTHOR: Håkan Nilsson
#+AUTHOR: Henrik Rusche #+AUTHOR: Henrik Rusche
#+AUTHOR: Martin Beaudoin #+AUTHOR: Martin Beaudoin
#+AUTHOR: Bernhard Gschaider #+AUTHOR: Bernhard Gschaider
#+DATE: August 2015 #+DATE: December 2016
#+LINK: http://foam-extend.org #+LINK: http://foam-extend.org
#+OPTIONS: author:nil #+OPTIONS: author:nil
#+OPTIONS: toc:2 #+OPTIONS: toc:2
@ -31,9 +31,9 @@
comprehensive dynamic mesh (motion and topological changes) comprehensive dynamic mesh (motion and topological changes)
capability and GPU support. For a full list, see below and previous capability and GPU support. For a full list, see below and previous
release notes at: release notes at:
http://sourceforge.net/p/openfoam-extend/wiki/Home/ http://sourceforge.net/p/foam-extend/wiki/Home/
Version 3.2, nicknamed "Ann Arbor", is the current version of Version 4.0, nicknamed "Guimaraes", is the current version of
foam-extend. The release continues the tradition and spirit of the foam-extend. The release continues the tradition and spirit of the
original FOAM code developed by prof. Jasak and Mr. Weller during original FOAM code developed by prof. Jasak and Mr. Weller during
their time at Imperial College and released as the general purpose their time at Imperial College and released as the general purpose
@ -47,21 +47,22 @@
** Installation ** Installation
foam-extend-3.2 can be compiled and runs on a large variety of Linux, Mac or Windows foam-extend-4.0 can be compiled and runs on a large variety of Linux, Mac or Windows
systems systems
* Main supported OSs: * Main supported OSs:
- Ubuntu 14.04 - Ubuntu 16.04 LTS
- Fedora 20 - Ubuntu 14.04 LTS
- Fedora 24
- Mac OS X - Mac OS X
- Microsoft Windows 7 and 8.1 - Microsoft Windows 7, 8.1 and 10
* Compile from source: * Compile from source:
Please refer to doc/buildInstructions/ for details. Further Please refer to doc/buildInstructions/ for details. Further
installation instruction are available on the unofficial OpenFOAM installation instruction are available on the unofficial OpenFOAM
Wiki: Wiki:
http://openfoamwiki.net/index.php/Installation/Linux/foam-extend-3.1 http://openfoamwiki.net/index.php/Installation/Linux/foam-extend-4.0
If you have improvements or build instructions for a new system, If you have improvements or build instructions for a new system,
please share them with the community (see section "How to please share them with the community (see section "How to
contribute", below). contribute", below).
@ -69,8 +70,8 @@
* Download binary packages: * Download binary packages:
Binary packages are available for download at Binary packages are available for download at
http://sourceforge.net/projects/openfoam-extend/ for the following http://sourceforge.net/projects/foam-extend/ for the following
systems: Ubuntu 14.04, Fedora 20 and Mac OS X. systems: Ubuntu 16.04, Fedora 24 and Mac OS X and Windows 10.
* Accompanying ThirdParty software: * Accompanying ThirdParty software:
- gcc compatibility up to 4.9.2 - gcc compatibility up to 4.9.2
@ -81,20 +82,20 @@
- libccmio 2.6.1 - libccmio 2.6.1
- mesquite 2.1.2 - mesquite 2.1.2
- metis 5.1.0 - metis 5.1.0
- openmpi 1.6.5 - openmpi 1.8.8
- Paraview 4.3.1 - Paraview 4.4.0
- parmetis 4.0.3 - parmetis 4.0.3
- ParMGridGen 1.0 - ParMGridGen 1.0
- PyFoam 0.6.4 - PyFoam 0.6.4
- qt 4.8.6 - qt 4.8.6
- scotch 6.0.4 - scotch 6.0.4
- swak4Foam 0.3.2 - swak4Foam 0.4.0
** Compatibility ** Compatibility
Upstream features from the OpenFOAM® code base are merged into Upstream features from the OpenFOAM® code base are merged into
foam-extend on regular basis. The interface format of foam-extend on regular basis. The interface format of
foam-extend-3.2 is largely compatible to foam-extend-3.1, to foam-extend-4.0 is largely compatible to foam-extend-3.2, to
OpenFOAM-1.6-ext and OpenFOAM-1.7.x. In some cases, the OpenFOAM-1.6-ext and OpenFOAM-1.7.x. In some cases, the
differences are caused by bug fixes and algorithmic improvements, differences are caused by bug fixes and algorithmic improvements,
considered more important than inter-operability. considered more important than inter-operability.
@ -172,108 +173,96 @@
* Algebraic multigrid solver framework * Algebraic multigrid solver framework
* 243 tutorials with automated run scripts * 253 tutorials with automated run scripts
* Automatic test harness * Automatic test harness
* Approximately 6000 bug fixes in fundamental level libraries and * Approximately 6000 bug fixes in fundamental level libraries and
discretisation techniques discretisation techniques
** New features in foam-extend-3.2, since foam-extend-3.1 ** New features in foam-extend-4.0, since foam-extend-3.2
The list of features is a result of the work of numerous The list of features is a result of the work of numerous
contributors. The maintainers of foam-extend would formally like to contributors. The maintainers of foam-extend would formally like to
thank them all. thank them all.
Get a full log of the updates by (either): Get a full log of the updates by (either):
#+BEGIN_SRC bash #+BEGIN_SRC bash
user@machine> git log 3.1.. > commitLog user@machine> git log 4.0.. > commitLog
#+END_SRC #+END_SRC
#+BEGIN_SRC bash #+BEGIN_SRC bash
user@machine> git log 3.1.. --oneline > commitLog user@machine> git log 4.0.. --oneline > commitLog
#+END_SRC #+END_SRC
#+BEGIN_SRC bash #+BEGIN_SRC bash
user@machine> gitg 3.1.. user@machine> gitg 4.0..
#+END_SRC #+END_SRC
* Major new features: * Major new features:
- Immersed Boundary method: full release - Improved BlockLduMatrix and block-coupled p-U solver and associated tools
- Liquid film method, based on finite area infrastructure - ILUCp and block ILUCp preconditioners
- Global controlDict switches controlled from command line - Added MRF and porous media handling to the block-coupled solver
- Integration of cfMesh automatic mesh solvers - Change of generic turbulence modelling interface: no U required
- Update to block coupled solvers: Performance, Coupled RAS, MRF - Updated version of block-coupled turbulence models
- Rewrite of block-coupled matrix assembly and analysis tools - Major improvements in immersed boundary method library: improved performance
- New solver: potentialDyMFoam and parallel scaling. Completed supporft for moving deforming immersed boundary
- Rothalpy in compressible MRF solvers for turbomachinery - Adopted vanilla OpenFOAM solver control format (solutionControl class)
- Symmetry 2nd order accurate boundary condition - Implicit adjoint convection operator
- Generation of config files (e.g. csh, tcsh, fishshell, zsh) from bashrc - Improved GGI interpolation and cutting, with better parallel scaling
- Overhaul of fvDOM radiation model: symmetry plane and fast convergence - Global GGI search option for parallel cases
- New compilers: GCC new versions, Icc 14 and Icc 16, Clang - GGI and mixing planes with jump condition for the rothalpy equation
- Long long support - Improved 6-DOF solver, with new handling of constraints
- Long double support - Fully integrated real gas library
- SuperBee01 and SuperBee01DC - Updated viscoelastoplastic models
- wallShearStress also for compressible flow (backport) - New steady-state universal flow solver, handling incompressible and compressible
- Version updates of 3rd Party, PyFOAM, swak4Foam flows within the same framework
- Extend-bazaar: Added makeAxialMesh - Time consistent incompressible solvers update
- Added limiters on turbulence viscosity - Added decaying turbulence inlet boundary condition by Kornev
- Initial version of block-coupled turbulence models - New gradient limiter implementation
- New ThirdParty app: ParaView server for parallel rendering - Full gradient cacheing capability
- Removed fluxRequired from solution dictionaries
* Licence: GPLv3 - Consistent notation of 1/aP
- Dynamic mesh improvements: prescribed motion functions
* Software * Software
- File name changes resolving name clashes on non-case-sensitive filing - New handling of lnInclude directories: avoid file copying on MS Windows
systems - Changes to controlDict and options on MS Windows
- Unified code base for Windows, Mac OS X and Linux compilation - Consistency in formatting of compression options
- Parallel execution of automated test loops - Raspberry Pi port
* Installation: * Installation:
- Native port to Microsoft Windows 7 and 8.1 - Compilation improvements
- Updated and bug-fixed installation procedures - Updated packages versions and compilation in ThirdParty
- Improved ThirdParty packages selection mechanism - Changed compilation options for Infiniband: new versions of MPI
- Added support for mvapich2-2.2
- Updated compilation for latest version of XCode for Mac OSX
- Updates for MS Windows build
* Solvers: * Solvers:
- potentialDyMFoam - Updated time consistent incompressible solvers (channelFoam, icoFoam, nonNewtonianIcoFoam, pimpleDyMFoam, pimpleFoam, simpleFoam, simpleSRFFoam)
- sonicDyMFoam - Steady universal (compressible and incompressible) flow solver (steadyUniversalFoam)
- sonicFoamAutoMotion - Block-coupled p-U solver improvements (MRFPorousFoam and pUCoupledFoam)
- MRFPorousFoam - Improved steadyCompressibleMRFFoam
- liquidFilmFoam
- surfactantFoam
- icoIbFoam
- interIbFoam
- porousSimpleIbFoam
- potentialIbFoam
- simpleIbFoam
* New tutorials: * New tutorials:
- Mesquite mesh movement - Transient real fluid examples
- Immersed boundary method - Universal steady-state MRF examples
- Liquid film examples - Additional coupled CHT example
- Additional immersed boundary example
- Additional steady-state MRF and GGI example
* Bug fixes: see git log for details * Bug fixes: see git log for details
** Recent successful compilations and tests ** Recent successful compilations and tests
* CentOS 6.6: * Ubuntu 16.04 LTS
http://foam-extend.sourceforge.net/CDash/buildSummary.php?buildid=49
http://foam-extend.sourceforge.net/CDash/buildSummary.php?buildid=48
* Ubuntu 14.04
http://foam-extend.sourceforge.net/CDash/buildSummary.php?buildid=47
* Mac OS X 10.10
http://foam-extend.sourceforge.net/CDash/buildSummary.php?buildid=46
** Reporting bugs ** Reporting bugs
To report bugs, please use the bugtracker at To report bugs, please use the bugtracker at
http://sourceforge.net/p/openfoam-extend/ticketsfoamextendrelease/ http://sourceforge.net/p/foam-extend/tickets/
** How to contribute ** How to contribute
All your contributions are highly welcome: New solvers, utilities and All your contributions are highly welcome: New solvers, utilities and
models; bug fixes; documentation. The many ways of contributing and the models; bug fixes; documentation. The many ways of contributing and the
contribution process are described in detail at: contribution process are described in detail at:
http://sourceforge.net/p/openfoam-extend/wiki/HowToContribute/ http://sourceforge.net/p/foam-extend/wiki/HowToContribute/
** List of Contributors: ** List of Contributors:
See file ListOfContributors See file ListOfContributors

189
ReleaseNotes.html
View file

@ -3,8 +3,8 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head> <head>
<title><b>Release notes for foam-extend-3.2</b></title> <title><b>Release notes for foam-extend-4.0</b></title>
<!-- 2015-09-11 Fri 18:01 --> <!-- 2016-12-09 Fri 16:16 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="generator" content="Org-mode" /> <meta name="generator" content="Org-mode" />
<style type="text/css"> <style type="text/css">
@ -54,6 +54,8 @@
pre.src-sql:before { content: 'SQL'; } pre.src-sql:before { content: 'SQL'; }
table { border-collapse:collapse; } table { border-collapse:collapse; }
caption.t-above { caption-side: top; }
caption.t-bottom { caption-side: bottom; }
td, th { vertical-align:top; } td, th { vertical-align:top; }
th.right { text-align: center; } th.right { text-align: center; }
th.left { text-align: center; } th.left { text-align: center; }
@ -134,7 +136,7 @@ for the JavaScript code in this tag.
</head> </head>
<body> <body>
<div id="content"> <div id="content">
<h1 class="title"><b>Release notes for foam-extend-3.2</b></h1> <h1 class="title"><b>Release notes for foam-extend-4.0</b></h1>
<div id="table-of-contents"> <div id="table-of-contents">
<h2>Table of Contents</h2> <h2>Table of Contents</h2>
<div id="text-table-of-contents"> <div id="text-table-of-contents">
@ -143,7 +145,7 @@ for the JavaScript code in this tag.
<li><a href="#sec-2">2. Installation</a></li> <li><a href="#sec-2">2. Installation</a></li>
<li><a href="#sec-3">3. Compatibility</a></li> <li><a href="#sec-3">3. Compatibility</a></li>
<li><a href="#sec-4">4. Main differentiators between foam-extend and OpenFOAM</a></li> <li><a href="#sec-4">4. Main differentiators between foam-extend and OpenFOAM</a></li>
<li><a href="#sec-5">5. New features in foam-extend-3.2, since foam-extend-3.1</a></li> <li><a href="#sec-5">5. New features in foam-extend-4.0, since foam-extend-3.2</a></li>
<li><a href="#sec-6">6. Recent successful compilations and tests</a></li> <li><a href="#sec-6">6. Recent successful compilations and tests</a></li>
<li><a href="#sec-7">7. Reporting bugs</a></li> <li><a href="#sec-7">7. Reporting bugs</a></li>
<li><a href="#sec-8">8. How to contribute</a></li> <li><a href="#sec-8">8. How to contribute</a></li>
@ -173,11 +175,11 @@ transfer and other physics coupling, finite area method,
comprehensive dynamic mesh (motion and topological changes) comprehensive dynamic mesh (motion and topological changes)
capability and GPU support. For a full list, see below and previous capability and GPU support. For a full list, see below and previous
release notes at: release notes at:
<a href="http://sourceforge.net/p/openfoam-extend/wiki/Home/">http://sourceforge.net/p/openfoam-extend/wiki/Home/</a> <a href="http://sourceforge.net/p/foam-extend/wiki/Home/">http://sourceforge.net/p/foam-extend/wiki/Home/</a>
</p> </p>
<p> <p>
Version 3.2, nicknamed "Ann Arbor", is the current version of Version 4.0, nicknamed "Guimaraes", is the current version of
foam-extend. The release continues the tradition and spirit of the foam-extend. The release continues the tradition and spirit of the
original FOAM code developed by prof. Jasak and Mr. Weller during original FOAM code developed by prof. Jasak and Mr. Weller during
their time at Imperial College and released as the general purpose their time at Imperial College and released as the general purpose
@ -194,24 +196,27 @@ foam-extend are a community effort not endorsed by ESI Group.
</div> </div>
</div> </div>
<div id="outline-container-sec-2" class="outline-2"> <div id="outline-container-sec-2" class="outline-2">
<h2 id="sec-2"><span class="section-number-2">2</span> Installation</h2> <h2 id="sec-2"><span class="section-number-2">2</span> Installation</h2>
<div class="outline-text-2" id="text-2"> <div class="outline-text-2" id="text-2">
<p> <p>
foam-extend-3.2 can be compiled and runs on a large variety of Linux, Mac or Windows foam-extend-4.0 can be compiled and runs on a large variety of Linux, Mac or Windows
systems systems
</p> </p>
<ul class="org-ul"> <ul class="org-ul">
<li>Main supported OSs: <li>Main supported OSs:
<ul class="org-ul"> <ul class="org-ul">
<li>Ubuntu 14.04 <li>Ubuntu 16.04 LTS
</li> </li>
<li>Fedora 20 <li>Ubuntu 14.04 LTS
</li>
<li>Fedora 24
</li> </li>
<li>Mac OS X <li>Mac OS X
</li> </li>
<li>Microsoft Windows 7 and 8.1 <li>Microsoft Windows 7, 8.1 and 10
</li> </li>
</ul> </ul>
</li> </li>
@ -222,7 +227,7 @@ systems
Please refer to doc/buildInstructions/ for details. Further Please refer to doc/buildInstructions/ for details. Further
installation instruction are available on the unofficial OpenFOAM installation instruction are available on the unofficial OpenFOAM
Wiki: Wiki:
<a href="http://openfoamwiki.net/index.php/Installation/Linux/foam-extend-3.1">http://openfoamwiki.net/index.php/Installation/Linux/foam-extend-3.1</a> <a href="http://openfoamwiki.net/index.php/Installation/Linux/foam-extend-4.0">http://openfoamwiki.net/index.php/Installation/Linux/foam-extend-4.0</a>
If you have improvements or build instructions for a new system, If you have improvements or build instructions for a new system,
please share them with the community (see section "How to please share them with the community (see section "How to
contribute", below). contribute", below).
@ -233,8 +238,8 @@ contribute", below).
<p> <p>
Binary packages are available for download at Binary packages are available for download at
<a href="http://sourceforge.net/projects/openfoam-extend/">http://sourceforge.net/projects/openfoam-extend/</a> for the following <a href="http://sourceforge.net/projects/foam-extend/">http://sourceforge.net/projects/foam-extend/</a> for the following
systems: Ubuntu 14.04, Fedora 20 and Mac OS X. systems: Ubuntu 16.04, Fedora 24 and Mac OS X and Windows 10.
</p> </p>
</li> </li>
@ -256,9 +261,9 @@ systems: Ubuntu 14.04, Fedora 20 and Mac OS X.
</li> </li>
<li>metis 5.1.0 <li>metis 5.1.0
</li> </li>
<li>openmpi 1.6.5 <li>openmpi 1.8.8
</li> </li>
<li>Paraview 4.3.1 <li>Paraview 4.4.0
</li> </li>
<li>parmetis 4.0.3 <li>parmetis 4.0.3
</li> </li>
@ -270,7 +275,7 @@ systems: Ubuntu 14.04, Fedora 20 and Mac OS X.
</li> </li>
<li>scotch 6.0.4 <li>scotch 6.0.4
</li> </li>
<li>swak4Foam 0.3.2 <li>swak4Foam 0.4.0
</li> </li>
</ul> </ul>
</li> </li>
@ -278,19 +283,21 @@ systems: Ubuntu 14.04, Fedora 20 and Mac OS X.
</div> </div>
</div> </div>
<div id="outline-container-sec-3" class="outline-2"> <div id="outline-container-sec-3" class="outline-2">
<h2 id="sec-3"><span class="section-number-2">3</span> Compatibility</h2> <h2 id="sec-3"><span class="section-number-2">3</span> Compatibility</h2>
<div class="outline-text-2" id="text-3"> <div class="outline-text-2" id="text-3">
<p> <p>
Upstream features from the OpenFOAM® code base are merged into Upstream features from the OpenFOAM® code base are merged into
foam-extend on regular basis. The interface format of foam-extend on regular basis. The interface format of
foam-extend-3.2 is largely compatible to foam-extend-3.1, to foam-extend-4.0 is largely compatible to foam-extend-3.2, to
OpenFOAM-1.6-ext and OpenFOAM-1.7.x. In some cases, the OpenFOAM-1.6-ext and OpenFOAM-1.7.x. In some cases, the
differences are caused by bug fixes and algorithmic improvements, differences are caused by bug fixes and algorithmic improvements,
considered more important than inter-operability. considered more important than inter-operability.
</p> </p>
</div> </div>
</div> </div>
<div id="outline-container-sec-4" class="outline-2"> <div id="outline-container-sec-4" class="outline-2">
<h2 id="sec-4"><span class="section-number-2">4</span> Main differentiators between foam-extend and OpenFOAM</h2> <h2 id="sec-4"><span class="section-number-2">4</span> Main differentiators between foam-extend and OpenFOAM</h2>
<div class="outline-text-2" id="text-4"> <div class="outline-text-2" id="text-4">
@ -386,7 +393,7 @@ correction or explicit schemes
<li>Algebraic multigrid solver framework <li>Algebraic multigrid solver framework
</li> </li>
<li>243 tutorials with automated run scripts <li>253 tutorials with automated run scripts
</li> </li>
<li>Automatic test harness <li>Automatic test harness
@ -398,8 +405,9 @@ discretisation techniques
</ul> </ul>
</div> </div>
</div> </div>
<div id="outline-container-sec-5" class="outline-2"> <div id="outline-container-sec-5" class="outline-2">
<h2 id="sec-5"><span class="section-number-2">5</span> New features in foam-extend-3.2, since foam-extend-3.1</h2> <h2 id="sec-5"><span class="section-number-2">5</span> New features in foam-extend-4.0, since foam-extend-3.2</h2>
<div class="outline-text-2" id="text-5"> <div class="outline-text-2" id="text-5">
<p> <p>
The list of features is a result of the work of numerous The list of features is a result of the work of numerous
@ -412,128 +420,126 @@ Get a full log of the updates by (either):
</p> </p>
<div class="org-src-container"> <div class="org-src-container">
<pre class="src src-bash">user@machine&gt; git log 3.1.. &gt; commitLog <pre class="src src-bash">user@machine&gt; git log 4.0.. &gt; commitLog
</pre> </pre>
</div> </div>
<div class="org-src-container"> <div class="org-src-container">
<pre class="src src-bash">user@machine&gt; git log 3.1.. --oneline &gt; commitLog <pre class="src src-bash">user@machine&gt; git log 4.0.. --oneline &gt; commitLog
</pre> </pre>
</div> </div>
<div class="org-src-container"> <div class="org-src-container">
<pre class="src src-bash">user@machine&gt; gitg 3.1.. <pre class="src src-bash">user@machine&gt; gitg 4.0..
</pre> </pre>
</div> </div>
<ul class="org-ul"> <ul class="org-ul">
<li>Major new features: <li>Major new features:
<ul class="org-ul"> <ul class="org-ul">
<li>Immersed Boundary method: full release <li>Improved BlockLduMatrix and block-coupled p-U solver and associated tools
</li> </li>
<li>Liquid film method, based on finite area infrastructure <li>ILUCp and block ILUCp preconditioners
</li> </li>
<li>Global controlDict switches controlled from command line <li>Added MRF and porous media handling to the block-coupled solver
</li> </li>
<li>Integration of cfMesh automatic mesh solvers <li>Change of generic turbulence modelling interface: no U required
</li> </li>
<li>Update to block coupled solvers: Performance, Coupled RAS, MRF <li>Updated version of block-coupled turbulence models
</li> </li>
<li>Rewrite of block-coupled matrix assembly and analysis tools <li>Major improvements in immersed boundary method library: improved performance
and parallel scaling. Completed supporft for moving deforming immersed boundary
</li> </li>
<li>New solver: potentialDyMFoam <li>Adopted vanilla OpenFOAM solver control format (solutionControl class)
</li> </li>
<li>Rothalpy in compressible MRF solvers for turbomachinery <li>Implicit adjoint convection operator
</li> </li>
<li>Symmetry 2nd order accurate boundary condition <li>Improved GGI interpolation and cutting, with better parallel scaling
</li> </li>
<li>Generation of config files (e.g. csh, tcsh, fishshell, zsh) from bashrc <li>Global GGI search option for parallel cases
</li> </li>
<li>Overhaul of fvDOM radiation model: symmetry plane and fast convergence <li>GGI and mixing planes with jump condition for the rothalpy equation
</li> </li>
<li>New compilers: GCC new versions, Icc 14 and Icc 16, Clang <li>Improved 6-DOF solver, with new handling of constraints
</li> </li>
<li>Long long support <li>Fully integrated real gas library
</li> </li>
<li>Long double support <li>Updated viscoelastoplastic models
</li> </li>
<li>SuperBee01 and SuperBee01DC <li>New steady-state universal flow solver, handling incompressible and compressible
flows within the same framework
</li> </li>
<li>wallShearStress also for compressible flow (backport) <li>Time consistent incompressible solvers update
</li> </li>
<li>Version updates of 3rd Party, PyFOAM, swak4Foam <li>Added decaying turbulence inlet boundary condition by Kornev
</li> </li>
<li>Extend-bazaar: Added makeAxialMesh <li>New gradient limiter implementation
</li> </li>
<li>Added limiters on turbulence viscosity <li>Full gradient cacheing capability
</li> </li>
<li>Initial version of block-coupled turbulence models <li>Removed fluxRequired from solution dictionaries
</li> </li>
<li>New ThirdParty app: ParaView server for parallel rendering <li>Consistent notation of 1/aP
</li>
<li>Dynamic mesh improvements: prescribed motion functions
</li> </li>
</ul> </ul>
</li> </li>
<li>Licence: GPLv3
</li>
<li>Software <li>Software
<ul class="org-ul"> <ul class="org-ul">
<li>File name changes resolving name clashes on non-case-sensitive filing <li>New handling of lnInclude directories: avoid file copying on MS Windows
systems
</li> </li>
<li>Unified code base for Windows, Mac OS X and Linux compilation <li>Changes to controlDict and options on MS Windows
</li> </li>
<li>Parallel execution of automated test loops <li>Consistency in formatting of compression options
</li>
<li>Raspberry Pi port
</li> </li>
</ul> </ul>
</li> </li>
<li>Installation: <li>Installation:
<ul class="org-ul"> <ul class="org-ul">
<li>Native port to Microsoft Windows 7 and 8.1 <li>Compilation improvements
</li> </li>
<li>Updated and bug-fixed installation procedures <li>Updated packages versions and compilation in ThirdParty
</li> </li>
<li>Improved ThirdParty packages selection mechanism <li>Changed compilation options for Infiniband: new versions of MPI
</li>
<li>Added support for mvapich2-2.2
</li>
<li>Updated compilation for latest version of XCode for Mac OSX
</li>
<li>Updates for MS Windows build
</li> </li>
</ul> </ul>
</li> </li>
<li>Solvers: <li>Solvers:
<ul class="org-ul"> <ul class="org-ul">
<li>potentialDyMFoam <li>Updated time consistent incompressible solvers (channelFoam, icoFoam, nonNewtonianIcoFoam, pimpleDyMFoam, pimpleFoam, simpleFoam, simpleSRFFoam)
</li> </li>
<li>sonicDyMFoam <li>Steady universal (compressible and incompressible) flow solver (steadyUniversalFoam)
</li> </li>
<li>sonicFoamAutoMotion <li>Block-coupled p-U solver improvements (MRFPorousFoam and pUCoupledFoam)
</li> </li>
<li>MRFPorousFoam <li>Improved steadyCompressibleMRFFoam
</li>
<li>liquidFilmFoam
</li>
<li>surfactantFoam
</li>
<li>icoIbFoam
</li>
<li>interIbFoam
</li>
<li>porousSimpleIbFoam
</li>
<li>potentialIbFoam
</li>
<li>simpleIbFoam
</li> </li>
</ul> </ul>
</li> </li>
<li>New tutorials: <li>New tutorials:
<ul class="org-ul"> <ul class="org-ul">
<li>Mesquite mesh movement <li>Transient real fluid examples
</li> </li>
<li>Immersed boundary method <li>Universal steady-state MRF examples
</li> </li>
<li>Liquid film examples <li>Additional coupled CHT example
</li>
<li>Additional immersed boundary example
</li>
<li>Additional steady-state MRF and GGI example
</li> </li>
</ul> </ul>
</li> </li>
@ -543,43 +549,27 @@ systems
</ul> </ul>
</div> </div>
</div> </div>
<div id="outline-container-sec-6" class="outline-2"> <div id="outline-container-sec-6" class="outline-2">
<h2 id="sec-6"><span class="section-number-2">6</span> Recent successful compilations and tests</h2> <h2 id="sec-6"><span class="section-number-2">6</span> Recent successful compilations and tests</h2>
<div class="outline-text-2" id="text-6"> <div class="outline-text-2" id="text-6">
<ul class="org-ul"> <ul class="org-ul">
<li>CentOS 6.6: <li>Ubuntu 16.04 LTS
<p>
<a href="http://foam-extend.sourceforge.net/CDash/buildSummary.php?buildid=49">http://foam-extend.sourceforge.net/CDash/buildSummary.php?buildid=49</a>
<a href="http://foam-extend.sourceforge.net/CDash/buildSummary.php?buildid=48">http://foam-extend.sourceforge.net/CDash/buildSummary.php?buildid=48</a>
</p>
</li>
<li>Ubuntu 14.04
<p>
<a href="http://foam-extend.sourceforge.net/CDash/buildSummary.php?buildid=47">http://foam-extend.sourceforge.net/CDash/buildSummary.php?buildid=47</a>
</p>
</li>
<li>Mac OS X 10.10
<p>
<a href="http://foam-extend.sourceforge.net/CDash/buildSummary.php?buildid=46">http://foam-extend.sourceforge.net/CDash/buildSummary.php?buildid=46</a>
</p>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
<div id="outline-container-sec-7" class="outline-2"> <div id="outline-container-sec-7" class="outline-2">
<h2 id="sec-7"><span class="section-number-2">7</span> Reporting bugs</h2> <h2 id="sec-7"><span class="section-number-2">7</span> Reporting bugs</h2>
<div class="outline-text-2" id="text-7"> <div class="outline-text-2" id="text-7">
<p> <p>
To report bugs, please use the bugtracker at To report bugs, please use the bugtracker at
<a href="http://sourceforge.net/p/openfoam-extend/ticketsfoamextendrelease/">http://sourceforge.net/p/openfoam-extend/ticketsfoamextendrelease/</a> <a href="http://sourceforge.net/p/foam-extend/tickets/">http://sourceforge.net/p/foam-extend/tickets/</a>
</p> </p>
</div> </div>
</div> </div>
<div id="outline-container-sec-8" class="outline-2"> <div id="outline-container-sec-8" class="outline-2">
<h2 id="sec-8"><span class="section-number-2">8</span> How to contribute</h2> <h2 id="sec-8"><span class="section-number-2">8</span> How to contribute</h2>
<div class="outline-text-2" id="text-8"> <div class="outline-text-2" id="text-8">
@ -587,10 +577,11 @@ To report bugs, please use the bugtracker at
All your contributions are highly welcome: New solvers, utilities and All your contributions are highly welcome: New solvers, utilities and
models; bug fixes; documentation. The many ways of contributing and the models; bug fixes; documentation. The many ways of contributing and the
contribution process are described in detail at: contribution process are described in detail at:
<a href="http://sourceforge.net/p/openfoam-extend/wiki/HowToContribute/">http://sourceforge.net/p/openfoam-extend/wiki/HowToContribute/</a> <a href="http://sourceforge.net/p/foam-extend/wiki/HowToContribute/">http://sourceforge.net/p/foam-extend/wiki/HowToContribute/</a>
</p> </p>
</div> </div>
</div> </div>
<div id="outline-container-sec-9" class="outline-2"> <div id="outline-container-sec-9" class="outline-2">
<h2 id="sec-9"><span class="section-number-2">9</span> List of Contributors:</h2> <h2 id="sec-9"><span class="section-number-2">9</span> List of Contributors:</h2>
<div class="outline-text-2" id="text-9"> <div class="outline-text-2" id="text-9">
@ -601,9 +592,9 @@ See file ListOfContributors
</div> </div>
</div> </div>
<div id="postamble" class="status"> <div id="postamble" class="status">
<p class="date">Date: August 2015</p> <p class="date">Date: December 2016</p>
<p class="date">Created: 2015-09-11 Fri 18:01</p> <p class="date">Created: 2016-12-09 Fri 16:16</p>
<p class="creator"><a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.3.1 (<a href="http://orgmode.org">Org</a> mode 8.2.4)</p> <p class="creator"><a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.5.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10)</p>
<p class="validation"><a href="http://validator.w3.org/check?uri=referer">Validate</a></p> <p class="validation"><a href="http://validator.w3.org/check?uri=referer">Validate</a></p>
</div> </div>
</body> </body>

161
ReleaseNotes.txt
View file

@ -1,10 +1,10 @@
_____________________________________ _____________________________________
*RELEASE NOTES FOR FOAM-EXTEND-3.2* *RELEASE NOTES FOR FOAM-EXTEND-4.0*
_____________________________________ _____________________________________
August 2015 December 2016
Table of Contents Table of Contents
@ -14,7 +14,7 @@ _________________
2 Installation 2 Installation
3 Compatibility 3 Compatibility
4 Main differentiators between foam-extend and OpenFOAM 4 Main differentiators between foam-extend and OpenFOAM
5 New features in foam-extend-3.2, since foam-extend-3.1 5 New features in foam-extend-4.0, since foam-extend-3.2
6 Recent successful compilations and tests 6 Recent successful compilations and tests
7 Reporting bugs 7 Reporting bugs
8 How to contribute 8 How to contribute
@ -40,9 +40,9 @@ _________________
coupling, finite area method, comprehensive dynamic mesh (motion and coupling, finite area method, comprehensive dynamic mesh (motion and
topological changes) capability and GPU support. For a full list, see topological changes) capability and GPU support. For a full list, see
below and previous release notes at: below and previous release notes at:
[http://sourceforge.net/p/openfoam-extend/wiki/Home/] [http://sourceforge.net/p/foam-extend/wiki/Home/]
Version 3.2, nicknamed "Ann Arbor", is the current version of Version 4.0, nicknamed "Guimaraes", is the current version of
foam-extend. The release continues the tradition and spirit of the foam-extend. The release continues the tradition and spirit of the
original FOAM code developed by prof. Jasak and Mr. Weller during original FOAM code developed by prof. Jasak and Mr. Weller during
their time at Imperial College and released as the general purpose their time at Imperial College and released as the general purpose
@ -58,21 +58,22 @@ _________________
2 Installation 2 Installation
============== ==============
foam-extend-3.2 can be compiled and runs on a large variety of Linux, foam-extend-4.0 can be compiled and runs on a large variety of Linux,
Mac or Windows systems Mac or Windows systems
* Main supported OSs: * Main supported OSs:
- Ubuntu 14.04 - Ubuntu 16.04 LTS
- Fedora 20 - Ubuntu 14.04 LTS
- Fedora 24
- Mac OS X - Mac OS X
- Microsoft Windows 7 and 8.1 - Microsoft Windows 7, 8.1 and 10
* Compile from source: * Compile from source:
Please refer to doc/buildInstructions/ for details. Further Please refer to doc/buildInstructions/ for details. Further
installation instruction are available on the unofficial OpenFOAM installation instruction are available on the unofficial OpenFOAM
Wiki: Wiki:
[http://openfoamwiki.net/index.php/Installation/Linux/foam-extend-3.1] [http://openfoamwiki.net/index.php/Installation/Linux/foam-extend-4.0]
If you have improvements or build instructions for a new system, If you have improvements or build instructions for a new system,
please share them with the community (see section "How to please share them with the community (see section "How to
contribute", below). contribute", below).
@ -80,8 +81,8 @@ _________________
* Download binary packages: * Download binary packages:
Binary packages are available for download at Binary packages are available for download at
[http://sourceforge.net/projects/openfoam-extend/] for the following [http://sourceforge.net/projects/foam-extend/] for the following
systems: Ubuntu 14.04, Fedora 20 and Mac OS X. systems: Ubuntu 16.04, Fedora 24 and Mac OS X and Windows 10.
* Accompanying ThirdParty software: * Accompanying ThirdParty software:
- gcc compatibility up to 4.9.2 - gcc compatibility up to 4.9.2
@ -92,22 +93,22 @@ _________________
- libccmio 2.6.1 - libccmio 2.6.1
- mesquite 2.1.2 - mesquite 2.1.2
- metis 5.1.0 - metis 5.1.0
- openmpi 1.6.5 - openmpi 1.8.8
- Paraview 4.3.1 - Paraview 4.4.0
- parmetis 4.0.3 - parmetis 4.0.3
- ParMGridGen 1.0 - ParMGridGen 1.0
- PyFoam 0.6.4 - PyFoam 0.6.4
- qt 4.8.6 - qt 4.8.6
- scotch 6.0.4 - scotch 6.0.4
- swak4Foam 0.3.2 - swak4Foam 0.4.0
3 Compatibility 3 Compatibility
=============== ===============
Upstream features from the OpenFOAM® code base are merged into Upstream features from the OpenFOAM® code base are merged into
foam-extend on regular basis. The interface format of foam-extend-3.2 foam-extend on regular basis. The interface format of foam-extend-4.0
is largely compatible to foam-extend-3.1, to OpenFOAM-1.6-ext and is largely compatible to foam-extend-3.2, to OpenFOAM-1.6-ext and
OpenFOAM-1.7.x. In some cases, the differences are caused by bug fixes OpenFOAM-1.7.x. In some cases, the differences are caused by bug fixes
and algorithmic improvements, considered more important than and algorithmic improvements, considered more important than
inter-operability. inter-operability.
@ -186,7 +187,7 @@ _________________
* Algebraic multigrid solver framework * Algebraic multigrid solver framework
* 243 tutorials with automated run scripts * 253 tutorials with automated run scripts
* Automatic test harness * Automatic test harness
@ -194,7 +195,7 @@ _________________
discretisation techniques discretisation techniques
5 New features in foam-extend-3.2, since foam-extend-3.1 5 New features in foam-extend-4.0, since foam-extend-3.2
======================================================== ========================================================
The list of features is a result of the work of numerous The list of features is a result of the work of numerous
@ -203,70 +204,77 @@ _________________
Get a full log of the updates by (either): Get a full log of the updates by (either):
,---- ,----
| user@machine> git log 3.1.. > commitLog | user@machine> git log 4.0.. > commitLog
`---- `----
,---- ,----
| user@machine> git log 3.1.. --oneline > commitLog | user@machine> git log 4.0.. --oneline > commitLog
`---- `----
,---- ,----
| user@machine> gitg 3.1.. | user@machine> gitg 4.0..
`---- `----
* Major new features: * Major new features:
- Immersed Boundary method: full release - Improved BlockLduMatrix and block-coupled p-U solver and
- Liquid film method, based on finite area infrastructure associated tools
- Global controlDict switches controlled from command line - ILUCp and block ILUCp preconditioners
- Integration of cfMesh automatic mesh solvers - Added MRF and porous media handling to the block-coupled solver
- Update to block coupled solvers: Performance, Coupled RAS, MRF - Change of generic turbulence modelling interface: no U required
- Rewrite of block-coupled matrix assembly and analysis tools - Updated version of block-coupled turbulence models
- New solver: potentialDyMFoam - Major improvements in immersed boundary method library: improved
- Rothalpy in compressible MRF solvers for turbomachinery performance and parallel scaling. Completed supporft for moving
- Symmetry 2nd order accurate boundary condition deforming immersed boundary
- Generation of config files (e.g. csh, tcsh, fishshell, zsh) from - Adopted vanilla OpenFOAM solver control format (solutionControl
bashrc class)
- Overhaul of fvDOM radiation model: symmetry plane and fast - Implicit adjoint convection operator
convergence - Improved GGI interpolation and cutting, with better parallel
- New compilers: GCC new versions, Icc 14 and Icc 16, Clang scaling
- Long long support - Global GGI search option for parallel cases
- Long double support - GGI and mixing planes with jump condition for the rothalpy
- SuperBee01 and SuperBee01DC equation
- wallShearStress also for compressible flow (backport) - Improved 6-DOF solver, with new handling of constraints
- Version updates of 3rd Party, PyFOAM, swak4Foam - Fully integrated real gas library
- Extend-bazaar: Added makeAxialMesh - Updated viscoelastoplastic models
- Added limiters on turbulence viscosity - New steady-state universal flow solver, handling incompressible
- Initial version of block-coupled turbulence models and compressible flows within the same framework
- New ThirdParty app: ParaView server for parallel rendering - Time consistent incompressible solvers update
- Added decaying turbulence inlet boundary condition by Kornev
* Licence: GPLv3 - New gradient limiter implementation
- Full gradient cacheing capability
- Removed fluxRequired from solution dictionaries
- Consistent notation of 1/aP
- Dynamic mesh improvements: prescribed motion functions
* Software * Software
- File name changes resolving name clashes on non-case-sensitive - New handling of lnInclude directories: avoid file copying on MS
filing systems Windows
- Unified code base for Windows, Mac OS X and Linux compilation - Changes to controlDict and options on MS Windows
- Parallel execution of automated test loops - Consistency in formatting of compression options
- Raspberry Pi port
* Installation: * Installation:
- Native port to Microsoft Windows 7 and 8.1 - Compilation improvements
- Updated and bug-fixed installation procedures - Updated packages versions and compilation in ThirdParty
- Improved ThirdParty packages selection mechanism - Changed compilation options for Infiniband: new versions of MPI
- Added support for mvapich2-2.2
- Updated compilation for latest version of XCode for Mac OSX
- Updates for MS Windows build
* Solvers: * Solvers:
- potentialDyMFoam - Updated time consistent incompressible solvers (channelFoam,
- sonicDyMFoam icoFoam, nonNewtonianIcoFoam, pimpleDyMFoam, pimpleFoam,
- sonicFoamAutoMotion simpleFoam, simpleSRFFoam)
- MRFPorousFoam - Steady universal (compressible and incompressible) flow solver
- liquidFilmFoam (steadyUniversalFoam)
- surfactantFoam - Block-coupled p-U solver improvements (MRFPorousFoam and
- icoIbFoam pUCoupledFoam)
- interIbFoam - Improved steadyCompressibleMRFFoam
- porousSimpleIbFoam
- potentialIbFoam
- simpleIbFoam
* New tutorials: * New tutorials:
- Mesquite mesh movement - Transient real fluid examples
- Immersed boundary method - Universal steady-state MRF examples
- Liquid film examples - Additional coupled CHT example
- Additional immersed boundary example
- Additional steady-state MRF and GGI example
* Bug fixes: see git log for details * Bug fixes: see git log for details
@ -274,25 +282,14 @@ _________________
6 Recent successful compilations and tests 6 Recent successful compilations and tests
========================================== ==========================================
* CentOS 6.6: * Ubuntu 16.04 LTS
[http://foam-extend.sourceforge.net/CDash/buildSummary.php?buildid=49]
[http://foam-extend.sourceforge.net/CDash/buildSummary.php?buildid=48]
* Ubuntu 14.04
[http://foam-extend.sourceforge.net/CDash/buildSummary.php?buildid=47]
* Mac OS X 10.10
[http://foam-extend.sourceforge.net/CDash/buildSummary.php?buildid=46]
7 Reporting bugs 7 Reporting bugs
================ ================
To report bugs, please use the bugtracker at To report bugs, please use the bugtracker at
[http://sourceforge.net/p/openfoam-extend/ticketsfoamextendrelease/] [http://sourceforge.net/p/foam-extend/tickets/]
8 How to contribute 8 How to contribute
@ -301,7 +298,7 @@ _________________
All your contributions are highly welcome: New solvers, utilities and All your contributions are highly welcome: New solvers, utilities and
models; bug fixes; documentation. The many ways of contributing and models; bug fixes; documentation. The many ways of contributing and
the contribution process are described in detail at: the contribution process are described in detail at:
[http://sourceforge.net/p/openfoam-extend/wiki/HowToContribute/] [http://sourceforge.net/p/foam-extend/wiki/HowToContribute/]
9 List of Contributors: 9 List of Contributors:

10
ThirdParty/AllMake.stage1 vendored
View file

@ -100,6 +100,16 @@ echo
( rpm_make -p gcc-4.7.4 -s gcc-4.7.4.spec -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.gz ) ( rpm_make -p gcc-4.7.4 -s gcc-4.7.4.spec -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.gz )
} }
# Gcc 4.7.4 and companion libraries
#
[ ! -z "$WM_THIRD_PARTY_USE_GCC_474" ] && {
echo "Building gmp-5.0.5 mpfr-3.1.0 mpc-0.9 gcc-4.6.3"
( rpm_make -p gmp-5.1.2 -s gmp-5.1.2.spec -u ftp://ftp.gnu.org/gnu/gmp/gmp-5.1.2.tar.bz2 )
( rpm_make -p mpfr-3.1.2 -s mpfr-3.1.2.spec -u ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.1.2.tar.gz )
( rpm_make -p mpc-1.0.1 -s mpc-1.0.1.spec -u http://www.multiprecision.org/mpc/download/mpc-1.0.1.tar.gz )
( rpm_make -p gcc-4.7.4 -s gcc-4.7.4.spec -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.gz )
}
# Gcc 4.8.4 and companion libraries # Gcc 4.8.4 and companion libraries
# #
[ ! -z "$WM_THIRD_PARTY_USE_GCC_484" ] && { [ ! -z "$WM_THIRD_PARTY_USE_GCC_484" ] && {

14
ThirdParty/AllMake.stage3 vendored
View file

@ -63,7 +63,7 @@ then
# #
[ ! -z "$WM_THIRD_PARTY_USE_METIS_510" ] && { [ ! -z "$WM_THIRD_PARTY_USE_METIS_510" ] && {
echo "Building metis 5.1.0" echo "Building metis 5.1.0"
( rpm_make -p metis-5.1.0 -s metis-5.1.0.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/metis-5.1.0.tar.gz ) ( rpm_make -p metis-5.1.0 -s metis-5.1.0.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/metis-5.1.0.tar.gz )
} }
else else
echo "Using system installed Metis" echo "Using system installed Metis"
@ -78,7 +78,7 @@ then
[ ! -z "$WM_THIRD_PARTY_USE_PARMGRIDGEN_10" ] && { [ ! -z "$WM_THIRD_PARTY_USE_PARMGRIDGEN_10" ] && {
echo "Building ParMGridGen 1.0" echo "Building ParMGridGen 1.0"
#( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u http://www.mgnet.org/mgnet/Codes/parmgridgen/ParMGridGen-1.0.tar.gz ) #( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u http://www.mgnet.org/mgnet/Codes/parmgridgen/ParMGridGen-1.0.tar.gz )
( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/ParMGridGen-1.0.tar.gz ) ( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/ParMGridGen-1.0.tar.gz )
} }
else else
echo "Using system installed ParMGridGen" echo "Using system installed ParMGridGen"
@ -106,7 +106,7 @@ then
# #
[ ! -z "$WM_THIRD_PARTY_USE_MESQUITE_212" ] && { [ ! -z "$WM_THIRD_PARTY_USE_MESQUITE_212" ] && {
echo "Building Mesquite 2.1.2" echo "Building Mesquite 2.1.2"
( rpm_make -p mesquite-2.1.2 -s mesquite-2.1.2.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/mesquite-2.1.2.tar.gz ) ( rpm_make -p mesquite-2.1.2 -s mesquite-2.1.2.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/mesquite-2.1.2.tar.gz )
} }
else else
echo "Using system installed Mesquite" echo "Using system installed Mesquite"
@ -127,13 +127,13 @@ then
[ ! -z "$WM_THIRD_PARTY_USE_SCOTCH_604" ] && { [ ! -z "$WM_THIRD_PARTY_USE_SCOTCH_604" ] && {
echo "Building Scotch 6.0.4" echo "Building Scotch 6.0.4"
#( rpm_make -p scotch-6.0.4 -s scotch-6.0.4.spec -u http://gforge.inria.fr/frs/download.php/file/34618/scotch_6.0.4.tar.gz ) #( rpm_make -p scotch-6.0.4 -s scotch-6.0.4.spec -u http://gforge.inria.fr/frs/download.php/file/34618/scotch_6.0.4.tar.gz )
( rpm_make -p scotch-6.0.4 -s scotch-6.0.4.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/scotch_6.0.4.tar.gz ) ( rpm_make -p scotch-6.0.4 -s scotch-6.0.4.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/scotch_6.0.4.tar.gz )
} }
# Scotch 6.0.0 # Scotch 6.0.0
# #
[ ! -z "$WM_THIRD_PARTY_USE_SCOTCH_600" ] && { [ ! -z "$WM_THIRD_PARTY_USE_SCOTCH_600" ] && {
echo "Building Scotch 6.0.0" echo "Building Scotch 6.0.0"
( rpm_make -p scotch-6.0.0 -s scotch-6.0.0.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/scotch-6.0.0.tar.gz ) ( rpm_make -p scotch-6.0.0 -s scotch-6.0.0.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/scotch-6.0.0.tar.gz )
} }
else else
echo "Using system installed Scotch" echo "Using system installed Scotch"
@ -196,13 +196,13 @@ then
[ ! -z "$WM_THIRD_PARTY_USE_HWLOC_1101" ] && { [ ! -z "$WM_THIRD_PARTY_USE_HWLOC_1101" ] && {
echo "Building hwloc 1.10.1" echo "Building hwloc 1.10.1"
# ( rpm_make -p hwloc-1.10.1 -s hwloc-1.10.1.spec -u http://www.open-mpi.org/software/hwloc/v1.10/downloads/hwloc-1.10.1.tar.gz ) # ( rpm_make -p hwloc-1.10.1 -s hwloc-1.10.1.spec -u http://www.open-mpi.org/software/hwloc/v1.10/downloads/hwloc-1.10.1.tar.gz )
( rpm_make -p hwloc-1.10.1 -s hwloc-1.10.1.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/hwloc-1.10.1.tar.gz ) ( rpm_make -p hwloc-1.10.1 -s hwloc-1.10.1.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/hwloc-1.10.1.tar.gz )
} }
# hwloc 1.7.2 # hwloc 1.7.2
# #
[ ! -z "$WM_THIRD_PARTY_USE_HWLOC_172" ] && { [ ! -z "$WM_THIRD_PARTY_USE_HWLOC_172" ] && {
echo "Building hwloc 1.7.2" echo "Building hwloc 1.7.2"
( rpm_make -p hwloc-1.7.2 -s hwloc-1.7.2.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/hwloc-1.7.2.tar.gz ) ( rpm_make -p hwloc-1.7.2 -s hwloc-1.7.2.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/hwloc-1.7.2.tar.gz )
} }
else else
echo "Using system installed hwloc" echo "Using system installed hwloc"

14
ThirdParty/AllMake.stage4 vendored
View file

@ -82,7 +82,7 @@ then
# #
[ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_401" ] && { [ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_401" ] && {
echo "Building ParaView 4.0.1" echo "Building ParaView 4.0.1"
( rpm_make -p ParaView-4.0.1 -s ParaView-4.0.1.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/ParaView-v4.0.1-source.tgz \ ( rpm_make -p ParaView-4.0.1 -s ParaView-4.0.1.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/ParaView-v4.0.1-source.tgz \
-f --define='_qmakePath $QT_BIN_DIR/qmake' -f --define='_qmakePath $QT_BIN_DIR/qmake'
) )
} }
@ -90,7 +90,7 @@ then
# #
[ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_410" ] && { [ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_410" ] && {
echo "Building ParaView 4.1.0" echo "Building ParaView 4.1.0"
( rpm_make -p ParaView-4.1.0 -s ParaView-4.1.0.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/ParaView-v4.1.0-source.tar.gz \ ( rpm_make -p ParaView-4.1.0 -s ParaView-4.1.0.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/ParaView-v4.1.0-source.tar.gz \
-f --define='_qmakePath $QT_BIN_DIR/qmake' -f --define='_qmakePath $QT_BIN_DIR/qmake'
) )
} }
@ -98,7 +98,15 @@ then
# #
[ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_431" ] && { [ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_431" ] && {
echo "Building ParaView 4.3.1" echo "Building ParaView 4.3.1"
( rpm_make -p ParaView-4.3.1 -s ParaView-4.3.1.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/ParaView-v4.3.1-source.tar.gz \ ( rpm_make -p ParaView-4.3.1 -s ParaView-4.3.1.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/ParaView-v4.3.1-source.tar.gz \
-f --define='_qmakePath $QT_BIN_DIR/qmake'
)
}
# ParaView 4.4.0
#
[ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_440" ] && {
echo "Building ParaView 4.4.0"
( rpm_make -p ParaView-4.4.0 -s ParaView-4.4.0.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/ParaView-v4.4.0-source.tar.gz \
-f --define='_qmakePath $QT_BIN_DIR/qmake' -f --define='_qmakePath $QT_BIN_DIR/qmake'
) )
} }

3
ThirdParty/AllMake.stage5 vendored
View file

@ -57,11 +57,12 @@ echo
# swak4Foam - Version 0.3.1 # swak4Foam - Version 0.3.1
# swak4Foam - Version 0.3.2 # swak4Foam - Version 0.3.2
# swak4Foam - Version 0.4.0
# In fact, we are basically tracking the head branch from the Mercurial repository # In fact, we are basically tracking the head branch from the Mercurial repository
# which is also replicated under the Breeder_2.0 section of the Subversion repository # which is also replicated under the Breeder_2.0 section of the Subversion repository
# #
SWAK_RELEASE_VERSION=0.3.2 SWAK_RELEASE_VERSION=0.4.0
if [ -z "$SWAK4FOAM_SYSTEM" ] if [ -z "$SWAK4FOAM_SYSTEM" ]
then then

2
ThirdParty/mingwBuild/build.sh vendored
View file

@ -158,7 +158,9 @@ build_library() {
download $PACKAGE.zip ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip > $LOG_FILE 2>&1 download $PACKAGE.zip ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip > $LOG_FILE 2>&1
unzip_dir $PACKAGE >> $LOG_FILE 2>&1 unzip_dir $PACKAGE >> $LOG_FILE 2>&1
patch $PACKAGE patch $PACKAGE
sleep 5
mv $PACKAGE $INSTALL_DIR mv $PACKAGE $INSTALL_DIR
sleep 5
;; ;;
metis-5.1.0) metis-5.1.0)

296
ThirdParty/rpmBuild/SPECS/ParaView-4.4.0.spec vendored Normal file
View file

@ -0,0 +1,296 @@
#------------------------------------------------------------------------------
# ========= |
# \\ / F ield | foam-extend: Open Source CFD
# \\ / O peration |
# \\ / A nd | For copyright notice see file Copyright
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
# This file is part of foam-extend.
#
# foam-extend is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation, either version 3 of the License, or (at your
# option) any later version.
#
# foam-extend is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with foam-extend. If not, see <http://www.gnu.org/licenses/>.
#
# Script
# RPM spec file for ParaView-4.4.0
#
# Description
# RPM spec file for creating a relocatable RPM
#
# Authors:
# Martin Beaudoin, Hydro-Quebec, (2010)
# Andreas Feymark, Chalmers University of Technology, (2013)
#
#------------------------------------------------------------------------------
# We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable
%{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)}
%{expand:%%define _WM_OPTIONS %(echo $WM_OPTIONS)}
# Disable the generation of debuginfo packages
%define debug_package %{nil}
# Turning off the Fascist build policy
# Useful for debugging the install section
%define _unpackaged_files_terminate_build 0
# The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory
%define _topdir %{_WM_THIRD_PARTY_DIR}/rpmBuild
%define _tmppath %{_topdir}/tmp
# Will install the package directly $WM_THIRD_PARTY_DIR
# Some comments about package relocation:
# By using this prefix for the Prefix: parameter in this file, you will make this
# package relocatable.
#
# This is fine, as long as your software is itself relocatable.
#
# Simply take note that libraries built with libtool are not relocatable because the
# prefix we specify will be hard-coded in the library .la files.
# Ref: http://sourceware.org/autobook/autobook/autobook_80.html
#
# In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will
# not be able to reutilize this RPM, even though it is relocatable. You will need to
# regenerate the RPM.
#
%define _prefix %{_WM_THIRD_PARTY_DIR}
%define name ParaView
%define release %{_WM_OPTIONS}
%define version 4.4.0
%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root
BuildRoot: %{buildroot}
Summary: ParaView
License: Unkown
Name: %{name}
Version: %{version}
Release: %{release}
URL: http://www.paraview.org/files/v4.4/
Source: %url/%{name}-v%{version}-source.tar.gz
Prefix: %{_prefix}
Group: Development/Tools
Patch0: ParaView-4.4.0.patch_darwin
%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
#--------------------------------------------------------------------------
#
# Here, we define default compiling options for cmake
#
# One can override the option on the commande line : --define='MACRO EXPR'
#
%{!?_withVerbose: %define _withVerbose false}
%{!?_withMesa: %define _withMesa false}
%{!?_withMPI: %define _withMPI false}
%{!?_withPython: %define _withPython false}
%{!?_withQt: %define _withQt true}
%{!?_qmakePath: %define _qmakePath Undefined}
%{!?_mesaIncludePath: %define _mesaIncludePath Undefined}
%{!?_mesaLibPath: %define _mesaLibPath Undefined}
%{!?_pythonLibPath: %define _pythonLibPath Undefined}
#--------------------------------------------------------------------------
%description
%{summary}
%prep
%setup -q -n %{name}-v%{version}-source
%ifos darwin
%patch0 -p1
%endif
%build
#
# set CMake cache variables
#
addCMakeVariable()
{
while [ -n "$1" ]
do
CMAKE_VARIABLES="$CMAKE_VARIABLES -D$1"
shift
done
}
# export WM settings in a form that GNU configure recognizes
[ -n "$WM_CC" ] && export CC="$WM_CC"
[ -n "$WM_CXX" ] && export CXX="$WM_CXX"
[ -n "$WM_CFLAGS" ] && export CFLAGS="$WM_CFLAGS"
[ -n "$WM_CXXFLAGS" ] && export CXXFLAGS="$WM_CXXFLAGS"
[ -n "$WM_LDFLAGS" ] && export LDFLAGS="$WM_LDFLAGS"
set +x
echo ""
echo "Compilation options:"
echo " _withVerbose : %{_withVerbose}"
echo " _withMesa : %{_withMesa}"
echo " _withMPI : %{_withMPI}"
echo " _withPython : %{_withPython}"
echo " _withQt : %{_withQt}"
echo " _qmakePath : %{_qmakePath}"
echo " _mesaIncludePath : %{_mesaIncludePath}"
echo " _mesaLibPath : %{_mesaLibPath}"
echo " _pythonLibPath : %{_pythonLibPath}"
echo ""
set -x
# start with these general settings
addCMakeVariable BUILD_SHARED_LIBS:BOOL=ON
addCMakeVariable CMAKE_BUILD_TYPE:STRING=Release
addCMakeVariable BUILD_TESTING:BOOL=OFF
# We build with Python. This is ust too useful
addCMakeVariable PARAVIEW_ENABLE_PYTHON:BOOL=ON
# include development files in "make install"
addCMakeVariable PARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON
%ifos darwin
# Additional installation rules for Mac OSX
addCMakeVariable PARAVIEW_EXTRA_INSTALL_RULES_FILE:FILEPATH=%{_topdir}/BUILD/%{name}-v%{version}-source/Applications/ParaView-4.4.0_extra_install_Darwin.cmake
# We activate the new Unix-style installation for Mac OS X
addCMakeVariable PARAVIEW_DO_UNIX_STYLE_INSTALLS:BOOL=ON
# Recent version of Mac OSX (Yosemite) cannot compile ParaView with the gcc compiler
# Using clang instead
CC=clang
CXX=clang++
%endif
# Add the value of _qmakePath for QT_QMAKE_EXECUTABLE
addCMakeVariable QT_QMAKE_EXECUTABLE:FILEPATH=%{_qmakePath}
echo "CMAKE_VARIABLES: $CMAKE_VARIABLES"
mkdir -p ./buildObj
cd ./buildObj
cmake \
-DCMAKE_INSTALL_PREFIX:PATH=%{_installPrefix} \
$CMAKE_VARIABLES \
..
[ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1
make -j $WM_NCOMPPROCS
%install
# On OpenSUSE, rpmbuild, will choke when detecting unreferenced symlinks
# created during installation.
# Qt version 4.6.3 will generate some unreferenced symlinks when
# ParaView is compiled and installed. By enabling the following
# environment variable, the command brp-symlink will still complain
# about missing link targets, but it won't stop rpmbuild from generating
# the final rpm.
# For all other Unix distros, this is a no-op.
export NO_BRP_STALE_LINK_ERROR=yes
cd buildObj
make install DESTDIR=$RPM_BUILD_ROOT
%ifos darwin
# Cleaning up some strange install side effect from option
# PARAVIEW_DO_UNIX_STYLE_INSTALLS
# Need to revisit this section eventually.
if [ -d "$RPM_BUILD_ROOT/$RPM_BUILD_ROOT" ]; then
mv $RPM_BUILD_ROOT/$RPM_BUILD_ROOT/%{_installPrefix}/bin/* $RPM_BUILD_ROOT/%{_installPrefix}/bin
fi
%endif
# Creation of foam-extend specific .csh and .sh files"
echo ""
echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo ""
#
# Generate package specific .sh file for foam-extend
#
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
# Load %{name}-%{version} libraries and binaries if available
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
export PARAVIEW_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
export PARAVIEW_BIN_DIR=\$PARAVIEW_DIR/bin
export PARAVIEW_LIB_DIR=\$PARAVIEW_DIR/lib
export PARAVIEW_INCLUDE_DIR=\$PARAVIEW_DIR/include/paraview-4.4
export PARAVIEW_VERSION=%{version}
# NB: It is important to set the PV_PLUGIN_PATH location to a directory containing only the ParaView plugins.
# Otherwise, paraview will try to automatically autoload each and every dynamic library it can find in the
# specified directory to see if a given library is a paraview plugin.
# In the case of \$FOAM_LIBBIN, with over 80 libraries, this is a total waste of time that will slow down the
# startup of paraview or even make paraview crash on startup.
export PV_PLUGIN_PATH=\$FOAM_LIBBIN/paraview_plugins
[ -d \$PARAVIEW_LIB_DIR/paraview-4.4 ] && _foamAddLib \$PARAVIEW_LIB_DIR/paraview-4.4
# Enable access to the package applications if present
[ -d \$PARAVIEW_BIN_DIR ] && _foamAddPath \$PARAVIEW_BIN_DIR
# Additional binary path if running on Mac OS X
[ -d \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS ] && _foamAddPath \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS
DOT_SH_EOF
#
# Generate package specific .csh file for foam-extend
#
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
setenv PARAVIEW_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
setenv PARAVIEW_BIN_DIR \$PARAVIEW_DIR/bin
setenv PARAVIEW_LIB_DIR \$PARAVIEW_DIR/lib
setenv PARAVIEW_INCLUDE_DIR \$PARAVIEW_DIR/include/paraview-4.4
setenv PARAVIEW_VERSION %{version}
# NB: It is important to set the PV_PLUGIN_PATH location to a directory containing only the ParaView plugins.
# Otherwise, paraview will try to automatically autoload each and every dynamic library it can find in the
# specified directory to see if a given library is a paraview plugin.
# In the case of \$FOAM_LIBBIN, with over 80 libraries, this is a total waste of time that will slow down the
# startup of paraview or even make paraview crash on startup.
setenv PV_PLUGIN_PATH \$FOAM_LIBBIN/paraview_plugins
if ( -e \$PARAVIEW_BIN_DIR ) then
_foamAddPath \$PARAVIEW_BIN_DIR
endif
if ( -e \$PARAVIEW_LIB_DIR/paraview-4.4 ) then
_foamAddLib \$PARAVIEW_LIB_DIR/paraview-4.4
endif
# Additional binary path if running on Mac OS X
if ( -e \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS ) then
_foamAddPath \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS
endif
DOT_CSH_EOF
#finally, generate a .tgz file for systems where using rpm for installing packages
# as a non-root user might be a problem.
(mkdir -p %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz packages/%{name}-%{version})
%clean
%files
%defattr(-,root,root)
%{_installPrefix}

2
applications/solvers/DNS/dnsFoam/createFields.H
View file

@ -27,3 +27,5 @@
); );
# include "createPhi.H" # include "createPhi.H"
mesh.schemesDict().setFluxRequired(p.name());

10
applications/solvers/DNS/dnsFoam/dnsFoam.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@ -35,6 +35,7 @@ Description
#include "fft.H" #include "fft.H"
#include "calcEk.H" #include "calcEk.H"
#include "graph.H" #include "graph.H"
#include "pisoControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -44,6 +45,9 @@ int main(int argc, char *argv[])
#include "createTime.H" #include "createTime.H"
#include "createMeshNoClear.H" #include "createMeshNoClear.H"
pisoControl piso(mesh);
#include "readTransportProperties.H" #include "readTransportProperties.H"
#include "createFields.H" #include "createFields.H"
#include "readTurbulenceProperties.H" #include "readTurbulenceProperties.H"
@ -57,8 +61,6 @@ int main(int argc, char *argv[])
{ {
Info<< "Time = " << runTime.timeName() << nl << endl; Info<< "Time = " << runTime.timeName() << nl << endl;
#include "readPISOControls.H"
force.internalField() = ReImSum force.internalField() = ReImSum
( (
fft::reverseTransform fft::reverseTransform
@ -83,7 +85,7 @@ int main(int argc, char *argv[])
// --- PISO loop // --- PISO loop
for (int corr=1; corr<=1; corr++) while (piso.correct())
{ {
volScalarField rUA = 1.0/UEqn.A(); volScalarField rUA = 1.0/UEqn.A();

2
applications/solvers/DNS/dnsFoam/globalProperties.H
View file

@ -9,7 +9,7 @@
<< ( << (
0.5*nu*average 0.5*nu*average
( (
magSqr(fvc::grad(U) + fvc::grad(U)().T()) magSqr(fvc::grad(U) + T(fvc::grad(U)))
) )
).value() << endl; ).value() << endl;

2
applications/solvers/basic/PODSolver/PODSolver.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

13
applications/solvers/basic/laplacianFoam/laplacianFoam.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@ -30,7 +30,7 @@ Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "fvCFD.H" #include "fvCFD.H"
#include "simpleControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -41,19 +41,20 @@ int main(int argc, char *argv[])
# include "createTime.H" # include "createTime.H"
# include "createMesh.H" # include "createMesh.H"
simpleControl simple(mesh);
# include "createFields.H" # include "createFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info<< "\nCalculating temperature distribution\n" << endl; Info<< "\nCalculating temperature distribution\n" << endl;
while (runTime.loop()) while (simple.loop())
{ {
Info<< "Time = " << runTime.timeName() << nl << endl; Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H" while (simple.correctNonOrthogonal())
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
{ {
solve solve
( (

2
applications/solvers/basic/potentialDyMFoam/correctPhi.H
View file

@ -34,6 +34,8 @@
fvc::makeAbsolute(phi, U); fvc::makeAbsolute(phi, U);
} }
mesh.schemesDict().setFluxRequired(pcorr.name());
for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
{ {
fvScalarMatrix pcorrEqn fvScalarMatrix pcorrEqn

3
applications/solvers/basic/potentialDyMFoam/createFields.H
View file

@ -47,4 +47,5 @@
label pRefCell = 0; label pRefCell = 0;
scalar pRefValue = 0.0; scalar pRefValue = 0.0;
setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue); setRefCell(p, piso.dict(), pRefCell, pRefValue);
mesh.schemesDict().setFluxRequired(p.name());

13
applications/solvers/basic/potentialDyMFoam/potentialDyMFoam.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@ -34,6 +34,7 @@ Author
#include "fvCFD.H" #include "fvCFD.H"
#include "dynamicFvMesh.H" #include "dynamicFvMesh.H"
#include "pisoControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -45,6 +46,9 @@ int main(int argc, char *argv[])
# include "setRootCase.H" # include "setRootCase.H"
# include "createTime.H" # include "createTime.H"
# include "createDynamicFvMesh.H" # include "createDynamicFvMesh.H"
pisoControl piso(mesh);
# include "createFields.H" # include "createFields.H"
# include "initTotalVolume.H" # include "initTotalVolume.H"
@ -54,7 +58,6 @@ int main(int argc, char *argv[])
while (runTime.loop()) while (runTime.loop())
{ {
# include "readPISOControls.H"
# include "checkTotalVolume.H" # include "checkTotalVolume.H"
Info<< "Time = " << runTime.timeName() << nl << endl; Info<< "Time = " << runTime.timeName() << nl << endl;
@ -75,10 +78,8 @@ int main(int argc, char *argv[])
// Solve potential flow equations // Solve potential flow equations
adjustPhi(phi, U, p); adjustPhi(phi, U, p);
for (int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++) while (piso.correctNonOrthogonal())
{ {
p.storePrevIter();
fvScalarMatrix pEqn fvScalarMatrix pEqn
( (
fvm::laplacian fvm::laplacian
@ -98,7 +99,7 @@ int main(int argc, char *argv[])
pEqn.setReference(pRefCell, pRefValue); pEqn.setReference(pRefCell, pRefValue);
pEqn.solve(); pEqn.solve();
if (nonOrth == nNonOrthCorr) if (piso.finalNonOrthogonalIter())
{ {
phi -= pEqn.flux(); phi -= pEqn.flux();
} }

3
applications/solvers/basic/potentialFoam/createFields.H
View file

@ -49,4 +49,5 @@
label pRefCell = 0; label pRefCell = 0;
scalar pRefValue = 0.0; scalar pRefValue = 0.0;
setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue); setRefCell(p, simple.dict(), pRefCell, pRefValue);
mesh.schemesDict().setFluxRequired(p.name());

11
applications/solvers/basic/potentialFoam/potentialFoam.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@ -31,6 +31,7 @@ Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "fvCFD.H" #include "fvCFD.H"
#include "simpleControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -43,8 +44,10 @@ int main(int argc, char *argv[])
# include "createTime.H" # include "createTime.H"
# include "createMesh.H" # include "createMesh.H"
simpleControl simple(mesh);
# include "createFields.H" # include "createFields.H"
# include "readSIMPLEControls.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -52,7 +55,7 @@ int main(int argc, char *argv[])
adjustPhi(phi, U, p); adjustPhi(phi, U, p);
for (int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++) while (simple.correctNonOrthogonal())
{ {
p.storePrevIter(); p.storePrevIter();
@ -75,7 +78,7 @@ int main(int argc, char *argv[])
pEqn.setReference(pRefCell, pRefValue); pEqn.setReference(pRefCell, pRefValue);
pEqn.solve(); pEqn.solve();
if (nonOrth == nNonOrthCorr) if (simple.finalNonOrthogonalIter())
{ {
phi -= pEqn.flux(); phi -= pEqn.flux();
} }

12
applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@ -30,6 +30,7 @@ Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "fvCFD.H" #include "fvCFD.H"
#include "simpleControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -39,6 +40,9 @@ int main(int argc, char *argv[])
# include "createTime.H" # include "createTime.H"
# include "createMesh.H" # include "createMesh.H"
simpleControl simple(mesh);
# include "createFields.H" # include "createFields.H"
@ -48,13 +52,11 @@ int main(int argc, char *argv[])
# include "CourantNo.H" # include "CourantNo.H"
while (runTime.loop()) while (simple.loop())
{ {
Info<< "Time = " << runTime.timeName() << nl << endl; Info<< "Time = " << runTime.timeName() << nl << endl;
# include "readSIMPLEControls.H" while (simple.correctNonOrthogonal())
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
{ {
solve solve
( (

2
applications/solvers/basic/sixDOFSolver/sixDOFSolver.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

11
applications/solvers/combustion/PDRFoam/PDRFoam.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@ -64,6 +64,7 @@ Description
#include "ignition.H" #include "ignition.H"
#include "Switch.H" #include "Switch.H"
#include "bound.H" #include "bound.H"
#include "pisoControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -73,11 +74,14 @@ int main(int argc, char *argv[])
# include "createTime.H" # include "createTime.H"
# include "createMesh.H" # include "createMesh.H"
pisoControl piso(mesh);
# include "readCombustionProperties.H" # include "readCombustionProperties.H"
# include "readGravitationalAcceleration.H" # include "readGravitationalAcceleration.H"
# include "createFields.H" # include "createFields.H"
# include "initContinuityErrs.H" # include "initContinuityErrs.H"
# include "readTimeControls.H" # include "createTimeControls.H"
# include "CourantNo.H" # include "CourantNo.H"
# include "setInitialDeltaT.H" # include "setInitialDeltaT.H"
@ -90,7 +94,6 @@ int main(int argc, char *argv[])
while (runTime.run()) while (runTime.run())
{ {
# include "readTimeControls.H" # include "readTimeControls.H"
# include "readPISOControls.H"
# include "CourantNo.H" # include "CourantNo.H"
# include "setDeltaT.H" # include "setDeltaT.H"
@ -102,7 +105,7 @@ int main(int argc, char *argv[])
# include "UEqn.H" # include "UEqn.H"
// --- PISO loop // --- PISO loop
for (int corr=1; corr<=nCorr; corr++) while (piso.correct())
{ {
# include "bEqn.H" # include "bEqn.H"
# include "ftEqn.H" # include "ftEqn.H"

12
applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@ -66,6 +66,7 @@ Description
#include "Switch.H" #include "Switch.H"
#include "bound.H" #include "bound.H"
#include "dynamicRefineFvMesh.H" #include "dynamicRefineFvMesh.H"
#include "pisoControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -75,12 +76,14 @@ int main(int argc, char *argv[])
# include "createTime.H" # include "createTime.H"
# include "createDynamicFvMesh.H" # include "createDynamicFvMesh.H"
pisoControl piso(mesh);
# include "readCombustionProperties.H" # include "readCombustionProperties.H"
# include "readGravitationalAcceleration.H" # include "readGravitationalAcceleration.H"
# include "createFields.H" # include "createFields.H"
# include "readPISOControls.H"
# include "initContinuityErrs.H" # include "initContinuityErrs.H"
# include "readTimeControls.H" # include "createTimeControls.H"
# include "setInitialDeltaT.H" # include "setInitialDeltaT.H"
scalar StCoNum = 0.0; scalar StCoNum = 0.0;
@ -92,7 +95,6 @@ int main(int argc, char *argv[])
while (runTime.run()) while (runTime.run())
{ {
# include "readTimeControls.H" # include "readTimeControls.H"
# include "readPISOControls.H"
# include "CourantNo.H" # include "CourantNo.H"
# include "setDeltaT.H" # include "setDeltaT.H"
@ -168,7 +170,7 @@ int main(int argc, char *argv[])
# include "UEqn.H" # include "UEqn.H"
// --- PISO loop // --- PISO loop
for (int corr=1; corr<=nCorr; corr++) while (piso.correct())
{ {
# include "bEqn.H" # include "bEqn.H"
# include "ftEqn.H" # include "ftEqn.H"

2
applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/newPDRDragModel.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

7
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@ -215,11 +215,12 @@ tmp<volSymmTensorField> PDRkEpsilon::devRhoReff() const
} }
tmp<fvVectorMatrix> PDRkEpsilon::divDevRhoReff(volVectorField& U) const tmp<fvVectorMatrix> PDRkEpsilon::divDevRhoReff() const
{ {
return return
( (
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(fvc::grad(U)().T())) - fvm::laplacian(muEff(), U_)
- fvc::div(muEff()*dev2(T(fvc::grad(U_))))
); );
} }

4
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@ -174,7 +174,7 @@ public:
tmp<volSymmTensorField> devRhoReff() const; tmp<volSymmTensorField> devRhoReff() const;
//- Return the source term for the momentum equation //- Return the source term for the momentum equation
tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const; tmp<fvVectorMatrix> divDevRhoReff() const;
//- Solve the turbulence equations and correct the turbulence viscosity //- Solve the turbulence equations and correct the turbulence viscosity
void correct(); void correct();

2
applications/solvers/combustion/PDRFoam/StCourantNo.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

4
applications/solvers/combustion/PDRFoam/UEqn.H
View file

@ -2,14 +2,14 @@
( (
betav*fvm::ddt(rho, U) betav*fvm::ddt(rho, U)
+ fvm::div(phi, U) + fvm::div(phi, U)
+ turbulence->divDevRhoReff(U) + turbulence->divDevRhoReff()
== ==
betav*rho*g betav*rho*g
); );
volSymmTensorField invA = inv(I*UEqn.A() + drag->Dcu()); volSymmTensorField invA = inv(I*UEqn.A() + drag->Dcu());
if (momentumPredictor) if (piso.momentumPredictor())
{ {
U = invA & (UEqn.H() - betav*fvc::grad(p)); U = invA & (UEqn.H() - betav*fvc::grad(p));
U.correctBoundaryConditions(); U.correctBoundaryConditions();

2
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/newXiEqModel.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/newXiGModel.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/XiModel/newXiModel.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/createFields.H
View file

@ -163,3 +163,5 @@
fields.add(h); fields.add(h);
fields.add(hu); fields.add(hu);
flameWrinkling->addXi(fields); flameWrinkling->addXi(fields);
mesh.schemesDict().setFluxRequired(p.name());

2
applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

10
applications/solvers/combustion/PDRFoam/pEqn.H
View file

@ -3,7 +3,7 @@ rho = thermo.rho();
volScalarField rUA = 1.0/UEqn.A(); volScalarField rUA = 1.0/UEqn.A();
U = invA & UEqn.H(); U = invA & UEqn.H();
if (transonic) if (piso.transonic())
{ {
surfaceScalarField phid surfaceScalarField phid
( (
@ -15,7 +15,7 @@ if (transonic)
) )
); );
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) while (piso.correctNonOrthogonal())
{ {
fvScalarMatrix pEqn fvScalarMatrix pEqn
( (
@ -26,7 +26,7 @@ if (transonic)
pEqn.solve(); pEqn.solve();
if (nonOrth == nNonOrthCorr) if (piso.finalNonOrthogonalIter())
{ {
phi == pEqn.flux(); phi == pEqn.flux();
} }
@ -41,7 +41,7 @@ else
+ fvc::ddtPhiCorr(rUA, rho, U, phi) + fvc::ddtPhiCorr(rUA, rho, U, phi)
); );
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) while (piso.correctNonOrthogonal())
{ {
fvScalarMatrix pEqn fvScalarMatrix pEqn
( (
@ -52,7 +52,7 @@ else
pEqn.solve(); pEqn.solve();
if (nonOrth == nNonOrthCorr) if (piso.finalNonOrthogonalIter())
{ {
phi += pEqn.flux(); phi += pEqn.flux();
} }

2
applications/solvers/combustion/PDRFoam/rhoEqn.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/PDRFoam/setDeltaT.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

4
applications/solvers/combustion/XiFoam/UEqn.H
View file

@ -2,14 +2,14 @@
( (
fvm::ddt(rho, U) fvm::ddt(rho, U)
+ fvm::div(phi, U) + fvm::div(phi, U)
+ turbulence->divDevRhoReff(U) + turbulence->divDevRhoReff()
== ==
rho*g rho*g
); );
UEqn.relax(); UEqn.relax();
if (momentumPredictor) if (pimple.momentumPredictor())
{ {
solve(UEqn == -fvc::grad(p)); solve(UEqn == -fvc::grad(p));
} }

13
applications/solvers/combustion/XiFoam/XiFoam.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@ -55,6 +55,7 @@ Description
#include "laminarFlameSpeed.H" #include "laminarFlameSpeed.H"
#include "ignition.H" #include "ignition.H"
#include "Switch.H" #include "Switch.H"
#include "pimpleControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -64,11 +65,14 @@ int main(int argc, char *argv[])
# include "createTime.H" # include "createTime.H"
# include "createMesh.H" # include "createMesh.H"
pimpleControl pimple(mesh);
# include "readCombustionProperties.H" # include "readCombustionProperties.H"
# include "readGravitationalAcceleration.H" # include "readGravitationalAcceleration.H"
# include "createFields.H" # include "createFields.H"
# include "initContinuityErrs.H" # include "initContinuityErrs.H"
# include "readTimeControls.H" # include "createTimeControls.H"
# include "compressibleCourantNo.H" # include "compressibleCourantNo.H"
# include "setInitialDeltaT.H" # include "setInitialDeltaT.H"
@ -79,7 +83,6 @@ int main(int argc, char *argv[])
while (runTime.run()) while (runTime.run())
{ {
# include "readTimeControls.H" # include "readTimeControls.H"
# include "readPISOControls.H"
# include "compressibleCourantNo.H" # include "compressibleCourantNo.H"
# include "setDeltaT.H" # include "setDeltaT.H"
@ -87,7 +90,7 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl; Info<< "Time = " << runTime.timeName() << nl << endl;
// --- Pressure-velocity PIMPLE corrector loop // --- Pressure-velocity PIMPLE corrector loop
for (int oCorr=0; oCorr<nOuterCorr; oCorr++) while (pimple.loop())
{ {
# include "rhoEqn.H" # include "rhoEqn.H"
# include "UEqn.H" # include "UEqn.H"
@ -103,7 +106,7 @@ int main(int argc, char *argv[])
} }
// --- PISO loop // --- PISO loop
for (int corr=1; corr<=nCorr; corr++) while (pimple.correct())
{ {
# include "pEqn.H" # include "pEqn.H"
} }

2
applications/solvers/combustion/XiFoam/createFields.H
View file

@ -132,3 +132,5 @@
fields.add(b); fields.add(b);
fields.add(h); fields.add(h);
fields.add(hu); fields.add(hu);
mesh.schemesDict().setFluxRequired(p.name());

10
applications/solvers/combustion/XiFoam/pEqn.H
View file

@ -3,7 +3,7 @@ rho = thermo.rho();
volScalarField rUA = 1.0/UEqn.A(); volScalarField rUA = 1.0/UEqn.A();
U = rUA*UEqn.H(); U = rUA*UEqn.H();
if (transonic) if (pimple.transonic())
{ {
surfaceScalarField phid surfaceScalarField phid
( (
@ -15,7 +15,7 @@ if (transonic)
) )
); );
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) while (pimple.correctNonOrthogonal())
{ {
fvScalarMatrix pEqn fvScalarMatrix pEqn
( (
@ -26,7 +26,7 @@ if (transonic)
pEqn.solve(); pEqn.solve();
if (nonOrth == nNonOrthCorr) if (pimple.finalNonOrthogonalIter())
{ {
phi == pEqn.flux(); phi == pEqn.flux();
} }
@ -41,7 +41,7 @@ else
+ fvc::ddtPhiCorr(rUA, rho, U, phi) + fvc::ddtPhiCorr(rUA, rho, U, phi)
); );
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) while (pimple.correctNonOrthogonal())
{ {
fvScalarMatrix pEqn fvScalarMatrix pEqn
( (
@ -52,7 +52,7 @@ else
pEqn.solve(); pEqn.solve();
if (nonOrth == nNonOrthCorr) if (pimple.finalNonOrthogonalIter())
{ {
phi += pEqn.flux(); phi += pEqn.flux();
} }

10
applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@ -35,6 +35,7 @@ Description
#include "basicPsiThermo.H" #include "basicPsiThermo.H"
#include "turbulenceModel.H" #include "turbulenceModel.H"
#include "OFstream.H" #include "OFstream.H"
#include "pisoControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -44,8 +45,12 @@ int main(int argc, char *argv[])
# include "createEngineTime.H" # include "createEngineTime.H"
# include "createEngineMesh.H" # include "createEngineMesh.H"
pisoControl piso(mesh);
# include "createFields.H" # include "createFields.H"
# include "initContinuityErrs.H" # include "initContinuityErrs.H"
# include "createTimeControls.H"
# include "readEngineTimeControls.H" # include "readEngineTimeControls.H"
# include "compressibleCourantNo.H" # include "compressibleCourantNo.H"
# include "setInitialDeltaT.H" # include "setInitialDeltaT.H"
@ -57,7 +62,6 @@ int main(int argc, char *argv[])
while (runTime.run()) while (runTime.run())
{ {
# include "readPISOControls.H"
# include "readEngineTimeControls.H" # include "readEngineTimeControls.H"
# include "compressibleCourantNo.H" # include "compressibleCourantNo.H"
# include "setDeltaT.H" # include "setDeltaT.H"
@ -74,7 +78,7 @@ int main(int argc, char *argv[])
# include "UEqn.H" # include "UEqn.H"
// --- PISO loop // --- PISO loop
for (int corr=1; corr<=nCorr; corr++) while (piso.correct())
{ {
# include "hEqn.H" # include "hEqn.H"
# include "pEqn.H" # include "pEqn.H"

2
applications/solvers/combustion/coldEngineFoam/createFields.H
View file

@ -57,3 +57,5 @@
Info<< "Creating field DpDt\n" << endl; Info<< "Creating field DpDt\n" << endl;
volScalarField DpDt = volScalarField DpDt =
fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p); fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
mesh.schemesDict().setFluxRequired(p.name());

4
applications/solvers/combustion/dieselEngineFoam/UEqn.H
View file

@ -2,7 +2,7 @@
( (
fvm::ddt(rho, U) fvm::ddt(rho, U)
+ fvm::div(phi, U) + fvm::div(phi, U)
+ turbulence->divDevRhoReff(U) + turbulence->divDevRhoReff()
== ==
rho*g rho*g
+ dieselSpray.momentumSource() + dieselSpray.momentumSource()
@ -10,7 +10,7 @@
UEqn.relax(); UEqn.relax();
if (momentumPredictor) if (pimple.momentumPredictor())
{ {
solve(UEqn == -fvc::grad(p)); solve(UEqn == -fvc::grad(p));
} }

2
applications/solvers/combustion/dieselEngineFoam/createFields.H
View file

@ -107,3 +107,5 @@ DimensionedField<scalar, volMesh> chemistrySh
mesh, mesh,
dimensionedScalar("chemistrySh", dimEnergy/dimTime/dimVolume, 0.0) dimensionedScalar("chemistrySh", dimEnergy/dimTime/dimVolume, 0.0)
); );
mesh.schemesDict().setFluxRequired(p.name());

12
applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@ -42,6 +42,7 @@ Description
#include "OFstream.H" #include "OFstream.H"
#include "volPointInterpolation.H" #include "volPointInterpolation.H"
#include "thermoPhysicsTypes.H" #include "thermoPhysicsTypes.H"
#include "pimpleControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -50,11 +51,15 @@ int main(int argc, char *argv[])
# include "setRootCase.H" # include "setRootCase.H"
# include "createEngineTime.H" # include "createEngineTime.H"
# include "createEngineMesh.H" # include "createEngineMesh.H"
pimpleControl pimple(mesh);
# include "createFields.H" # include "createFields.H"
# include "readGravitationalAcceleration.H" # include "readGravitationalAcceleration.H"
# include "readCombustionProperties.H" # include "readCombustionProperties.H"
# include "createSpray.H" # include "createSpray.H"
# include "initContinuityErrs.H" # include "initContinuityErrs.H"
# include "createTimeControls.H"
# include "readEngineTimeControls.H" # include "readEngineTimeControls.H"
# include "compressibleCourantNo.H" # include "compressibleCourantNo.H"
# include "setInitialDeltaT.H" # include "setInitialDeltaT.H"
@ -66,7 +71,6 @@ int main(int argc, char *argv[])
while (runTime.run()) while (runTime.run())
{ {
# include "readPISOControls.H"
# include "readEngineTimeControls.H" # include "readEngineTimeControls.H"
# include "compressibleCourantNo.H" # include "compressibleCourantNo.H"
# include "setDeltaT.H" # include "setDeltaT.H"
@ -102,13 +106,13 @@ int main(int argc, char *argv[])
# include "rhoEqn.H" # include "rhoEqn.H"
# include "UEqn.H" # include "UEqn.H"
for (label ocorr=1; ocorr <= nOuterCorr; ocorr++) while (pimple.loop())
{ {
# include "YEqn.H" # include "YEqn.H"
# include "hsEqn.H" # include "hsEqn.H"
// --- PISO loop // --- PISO loop
for (int corr=1; corr<=nCorr; corr++) while (pimple.correct())
{ {
# include "pEqn.H" # include "pEqn.H"
} }

10
applications/solvers/combustion/dieselEngineFoam/pEqn.H
View file

@ -3,7 +3,7 @@ rho = thermo.rho();
volScalarField A = UEqn.A(); volScalarField A = UEqn.A();
U = UEqn.H()/A; U = UEqn.H()/A;
if (transonic) if (pimple.transonic())
{ {
surfaceScalarField phid surfaceScalarField phid
( (
@ -12,7 +12,7 @@ if (transonic)
*((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U)) *((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U))
); );
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) while (pimple.correctNonOrthogonal())
{ {
fvScalarMatrix pEqn fvScalarMatrix pEqn
( (
@ -25,7 +25,7 @@ if (transonic)
pEqn.solve(); pEqn.solve();
if (nonOrth == nNonOrthCorr) if (pimple.finalNonOrthogonalIter())
{ {
phi == pEqn.flux(); phi == pEqn.flux();
} }
@ -36,7 +36,7 @@ else
phi = fvc::interpolate(rho) phi = fvc::interpolate(rho)
*((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U)); *((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U));
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) while (pimple.correctNonOrthogonal())
{ {
fvScalarMatrix pEqn fvScalarMatrix pEqn
( (
@ -49,7 +49,7 @@ else
pEqn.solve(); pEqn.solve();
if (nonOrth == nNonOrthCorr) if (pimple.finalNonOrthogonalIter())
{ {
phi += pEqn.flux(); phi += pEqn.flux();
} }

2
applications/solvers/combustion/dieselEngineFoam/rhoEqn.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

13
applications/solvers/combustion/dieselFoam/dieselFoam.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@ -40,6 +40,7 @@ Description
#include "IFstream.H" #include "IFstream.H"
#include "OFstream.H" #include "OFstream.H"
#include "Switch.H" #include "Switch.H"
#include "pimpleControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -48,12 +49,15 @@ int main(int argc, char *argv[])
# include "setRootCase.H" # include "setRootCase.H"
# include "createTime.H" # include "createTime.H"
# include "createMesh.H" # include "createMesh.H"
pimpleControl pimple(mesh);
# include "createFields.H" # include "createFields.H"
# include "readGravitationalAcceleration.H" # include "readGravitationalAcceleration.H"
# include "readCombustionProperties.H" # include "readCombustionProperties.H"
# include "createSpray.H" # include "createSpray.H"
# include "initContinuityErrs.H" # include "initContinuityErrs.H"
# include "readTimeControls.H" # include "createTimeControls.H"
# include "compressibleCourantNo.H" # include "compressibleCourantNo.H"
# include "setInitialDeltaT.H" # include "setInitialDeltaT.H"
@ -63,7 +67,6 @@ int main(int argc, char *argv[])
while (runTime.run()) while (runTime.run())
{ {
# include "readPISOControls.H"
# include "compressibleCourantNo.H" # include "compressibleCourantNo.H"
# include "setDeltaT.H" # include "setDeltaT.H"
@ -97,13 +100,13 @@ int main(int argc, char *argv[])
# include "rhoEqn.H" # include "rhoEqn.H"
# include "UEqn.H" # include "UEqn.H"
for (label ocorr=1; ocorr <= nOuterCorr; ocorr++) while (pimple.loop())
{ {
# include "YEqn.H" # include "YEqn.H"
# include "hsEqn.H" # include "hsEqn.H"
// --- PISO loop // --- PISO loop
for (int corr=1; corr<=nCorr; corr++) while (pimple.correct())
{ {
# include "pEqn.H" # include "pEqn.H"
} }

10
applications/solvers/combustion/dieselFoam/pEqn.H
View file

@ -3,7 +3,7 @@ rho = thermo.rho();
volScalarField rUA = 1.0/UEqn.A(); volScalarField rUA = 1.0/UEqn.A();
U = rUA*UEqn.H(); U = rUA*UEqn.H();
if (transonic) if (pimple.transonic())
{ {
surfaceScalarField phid surfaceScalarField phid
( (
@ -15,7 +15,7 @@ if (transonic)
) )
); );
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) while (pimple.correctNonOrthogonal())
{ {
fvScalarMatrix pEqn fvScalarMatrix pEqn
( (
@ -28,7 +28,7 @@ if (transonic)
pEqn.solve(); pEqn.solve();
if (nonOrth == nNonOrthCorr) if (pimple.finalNonOrthogonalIter())
{ {
phi == pEqn.flux(); phi == pEqn.flux();
} }
@ -43,7 +43,7 @@ else
+ fvc::ddtPhiCorr(rUA, rho, U, phi) + fvc::ddtPhiCorr(rUA, rho, U, phi)
); );
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) while (pimple.correctNonOrthogonal())
{ {
fvScalarMatrix pEqn fvScalarMatrix pEqn
( (
@ -56,7 +56,7 @@ else
pEqn.solve(); pEqn.solve();
if (nonOrth == nNonOrthCorr) if (pimple.finalNonOrthogonalIter())
{ {
phi += pEqn.flux(); phi += pEqn.flux();
} }

4
applications/solvers/combustion/engineFoam/UEqn.H
View file

@ -2,10 +2,10 @@
( (
fvm::ddt(rho, U) fvm::ddt(rho, U)
+ fvm::div(phi, U) + fvm::div(phi, U)
+ turbulence->divDevRhoReff(U) + turbulence->divDevRhoReff()
); );
if (momentumPredictor) if (piso.momentumPredictor())
{ {
solve(UEqn == -fvc::grad(p)); solve(UEqn == -fvc::grad(p));
} }

10
applications/solvers/combustion/engineFoam/engineFoam.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@ -57,6 +57,7 @@ Description
#include "ignition.H" #include "ignition.H"
#include "Switch.H" #include "Switch.H"
#include "OFstream.H" #include "OFstream.H"
#include "pisoControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -66,9 +67,13 @@ int main(int argc, char *argv[])
# include "createEngineTime.H" # include "createEngineTime.H"
# include "createEngineMesh.H" # include "createEngineMesh.H"
pisoControl piso(mesh);
# include "readCombustionProperties.H" # include "readCombustionProperties.H"
# include "createFields.H" # include "createFields.H"
# include "initContinuityErrs.H" # include "initContinuityErrs.H"
# include "createTimeControls.H"
# include "readEngineTimeControls.H" # include "readEngineTimeControls.H"
# include "compressibleCourantNo.H" # include "compressibleCourantNo.H"
# include "setInitialDeltaT.H" # include "setInitialDeltaT.H"
@ -80,7 +85,6 @@ int main(int argc, char *argv[])
while (runTime.run()) while (runTime.run())
{ {
# include "readPISOControls.H"
# include "readEngineTimeControls.H" # include "readEngineTimeControls.H"
# include "compressibleCourantNo.H" # include "compressibleCourantNo.H"
# include "setDeltaT.H" # include "setDeltaT.H"
@ -96,7 +100,7 @@ int main(int argc, char *argv[])
# include "UEqn.H" # include "UEqn.H"
// --- PISO loop // --- PISO loop
for (int corr=1; corr<=nCorr; corr++) while (piso.correct())
{ {
# include "ftEqn.H" # include "ftEqn.H"
# include "bEqn.H" # include "bEqn.H"

10
applications/solvers/combustion/engineFoam/pEqn.H
View file

@ -3,7 +3,7 @@ rho = thermo.rho();
volScalarField rUA = 1.0/UEqn.A(); volScalarField rUA = 1.0/UEqn.A();
U = rUA*UEqn.H(); U = rUA*UEqn.H();
if (transonic) if (piso.transonic())
{ {
surfaceScalarField phid surfaceScalarField phid
( (
@ -12,7 +12,7 @@ if (transonic)
*((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U)) *((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U))
); );
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) while (piso.correctNonOrthogonal())
{ {
fvScalarMatrix pEqn fvScalarMatrix pEqn
( (
@ -23,7 +23,7 @@ if (transonic)
pEqn.solve(); pEqn.solve();
if (nonOrth == nNonOrthCorr) if (piso.finalNonOrthogonalIter())
{ {
phi == pEqn.flux(); phi == pEqn.flux();
} }
@ -34,7 +34,7 @@ else
phi = fvc::interpolate(rho) phi = fvc::interpolate(rho)
*((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U)); *((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U));
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) while (piso.correctNonOrthogonal())
{ {
fvScalarMatrix pEqn fvScalarMatrix pEqn
( (
@ -45,7 +45,7 @@ else
pEqn.solve(); pEqn.solve();
if (nonOrth == nNonOrthCorr) if (piso.finalNonOrthogonalIter())
{ {
phi += pEqn.flux(); phi += pEqn.flux();
} }

3
applications/solvers/combustion/fireFoam/Make/options
View file

@ -17,4 +17,5 @@ EXE_LIBS = \
-lcompressibleTurbulenceModel \ -lcompressibleTurbulenceModel \
-lcompressibleLESModels \ -lcompressibleLESModels \
-lcompressibleRASModels \ -lcompressibleRASModels \
-lradiation -lradiation \
-llduSolvers

20
applications/solvers/combustion/fireFoam/UEqn.H
View file

@ -2,13 +2,11 @@ fvVectorMatrix UEqn
( (
fvm::ddt(rho, U) fvm::ddt(rho, U)
+ fvm::div(phi, U) + fvm::div(phi, U)
+ turbulence->divDevRhoReff(U) + turbulence->divDevRhoReff()
); );
UEqn.relax(); UEqn.relax();
if (oCorr == nOuterCorr - 1)
{
solve solve
( (
UEqn UEqn
@ -18,19 +16,5 @@ if (oCorr == nOuterCorr - 1)
fvc::interpolate(rho)*(g & mesh.Sf()) fvc::interpolate(rho)*(g & mesh.Sf())
- fvc::snGrad(p)*mesh.magSf() - fvc::snGrad(p)*mesh.magSf()
), ),
mesh.solutionDict().solver("UFinal") mesh.solutionDict().solver((U.select(pimple.finalIter())))
); );
}
else
{
solve
(
UEqn
==
fvc::reconstruct
(
fvc::interpolate(rho)*(g & mesh.Sf())
- fvc::snGrad(p)*mesh.magSf()
)
);
}

2
applications/solvers/combustion/fireFoam/combustionModels/combustionModel/combustionModel.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/fireFoam/combustionModels/combustionModel/combustionModel.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/fireFoam/combustionModels/combustionModel/newCombustionModel.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/fireFoam/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/fireFoam/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
applications/solvers/combustion/fireFoam/combustionModels/noCombustion/noCombustion.C
View file

@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
========= | ========= |
\\ / F ield | foam-extend: Open Source CFD \\ / F ield | foam-extend: Open Source CFD
\\ / O peration | Version: 3.2 \\ / O peration | Version: 4.0
\\ / A nd | Web: http://www.foam-extend.org \\ / A nd | Web: http://www.foam-extend.org
\\/ M anipulation | For copyright notice see file Copyright \\/ M anipulation | For copyright notice see file Copyright
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

Some files were not shown because too many files have changed in this diff Show more