Merge branch 'nextRelease' into nr/feature/changeGlobalControlDictParamsFromCmdLine

This commit is contained in:
Martin Beaudoin 2014-12-24 11:59:55 -05:00
commit e64704203c
4780 changed files with 2121392 additions and 22627 deletions

View file

@ -83,4 +83,7 @@ fi
export WM_NCOMPPROCS=1 export WM_NCOMPPROCS=1
( cd $WM_THIRD_PARTY_DIR && ./AllMake.post ) ( cd $WM_THIRD_PARTY_DIR && ./AllMake.post )
# Build extend-bazaar packages
#( cd extend-bazaar && ./Allwmake)
# ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file

View file

@ -23,7 +23,7 @@
# #
# Description # Description
# CMakeLists.txt file for implementing a test harness for the compilation # CMakeLists.txt file for implementing a test harness for the compilation
# and test of foam-extend-3.0 using Kitware CTest./CMake/CDash # and test of foam-extend-3.1 using Kitware CTest./CMake/CDash
# #
# The results will be submitted to the CDash server identified by the file # The results will be submitted to the CDash server identified by the file
# CTestConfig.cmake # CTestConfig.cmake
@ -36,7 +36,7 @@
cmake_minimum_required (VERSION 2.8) cmake_minimum_required (VERSION 2.8)
PROJECT(foam-extend-3.0) PROJECT(foam-extend-3.1)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Initialization of CTest specific variables # Initialization of CTest specific variables
@ -96,10 +96,10 @@ SET(BUILDNAME "${BUILDNAME}-$ENV{WM_CC}${COMPILER_VERSION}")
# DART_TESTING_TIMEOUT 14400 # DART_TESTING_TIMEOUT 14400
# CACHE STRING "Maximum time allowed (4 hours) before CTest will kill the test." # CACHE STRING "Maximum time allowed (4 hours) before CTest will kill the test."
#) #)
# Timeout for running all this: 10 minutes : 600 seconds # Timeout for running all this: 20 minutes : 1200 seconds (for debug)
SET( SET(
DART_TESTING_TIMEOUT 600 DART_TESTING_TIMEOUT 1200
CACHE STRING "Maximum time allowed (10 minutes) before CTest will kill the test." CACHE STRING "Maximum time allowed (20 minutes) before CTest will kill the test."
) )
SET( SET(
@ -127,9 +127,12 @@ if(GIT_FOUND)
if (GIT_BRANCH_NAME STREQUAL "") if (GIT_BRANCH_NAME STREQUAL "")
message("No git-branch. Mercurial?") message("No git-branch. Mercurial?")
EXEC_PROGRAM(hg EXEC_PROGRAM(hg
ARGS branch ARGS id
OUTPUT_VARIABLE GIT_BRANCH_NAME OUTPUT_VARIABLE GIT_BRANCH_NAME
) )
string(REPLACE " " "_" GIT_BRANCH_NAME ${GIT_BRANCH_NAME})
string(REPLACE "+" "_modified" GIT_BRANCH_NAME ${GIT_BRANCH_NAME})
SET(GIT_BRANCH_NAME "hg_${GIT_BRANCH_NAME}")
message("Git branch (mercurial): ${GIT_BRANCH_NAME}") message("Git branch (mercurial): ${GIT_BRANCH_NAME}")
endif() endif()
SET(BUILDNAME "${BUILDNAME}-git-branch=${GIT_BRANCH_NAME}") SET(BUILDNAME "${BUILDNAME}-git-branch=${GIT_BRANCH_NAME}")
@ -140,7 +143,6 @@ endif()
string(REPLACE "/" "_" BUILDNAME ${BUILDNAME}) string(REPLACE "/" "_" BUILDNAME ${BUILDNAME})
string(REPLACE "/" "_" SITE ${SITE}) string(REPLACE "/" "_" SITE ${SITE})
# Build section # Build section
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

View file

@ -4,10 +4,10 @@
## # The following are required to uses Dart and the Cdash dashboard ## # The following are required to uses Dart and the Cdash dashboard
## ENABLE_TESTING() ## ENABLE_TESTING()
## INCLUDE(CTest) ## INCLUDE(CTest)
set(CTEST_PROJECT_NAME "foam-extend-3.0") set(CTEST_PROJECT_NAME "foam-extend-3.1")
set(CTEST_NIGHTLY_START_TIME "00:00:00 EST") set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
set(CTEST_DROP_METHOD "http") set(CTEST_DROP_METHOD "http")
set(CTEST_DROP_SITE "openfoam-extend.sourceforge.net") set(CTEST_DROP_SITE "openfoam-extend.sourceforge.net")
set(CTEST_DROP_LOCATION "/CDash/submit.php?project=foam-extend-3.0") set(CTEST_DROP_LOCATION "/CDash/submit.php?project=foam-extend-3.1")
set(CTEST_DROP_SITE_CDASH TRUE) set(CTEST_DROP_SITE_CDASH TRUE)

37
Changelog.current Normal file
View file

@ -0,0 +1,37 @@
################################################################################
This file contains brief description of the changes introduced by merging
branches
There are two secions: feature and bugfix
The general format should be:
Branchname (sans "bugfix/" of "feature/" prefix)
Author: Contributor name; Merge: Code maintainer name
One or two lines describing the bugfix or feature
################################################################################
** Feature
** Bugfix
* updatePreconfiguredBoundaryTuts
Author: Hrvoje Jasak; Merge: Dominik Christ
Updated tutorials which use mixing plane and had broken preconfigured boundary
files
* ReleaseNotesInstallationVersionNumber
Author: Hrvoje Jasak; Merge: Dominik Christ
Bumped version number in ReleaseNotes and updated links to SourceForce pages
* Intel14Port
Author: Hrvoje Jasak; Merge: Dominik Christ
Updated wmake/rules for compilation with ICC 14
* processorPointPatch
Author: Zeljko Tukovic; Merge: Dominik Christ
Correct interpolation of point data on processor boundaries after parallel
topological changes

View file

@ -1,45 +0,0 @@
Guide to contribute code to OpenFOAM-extend project
You have developed a new top-level solver or utility. You have implemented a further turbulence model, interface to a material properties library or created a really useful boundary condition? This guide shows the ways to share this code with the OpenFOAM® communinity.
Why should I share my code?
Depending on your background, motivations for contributing code to OpenFOAM® via the FOAM-extend project will differ.
With an industrial background you may find it a cost-advantage compared to keeping everything in-house. Code contributed to the source-core will be maintained along with the complete project source code. This saves you the cost of porting your code to each new release. Furthermore, your code will be reviewed by experts with relevant OpenFOAM® experience, who will be able to spot design improvements that lead to increased speed of execution, better convergence, improved robustness, stability or all of the above. If you plan to deploy your code to clients, the extend-bazaar gives you a unified platform that is simple to use, easy to access and gives you maximum freedom in presenting your code.
In academia, many OpenFOAM® developments are carried out within publicly funded projects, often as part of PhD studies. Unfortunately, much of this work is not re-used and developed further. A time-saving option to share this work is the extend-bazaar, where working code and example cases can be simply uploaded with a brief description. This can be expanded and may even form the base for a journal publication; a good example for this is the waves2Foam package by Niels Jacobsen LINK. Contributing gives the code visibility in the OpenFOAM® community and harvests public recognition long after the project has been completed.
In both cases, the credit for your work, its authorship, and Copyright remains with you. We do not require contributors to give up the rights to their work.
What is the difference between contibuting to source-core and to extend-bazaar?
The \BOLD{source-core} of FOAM-extend meets the high quality standards of a software package that is deployed for production use. A contribution will be therefore reviewed by an experiened OpenFOAM®-extend maintainer. The code must adhere to OpenFOAM® coding style guideline LINK. The contribution procedure is:
* Check your code, especially regarding coding style and trailing whitespace
* Contact the maintainers of FOAM-extend repository to get write access , ???@???.org.
* Use git to make a local feature branch, move your contribution into this branch and push the branch to the repository. See details of the FOAM-extend branching model LINK and git usage LINK.
* Contact the maintainers and ask for review and merge of your code. Experience shows this involves a few iterative steps.
* Your code is merged and becomes part of FOAM-extend. You are added to the list of contributors FOAM-extend.
* Maintainance of your case is now part of the general development
The \BOLD{extend-bazaar} has been created to minimize the effort for sharing your code. It is ideal for solvers and utilities that can live in the user-directory. The required steps are:
* Create a user account on the OpenFOAM® Wiki.
* Go to the extend-bazaar page and find a category for your contribution.
* Create a new sub-page in the category and write a brief description/documentation for your contribution. Templates LINK exist that you can re-use.
* Upload your code. Options are:
* For small packages that will not change much in the future, you can upload a .tgz archive to your wiki page directly.
* For larger packages that contain for example big meshes, use a file-hoster and add a link to your wiki page.
* If your contribution is under active development, create a repository for example on sourceforge LINK or github LINK. Add a link to the repository on the wiki page.
* Implementing bug fixes, new features or ports to a new FOAM-extend release is at your discretion
http://www.openfoam.org/contrib/code-style.php

View file

@ -21,57 +21,62 @@ Contents:
Henry Weller Henry Weller
Hrvoje Jasak Hrvoje Jasak
Mattijs Janssens
Zeljko Tukovic
Bernhard Gschaider
Tommaso Lucchini
Martin Beaudoin
Sandeep Menon
Niklas Nordin
Eugene De Villiers
Henrik Rusche
Ivor Clifford
Philiposse Rajan
Gavin Tabor
Jovani Favero
Frank Bos
David Hill
Niklas Wikstrom
Dubravko Matijasevic
Darrin Stephens
Christian Beck
Oliver Borm
James Criner
Hua Shan
David Boner
Pierre-Olivier Dallaire
Norman Del Puppo
Dennis Kingsley
Frank Albina Frank Albina
Flavio Galeazzo Martin Beaudoin
Hannes Kroger Christian Beck
Olivier Petit David Boner
David Schmidt Oliver Borm
Andreas Feymark Frank Bos
Luca Mangani
Daniel Schmode
Christoph Goniva
Takuya Oshima
Juho Peltola
Eric Paterson
Fabian Peng Karrholm
Aleksandar Karac
Maria Garcia Camprubi
Chris Greenshields
Mark Olesen
Hilary Spencer
Andy Heather
Dominik Christ
Peter Janas
Niels Linnemann
Nikola Kornev
Philip Cardiff Philip Cardiff
Declan Carolan Declan Carolan
Dominik Christ
Ivor Clifford
James Criner
Pierre-Olivier Dallaire
Carsten Dehning
Norman Del Puppo
Eugene De Villiers
Jovani Favero
Andreas Feymark
Flavio Galeazzo
Maria Garcia Camprubi
Christoph Goniva
Chris Greenshields
Bernhard Gschaider
Andy Heather
David Hill
Peter Janas
Mattijs Janssens
Klas Jareteg
Franjo Juretic
Aleksandar Karac
Dennis Kingsley
Nikola Kornev
Hannes Kroger
Michael Leonard Michael Leonard
Niels Linnemann
Tommaso Lucchini
Luca Mangani
Dubravko Matijasevic
David McAuliffe David McAuliffe
Sandeep Menon
Håkan Nilsson
Niklas Nordin
Mark Olesen
Takuya Oshima
Eric Paterson
Juho Peltola
Fabian Peng Karrholm
Olivier Petit
Philiposse Rajan
Henrik Rusche
David Schmidt
Daniel Schmode
Hua Shan
Hilary Spencer
Darrin Stephens
Gavin Tabor
Tian Tang Tian Tang
Zeljko Tukovic
Niklas Wikstrom

337
ReleaseNotes Normal file
View file

@ -0,0 +1,337 @@
# -*- mode: org; -*-
#
#+TITLE: *Release notes for foam-extend-3.1*
#+AUTHOR: foam-extend administrators:
#+AUTHOR: Hrvoje Jasak
#+AUTHOR: Håkan Nilsson
#+AUTHOR: Henrik Rusche
#+AUTHOR: Martin Beaudoin
#+AUTHOR: Bernhard Gschaider
#+DATE: 8 June 2014
#+LINK: http://foam-extend.org
#+OPTIONS: author:nil
#+OPTIONS: toc:2
#+OPTIONS: _:nil
#+OPTIONS: ^:nil
###############################################################################
** Overview
The foam-extend project is a fork of the OpenFOAM® open source
library for Computational Fluid Dynamics (CFD). It is an open
project welcoming and integrating contributions from all users and
developers. Previously known as OpenFOAM®-dev and OpenFOAM®-extend,
it contains bug fixes and performance improvements, as well as
extensions and additional features provided by community
contributors (see file ListOfContributors), such as dynamic mesh and
topological change support, turbomachinery extensions including
general grid interpolation (GGI), cyclic GGI and mixing plane,
block-coupled matrix support, implicitly coupled conjugate heat
transfer and other pyshics coupling, finite area method,
comprehensive dynamic mesh (motion and topological changes)
capability and GPU support. For a full list, see below and previous
release notes at:
http://sourceforge.net/p/openfoam-extend/wiki/Home/
Version 3.1, nicknamed "Zagreb", is the current version of
foam-extend. The release continues the tradition and spirit of the
original FOAM code developed by prof. Jasak and Mr. Weller during
their time at Imperial College and released as the general purpose
CFD/CCM package by Nabla Ltd. in 2000. In this spirit, we reverted
18 December 2013 to the original numbering scheme (foam-2.3.2, 13
December 2004) as release number 3.0. Visit http://foam-extend.org
for more information.
OPENFOAM® is a registered trademark of ESI Group. OpenFOAM-extend and
foam-extend are a community effort not endorsed by ESI Group.
** Installation
foam-extend-3.1 can be compiled and runs on any linux system
* Main supported OSs:
- Ubuntu 14.04
- Fedora 20
- Mac OS X
* Compile from source:
Please refer to doc/buildInstructions/ for details. Further
installation instruction are available on the unofficial OpenFOAM
Wiki:
http://openfoamwiki.net/index.php/Installation/Linux/foam-extend-3.1
If you have improvements or build instructions for a new system,
please share them with the community (see section "How to
contribute", below).
* Download binary packages:
Binary packages are available for download at
http://sourceforge.net/projects/openfoam-extend/ for the following
systems: Ubuntu 14.04, Fedora 20 and Mac OS X.
* Accompanying ThirdParty software:
- gcc compatibility up to 4.8.2
- Paraview 4.0.1
- qt 4.8.5
- openmpi 1.6.5
- cmake 2.8.12
- metis 5.1.0
- parmetis 4.0.3
- scotch 6.0.0
- ParMGridGen 1.0
- mesquite 2.1.2
- PyFoam 0.6.3
- swak4Foam 0.3.1
- zoltan 3.6
- bison 2.7
- hwloc 1.7.2
- libccmio 2.6.1
** Compatibility
Upstream features from the OpenFOAM® code base are merged into
foam-extend on regular basis. The interface format of
foam-extend-3.1 is largely compatible to OpenFOAM-1.6-ext and
OpenFOAM-1.7.x. In some cases, the differences are caused by bug
fixes and algorithmic improvements, considered more important than
inter-operability.
** Main differentiators between foam-extend and OpenFOAM
A large number of features have been lost within the release of
OpenFOAM since version 1.3, the code base has shrunk by more than
40%. While we understand the lack of technical ability of
supporting advanced CFD features, we feel that existing features and
specifically large-scale contributions should remain active and
developed further. Below is a list of main features of foam-extend
which are lacking, lost, deactivated or unusable in ESI releases:
* Turbomachinery features, including General Grid Interface (GGI),
partial overlap GGI, cyclic GGI, with improvements in parallel
scaling. First release of a mixing plane stage interface
* Dynamic mesh with topological changes Sliding interfaces, mesh
layering, attach-detach boundaries etc. In foam-extend, full
parallel support for topological changes is released for the first
time
* Finite Element Method with support for polyhedral meshes This is
mainly used in mesh deformation and over the last 15 years it has
proven vastly superior to all other dynamic mesh methods.
* Advanced mesh deformation technology Including tet FEM mesh
deformation, Radial Basis Function (RBF) mesh deformation,
tetrahedral remeshing dynamic mesh support and solid body motion
functions. All of the above include parallelisation support
* Library of dynamic meshes with topological changes with full
second order FVM discretisation support on moving meshes with
topological changes
* Internal combustion engine-specific dynamic mesh classes such as
two-stroke engine and various forms of 4-stroke and multi-valve
dynamic mesh classes
* Finite Area Method providing support for FVM-like discretisation
on a curved surface in 3-D, with examples of liquid film modelling
* Block-coupled matrix support, allowing fully implicit
multi-equation solution of NxN equation sets, with full
parallelisation support. First release of a block-AMG linear
equation solver
* Fully implicit conjugate-coupled solution framework, allowing
implicit solution fo multiple equations over multiple meshes, with
parallelism
* Proper Orthogonal Decomposition data analysis tools, with
applications to FOAM field classes
* Equation reader classes and tutorials
* Multi-solver solution framework, allowing multiple field models to
be solved in a coupled manner
* A major contribution is solid mechanics modelling, including
linear and non-linear materials, contact, self-contact and
friction, with updated Lagrangian or absolute Lagrangian
formulation. Solution of damage models and crack propagation in
complex materials via topological changes
* CUDA solver release, provided in full source and as an example of
coupling external linear equation solvers with FOAM
* Library-level support for Immersed Boundary Method and Overset
Mesh
* Major improvements in accuracy and stability of FVM discretisation
with options on convection and diffusion discretisation, deferred
correction or explicit schemes
* Algebraic multigrid solver framework
* 210 tutorials with automated run scripts
* Automatic test harness
* Approximately 6000 bug fixes in fundamental level libraries and
discretisation techniques
** New features in foam-extend-3.1, since foam-extend-3.0
The list of features is a result of the work of numerous
contributors. The maintainers of foam-extend would formally like to
thank them all.
Get a full log of the updates by (either):
#+BEGIN_SRC bash
user@machine> git log 3.0.. > commitLog
#+END_SRC
#+BEGIN_SRC bash
user@machine> git log 3.0.. --oneline > commitLog
#+END_SRC
#+BEGIN_SRC bash
user@machine> gitg 3.0..
#+END_SRC
* Major new features:
- Pressure-based compressible turbo functionalities
- Pressure-based coupled solver (block-coupling p and U)
- Density-based coupled Roe flux solver dbnsFoam and dbnsTurbFoam
- Major update and validation of mixing plane boundary
- Full deployment of block matrix, including block-AMG solverse
- Further parallel dynamic mesh capability: all topological changes
supported in parallel execution
- Major upgrade of solid mechanics solvers
- Support for CLang-based compilers
* Licence: GPLv3
* Installation:
- Updated and bug-fixed installation procedures
- Removed need for gmake link in Ubuntu
- Scripts for minimizing installation after compilation
- ThirdParty/Allclean alsoPackage - new option
- wcleanAllButLibBinLnInclude
- Fixed problem with ParaView reader for Ubuntu 14.04
- foamToTecplot360: building tecio doesn't require X.org
development files
* Solvers:
- compressible/dbnsFoam
- compressible/dbnsTurbFoam
- compressible/steadyCompressibleFoam
- compressible/steadyCompressibleMRFFoam
- compressible/steadyCompressibleSRFFoam
- coupled/pUCoupledFoam (incl. core library changes)
- Update and cleanup of solvers/solidMechanics
- Update for segregated FEM matrix,
solvers/solidMechanics/stressFemFoam
* Utilities:
- convertPhi (for steadyCompressible solvers)
- foamMeshToElmer, fluent3DMeshToElmer
- transformPoints -cylToCart "origin axis direction" - new option
- blockMesh syntax update (see commit a78b12074)
* Libraries:
- General:
- Added Gauss-Seidel as asymmetric solver
- Block matrix agglomeration (for pUCoupledFoam)
- Block AMG solver
- dbns library (src/dbns)
- Boundary conditions:
- cfdTools/general/SRF/derivedFvPatchFields/SRFFlowRateInletVelocity
- cfdTools/general/SRF/derivedFvPatchFields/SRFSurfaceNormalVelocity
- cfdTools/general/SRF/derivedFvPatchFields/SRFTotalPressure
- cfdTools/general/SRF/derivedFvPatchFields/SRFTotalTemperature
- cfdTools/general/SRF/derivedFvPatchFields/pulseFixedValue
- cfdTools/general/SRF/derivedFvPatchFields/waveTransmissiveInlet
- thermophysicalModels/basic/derivedFvPatchFields/isentropicTotalTemperature
- thermophysicalModels/basic/derivedFvPatchFields/temperatureDirectedInletOutletVelocity
- fvMesh/fvPatches/constraint/mixingPlane
- Turbulence modeling:
- Removed kOmegaSST_lowRe - use standard kOmegaSST
* Tutorial updates (settings, initial conditions, bug fixes etc.):
- incompressible/icoDyMFoam/mixerGgi
- incompressible/icoDyMFoam/movingConeMotion
- incompressible/icoDyMFoam/movingConeTopo
- solidMechanics/elasticNonLinTLSolidFoam/largeStrainCantileverBeam
- solidMechanics/elasticNonLinTLSolidFoam/nonLinBlock
- solidMechanics/elasticNonLinTLSolidFoam/rotateSphereTL
- solidMechanics/elasticThermalSolidFoam/hotCylinder
- solidMechanics/stressFemFoam/plateHole
- Many other updates due to blockMesh syntax update
* New tutorials:
- compressible/dbnsFoam/forwardStep
- compressible/dbnsFoam/shockTube
- compressible/dbnsTurbFoam/naca0012
- compressible/steadyCompressibleFoam/2bump
- compressible/steadyCompressibleFoam/bumpBlockMesh
- compressible/steadyCompressibleFoam/bumpFine05
- compressible/steadyCompressibleMRFFoam/bentRotorStator
- compressible/steadyCompressibleMRFFoam/simpleRotorStator
- compressible/steadyCompressibleSRFFoam/bentBlade
- compressible/steadyCompressibleSRFFoam/simpleBlade
- coupled/pUCoupledFoam/cavity
- incompressible/MRFSimpleFoam/axialTurbine_ggi
- incompressible/MRFSimpleFoam/axialTurbine_mixingPlane
- incompressible/pimpleDyMFoam/axialTurbine
- incompressible/pimpleDyMFoam/movingCylinders
- incompressible/pUCoupledFoam/backwardFacingStepLaminar
- incompressible/pUCoupledFoam/backwardFacingStepTurbulent
- incompressible/pUCoupledFoam/cavity
- incompressible/simpleSRFFoam/axialTurbine
- mesh/moveDynamicMesh/movingCylinders
* Bug fixes:
- Correct snGrad on coupled boundaries
- Handling of static null pointers: safe to dereference
- LinearUpwind no longer hangs in parallel execution on empty patches
- Mesh update on parallel topo changes: zones before boundaries
- GGI interpolation updates on topologically changing meshes
- Cell layering issues off complex surfaces
- Template depth for block matrix support
- Parallel efficiency improvements
** Recent successful compilations and tests
* Ubuntu 14.04:
http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=736
* Ubuntu 12.04:
http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=738
* CentOS 6.4:
http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=734
* Mac OX X 10.9.3 Maverick & CLang (XCode compiler):
http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=733
* Mac OX X & gcc (Macports)
http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=737
* Linux PPC ppc64 (Blue Gene)
http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=742
* Red Hat Enterprise Linux Server release 5.2 (Tikanga), Intel CC 11.1
http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=743
** Reporting bugs
To report bugs, please use the MantisBT bugtracker at
http://sourceforge.net/apps/mantisbt/openfoam-extend
** How to contribute
All your contributions are highly welcome: New solvers, utilities and
models; bug fixes; documentation. The many ways of contributing and the
contribution process are described in detail at:
http://sourceforge.net/p/openfoam-extend/wiki/HowToContribute/
** List of Contributors:
See file ListOfContributors

View file

@ -1,282 +0,0 @@
# -*- mode: org; -*-
#
#+TITLE: *Release notes for foam-extend-3.0*
#+AUTHOR: Hrvoje Jasak.
#+DATE: 18 December 2013
#+LINK: http://foam-extend.org
#+OPTIONS: author:nil
################################################################################
Contents:
* Overview
* Installation
* Compatibility
* New features in foam-extend-3.0
* Reporting bugs
* How to contribute
* List of Contributors
################################################################################
* Overview
The foam-extend project is a fork of the OpenFOAM® open source library for
Computational Fluid Dynamics (CFD). It is an open project welcoming and
integrating contributions from all users and developers. Previously known as
OpenFOAM®-dev and OpenFOAM®-extend, it contains bug fixes and performance
improvements, as well as extensions and additional features provided
by community contributors (see list below), such as dynamic mesh and
topological change support, turbomachinery extensions including general grid
interpolation (GGI), cyclic GGI and mixing place, block-coupled matrix
support, finite area method, comprehensive mesh motion capability and GPU
support. For a full list, see below.
Version 3.0, nicknamed "Jeju", is the current version of foam-extend. The
release now continues the tradition and spirit of the original FOAM code
developed by prof. Jasak and Mr. Weller during their time at
Imperial College and released as the general purpose CFD/CCM package by
Nabla Ltd. in 2000. In this spirit, we shall revert to original numbering
scheme (foam-2.3.2, 13 December 2004) as release number 3.0.
Visit http://foam-extend.org for more information.
OPENFOAM® is a registered trademark of ESI Group. OpenFOAM-extend and
foam-extend are a community effort not endorsed by ESI Group.
* Installation
foam-extend-3.0 can be compiled and runs on any linux system and
Apple Mac OS X.
** From source
Please refer to doc/buildInstructions/ for details. Further
installation instruction are available on the unofficial OpenFOAM Wiki:
http://openfoamwiki.net/index.php/Installation/Linux/foam-extend-3.0
If you have improvements or build instructions for a new system, please
share them with the community (see section "How to contribute", below).
** Binary packages
Binary packages are available for download at
http://sourceforge.net/projects/openfoam-extend/
for the following systems: Ubuntu 12.04, Ubuntu 13.10 and Fedora 19 .
* Compatibility
Upstream features from the OpenFOAM® code base are merged into foam-extend
on regular basis. The interface format of foam-extend-3.0 is largely
compatible to OpenFOAM-1.6-ext and OpenFOAM-1.7.x. In some cases,
the differences are caused by bug fixes and algorithmic improvements,
considered more important than inter-operability.
* Main diferentiators
A large number of features has been lost within the release cycle of OpenFOAM
code; since version 1.3, the code base has shrunk by more than 40%. While
we understand the lack of technical ability of supporting advanced
CFD features, we feel that existing features and specifically large-scale
contributions should remain active and developed further. Below is a list
of main features of foam-extend-3.0 which are lost, deactivated or unusable
in ESI releases:
** Turbomachinery features, including General Grid Interface (GGI),
partial overlap GGI, cyclic GGI, with improvements in parallel scaling.
First full and validated release of a mixing plane stage interface
** Dynamic mesh with topological changes
sliding interfaces, mesh layering, attach-detach boundaries etc.
in foam-extend-3.0 full parallel support for topological changes
is released for the first time
** Finite Element Method with support for polyhedral meshes
This is mainly used in mesh deformation and over the last 15 years
it has proven vastly superior to all other dynamic mesh methods.
** Advanced mesh deformation technology
including tet FEM mesh deformation, Radial Basis Function (RBF) mesh
deformation, tetrahedral remeshing dynamic mesh support and solid body
motion functions. All of the above include parallelisation support
** Library of dynamic meshes with topological changes with full
second order FVM discretisation support on moving meshes with
topological changes
** Internal combustion engine-specific dynamic mesh classes such as
two-stroke engine and various forms of 4-stroke and multi-valve
dynamic mesh classes
** Finite Area Method providing support for FVM-like discretisation on
a curved surface in 3-D, with examples of liquid film modelling
** Block-coupled matrix support, allowing fully implicit multi-equation
solution of NxN equation sets, with full parallelisation support.
First release of a block-AMG linear equation solver
** Fully implicit conjugate-coupled solution framework, allowing implicit
solution fo multiple equations over multiple meshes, with parallelism
** Proper Orthogonal Decomposition data analysis tools, with applications
to FOAM field classes
** Equation reader classes and tutorials
** Multi-solver solution framework, allowing mutiple field models to be
solved in a coupled manner
** A major contribution is solid mechanics modelling, including linear
and non-linear materials, contact, self-contact and friction, with
updated Lagrangian or absolute Lagrangian formulation. Solution o
damage models and crack propagation in complex materials via
topological changes
** CUDA solver release, provided in full source and as an example of
coupling external linear equation solvers with FOAM
** Library-level support for Immersed Boundary Method and Overset Mesh
** Major improvements in accuracy and stability of FVM discretisation
with options on convection and diffusion discretisation, deferred
correction or explicit schemes
** Algebraic multigrid solver framerowk
** 190 tutorials with automated run scripts
** Automatic test harness
* New features in foam-extend-3.0
The list of features is a result of the work of numerous contributors. The
maintainers of foam-extend would formally like to thank them all.
** Core library
cudaSolvers
dynamicMesh
dynamicTopoFvMesh:
dynamicTopoFvMeshCoupled
convexSetAlgorithm
fieldMapping
meshOpsTemplates
msqAdditionalSrc
tetDecompositionMotionSolver
tetMotionSolver
multiTopoBodyFvMesh
engine
accordionValve
accordionEngineMesh
attachDetachFunctions
deformingEngineMesh
regionSide
twoStrokeEngine
equationReader
finiteArea:
faMeshMapper
faMeshUpdate.C
interpolation:
mapping
finitVolume:
mixingPlane
regionCouple
adjConvectionSchemes
backwardD2dt2Scheme
skewCorrectedSnGrad
singleCellFvMesh
harmonic
harmonicTemplates
magLongDelta.[HC]
multiSolver
OpenFOAM:
PriorityList
IOReferencer
postfixedSubRegistry
symmTensor4thOrder
VectorN
diagTensor
oscillatingFixedValue
profiling
MixingPlaneInterpolation
splineInterpolateXY
BlockAmg solver
blockVectorN solver
BlockLduInterface
mixingPlane (also with GAMG)
regionCouple (also with GAMG)
BlockCoeffNorm
postProcessing:
foamCalcFunctions:
scalarMult
componentsTurbo
domainIntegrate
functionObjects:
mixingPlaneCheck
maxFieldCell
solidModels
tetDecompositionFiniteElement
thermophysicalModels:
radiation:
viewFactor
turbulenceModels:
RWallFunctions
VectorN
** Solver applications
conjugateHeatSimpleFoam
equationReaderDemo
MRFSimpleFoam
simpleSRFFoam
MRFInterFoam
multiSolver
solidMechanics:
elasticAcpSolidFoam
elasticIncrAcpSolidFoam
elasticIncrSolidFoam
elasticNonLinIncrTLSolidFoam
elasticNonLinTLSolidFoam
elasticNonLinULSolidFoam
elasticOrthoAcpSolidFoam
elasticOrthoNonLinULSolidFoam
elasticOrthoSolidFoam
elasticPlasticSolidFoam
elasticPlasticNonLinTLSolidFoam
elasticPlasticNonLinULSolidFoam
elasticSolidFoam
elasticThermalSolidFoam
icoFsiElasticNonLinULSolidFoam
viscoElasticSolidFoam
** Utilities
foamMeshToAbaqus
multiSolver (postProcessing)
solidMechanics:
calculateCourantNumber
forceDisp
patchStressIntegrate
smoothMesh
surfaceTractions
** ThirdParty software
gcc compatibility up to 4.8.1
Updated to:
Paraview 4.1
openmpi 1.6.5
cmake 2.8.12
metis 5.1.0
parmetis 4.0.3
scotch 6.0.0
zoltan 3.6
* Reporting bugs
To report bugs, please use the MantisBT bugtracker at
http://sourceforge.net/apps/mantisbt/openfoam-extend/my_view_page.php .
* How to contribute
All your contributions are highly welcome: New solvers, utilities and
models; bug fixes; documentation. The many ways of contributing and the
contribution process are described in detail in the file "HowToContribute".
* List of Contributors: See file ListOfContributors

740
ReleaseNotes.html Normal file
View file

@ -0,0 +1,740 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<title><b>Release notes for foam-extend-3.1</b></title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
<meta name="title" content="<b>Release notes for foam-extend-3.1</b>"/>
<meta name="generator" content="Org-mode"/>
<meta name="generated" content="8 June 2014"/>
<meta name="author" content="Bernhard Gschaider"/>
<meta name="description" content=""/>
<meta name="keywords" content=""/>
<style type="text/css">
<!--/*--><![CDATA[/*><!--*/
html { font-family: Times, serif; font-size: 12pt; }
.title { text-align: center; }
.todo { color: red; }
.done { color: green; }
.tag { background-color: #add8e6; font-weight:normal }
.target { }
.timestamp { color: #bebebe; }
.timestamp-kwd { color: #5f9ea0; }
.right {margin-left:auto; margin-right:0px; text-align:right;}
.left {margin-left:0px; margin-right:auto; text-align:left;}
.center {margin-left:auto; margin-right:auto; text-align:center;}
p.verse { margin-left: 3% }
pre {
border: 1pt solid #AEBDCC;
background-color: #F3F5F7;
padding: 5pt;
font-family: courier, monospace;
font-size: 90%;
overflow:auto;
}
table { border-collapse: collapse; }
td, th { vertical-align: top; }
th.right { text-align:center; }
th.left { text-align:center; }
th.center { text-align:center; }
td.right { text-align:right; }
td.left { text-align:left; }
td.center { text-align:center; }
dt { font-weight: bold; }
div.figure { padding: 0.5em; }
div.figure p { text-align: center; }
div.inlinetask {
padding:10px;
border:2px solid gray;
margin:10px;
background: #ffffcc;
}
textarea { overflow-x: auto; }
.linenr { font-size:smaller }
.code-highlighted {background-color:#ffff00;}
.org-info-js_info-navigation { border-style:none; }
#org-info-js_console-label { font-size:10px; font-weight:bold;
white-space:nowrap; }
.org-info-js_search-highlight {background-color:#ffff00; color:#000000;
font-weight:bold; }
/*]]>*/-->
</style>
<script type="text/javascript">
/*
@licstart The following is the entire license notice for the
JavaScript code in this tag.
Copyright (C) 2012-2013 Free Software Foundation, Inc.
The JavaScript code in this tag is free software: you can
redistribute it and/or modify it under the terms of the GNU
General Public License (GNU GPL) as published by the Free Software
Foundation, either version 3 of the License, or (at your option)
any later version. The code is distributed WITHOUT ANY WARRANTY;
without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU GPL for more details.
As additional permission under GNU GPL version 3 section 7, you
may distribute non-source (e.g., minimized or compacted) forms of
that code without the copy of the GNU GPL normally required by
section 4, provided you include this license notice and a URL
through which recipients can access the Corresponding Source.
@licend The above is the entire license notice
for the JavaScript code in this tag.
*/
<!--/*--><![CDATA[/*><!--*/
function CodeHighlightOn(elem, id)
{
var target = document.getElementById(id);
if(null != target) {
elem.cacheClassElem = elem.className;
elem.cacheClassTarget = target.className;
target.className = "code-highlighted";
elem.className = "code-highlighted";
}
}
function CodeHighlightOff(elem, id)
{
var target = document.getElementById(id);
if(elem.cacheClassElem)
elem.className = elem.cacheClassElem;
if(elem.cacheClassTarget)
target.className = elem.cacheClassTarget;
}
/*]]>*///-->
</script>
</head>
<body>
<div id="preamble">
</div>
<div id="content">
<h1 class="title"><b>Release notes for foam-extend-3.1</b></h1>
<p>################################################################################
</p>
<div id="table-of-contents">
<h2>Table of Contents</h2>
<div id="text-table-of-contents">
<ul>
<li><a href="#sec-1">1 Overview</a></li>
<li><a href="#sec-2">2 Installation</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-5">5 New features in foam-extend-3.1, since foam-extend-3.0</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-8">8 How to contribute</a></li>
<li><a href="#sec-9">9 List of Contributors:</a></li>
</ul>
</div>
</div>
<div id="outline-container-1" class="outline-3">
<h3 id="sec-1"><span class="section-number-3">1</span> Overview</h3>
<div class="outline-text-3" id="text-1">
<p> The foam-extend project is a fork of the OpenFOAM® open source
library for Computational Fluid Dynamics (CFD). It is an open
project welcoming and integrating contributions from all users and
developers. Previously known as OpenFOAM®-dev and OpenFOAM®-extend,
it contains bug fixes and performance improvements, as well as
extensions and additional features provided by community
contributors (see file ListOfContributors), such as dynamic mesh and
topological change support, turbomachinery extensions including
general grid interpolation (GGI), cyclic GGI and mixing plane,
block-coupled matrix support, implicitly coupled conjugate heat
transfer and other pyshics coupling, finite area method,
comprehensive dynamic mesh (motion and topological changes)
capability and GPU support. For a full list, see below and previous
release notes at:
<a href="http://sourceforge.net/p/openfoam-extend/wiki/Home/">http://sourceforge.net/p/openfoam-extend/wiki/Home/</a>
</p>
<p>
Version 3.1, nicknamed "Zagreb", is the current version of
foam-extend. The release continues the tradition and spirit of the
original FOAM code developed by prof. Jasak and Mr. Weller during
their time at Imperial College and released as the general purpose
CFD/CCM package by Nabla Ltd. in 2000. In this spirit, we reverted
18 December 2013 to the original numbering scheme (foam-2.3.2, 13
December 2004) as release number 3.0. Visit <a href="http://foam-extend.org">http://foam-extend.org</a>
for more information.
</p>
<p>
OPENFOAM® is a registered trademark of ESI Group. OpenFOAM-extend and
foam-extend are a community effort not endorsed by ESI Group.
</p>
</div>
</div>
<div id="outline-container-2" class="outline-3">
<h3 id="sec-2"><span class="section-number-3">2</span> Installation</h3>
<div class="outline-text-3" id="text-2">
<p> foam-extend-3.1 can be compiled and runs on any linux system
</p>
<ul>
<li>Main supported OSs:
<ul>
<li>Ubuntu 14.04
</li>
<li>Fedora 20
</li>
<li>Mac OS X
</li>
</ul>
</li>
<li>Compile from source:
<p>
Please refer to doc/buildInstructions/ for details. Further
installation instruction are available on the unofficial OpenFOAM
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>
If you have improvements or build instructions for a new system,
please share them with the community (see section "How to
contribute", below).
</p>
</li>
<li>Download binary packages:
<p>
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
systems: Ubuntu 14.04, Fedora 20 and Mac OS X.
</p>
</li>
<li>Accompanying ThirdParty software:
<ul>
<li>gcc compatibility up to 4.8.2
</li>
<li>Paraview 4.0.1
</li>
<li>qt 4.8.5
</li>
<li>openmpi 1.6.5
</li>
<li>cmake 2.8.12
</li>
<li>metis 5.1.0
</li>
<li>parmetis 4.0.3
</li>
<li>scotch 6.0.0
</li>
<li>ParMGridGen 1.0
</li>
<li>mesquite 2.1.2
</li>
<li>PyFoam 0.6.3
</li>
<li>swak4Foam 0.3.1
</li>
<li>zoltan 3.6
</li>
<li>bison 2.7
</li>
<li>hwloc 1.7.2
</li>
<li>libccmio 2.6.1
</li>
</ul>
</li>
</ul>
</div>
</div>
<div id="outline-container-3" class="outline-3">
<h3 id="sec-3"><span class="section-number-3">3</span> Compatibility</h3>
<div class="outline-text-3" id="text-3">
<p> Upstream features from the OpenFOAM® code base are merged into
foam-extend on regular basis. The interface format of
foam-extend-3.1 is largely compatible to OpenFOAM-1.6-ext and
OpenFOAM-1.7.x. In some cases, the differences are caused by bug
fixes and algorithmic improvements, considered more important than
inter-operability.
</p>
</div>
</div>
<div id="outline-container-4" class="outline-3">
<h3 id="sec-4"><span class="section-number-3">4</span> Main differentiators between foam-extend and OpenFOAM</h3>
<div class="outline-text-3" id="text-4">
<p> A large number of features have been lost within the release of
OpenFOAM since version 1.3, the code base has shrunk by more than
40%. While we understand the lack of technical ability of
supporting advanced CFD features, we feel that existing features and
specifically large-scale contributions should remain active and
developed further. Below is a list of main features of foam-extend
which are lacking, lost, deactivated or unusable in ESI releases:
</p>
<ul>
<li>Turbomachinery features, including General Grid Interface (GGI),
partial overlap GGI, cyclic GGI, with improvements in parallel
scaling. First release of a mixing plane stage interface
</li>
<li>Dynamic mesh with topological changes Sliding interfaces, mesh
layering, attach-detach boundaries etc. In foam-extend, full
parallel support for topological changes is released for the first
time
</li>
<li>Finite Element Method with support for polyhedral meshes This is
mainly used in mesh deformation and over the last 15 years it has
proven vastly superior to all other dynamic mesh methods.
</li>
<li>Advanced mesh deformation technology Including tet FEM mesh
deformation, Radial Basis Function (RBF) mesh deformation,
tetrahedral remeshing dynamic mesh support and solid body motion
functions. All of the above include parallelisation support
</li>
<li>Library of dynamic meshes with topological changes with full
second order FVM discretisation support on moving meshes with
topological changes
</li>
<li>Internal combustion engine-specific dynamic mesh classes such as
two-stroke engine and various forms of 4-stroke and multi-valve
dynamic mesh classes
</li>
<li>Finite Area Method providing support for FVM-like discretisation
on a curved surface in 3-D, with examples of liquid film modelling
</li>
<li>Block-coupled matrix support, allowing fully implicit
multi-equation solution of NxN equation sets, with full
parallelisation support. First release of a block-AMG linear
equation solver
</li>
<li>Fully implicit conjugate-coupled solution framework, allowing
implicit solution fo multiple equations over multiple meshes, with
parallelism
</li>
<li>Proper Orthogonal Decomposition data analysis tools, with
applications to FOAM field classes
</li>
<li>Equation reader classes and tutorials
</li>
<li>Multi-solver solution framework, allowing multiple field models to
be solved in a coupled manner
</li>
<li>A major contribution is solid mechanics modelling, including
linear and non-linear materials, contact, self-contact and
friction, with updated Lagrangian or absolute Lagrangian
formulation. Solution of damage models and crack propagation in
complex materials via topological changes
</li>
<li>CUDA solver release, provided in full source and as an example of
coupling external linear equation solvers with FOAM
</li>
<li>Library-level support for Immersed Boundary Method and Overset
Mesh
</li>
<li>Major improvements in accuracy and stability of FVM discretisation
with options on convection and diffusion discretisation, deferred
correction or explicit schemes
</li>
<li>Algebraic multigrid solver framework
</li>
<li>210 tutorials with automated run scripts
</li>
<li>Automatic test harness
</li>
<li>Approximately 6000 bug fixes in fundamental level libraries and
discretisation techniques
</li>
</ul>
</div>
</div>
<div id="outline-container-5" class="outline-3">
<h3 id="sec-5"><span class="section-number-3">5</span> New features in foam-extend-3.1, since foam-extend-3.0</h3>
<div class="outline-text-3" id="text-5">
<p> The list of features is a result of the work of numerous
contributors. The maintainers of foam-extend would formally like to
thank them all.
</p>
<p>
Get a full log of the updates by (either):
</p>
<pre class="example">user@machine&gt; git log 3.0.. &gt; commitLog
</pre>
<pre class="example">user@machine&gt; git log 3.0.. --oneline &gt; commitLog
</pre>
<pre class="example">user@machine&gt; gitg 3.0..
</pre>
<ul>
<li>Major new features:
<ul>
<li>Pressure-based compressible turbo functionalities
</li>
<li>Pressure-based coupled solver (block-coupling p and U)
</li>
<li>Density-based coupled Roe flux solver dbnsFoam and dbnsTurbFoam
</li>
<li>Major update and validation of mixing plane boundary
</li>
<li>Full deploymenr of block matrix, including block-AMG solverse
</li>
<li>Further parallel dynamic mesh capability: all topological changes
supported in parallel execution
</li>
<li>Major upgrade of solid mechanics solvers
</li>
<li>Support for CLang-based compilers
</li>
</ul>
</li>
<li>Licence: GPLv3
</li>
<li>Installation:
<ul>
<li>Updated and bug-fixed installation procedures
</li>
<li>Removed need for gmake link in Ubuntu
</li>
<li>Scripts for minimizing installation after compilation
<ul>
<li>ThirdParty/Allclean alsoPackage - new option
</li>
<li>wcleanAllButLibBinLnInclude
</li>
</ul>
</li>
<li>Fixed problem with ParaView reader for Ubuntu 14.04
</li>
<li>foamToTecplot360: building tecio doesn't require X.org
development files
</li>
</ul>
</li>
<li>Solvers:
<ul>
<li>compressible/dbnsFoam
</li>
<li>compressible/dbnsTurbFoam
</li>
<li>compressible/steadyCompressibleFoam
</li>
<li>compressible/steadyCompressibleMRFFoam
</li>
<li>compressible/steadyCompressibleSRFFoam
</li>
<li>coupled/pUCoupledFoam (incl. core library changes)
</li>
<li>Update and cleanup of solvers/solidMechanics
</li>
<li>Update for segregated FEM matrix,
solvers/solidMechanics/stressFemFoam
</li>
</ul>
</li>
<li>Utilities:
<ul>
<li>convertPhi (for steadyCompressible solvers)
</li>
<li>foamMeshToElmer, fluent3DMeshToElmer
</li>
<li>transformPoints -cylToCart "origin axis direction" - new option
</li>
<li>blockMesh syntax update (see commit a78b12074)
</li>
</ul>
</li>
<li>Libraries:
<ul>
<li>General:
<ul>
<li>Added Gauss-Seidel as asymmetric solver
</li>
<li>Block matrix agglomeration (for pUCoupledFoam)
</li>
<li>Block AMG solver
</li>
<li>dbns library (src/dbns)
</li>
</ul>
</li>
<li>Boundary conditions:
<ul>
<li>cfdTools/general/SRF/derivedFvPatchFields/SRFFlowRateInletVelocity
</li>
<li>cfdTools/general/SRF/derivedFvPatchFields/SRFSurfaceNormalVelocity
</li>
<li>cfdTools/general/SRF/derivedFvPatchFields/SRFTotalPressure
</li>
<li>cfdTools/general/SRF/derivedFvPatchFields/SRFTotalTemperature
</li>
<li>cfdTools/general/SRF/derivedFvPatchFields/pulseFixedValue
</li>
<li>cfdTools/general/SRF/derivedFvPatchFields/waveTransmissiveInlet
</li>
<li>thermophysicalModels/basic/derivedFvPatchFields/isentropicTotalTemperature
</li>
<li>thermophysicalModels/basic/derivedFvPatchFields/temperatureDirectedInletOutletVelocity
</li>
<li>fvMesh/fvPatches/constraint/mixingPlane
</li>
</ul>
</li>
<li>Turbulence modeling:
<ul>
<li>Removed kOmegaSST_lowRe - use standard kOmegaSST
</li>
</ul>
</li>
</ul>
</li>
<li>Tutorial updates (settings, initial conditions, bug fixes etc.):
<ul>
<li>incompressible/icoDyMFoam/mixerGgi
</li>
<li>incompressible/icoDyMFoam/movingConeMotion
</li>
<li>incompressible/icoDyMFoam/movingConeTopo
</li>
<li>solidMechanics/elasticNonLinTLSolidFoam/largeStrainCantileverBeam
</li>
<li>solidMechanics/elasticNonLinTLSolidFoam/nonLinBlock
</li>
<li>solidMechanics/elasticNonLinTLSolidFoam/rotateSphereTL
</li>
<li>solidMechanics/elasticThermalSolidFoam/hotCylinder
</li>
<li>solidMechanics/stressFemFoam/plateHole
</li>
<li>Many other updates due to blockMesh syntax update
</li>
</ul>
</li>
<li>New tutorials:
<ul>
<li>compressible/dbnsFoam/forwardStep
</li>
<li>compressible/dbnsFoam/shockTube
</li>
<li>compressible/dbnsTurbFoam/naca0012
</li>
<li>compressible/steadyCompressibleFoam/2bump
</li>
<li>compressible/steadyCompressibleFoam/bumpBlockMesh
</li>
<li>compressible/steadyCompressibleFoam/bumpFine05
</li>
<li>compressible/steadyCompressibleMRFFoam/bentRotorStator
</li>
<li>compressible/steadyCompressibleMRFFoam/simpleRotorStator
</li>
<li>compressible/steadyCompressibleSRFFoam/bentBlade
</li>
<li>compressible/steadyCompressibleSRFFoam/simpleBlade
</li>
<li>coupled/pUCoupledFoam/cavity
</li>
<li>incompressible/MRFSimpleFoam/axialTurbine_ggi
</li>
<li>incompressible/MRFSimpleFoam/axialTurbine_mixingPlane
</li>
<li>incompressible/pimpleDyMFoam/axialTurbine
</li>
<li>incompressible/pimpleDyMFoam/movingCylinders
</li>
<li>incompressible/pUCoupledFoam/backwardFacingStepLaminar
</li>
<li>incompressible/pUCoupledFoam/backwardFacingStepTurbulent
</li>
<li>incompressible/pUCoupledFoam/cavity
</li>
<li>incompressible/simpleSRFFoam/axialTurbine
</li>
<li>mesh/moveDynamicMesh/movingCylinders
</li>
</ul>
</li>
<li>Bug fixes:
<ul>
<li>Correct snGrad on coupled boundaries
</li>
<li>Handling of static null pointers: safe to dereference
</li>
<li>LinearUpwind no longer hangs in parallel execution on empty patches
</li>
<li>Mesh update on parallel topo changes: zones before boundaries
</li>
<li>GGI interpolation updates on topologically changing meshes
</li>
<li>Cell layering issues off complex surfaces
</li>
<li>Template depth for block matrix support
</li>
<li>Parallel efficiency improvements
</li>
</ul>
</li>
</ul>
</div>
</div>
<div id="outline-container-6" class="outline-3">
<h3 id="sec-6"><span class="section-number-3">6</span> Recent successful compilations and tests</h3>
<div class="outline-text-3" id="text-6">
<ul>
<li>Ubuntu 14.04:
<p>
<a href="http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=736">http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=736</a>
</p>
</li>
<li>Ubuntu 12.04:
<p>
<a href="http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=738">http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=738</a>
</p>
</li>
<li>CentOS 6.4:
<p>
<a href="http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=734">http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=734</a>
</p>
</li>
<li>Mac OX X 10.9.3 Maverick &amp; CLang (XCode compiler):
<p>
<a href="http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=733">http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=733</a>
</p>
</li>
<li>Mac OX X &amp; gcc (Macports)
<p>
<a href="http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=737">http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=737</a>
</p>
</li>
<li>Linux PPC ppc64 (Blue Gene)
<p>
<a href="http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=742">http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=742</a>
</p>
</li>
<li>Red Hat Enterprise Linux Server release 5.2 (Tikanga), Intel CC 11.1
<p>
<a href="http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=743">http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=743</a>
</p></li>
</ul>
</div>
</div>
<div id="outline-container-7" class="outline-3">
<h3 id="sec-7"><span class="section-number-3">7</span> Reporting bugs</h3>
<div class="outline-text-3" id="text-7">
<p> To report bugs, please use the MantisBT bugtracker at
<a href="http://sourceforge.net/apps/mantisbt/openfoam-extend">http://sourceforge.net/apps/mantisbt/openfoam-extend</a>
</p>
</div>
</div>
<div id="outline-container-8" class="outline-3">
<h3 id="sec-8"><span class="section-number-3">8</span> How to contribute</h3>
<div class="outline-text-3" id="text-8">
<p> All your contributions are highly welcome: New solvers, utilities and
models; bug fixes; documentation. The many ways of contributing and the
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>
</p>
</div>
</div>
<div id="outline-container-9" class="outline-3">
<h3 id="sec-9"><span class="section-number-3">9</span> List of Contributors:</h3>
<div class="outline-text-3" id="text-9">
<p> See file ListOfContributors
</p></div>
</div>
</div>
<div id="postamble">
<p class="date">Date: 8 June 2014</p>
<p class="creator"><a href="http://orgmode.org">Org</a> version 7.9.3f with <a href="http://www.gnu.org/software/emacs/">Emacs</a> version 24</p>
<a href="http://validator.w3.org/check?uri=referer">Validate XHTML 1.0</a>
</div>
</body>
</html>

354
ReleaseNotes.txt Normal file
View file

@ -0,0 +1,354 @@
*Release notes for foam-extend-3.1*
===================================
Date: 8 June 2014
################################################################################
Table of Contents
=================
1 Overview
2 Installation
3 Compatibility
4 Main differentiators between foam-extend and OpenFOAM
5 New features in foam-extend-3.1, since foam-extend-3.0
6 Recent successful compilations and tests
7 Reporting bugs
8 How to contribute
9 List of Contributors:
1 Overview
-----------
The foam-extend project is a fork of the OpenFOAM® open source
library for Computational Fluid Dynamics (CFD). It is an open
project welcoming and integrating contributions from all users and
developers. Previously known as OpenFOAM®-dev and OpenFOAM®-extend,
it contains bug fixes and performance improvements, as well as
extensions and additional features provided by community
contributors (see file ListOfContributors), such as dynamic mesh and
topological change support, turbomachinery extensions including
general grid interpolation (GGI), cyclic GGI and mixing plane,
block-coupled matrix support, implicitly coupled conjugate heat
transfer and other pyshics coupling, finite area method,
comprehensive dynamic mesh (motion and topological changes)
capability and GPU support. For a full list, see below and previous
release notes at:
[http://sourceforge.net/p/openfoam-extend/wiki/Home/]
Version 3.1, nicknamed "Zagreb", is the current version of
foam-extend. The release continues the tradition and spirit of the
original FOAM code developed by prof. Jasak and Mr. Weller during
their time at Imperial College and released as the general purpose
CFD/CCM package by Nabla Ltd. in 2000. In this spirit, we reverted
18 December 2013 to the original numbering scheme (foam-2.3.2, 13
December 2004) as release number 3.0. Visit [http://foam-extend.org]
for more information.
OPENFOAM® is a registered trademark of ESI Group. OpenFOAM-extend and
foam-extend are a community effort not endorsed by ESI Group.
2 Installation
---------------
foam-extend-3.1 can be compiled and runs on any linux system
* Main supported OSs:
- Ubuntu 14.04
- Fedora 20
- Mac OS X
* Compile from source:
Please refer to doc/buildInstructions/ for details. Further
installation instruction are available on the unofficial OpenFOAM
Wiki:
[http://openfoamwiki.net/index.php/Installation/Linux/foam-extend-3.1]
If you have improvements or build instructions for a new system,
please share them with the community (see section "How to
contribute", below).
* Download binary packages:
Binary packages are available for download at
[http://sourceforge.net/projects/openfoam-extend/] for the following
systems: Ubuntu 14.04, Fedora 20 and Mac OS X.
* Accompanying ThirdParty software:
- gcc compatibility up to 4.8.2
- Paraview 4.0.1
- qt 4.8.5
- openmpi 1.6.5
- cmake 2.8.12
- metis 5.1.0
- parmetis 4.0.3
- scotch 6.0.0
- ParMGridGen 1.0
- mesquite 2.1.2
- PyFoam 0.6.3
- swak4Foam 0.3.1
- zoltan 3.6
- bison 2.7
- hwloc 1.7.2
- libccmio 2.6.1
3 Compatibility
----------------
Upstream features from the OpenFOAM® code base are merged into
foam-extend on regular basis. The interface format of
foam-extend-3.1 is largely compatible to OpenFOAM-1.6-ext and
OpenFOAM-1.7.x. In some cases, the differences are caused by bug
fixes and algorithmic improvements, considered more important than
inter-operability.
4 Main differentiators between foam-extend and OpenFOAM
--------------------------------------------------------
A large number of features have been lost within the release of
OpenFOAM since version 1.3, the code base has shrunk by more than
40%. While we understand the lack of technical ability of
supporting advanced CFD features, we feel that existing features and
specifically large-scale contributions should remain active and
developed further. Below is a list of main features of foam-extend
which are lacking, lost, deactivated or unusable in ESI releases:
* Turbomachinery features, including General Grid Interface (GGI),
partial overlap GGI, cyclic GGI, with improvements in parallel
scaling. First release of a mixing plane stage interface
* Dynamic mesh with topological changes Sliding interfaces, mesh
layering, attach-detach boundaries etc. In foam-extend, full
parallel support for topological changes is released for the first
time
* Finite Element Method with support for polyhedral meshes This is
mainly used in mesh deformation and over the last 15 years it has
proven vastly superior to all other dynamic mesh methods.
* Advanced mesh deformation technology Including tet FEM mesh
deformation, Radial Basis Function (RBF) mesh deformation,
tetrahedral remeshing dynamic mesh support and solid body motion
functions. All of the above include parallelisation support
* Library of dynamic meshes with topological changes with full
second order FVM discretisation support on moving meshes with
topological changes
* Internal combustion engine-specific dynamic mesh classes such as
two-stroke engine and various forms of 4-stroke and multi-valve
dynamic mesh classes
* Finite Area Method providing support for FVM-like discretisation
on a curved surface in 3-D, with examples of liquid film modelling
* Block-coupled matrix support, allowing fully implicit
multi-equation solution of NxN equation sets, with full
parallelisation support. First release of a block-AMG linear
equation solver
* Fully implicit conjugate-coupled solution framework, allowing
implicit solution fo multiple equations over multiple meshes, with
parallelism
* Proper Orthogonal Decomposition data analysis tools, with
applications to FOAM field classes
* Equation reader classes and tutorials
* Multi-solver solution framework, allowing multiple field models to
be solved in a coupled manner
* A major contribution is solid mechanics modelling, including
linear and non-linear materials, contact, self-contact and
friction, with updated Lagrangian or absolute Lagrangian
formulation. Solution of damage models and crack propagation in
complex materials via topological changes
* CUDA solver release, provided in full source and as an example of
coupling external linear equation solvers with FOAM
* Library-level support for Immersed Boundary Method and Overset
Mesh
* Major improvements in accuracy and stability of FVM discretisation
with options on convection and diffusion discretisation, deferred
correction or explicit schemes
* Algebraic multigrid solver framework
* 210 tutorials with automated run scripts
* Automatic test harness
* Approximately 6000 bug fixes in fundamental level libraries and
discretisation techniques
5 New features in foam-extend-3.1, since foam-extend-3.0
---------------------------------------------------------
The list of features is a result of the work of numerous
contributors. The maintainers of foam-extend would formally like to
thank them all.
Get a full log of the updates by (either):
user@machine> git log 3.0.. > commitLog
user@machine> git log 3.0.. --oneline > commitLog
user@machine> gitg 3.0..
* Major new features:
- Pressure-based compressible turbo functionalities
- Pressure-based coupled solver (block-coupling p and U)
- Density-based coupled Roe flux solver dbnsFoam and dbnsTurbFoam
- Major update and validation of mixing plane boundary
- Full deploymenr of block matrix, including block-AMG solverse
- Further parallel dynamic mesh capability: all topological changes
supported in parallel execution
- Major upgrade of solid mechanics solvers
- Support for CLang-based compilers
* Licence: GPLv3
* Installation:
- Updated and bug-fixed installation procedures
- Removed need for gmake link in Ubuntu
- Scripts for minimizing installation after compilation
- ThirdParty/Allclean alsoPackage - new option
- wcleanAllButLibBinLnInclude
- Fixed problem with ParaView reader for Ubuntu 14.04
- foamToTecplot360: building tecio doesn't require X.org
development files
* Solvers:
- compressible/dbnsFoam
- compressible/dbnsTurbFoam
- compressible/steadyCompressibleFoam
- compressible/steadyCompressibleMRFFoam
- compressible/steadyCompressibleSRFFoam
- coupled/pUCoupledFoam (incl. core library changes)
- Update and cleanup of solvers/solidMechanics
- Update for segregated FEM matrix,
solvers/solidMechanics/stressFemFoam
* Utilities:
- convertPhi (for steadyCompressible solvers)
- foamMeshToElmer, fluent3DMeshToElmer
- transformPoints -cylToCart "origin axis direction" - new option
- blockMesh syntax update (see commit a78b12074)
* Libraries:
- General:
- Added Gauss-Seidel as asymmetric solver
- Block matrix agglomeration (for pUCoupledFoam)
- Block AMG solver
- dbns library (src/dbns)
- Boundary conditions:
- cfdTools/general/SRF/derivedFvPatchFields/SRFFlowRateInletVelocity
- cfdTools/general/SRF/derivedFvPatchFields/SRFSurfaceNormalVelocity
- cfdTools/general/SRF/derivedFvPatchFields/SRFTotalPressure
- cfdTools/general/SRF/derivedFvPatchFields/SRFTotalTemperature
- cfdTools/general/SRF/derivedFvPatchFields/pulseFixedValue
- cfdTools/general/SRF/derivedFvPatchFields/waveTransmissiveInlet
- thermophysicalModels/basic/derivedFvPatchFields/isentropicTotalTemperature
- thermophysicalModels/basic/derivedFvPatchFields/temperatureDirectedInletOutletVelocity
- fvMesh/fvPatches/constraint/mixingPlane
- Turbulence modeling:
- Removed kOmegaSST_lowRe - use standard kOmegaSST
* Tutorial updates (settings, initial conditions, bug fixes etc.):
- incompressible/icoDyMFoam/mixerGgi
- incompressible/icoDyMFoam/movingConeMotion
- incompressible/icoDyMFoam/movingConeTopo
- solidMechanics/elasticNonLinTLSolidFoam/largeStrainCantileverBeam
- solidMechanics/elasticNonLinTLSolidFoam/nonLinBlock
- solidMechanics/elasticNonLinTLSolidFoam/rotateSphereTL
- solidMechanics/elasticThermalSolidFoam/hotCylinder
- solidMechanics/stressFemFoam/plateHole
- Many other updates due to blockMesh syntax update
* New tutorials:
- compressible/dbnsFoam/forwardStep
- compressible/dbnsFoam/shockTube
- compressible/dbnsTurbFoam/naca0012
- compressible/steadyCompressibleFoam/2bump
- compressible/steadyCompressibleFoam/bumpBlockMesh
- compressible/steadyCompressibleFoam/bumpFine05
- compressible/steadyCompressibleMRFFoam/bentRotorStator
- compressible/steadyCompressibleMRFFoam/simpleRotorStator
- compressible/steadyCompressibleSRFFoam/bentBlade
- compressible/steadyCompressibleSRFFoam/simpleBlade
- coupled/pUCoupledFoam/cavity
- incompressible/MRFSimpleFoam/axialTurbine_ggi
- incompressible/MRFSimpleFoam/axialTurbine_mixingPlane
- incompressible/pimpleDyMFoam/axialTurbine
- incompressible/pimpleDyMFoam/movingCylinders
- incompressible/pUCoupledFoam/backwardFacingStepLaminar
- incompressible/pUCoupledFoam/backwardFacingStepTurbulent
- incompressible/pUCoupledFoam/cavity
- incompressible/simpleSRFFoam/axialTurbine
- mesh/moveDynamicMesh/movingCylinders
* Bug fixes:
- Correct snGrad on coupled boundaries
- Handling of static null pointers: safe to dereference
- LinearUpwind no longer hangs in parallel execution on empty patches
- Mesh update on parallel topo changes: zones before boundaries
- GGI interpolation updates on topologically changing meshes
- Cell layering issues off complex surfaces
- Template depth for block matrix support
- Parallel efficiency improvements
6 Recent successful compilations and tests
-------------------------------------------
* Ubuntu 14.04:
[http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=736]
* Ubuntu 12.04:
[http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=738]
* CentOS 6.4:
[http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=734]
* Mac OX X 10.9.3 Maverick & CLang (XCode compiler):
[http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=733]
* Mac OX X & gcc (Macports)
[http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=737]
* Linux PPC ppc64 (Blue Gene)
[http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=742]
* Red Hat Enterprise Linux Server release 5.2 (Tikanga), Intel CC 11.1
[http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=743]
7 Reporting bugs
-----------------
To report bugs, please use the MantisBT bugtracker at
[http://sourceforge.net/apps/mantisbt/openfoam-extend]
8 How to contribute
--------------------
All your contributions are highly welcome: New solvers, utilities and
models; bug fixes; documentation. The many ways of contributing and the
contribution process are described in detail at:
[http://sourceforge.net/p/openfoam-extend/wiki/HowToContribute/]
9 List of Contributors:
------------------------
See file ListOfContributors

15
ThirdParty/AllClean vendored
View file

@ -27,6 +27,7 @@
# #
# Description # Description
# Cleanup script for ThirdParty packages. # Cleanup script for ThirdParty packages.
# Add option alsoPackage to remove the installed files.
# #
# Author: # Author:
# Martin Beaudoin, Hydro-Quebec, (2013) # Martin Beaudoin, Hydro-Quebec, (2013)
@ -38,7 +39,7 @@ cd ${0%/*} || exit 1
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
echo " The environment variables are inconsistent with the installation." echo " The environment variables are inconsistent with the installation."
echo " Check the OpenFOAM entries in your dot-files and source them." echo " Check the foam-extend entries in your dot-files and source them."
exit 1 exit 1
} }
. tools/makeThirdPartyFunctionsForRPM . tools/makeThirdPartyFunctionsForRPM
@ -50,22 +51,22 @@ echo ========================================
echo echo
# Cleaning stage 1 # Cleaning stage 1
./AllClean.stage1 ./AllClean.stage1 $1
# Cleaning stage 2 # Cleaning stage 2
./AllClean.stage2 ./AllClean.stage2 $1
# Cleaning stage 3 # Cleaning stage 3
./AllClean.stage3 ./AllClean.stage3 $1
# Cleaning stage 4 # Cleaning stage 4
./AllClean.stage4 ./AllClean.stage4 $1
# Cleaning stage 5 # Cleaning stage 5
./AllClean.stage5 ./AllClean.stage5 $1
# Cleaning stage 6 # Cleaning stage 6
./AllClean.stage6 ./AllClean.stage6 $1
echo ======================================== echo ========================================
echo Done ThirdParty Allclean echo Done ThirdParty Allclean

View file

@ -27,6 +27,7 @@
# #
# Description # Description
# Cleaning script for ThirdParty packages: Stage1 # Cleaning script for ThirdParty packages: Stage1
# Add option alsoPackage to remove the installed files.
# #
# Author: # Author:
# Martin Beaudoin, Hydro-Quebec, (2013) # Martin Beaudoin, Hydro-Quebec, (2013)
@ -38,7 +39,7 @@ cd ${0%/*} || exit 1
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
echo " The environment variables are inconsistent with the installation." echo " The environment variables are inconsistent with the installation."
echo " Check the OpenFOAM entries in your dot-files and source them." echo " Check the foam-extend entries in your dot-files and source them."
exit 1 exit 1
} }
. tools/makeThirdPartyFunctionsForRPM . tools/makeThirdPartyFunctionsForRPM
@ -50,32 +51,32 @@ echo ========================================
echo echo
# gmp # gmp
uninstallPackage gmp-5.0.1 uninstallPackage gmp-5.0.1 $1
# mpfr # mpfr
uninstallPackage mpfr-3.0.1 uninstallPackage mpfr-3.0.1 $1
# gcc # gcc
uninstallPackage gcc-4.4.5 uninstallPackage gcc-4.4.5 $1
uninstallPackage gcc-4.5.1 uninstallPackage gcc-4.5.1 $1
# mpc # mpc
uninstallPackage mpc-0.8.2 uninstallPackage mpc-0.8.2 $1
#Python #Python
uninstallPackage Python-2.7 uninstallPackage Python-2.7 $1
# m4 # m4
uninstallPackage m4-1.4.16 uninstallPackage m4-1.4.16 $1
# bison # bison
uninstallPackage bison-2.4.3 uninstallPackage bison-2.4.3 $1
# flex # flex
uninstallPackage flex-2.5.35 uninstallPackage flex-2.5.35 $1
# cmake # cmake
uninstallPackage cmake-2.8.11 uninstallPackage cmake-2.8.12 $1
echo echo

View file

@ -30,6 +30,7 @@
# #
# Author: # Author:
# Martin Beaudoin, Hydro-Quebec, (2013) # Martin Beaudoin, Hydro-Quebec, (2013)
# Add option alsoPackage to remove the installed files.
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# run from third-party directory only # run from third-party directory only
@ -38,7 +39,7 @@ cd ${0%/*} || exit 1
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
echo " The environment variables are inconsistent with the installation." echo " The environment variables are inconsistent with the installation."
echo " Check the OpenFOAM entries in your dot-files and source them." echo " Check the foam-extend entries in your dot-files and source them."
exit 1 exit 1
} }
. tools/makeThirdPartyFunctionsForRPM . tools/makeThirdPartyFunctionsForRPM
@ -50,11 +51,11 @@ echo ========================================
echo echo
# openmpi # openmpi
uninstallPackage openmpi-1.4.1 uninstallPackage openmpi-1.4.1 $1
uninstallPackage openmpi-1.4.3 uninstallPackage openmpi-1.4.3 $1
uninstallPackage openmpi-1.5 uninstallPackage openmpi-1.5 $1
uninstallPackage openmpi-1.6.3 uninstallPackage openmpi-1.6.3 $1
uninstallPackage openmpi-1.6.5 uninstallPackage openmpi-1.6.5 $1
echo echo
echo ======================================== echo ========================================

View file

@ -27,6 +27,7 @@
# #
# Description # Description
# Cleaning script for ThirdParty packages: Stage3 # Cleaning script for ThirdParty packages: Stage3
# Add option alsoPackage to remove the installed files.
# #
# Author: # Author:
# Martin Beaudoin, Hydro-Quebec, (2013) # Martin Beaudoin, Hydro-Quebec, (2013)
@ -38,7 +39,7 @@ cd ${0%/*} || exit 1
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
echo " The environment variables are inconsistent with the installation." echo " The environment variables are inconsistent with the installation."
echo " Check the OpenFOAM entries in your dot-files and source them." echo " Check the foam-extend entries in your dot-files and source them."
exit 1 exit 1
} }
. tools/makeThirdPartyFunctionsForRPM . tools/makeThirdPartyFunctionsForRPM
@ -50,31 +51,32 @@ echo ========================================
echo echo
# metis # metis
uninstallPackage metis-5.0pre2 uninstallPackage metis-5.1.0 $1
# ParMGridGen # ParMGridGen
uninstallPackage ParMGridGen-1.0 uninstallPackage ParMGridGen-1.0 $1
# Libccmio # Libccmio
uninstallPackage libccmio-2.6.1 uninstallPackage libccmio-2.6.1 $1
# Mesquite # Mesquite
uninstallPackage mesquite-2.1.2 uninstallPackage mesquite-2.1.2 $1
# Scotch/PtScotch # Scotch/PtScotch
uninstallPackage scotch-5.1.10b uninstallPackage scotch-6.0.0 $1
uninstallPackage scotch_6.0.0 $1
# ParMertis # ParMertis
uninstallPackage ParMetis-3.1.1 uninstallPackage parmetis-4.0.3 $1
# Zoltan # Zoltan
# uninstallPackage zoltan-3.6 # uninstallPackage zoltan-3.6 $1
# PyFoam # PyFoam
uninstallPackage PyFoam-0.6.1 uninstallPackage PyFoam-0.6.1 $1
# hwloc # hwloc
uninstallPackage hwloc-1.7.1 uninstallPackage hwloc-1.7.2 $1
echo echo
echo ======================================== echo ========================================

View file

@ -27,6 +27,7 @@
# #
# Description # Description
# Cleaning script for ThirdParty packages: Stage4 # Cleaning script for ThirdParty packages: Stage4
# Add option alsoPackage to remove the installed files.
# #
# Author: # Author:
# Martin Beaudoin, Hydro-Quebec, (2013) # Martin Beaudoin, Hydro-Quebec, (2013)
@ -38,7 +39,7 @@ cd ${0%/*} || exit 1
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
echo " The environment variables are inconsistent with the installation." echo " The environment variables are inconsistent with the installation."
echo " Check the OpenFOAM entries in your dot-files and source them." echo " Check the foam-extend entries in your dot-files and source them."
exit 1 exit 1
} }
. tools/makeThirdPartyFunctionsForRPM . tools/makeThirdPartyFunctionsForRPM
@ -50,10 +51,10 @@ echo ========================================
echo echo
# QT # QT
uninstallPackage qt-everywhere-opensource-src-4.7.4 uninstallPackage qt-everywhere-opensource-src-4.7.4 $1
# ParaView # ParaView
uninstallPackage ParaView-3.12.0 uninstallPackage ParaView-3.12.0 $1
echo echo
echo ======================================== echo ========================================

View file

@ -38,7 +38,7 @@ cd ${0%/*} || exit 1
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
echo " The environment variables are inconsistent with the installation." echo " The environment variables are inconsistent with the installation."
echo " Check the OpenFOAM entries in your dot-files and source them." echo " Check the foam-extend entries in your dot-files and source them."
exit 1 exit 1
} }
. tools/makeThirdPartyFunctionsForRPM . tools/makeThirdPartyFunctionsForRPM

View file

@ -38,7 +38,7 @@ cd ${0%/*} || exit 1
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
echo " The environment variables are inconsistent with the installation." echo " The environment variables are inconsistent with the installation."
echo " Check the OpenFOAM entries in your dot-files and source them." echo " Check the foam-extend entries in your dot-files and source them."
exit 1 exit 1
} }
. tools/makeThirdPartyFunctionsForRPM . tools/makeThirdPartyFunctionsForRPM

4
ThirdParty/AllMake vendored
View file

@ -42,7 +42,7 @@ cd ${0%/*} || exit 1
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
echo " The environment variables are inconsistent with the installation." echo " The environment variables are inconsistent with the installation."
echo " Check the OpenFOAM entries in your dot-files and source them." echo " Check the foam-extend entries in your dot-files and source them."
exit 1 exit 1
} }
. tools/makeThirdPartyFunctionsForRPM . tools/makeThirdPartyFunctionsForRPM
@ -73,7 +73,7 @@ echo
# Running stage 5 # Running stage 5
# This stage depends on a properly compiled installation # This stage depends on a properly compiled installation
# of OpenFOAM. On a brand new installation of OpenFOAM-1.6-ext, # of foam-extend. On a brand new installation of foam-extend-3.0
# this stage should be called last in your compilation process # this stage should be called last in your compilation process
./AllMake.stage5 ./AllMake.stage5

View file

@ -43,7 +43,7 @@ cd ${0%/*} || exit 1
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
echo " The environment variables are inconsistent with the installation." echo " The environment variables are inconsistent with the installation."
echo " Check the OpenFOAM entries in your dot-files and source them." echo " Check the foam-extend entries in your dot-files and source them."
exit 1 exit 1
} }
. tools/makeThirdPartyFunctionsForRPM . tools/makeThirdPartyFunctionsForRPM
@ -56,7 +56,7 @@ echo
# Running stage 5 # Running stage 5
# This stage depends on a properly compiled installation # This stage depends on a properly compiled installation
# of OpenFOAM. On a brand new installation of OpenFOAM-1.6-ext, # of foam-extend. On a brand new installation of foam-extend-3.0,
# this stage should be called last in your compilation process # this stage should be called last in your compilation process
./AllMake.stage5 ./AllMake.stage5

View file

@ -43,7 +43,7 @@ cd ${0%/*} || exit 1
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
echo " The environment variables are inconsistent with the installation." echo " The environment variables are inconsistent with the installation."
echo " Check the OpenFOAM entries in your dot-files and source them." echo " Check the foam-extend entries in your dot-files and source them."
exit 1 exit 1
} }
. tools/makeThirdPartyFunctionsForRPM . tools/makeThirdPartyFunctionsForRPM

View file

@ -46,7 +46,7 @@ cd ${0%/*} || exit 1
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
echo " The environment variables are inconsistent with the installation." echo " The environment variables are inconsistent with the installation."
echo " Check the OpenFOAM entries in your dot-files and source them." echo " Check the foam-extend entries in your dot-files and source them."
exit 1 exit 1
} }

View file

@ -31,13 +31,13 @@
# Compilers and basic tools. # Compilers and basic tools.
# #
# Once this stage is built, you would normally re-initialize your # Once this stage is built, you would normally re-initialize your
# OpenFOAM environment in order to use the new compilers and tools # foam-extend environment in order to use the new compilers and tools
# #
# NOTE: This stage is optional. Use it only if you want to override # NOTE: This stage is optional. Use it only if you want to override
# your system pre-installed compilers and tools # your system pre-installed compilers and tools
# #
# Requirements: # Requirements:
# 1: Your OpenFOAM environment must be properly initialized # 1: Your foam-extend environment must be properly initialized
# #
# Author: # Author:
# Martin Beaudoin, Hydro-Quebec, (2010) # Martin Beaudoin, Hydro-Quebec, (2010)
@ -49,7 +49,7 @@ cd ${0%/*} || exit 1
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
echo " The environment variables are inconsistent with the installation." echo " The environment variables are inconsistent with the installation."
echo " Check the OpenFOAM entries in your dot-files and source them." echo " Check the foam-extend entries in your dot-files and source them."
exit 1 exit 1
} }
. tools/makeThirdPartyFunctionsForRPM . tools/makeThirdPartyFunctionsForRPM
@ -87,13 +87,13 @@ echo
#( rpm_make -p m4-1.4.16 -s m4-1.4.16.spec -u http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz ) #( rpm_make -p m4-1.4.16 -s m4-1.4.16.spec -u http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz )
# bison # bison
#( rpm_make -p bison-2.4.3 -s bison-2.4.3.spec -u http://ftp.gnu.org/gnu/bison/bison-2.4.3.tar.gz ) ( rpm_make -p bison-2.7 -s bison-2.7.spec -u http://ftp.gnu.org/gnu/bison/bison-2.7.tar.gz )
# flex # flex
#( rpm_make -p flex-2.5.35 -s flex-2.5.35.spec -u http://downloads.sourceforge.net/project/flex/flex/flex-2.5.35/flex-2.5.35.tar.gz ) #( rpm_make -p flex-2.5.35 -s flex-2.5.35.spec -u http://downloads.sourceforge.net/project/flex/flex/flex-2.5.35/flex-2.5.35.tar.gz )
# cmake # cmake
( rpm_make -p cmake-2.8.12 -s cmake-2.8.12.spec -u http://www.cmake.org/files/v2.8/cmake-2.8.12.tar.gz ) #( rpm_make -p cmake-2.8.12 -s cmake-2.8.12.spec -u http://www.cmake.org/files/v2.8/cmake-2.8.12.tar.gz )
echo ======================================== echo ========================================
echo Done ThirdParty AllMake: Stage1 echo Done ThirdParty AllMake: Stage1

View file

@ -31,14 +31,14 @@
# Communication libraries # Communication libraries
# #
# Once this stage is built, you would normally re-initialize your # Once this stage is built, you would normally re-initialize your
# OpenFOAM environment in order redirect OpenFOAM toward the appropriate # foam-extend environment in order redirect foam-extend toward the
# communication library # appropriate communication library
# #
# NOTE: This stage is optional. Use it only if you want to override # NOTE: This stage is optional. Use it only if you want to override
# your system communication libraries # your system communication libraries
# #
# Requirements: # Requirements:
# 1: Your OpenFOAM environment must be properly initialized # 1: Your foam-extend environment must be properly initialized
# 2: AllMake.stage1 if you are overriding your system compiler # 2: AllMake.stage1 if you are overriding your system compiler
# #
# Author: # Author:
@ -51,7 +51,7 @@ cd ${0%/*} || exit 1
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
echo " The environment variables are inconsistent with the installation." echo " The environment variables are inconsistent with the installation."
echo " Check the OpenFOAM entries in your dot-files and source them." echo " Check the foam-extend entries in your dot-files and source them."
exit 1 exit 1
} }
. tools/makeThirdPartyFunctionsForRPM . tools/makeThirdPartyFunctionsForRPM
@ -68,7 +68,7 @@ then
#( rpm_make -p openmpi-1.4.1 -s openmpi-1.4.1.spec -u http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-1.4.1.tar.gz ) #( rpm_make -p openmpi-1.4.1 -s openmpi-1.4.1.spec -u http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-1.4.1.tar.gz )
#( rpm_make -p openmpi-1.5 -s openmpi-1.5.spec -u http://www.open-mpi.org/software/ompi/v1.5/downloads/openmpi-1.5.tar.gz ) #( rpm_make -p openmpi-1.5 -s openmpi-1.5.spec -u http://www.open-mpi.org/software/ompi/v1.5/downloads/openmpi-1.5.tar.gz )
#( rpm_make -p openmpi-1.4.3 -s openmpi-1.4.3.spec -u http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-1.4.3.tar.gz ) #( rpm_make -p openmpi-1.4.3 -s openmpi-1.4.3.spec -u http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-1.4.3.tar.gz )
( rpm_make -p openmpi-1.6.5 -s openmpi-1.6.5.spec -u http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.5.tar.gz ) ( rpm_make -p openmpi-1.6.5 -s openmpi-1.6.5.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/openmpi-1.6.5.tar.gz )
else else
echo "Using system installed OpenMPI" echo "Using system installed OpenMPI"
echo "" echo ""

View file

@ -31,7 +31,7 @@
# The ThirdParty libraries # The ThirdParty libraries
# #
# Requirements: # Requirements:
# 1: Your OpenFOAM environment must be properly initialized # 1: Your foam-extend environment must be properly initialized
# 2: AllMake.stage1 if you are overriding your system compiler # 2: AllMake.stage1 if you are overriding your system compiler
# 3: AllMake.stage2 if you are overriding your system comm. libraries # 3: AllMake.stage2 if you are overriding your system comm. libraries
# #
@ -45,7 +45,7 @@ cd ${0%/*} || exit 1
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
echo " The environment variables are inconsistent with the installation." echo " The environment variables are inconsistent with the installation."
echo " Check the OpenFOAM entries in your dot-files and source them." echo " Check the foam-extend entries in your dot-files and source them."
exit 1 exit 1
} }
. tools/makeThirdPartyFunctionsForRPM . tools/makeThirdPartyFunctionsForRPM
@ -59,7 +59,7 @@ echo
# Metis # Metis
if [ -z "$METIS_SYSTEM" ] if [ -z "$METIS_SYSTEM" ]
then then
( rpm_make -p metis-5.1.0 -s metis-5.1.0.spec -u http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/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/openfoam-extend/foam-extend-3.1/ThirdParty/metis-5.1.0.tar.gz )
else else
echo "Using system installed Metis" echo "Using system installed Metis"
echo "" echo ""
@ -69,7 +69,7 @@ fi
if [ -z "$PARMGRIDGEN_SYSTEM" ] if [ -z "$PARMGRIDGEN_SYSTEM" ]
then then
#( 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 ftp://ftp.proxad.net/.mirrors1/ftp.freebsd.org/ports/distfiles/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 )
else else
echo "Using system installed ParMGridGen" echo "Using system installed ParMGridGen"
echo "" echo ""
@ -87,7 +87,7 @@ fi
# Mesquite # Mesquite
if [ -z "$MESQUITE_SYSTEM" ] if [ -z "$MESQUITE_SYSTEM" ]
then then
( rpm_make -p mesquite-2.1.2 -s mesquite-2.1.2.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.0/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/openfoam-extend/foam-extend-3.1/ThirdParty/mesquite-2.1.2.tar.gz )
else else
echo "Using system installed Mesquite" echo "Using system installed Mesquite"
echo "" echo ""
@ -102,7 +102,7 @@ fi
# Scotch # Scotch
if [ -z "$SCOTCH_SYSTEM" ] if [ -z "$SCOTCH_SYSTEM" ]
then then
( rpm_make -p scotch-6.0.0 -s scotch-6.0.0.spec -u https://gforge.inria.fr/frs/download.php/31831/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/openfoam-extend/foam-extend-3.1/ThirdParty/scotch-6.0.0.tar.gz )
else else
echo "Using system installed Scotch" echo "Using system installed Scotch"
echo "" echo ""
@ -131,7 +131,9 @@ if [ -z "$PYFOAM_SYSTEM" ]
then then
# ( rpm_make -p PyFoam-0.5.6 -s PyFoam-0.5.6.spec -u http://openfoamwiki.net/images/b/b8/PyFoam-0.5.6.tar.gz -n PyFoam-0.5.6-1.noarch -a noarch) # ( rpm_make -p PyFoam-0.5.6 -s PyFoam-0.5.6.spec -u http://openfoamwiki.net/images/b/b8/PyFoam-0.5.6.tar.gz -n PyFoam-0.5.6-1.noarch -a noarch)
# ( rpm_make -p PyFoam-0.5.7 -s PyFoam-0.5.7.spec -u http://openfoamwiki.net/images/d/dc/PyFoam-0.5.7.tar.gz -n PyFoam-0.5.7-1.noarch -a noarch) # ( rpm_make -p PyFoam-0.5.7 -s PyFoam-0.5.7.spec -u http://openfoamwiki.net/images/d/dc/PyFoam-0.5.7.tar.gz -n PyFoam-0.5.7-1.noarch -a noarch)
( rpm_make -p PyFoam-0.6.1 -s PyFoam-0.6.1.spec -u http://openfoamwiki.net/images/3/33/PyFoam-0.6.1.tar.gz -n PyFoam-0.6.1-1.noarch -a noarch) # ( rpm_make -p PyFoam-0.6.1 -s PyFoam-0.6.1.spec -u http://openfoamwiki.net/images/3/33/PyFoam-0.6.1.tar.gz -n PyFoam-0.6.1-1.noarch -a noarch)
# ( rpm_make -p PyFoam-0.6.2 -s PyFoam-0.6.2.spec -u http://openfoamwiki.net/images/8/89/PyFoam-0.6.2.tar.gz -n PyFoam-0.6.2-1.noarch -a noarch)
( rpm_make -p PyFoam-0.6.3 -s PyFoam-0.6.3.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/PyFoam-0.6.1.tar.gz )
else else
echo "Using system installed PyFoam" echo "Using system installed PyFoam"
echo "" echo ""
@ -140,7 +142,7 @@ fi
# hwloc # hwloc
if [ -z "$HWLOC_SYSTEM" ] if [ -z "$HWLOC_SYSTEM" ]
then then
( rpm_make -p hwloc-1.7.2 -s hwloc-1.7.2.spec -u http://www.open-mpi.org/software/hwloc/v1.7/downloads/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/openfoam-extend/foam-extend-3.1/ThirdParty/hwloc-1.7.2.tar.gz )
else else
echo "Using system installed hwloc" echo "Using system installed hwloc"
echo "" echo ""
@ -152,5 +154,3 @@ echo ========================================
echo echo
# ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file

View file

@ -26,12 +26,12 @@
# AllMake.stage4 # AllMake.stage4
# #
# Description # Description
# Build script for ThirdParty packages: Stage3 # Build script for ThirdParty packages: Stage4
# #
# The OpenFOAM viewers # The foam-extend viewers
# #
# Requirements: # Requirements:
# 1: Your OpenFOAM environment must be properly initialized # 1: Your foam-extend environment must be properly initialized
# 2: AllMake.stage1 if you are overriding your system compiler # 2: AllMake.stage1 if you are overriding your system compiler
# 3: AllMake.stage2 if you are overriding your system comm. libraries # 3: AllMake.stage2 if you are overriding your system comm. libraries
# #
@ -45,7 +45,7 @@ cd ${0%/*} || exit 1
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
echo " The environment variables are inconsistent with the installation." echo " The environment variables are inconsistent with the installation."
echo " Check the OpenFOAM entries in your dot-files and source them." echo " Check the foam-extend entries in your dot-files and source them."
exit 1 exit 1
} }
. tools/makeThirdPartyFunctionsForRPM . tools/makeThirdPartyFunctionsForRPM
@ -73,7 +73,7 @@ then
if [ -d "$QT_BIN_DIR" -a -r "$QT_BIN_DIR"/qmake ] if [ -d "$QT_BIN_DIR" -a -r "$QT_BIN_DIR"/qmake ]
then then
( rpm_make -p ParaView-4.0.1 -s ParaView-4.0.1.spec -u http://www.paraview.org/files/v4.0/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/openfoam-extend/foam-extend-3.1/ThirdParty/ParaView-v4.0.1-source.tgz \
-f --define='_qmakePath $QT_BIN_DIR/qmake' -f --define='_qmakePath $QT_BIN_DIR/qmake'
) )
else else

View file

@ -30,9 +30,9 @@
# #
# #
# Requirements: # Requirements:
# 1: Your OpenFOAM environment must be properly initialized # 1: Your foam-extend environment must be properly initialized
# 2: OpenFOAM must already been compiled because swak4Foam depends on # 2: foam-extend must already been compiled because swak4Foam depends on
# OpenFOAM include files and libraries # foam-extend include files and libraries
# #
# Author: # Author:
# Martin Beaudoin, Hydro-Quebec, (2012) # Martin Beaudoin, Hydro-Quebec, (2012)
@ -44,7 +44,7 @@ cd ${0%/*} || exit 1
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
echo " The environment variables are inconsistent with the installation." echo " The environment variables are inconsistent with the installation."
echo " Check the OpenFOAM entries in your dot-files and source them." echo " Check the foam-extend entries in your dot-files and source them."
exit 1 exit 1
} }
@ -87,9 +87,7 @@ then
if [ $? -eq 0 ]; if [ $? -eq 0 ];
then then
echo "Using Subversion/svn to download the source code for swak4Foam" echo "Using Subversion/svn to download the source code for swak4Foam"
echo "Error: current Subversion-version does not support foam3. Please install mercurial" (cd ./rpmBuild/BUILD; svn checkout svn://svn.code.sf.net/p/openfoam-extend/svn/trunk/Breeder_2.0/libraries/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION)
exit -1
(cd ./rpmBuild/BUILD; svn checkout svn://svn.code.sf.net/p/openfoam-extend/svn/trunk/Breeder_1.7/libraries/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION)
else else
echo "Error: Please install either a Mercurial or Subversion client in order to download the source code for swak4Foam" echo "Error: Please install either a Mercurial or Subversion client in order to download the source code for swak4Foam"
exit -1 exit -1

View file

@ -30,7 +30,7 @@
# #
# #
# Requirements: # Requirements:
# 1: Your OpenFOAM environment must be properly initialized # 1: Your foam-extend environment must be properly initialized
# #
# Author: # Author:
# Martin Beaudoin, Hydro-Quebec, (2012) # Martin Beaudoin, Hydro-Quebec, (2012)
@ -42,7 +42,7 @@ cd ${0%/*} || exit 1
wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || { wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR" echo "Error: Current directory is not \$WM_THIRD_PARTY_DIR"
echo " The environment variables are inconsistent with the installation." echo " The environment variables are inconsistent with the installation."
echo " Check the OpenFOAM entries in your dot-files and source them." echo " Check the foam-extend entries in your dot-files and source them."
exit 1 exit 1
} }

View file

@ -44,8 +44,8 @@ if [ -z "$PYFOAM_DIR" ]
then then
echo "Error: Missing environment variable \$PYFOAM_DIR." echo "Error: Missing environment variable \$PYFOAM_DIR."
echo " Please execute the script ThirdParty/AllMake.stage5 to install PyFoam." echo " Please execute the script ThirdParty/AllMake.stage5 to install PyFoam."
echo " Then, make sure to freshen your OpenFOAM environment by sourcing your main" echo " Then, make sure to freshen your foam-extend environment by sourcing your main"
echo " OpenFOAM configuration file." echo " foam-extend configuration file."
exit -1 exit -1
fi fi

View file

@ -2,7 +2,7 @@ A new design for the ThirdParty packages compilation and installation process:
============================================================================== ==============================================================================
The main purpose of this new development is to build a complete ThirParty The main purpose of this new development is to build a complete ThirParty
packages set for OpenFOAM 1.6-ext using only the original package source packages set for foam-extend-3.1 using only the original package source
tarball and some patch files (when necessary). tarball and some patch files (when necessary).
A useful by-product of this development is also to provide some kind of A useful by-product of this development is also to provide some kind of
@ -87,16 +87,16 @@ and .csh files one needs to source in order to properly initialize the PATH and
LD_LIBRARY_PATH environment variables for running the packages. LD_LIBRARY_PATH environment variables for running the packages.
Some packages will also create environments variables necessary for the Some packages will also create environments variables necessary for the
compilation of some OpenFOAM libraries. compilation of some foam-extend libraries.
The scripts AllMake.stage[1-4] are taking care of refreshing the environment The scripts AllMake.stage[1-4] are taking care of refreshing the environment
variable after the installation of every single package, so you will not need to variable after the installation of every single package, so you will not need to
manually refresh your OpenFOAM environment yourself when building individual manually refresh your foam-extend environment yourself when building individual
ThirdParty packages through the AllMake.stage[1-4] scripts. ThirdParty packages through the AllMake.stage[1-4] scripts.
The main Allwmake script for the compilation of OpenFOAM will also take care of The main Allwmake script for the compilation of foam-extend will also take care of
refreshing the environment variable before moving on to the compilation of the refreshing the environment variable before moving on to the compilation of the
main OpenFOAM libraries and applications. main foam-extend libraries and applications.
However, if you decide to compile the libraries and/or applications manually, or However, if you decide to compile the libraries and/or applications manually, or
through the src/Allwmake or applications/Allwmake scripts, YOU MUST MAKE SURE through the src/Allwmake or applications/Allwmake scripts, YOU MUST MAKE SURE
@ -169,7 +169,7 @@ Warning: This section is a bit advanced, and as of yet, I have no evidence that
of my machines, I will get: of my machines, I will get:
> rpm -qip cmake-2.8.3-darwinIntelGccDPOpt.i386.rpm| grep Relocations > rpm -qip cmake-2.8.3-darwinIntelGccDPOpt.i386.rpm| grep Relocations
Name : cmake Relocations: /home/beaudoin/OpenFOAM/OpenFOAM-1.6-ext/ThirdParty Name : cmake Relocations: /home/beaudoin/foam/foam-extend-3.1/ThirdParty
The Relocations path is the actual location pointed by the The Relocations path is the actual location pointed by the
$WM_THIRD_PARTY_DIR on my virtual machine when I generated the RPM. It is $WM_THIRD_PARTY_DIR on my virtual machine when I generated the RPM. It is
@ -186,7 +186,7 @@ Warning: This section is a bit advanced, and as of yet, I have no evidence that
this: this:
rpm -ivh ./cmake-2.8.3-darwinIntelGccDPOpt.i386.rpm \ rpm -ivh ./cmake-2.8.3-darwinIntelGccDPOpt.i386.rpm \
--relocate /home/beaudoin/OpenFOAM/OpenFOAM-1.6-ext/ThirdParty=/tmp/someDir --relocate /home/beaudoin/foam/foam-extend-3.1/ThirdParty=/tmp/someDir
Even better, you can dig down the hard-coded path even deeper in order to Even better, you can dig down the hard-coded path even deeper in order to
relocate the whole installation directory, down to the last hard-coded relocate the whole installation directory, down to the last hard-coded
@ -238,7 +238,7 @@ Warning: This section is a bit advanced, and as of yet, I have no evidence that
-------------------- --------------------
Please report ThirdParty packages related bugs to the Bug tracking system Please report ThirdParty packages related bugs to the Bug tracking system
for OpenFOAM-1.6-ext. for foam-extend-3.1
http://sourceforge.net/apps/mantisbt/openfoam-extend/main_page.php http://sourceforge.net/apps/mantisbt/openfoam-extend/main_page.php
@ -246,3 +246,4 @@ Warning: This section is a bit advanced, and as of yet, I have no evidence that
Martin Beaudoin Martin Beaudoin
Rev 0: 05/2011 Rev 0: 05/2011
Rev 1: 08/2011 Rev 1: 08/2011
Rev 2: 05/2014

View file

@ -1,6 +1,14 @@
diff -ruN ParMGridGen-1.0_orig/Makefile.in ParMGridGen-1.0/Makefile.in diff -ruN ParMGridGen-1.0_orig/Makefile.in ParMGridGen-1.0/Makefile.in
--- ParMGridGen-1.0_orig/Makefile.in 2001-12-04 19:30:33.000000000 -0500 --- ParMGridGen-1.0_orig/Makefile.in 2001-12-04 16:30:33.000000000 -0800
+++ ParMGridGen-1.0/Makefile.in 2010-10-31 16:18:41.000000000 -0400 +++ ParMGridGen-1.0/Makefile.in 2013-08-22 20:07:33.491171127 -0700
@@ -1,6 +1,6 @@
#--------------------------------------------------------------------------
# Which make to use
-make = gmake
+make = make
# Which compiler to use
# CC is the compiler for the serial code
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
OPTFLAGS = -O3 OPTFLAGS = -O3
@ -41,8 +49,8 @@ diff -ruN ParMGridGen-1.0_orig/Makefile.in ParMGridGen-1.0/Makefile.in
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------
# #
diff -ruN ParMGridGen-1.0_orig/MGridGen/IMlib/Makefile ParMGridGen-1.0/MGridGen/IMlib/Makefile diff -ruN ParMGridGen-1.0_orig/MGridGen/IMlib/Makefile ParMGridGen-1.0/MGridGen/IMlib/Makefile
--- ParMGridGen-1.0_orig/MGridGen/IMlib/Makefile 2001-12-04 17:46:56.000000000 -0500 --- ParMGridGen-1.0_orig/MGridGen/IMlib/Makefile 2001-12-04 14:46:56.000000000 -0800
+++ ParMGridGen-1.0/MGridGen/IMlib/Makefile 2010-10-31 16:16:54.000000000 -0400 +++ ParMGridGen-1.0/MGridGen/IMlib/Makefile 2013-08-22 20:03:32.925673296 -0700
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
.c.o: .c.o:
$(CC) $(CFLAGS) -c $*.c $(CC) $(CFLAGS) -c $*.c
@ -59,8 +67,8 @@ diff -ruN ParMGridGen-1.0_orig/MGridGen/IMlib/Makefile ParMGridGen-1.0/MGridGen/
- rm -f *.o ; rm -f ./libIMlib.a - rm -f *.o ; rm -f ./libIMlib.a
+ rm -f *.o ; rm -f ./libIMlib.$(LIBEXT) + rm -f *.o ; rm -f ./libIMlib.$(LIBEXT)
diff -ruN ParMGridGen-1.0_orig/MGridGen/Lib/Makefile ParMGridGen-1.0/MGridGen/Lib/Makefile diff -ruN ParMGridGen-1.0_orig/MGridGen/Lib/Makefile ParMGridGen-1.0/MGridGen/Lib/Makefile
--- ParMGridGen-1.0_orig/MGridGen/Lib/Makefile 2001-12-04 18:01:00.000000000 -0500 --- ParMGridGen-1.0_orig/MGridGen/Lib/Makefile 2001-12-04 15:01:00.000000000 -0800
+++ ParMGridGen-1.0/MGridGen/Lib/Makefile 2010-10-31 16:16:54.000000000 -0400 +++ ParMGridGen-1.0/MGridGen/Lib/Makefile 2013-08-22 20:03:32.925673296 -0700
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
INCLUDES = -I./ -I$(IMLIBDIR) $(INCDIR) INCLUDES = -I./ -I$(IMLIBDIR) $(INCDIR)
CFLAGS = $(COPTIONS) $(OPTFLAGS) $(DEBUGFLAGS) $(INCLUDES) CFLAGS = $(COPTIONS) $(OPTFLAGS) $(DEBUGFLAGS) $(INCLUDES)
@ -86,8 +94,8 @@ diff -ruN ParMGridGen-1.0_orig/MGridGen/Lib/Makefile ParMGridGen-1.0/MGridGen/Li
- rm -f *.o ; rm -f ../../libmgrid.a - rm -f *.o ; rm -f ../../libmgrid.a
+ rm -f *.o ; rm -f ./libMGridGen.$(LIBEXT) + rm -f *.o ; rm -f ./libMGridGen.$(LIBEXT)
diff -ruN ParMGridGen-1.0_orig/MGridGen/Programs/Makefile ParMGridGen-1.0/MGridGen/Programs/Makefile diff -ruN ParMGridGen-1.0_orig/MGridGen/Programs/Makefile ParMGridGen-1.0/MGridGen/Programs/Makefile
--- ParMGridGen-1.0_orig/MGridGen/Programs/Makefile 2001-12-04 18:02:26.000000000 -0500 --- ParMGridGen-1.0_orig/MGridGen/Programs/Makefile 2001-12-04 15:02:26.000000000 -0800
+++ ParMGridGen-1.0/MGridGen/Programs/Makefile 2010-10-31 16:16:54.000000000 -0400 +++ ParMGridGen-1.0/MGridGen/Programs/Makefile 2013-08-22 20:03:32.925673296 -0700
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
include ../../Makefile.in include ../../Makefile.in

View file

@ -115,13 +115,13 @@ Patch1: ParMGridGen-1.0.patch
cp ./MGridGen/IMlib/libIMlib.* $RPM_BUILD_ROOT/%{_installPrefix}/lib cp ./MGridGen/IMlib/libIMlib.* $RPM_BUILD_ROOT/%{_installPrefix}/lib
cp ./MGridGen/Lib/libMGridGen.* $RPM_BUILD_ROOT/%{_installPrefix}/lib cp ./MGridGen/Lib/libMGridGen.* $RPM_BUILD_ROOT/%{_installPrefix}/lib
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -139,7 +139,7 @@ export PARMGRIDGEN_INCLUDE_DIR=\$PARMGRIDGEN_DIR/include
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -115,13 +115,13 @@ Patch1: ParMetis-3.1.1.patch
cp METISLib/libmetis-parmetis.* $RPM_BUILD_ROOT/%{_installPrefix}/lib cp METISLib/libmetis-parmetis.* $RPM_BUILD_ROOT/%{_installPrefix}/lib
cp ParMETISLib/libparmetis.* $RPM_BUILD_ROOT/%{_installPrefix}/lib cp ParMETISLib/libparmetis.* $RPM_BUILD_ROOT/%{_installPrefix}/lib
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -140,7 +140,7 @@ export PARMETIS_INCLUDE_DIR=\$PARMETIS_DIR/include
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -195,13 +195,13 @@ Patch0: ParaView-3.10.1.patch_darwin
cd buildObj cd buildObj
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -233,7 +233,7 @@ export PV_PLUGIN_PATH=\$FOAM_LIBBIN/paraview_plugins
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -202,13 +202,13 @@ Patch1: paraview-gcc47.patch
cd buildObj cd buildObj
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -240,7 +240,7 @@ export PV_PLUGIN_PATH=\$FOAM_LIBBIN/paraview_plugins
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -212,13 +212,13 @@ Patch3: ParaView-3.14.1.patch_darwin
cd buildObj cd buildObj
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -250,7 +250,7 @@ export PV_PLUGIN_PATH=\$FOAM_LIBBIN/paraview_plugins
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -189,13 +189,13 @@ Patch0: ParaView-3.8.1.patch_darwin
cd buildObj cd buildObj
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -227,7 +227,7 @@ export PV_PLUGIN_PATH=\$FOAM_LIBBIN/paraview_plugins
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -190,13 +190,13 @@ Patch0: ParaView-4.0.1.patch_darwin
cd buildObj cd buildObj
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -228,7 +228,7 @@ export PV_PLUGIN_PATH=\$FOAM_LIBBIN/paraview_plugins
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -95,13 +95,13 @@ Group: Development/Tools
%define pythonVersion $(python -V 2>&1 | awk -F ' ' {'print $2'} | awk -F \. {'print $1 "." $2'}) %define pythonVersion $(python -V 2>&1 | awk -F ' ' {'print $2'} | awk -F \. {'print $1 "." $2'})
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -117,7 +117,7 @@ export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHON
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available
@ -144,7 +144,7 @@ DOT_CSH_EOF
cat << DOT_HARDCODED_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.sh cat << DOT_HARDCODED_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.sh
# In this version of the configuration script, the paths are hardcoded, # In this version of the configuration script, the paths are hardcoded,
# which makes it easier to load PyFoam without the OpenFOAM environment # which makes it easier to load PyFoam without the foam-extend environment
# variables # variables
# #
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available
@ -159,11 +159,11 @@ export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHON
DOT_HARDCODED_SH_EOF DOT_HARDCODED_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_HARDCODED_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.csh cat << DOT_HARDCODED_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.csh
# In this version of the configuration script, the paths are hardcoded, # In this version of the configuration script, the paths are hardcoded,
# which makes it easier to load PyFoam without the OpenFOAM environment # which makes it easier to load PyFoam without the foam-extend environment
# variables # variables
# #
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -95,13 +95,13 @@ Group: Development/Tools
%define pythonVersion $(python -V 2>&1 | awk -F ' ' {'print $2'} | awk -F \. {'print $1 "." $2'}) %define pythonVersion $(python -V 2>&1 | awk -F ' ' {'print $2'} | awk -F \. {'print $1 "." $2'})
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -117,7 +117,7 @@ export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHON
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available
@ -144,7 +144,7 @@ DOT_CSH_EOF
cat << DOT_HARDCODED_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.sh cat << DOT_HARDCODED_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.sh
# In this version of the configuration script, the paths are hardcoded, # In this version of the configuration script, the paths are hardcoded,
# which makes it easier to load PyFoam without the OpenFOAM environment # which makes it easier to load PyFoam without the foam-extend environment
# variables # variables
# #
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available
@ -159,11 +159,11 @@ export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHON
DOT_HARDCODED_SH_EOF DOT_HARDCODED_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_HARDCODED_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.csh cat << DOT_HARDCODED_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.csh
# In this version of the configuration script, the paths are hardcoded, # In this version of the configuration script, the paths are hardcoded,
# which makes it easier to load PyFoam without the OpenFOAM environment # which makes it easier to load PyFoam without the foam-extend environment
# variables # variables
# #
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -95,13 +95,13 @@ Group: Development/Tools
%define pythonVersion $(python -V 2>&1 | awk -F ' ' {'print $2'} | awk -F \. {'print $1 "." $2'}) %define pythonVersion $(python -V 2>&1 | awk -F ' ' {'print $2'} | awk -F \. {'print $1 "." $2'})
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -117,7 +117,7 @@ export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHON
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available
@ -144,7 +144,7 @@ DOT_CSH_EOF
cat << DOT_HARDCODED_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.sh cat << DOT_HARDCODED_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.sh
# In this version of the configuration script, the paths are hardcoded, # In this version of the configuration script, the paths are hardcoded,
# which makes it easier to load PyFoam without the OpenFOAM environment # which makes it easier to load PyFoam without the foam-extend environment
# variables # variables
# #
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available
@ -159,11 +159,11 @@ export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHON
DOT_HARDCODED_SH_EOF DOT_HARDCODED_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_HARDCODED_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.csh cat << DOT_HARDCODED_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.csh
# In this version of the configuration script, the paths are hardcoded, # In this version of the configuration script, the paths are hardcoded,
# which makes it easier to load PyFoam without the OpenFOAM environment # which makes it easier to load PyFoam without the foam-extend environment
# variables # variables
# #
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -0,0 +1,201 @@
#------------------------------------------------------------------------------
# ========= |
# \\ / 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 PyFoam-0.6.2
#
# Description
# RPM spec file for PyFoam version 0.6.2
#
# Author:
# Martin Beaudoin, Hydro-Quebec, (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}
# 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 PyFoam
%define release 1
%define version 0.6.2
%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root
BuildRoot: %{buildroot}
Summary: PyFoam
License: Unkown
Name: %{name}
Version: %{version}
Release: %{release}
BuildArch: noarch
URL: http://openfoamwiki.net/images/8/89/PyFoam-0.6.2.tar.gz
Source: %url/%{name}-%{version}.tar.gz
Prefix: %{_prefix}
Group: Development/Tools
%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/noarch
%description
%{summary}
%prep
%setup -q
%build
# Make the shebang line portable
python setup.py build --executable "/usr/bin/env python"
%install
python setup.py install --prefix=$RPM_BUILD_ROOT/%{_installPrefix}
%define pythonVersion $(python -V 2>&1 | awk -F ' ' {'print $2'} | awk -F \. {'print $1 "." $2'})
# 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 PYFOAM_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
# Enable access to the package applications if present
[ -d \$PYFOAM_DIR/bin ] && _foamAddPath \$PYFOAM_DIR/bin
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 PYFOAM_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
if ! \$?PYTHONPATH then
setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages
else
setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
endif
if ( -e \$PYFOAM_DIR/bin ) then
_foamAddPath \$PYFOAM_DIR/bin
endif
if \$?PYFOAM_SITE_DIR then
if ( -e \$PYFOAM_SITE_DIR/bin ) then
_foamAddPath \$PYFOAM_SITE_DIR/bin
endif
endif
DOT_CSH_EOF
cat << DOT_HARDCODED_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.sh
# In this version of the configuration script, the paths are hardcoded,
# which makes it easier to load PyFoam without the foam-extend environment
# variables
#
# Load %{name}-%{version} libraries and binaries if available
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
export PYFOAM_DIR=$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
# Enable access to the package applications if present
[ -d \$PYFOAM_DIR/bin ] && export PATH=\$PYFOAM_DIR/bin:\$PATH
DOT_HARDCODED_SH_EOF
#
# Generate package specific .csh file for foam-extend
#
cat << DOT_HARDCODED_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.csh
# In this version of the configuration script, the paths are hardcoded,
# which makes it easier to load PyFoam without the foam-extend environment
# variables
#
# Load %{name}-%{version} libraries and binaries if available
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
setenv PYFOAM_DIR $WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
if ! \$?PYTHONPATH then
setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages
else
setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
endif
if ( -e \$PYFOAM_DIR/bin ) then
_foamAddPath \$PYFOAM_DIR/bin
endif
if \$?PYFOAM_SITE_DIR then
if ( -e \$PYFOAM_SITE_DIR/bin ) then
_foamAddPath \$PYFOAM_SITE_DIR/bin
endif
endif
DOT_HARDCODED_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
rm -rf %{buildroot}
%files
%defattr(-,root,root)
%{_installPrefix}

View file

@ -0,0 +1,201 @@
#------------------------------------------------------------------------------
# ========= |
# \\ / 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 PyFoam-0.6.3
#
# Description
# RPM spec file for PyFoam version 0.6.3
#
# Author:
# Martin Beaudoin, Hydro-Quebec, (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}
# 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 PyFoam
%define release 1
%define version 0.6.3
%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root
BuildRoot: %{buildroot}
Summary: PyFoam
License: Unkown
Name: %{name}
Version: %{version}
Release: %{release}
BuildArch: noarch
URL: http://openfoamwiki.net/images/e/e3/PyFoam-0.6.3-rc.tar.gz
Source: %url/%{name}-%{version}-rc.tar.gz
Prefix: %{_prefix}
Group: Development/Tools
%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/noarch
%description
%{summary}
%prep
%setup -q -n PyFoam-%{version}-rc
%build
# Make the shebang line portable
python setup.py build --executable "/usr/bin/env python"
%install
python setup.py install --prefix=$RPM_BUILD_ROOT/%{_installPrefix}
%define pythonVersion $(python -V 2>&1 | awk -F ' ' {'print $2'} | awk -F \. {'print $1 "." $2'})
# 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 PYFOAM_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
# Enable access to the package applications if present
[ -d \$PYFOAM_DIR/bin ] && _foamAddPath \$PYFOAM_DIR/bin
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 PYFOAM_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
if ! \$?PYTHONPATH then
setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages
else
setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
endif
if ( -e \$PYFOAM_DIR/bin ) then
_foamAddPath \$PYFOAM_DIR/bin
endif
if \$?PYFOAM_SITE_DIR then
if ( -e \$PYFOAM_SITE_DIR/bin ) then
_foamAddPath \$PYFOAM_SITE_DIR/bin
endif
endif
DOT_CSH_EOF
cat << DOT_HARDCODED_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.sh
# In this version of the configuration script, the paths are hardcoded,
# which makes it easier to load PyFoam without the foam-extend environment
# variables
#
# Load %{name}-%{version} libraries and binaries if available
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
export PYFOAM_DIR=$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
# Enable access to the package applications if present
[ -d \$PYFOAM_DIR/bin ] && export PATH=\$PYFOAM_DIR/bin:\$PATH
DOT_HARDCODED_SH_EOF
#
# Generate package specific .csh file for foam-extend
#
cat << DOT_HARDCODED_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.csh
# In this version of the configuration script, the paths are hardcoded,
# which makes it easier to load PyFoam without the foam-extend environment
# variables
#
# Load %{name}-%{version} libraries and binaries if available
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
setenv PYFOAM_DIR $WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch
if ! \$?PYTHONPATH then
setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages
else
setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH
endif
if ( -e \$PYFOAM_DIR/bin ) then
_foamAddPath \$PYFOAM_DIR/bin
endif
if \$?PYFOAM_SITE_DIR then
if ( -e \$PYFOAM_SITE_DIR/bin ) then
_foamAddPath \$PYFOAM_SITE_DIR/bin
endif
endif
DOT_HARDCODED_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
rm -rf %{buildroot}
%files
%defattr(-,root,root)
%{_installPrefix}

View file

@ -103,13 +103,13 @@ Group: Development/Tools
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -124,7 +124,7 @@ export PYTHON_BIN_DIR=\$PYTHON_DIR/bin
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -102,13 +102,13 @@ Group: Development/Tools
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -124,7 +124,7 @@ export BISON_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

154
ThirdParty/rpmBuild/SPECS/bison-2.7.spec vendored Normal file
View file

@ -0,0 +1,154 @@
#------------------------------------------------------------------------------
# ========= |
# \\ / 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 bison-2.7
#
# Description
# RPM spec file for creating a relocatable RPM
#
# Author:
# Martin Beaudoin, Hydro-Quebec, (2014)
#
#------------------------------------------------------------------------------
# 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}
# 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 bison
%define release %{_WM_OPTIONS}
%define version 2.7
%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root
BuildRoot: %{buildroot}
Summary: bison
License: Unkown
Name: %{name}
Version: %{version}
Release: %{release}
URL: http://ftp.gnu.org/gnu/bison
Source: %url/%{name}-%{version}.tar.gz
Prefix: %{_prefix}
Group: Development/Tools
%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
%description
%{summary}
%prep
%setup -q
%build
# 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"
./configure \
--prefix=%{_installPrefix}
[ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1
make -j $WM_NCOMPPROCS
%install
make install DESTDIR=$RPM_BUILD_ROOT
# 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 BISON_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
[ -d \$BISON_DIR/lib ] && _foamAddLib \$BISON_DIR/lib
# Enable access to the package applications if present
[ -d \$BISON_DIR/bin ] && _foamAddPath \$BISON_DIR/bin
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 BISON_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
if ( -e \$BISON_DIR/lib ) then
_foamAddLib \$BISON_DIR/lib
endif
if ( -e \$BISON_DIR/bin ) then
_foamAddPath \$BISON_DIR/bin
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
rm -rf %{buildroot}
%files
%defattr(-,root,root)
%{_installPrefix}

View file

@ -113,13 +113,13 @@ Group: Development/Tools
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -134,7 +134,7 @@ export CMAKE_BIN_DIR=\$CMAKE_DIR/bin
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -113,13 +113,13 @@ Group: Development/Tools
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -134,7 +134,7 @@ export CMAKE_BIN_DIR=\$CMAKE_DIR/bin
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -103,13 +103,13 @@ Group: Development/Tools
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -124,7 +124,7 @@ export CMAKE_BIN_DIR=\$CMAKE_DIR/bin
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -103,13 +103,13 @@ Group: Development/Tools
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -124,7 +124,7 @@ export CMAKE_BIN_DIR=\$CMAKE_DIR/bin
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -103,13 +103,13 @@ Group: Development/Tools
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -124,7 +124,7 @@ export CMAKE_BIN_DIR=\$CMAKE_DIR/bin
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -103,13 +103,13 @@ Group: Development/Tools
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -124,7 +124,7 @@ export CMAKE_BIN_DIR=\$CMAKE_DIR/bin
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -102,13 +102,13 @@ Group: Development/Tools
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -124,7 +124,7 @@ export FLEX_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -119,13 +119,13 @@ Group: Development/Tools
cd ./objBuildDir cd ./objBuildDir
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -142,7 +142,7 @@ export WM_COMPILER_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platform
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -117,13 +117,13 @@ Group: Development/Tools
cd ./objBuildDir cd ./objBuildDir
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -139,7 +139,7 @@ export GCC_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_O
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -1,26 +1,25 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | foam-extend: Open Source CFD
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright held by original author # \\ / A nd | For copyright notice see file Copyright
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of foam-extend.
# #
# OpenFOAM is free software; you can redistribute it and/or modify it # 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 # under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2 of the License, or (at your # Free Software Foundation, either version 3 of the License, or (at your
# option) any later version. # option) any later version.
# #
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT # foam-extend is distributed in the hope that it will be useful, but
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # WITHOUT ANY WARRANTY; without even the implied warranty of
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# for more details. # General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with OpenFOAM; if not, write to the Free Software Foundation, # along with foam-extend. If not, see <http://www.gnu.org/licenses/>.
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
# Script # Script
# RPM spec file for gcc-4.6.4 # RPM spec file for gcc-4.6.4
@ -118,13 +117,13 @@ Group: Development/Tools
cd ./objBuildDir cd ./objBuildDir
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -142,7 +141,7 @@ export GCC_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_O
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -101,13 +101,13 @@ Group: Development/Tools
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -123,7 +123,7 @@ export GMP_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_O
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -1,26 +1,25 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | foam-extend: Open Source CFD
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright held by original author # \\ / A nd | For copyright notice see file Copyright
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of foam-extend.
# #
# OpenFOAM is free software; you can redistribute it and/or modify it # 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 # under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2 of the License, or (at your # Free Software Foundation, either version 3 of the License, or (at your
# option) any later version. # option) any later version.
# #
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT # foam-extend is distributed in the hope that it will be useful, but
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # WITHOUT ANY WARRANTY; without even the implied warranty of
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# for more details. # General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with OpenFOAM; if not, write to the Free Software Foundation, # along with foam-extend. If not, see <http://www.gnu.org/licenses/>.
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
# Script # Script
# RPM spec file for gmp-5.1.2 # RPM spec file for gmp-5.1.2
@ -102,13 +101,13 @@ Group: Development/Tools
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -124,7 +123,7 @@ export GMP_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_O
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -103,13 +103,13 @@ Group: Development/Tools
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -124,7 +124,7 @@ export HWLOC_BIN_DIR=\$HWLOC_DIR/bin
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -103,13 +103,13 @@ Group: Development/Tools
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -124,7 +124,7 @@ export HWLOC_BIN_DIR=\$HWLOC_DIR/bin
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -132,13 +132,13 @@ Patch0: libccmio-2.6.1.patch_0
mv ${libsdir}/* $RPM_BUILD_ROOT/%{_installPrefix}/lib mv ${libsdir}/* $RPM_BUILD_ROOT/%{_installPrefix}/lib
cp libccmio/*.h $RPM_BUILD_ROOT/%{_installPrefix}/include/libccmio cp libccmio/*.h $RPM_BUILD_ROOT/%{_installPrefix}/include/libccmio
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -157,7 +157,7 @@ export LIBCCMIO_INCLUDE_DIR=\$LIBCCMIO_DIR/include
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -102,13 +102,13 @@ Group: Development/Tools
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -124,7 +124,7 @@ export M4_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OP
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -124,13 +124,13 @@ Patch0: mesquite-2.1.2_patch0
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -148,7 +148,7 @@ export MESQUITE_INCLUDE_DIR=\$MESQUITE_DIR/include
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -116,13 +116,13 @@ Patch0: metis-5.0pre2_patch_darwin
cp build/*/libmetis.* $RPM_BUILD_ROOT/%{_installPrefix}/lib cp build/*/libmetis.* $RPM_BUILD_ROOT/%{_installPrefix}/lib
cp include/metis.h $RPM_BUILD_ROOT/%{_installPrefix}/include cp include/metis.h $RPM_BUILD_ROOT/%{_installPrefix}/include
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -141,7 +141,7 @@ export METIS_INCLUDE_DIR=\$METIS_DIR/include
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -117,13 +117,13 @@ Patch0: metis-5.1.0_patch_gcc
cp build/*/libmetis/libmetis.* $RPM_BUILD_ROOT/%{_installPrefix}/lib cp build/*/libmetis/libmetis.* $RPM_BUILD_ROOT/%{_installPrefix}/lib
cp include/metis.h $RPM_BUILD_ROOT/%{_installPrefix}/include cp include/metis.h $RPM_BUILD_ROOT/%{_installPrefix}/include
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -142,7 +142,7 @@ export METIS_INCLUDE_DIR=\$METIS_DIR/include
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -108,13 +108,13 @@ Group: Development/Tools
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -130,7 +130,7 @@ export MPC_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_O
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -1,26 +1,25 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | foam-extend: Open Source CFD
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright held by original author # \\ / A nd | For copyright notice see file Copyright
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of foam-extend.
# #
# OpenFOAM is free software; you can redistribute it and/or modify it # 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 # under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2 of the License, or (at your # Free Software Foundation, either version 3 of the License, or (at your
# option) any later version. # option) any later version.
# #
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT # foam-extend is distributed in the hope that it will be useful, but
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # WITHOUT ANY WARRANTY; without even the implied warranty of
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# for more details. # General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with OpenFOAM; if not, write to the Free Software Foundation, # along with foam-extend. If not, see <http://www.gnu.org/licenses/>.
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
# Script # Script
# RPM spec file for mpc-1.0.1 # RPM spec file for mpc-1.0.1
@ -109,13 +108,13 @@ Group: Development/Tools
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -131,7 +130,7 @@ export MPC_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_O
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -105,13 +105,13 @@ Group: Development/Tools
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -127,7 +127,7 @@ export MPFR_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -105,13 +105,13 @@ Group: Development/Tools
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -127,7 +127,7 @@ export MPFR_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -1,26 +1,25 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | foam-extend: Open Source CFD
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright held by original author # \\ / A nd | For copyright notice see file Copyright
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of foam-extend.
# #
# OpenFOAM is free software; you can redistribute it and/or modify it # 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 # under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2 of the License, or (at your # Free Software Foundation, either version 3 of the License, or (at your
# option) any later version. # option) any later version.
# #
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT # foam-extend is distributed in the hope that it will be useful, but
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # WITHOUT ANY WARRANTY; without even the implied warranty of
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# for more details. # General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with OpenFOAM; if not, write to the Free Software Foundation, # along with foam-extend. If not, see <http://www.gnu.org/licenses/>.
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
# Script # Script
# RPM spec file for mpfr-3.1.2 # RPM spec file for mpfr-3.1.2
@ -106,13 +105,13 @@ Group: Development/Tools
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -128,7 +127,7 @@ export MPFR_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -131,13 +131,13 @@ Group: Development/Tools
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -153,7 +153,7 @@ export OPENMPI_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -133,13 +133,13 @@ Group: Development/Tools
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -162,7 +162,7 @@ export OPENMPI_INCLUDE_DIR="\`mpicc --showme:incdirs\`"
export OPENMPI_COMPILE_FLAGS="\`mpicc --showme:compile\`" export OPENMPI_COMPILE_FLAGS="\`mpicc --showme:compile\`"
export OPENMPI_LINK_FLAGS="\`mpicc --showme:link\`" export OPENMPI_LINK_FLAGS="\`mpicc --showme:link\`"
# Set the OpenFOAM compilation flags # Set the foam-extend compilation flags
export PINC=\$OPENMPI_COMPILE_FLAGS export PINC=\$OPENMPI_COMPILE_FLAGS
export PLIBS=\$OPENMPI_LINK_FLAGS export PLIBS=\$OPENMPI_LINK_FLAGS
@ -185,7 +185,7 @@ fi
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries # Load %{name}-%{version} libraries and binaries
@ -212,7 +212,7 @@ setenv OPENMPI_INCLUDE_DIR "\`mpicc --showme:incdirs\`"
setenv OPENMPI_COMPILE_FLAGS "\`mpicc --showme:compile\`" setenv OPENMPI_COMPILE_FLAGS "\`mpicc --showme:compile\`"
setenv OPENMPI_LINK_FLAGS "\`mpicc --showme:link\`" setenv OPENMPI_LINK_FLAGS "\`mpicc --showme:link\`"
# Set the OpenFOAM compilation flags # Set the foam-extend compilation flags
setenv PINC "\$OPENMPI_COMPILE_FLAGS" setenv PINC "\$OPENMPI_COMPILE_FLAGS"
setenv PLIBS "\$OPENMPI_LINK_FLAGS" setenv PLIBS "\$OPENMPI_LINK_FLAGS"

View file

@ -131,13 +131,13 @@ Group: Development/Tools
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -160,7 +160,7 @@ export OPENMPI_INCLUDE_DIR="\`mpicc --showme:incdirs\`"
export OPENMPI_COMPILE_FLAGS="\`mpicc --showme:compile\`" export OPENMPI_COMPILE_FLAGS="\`mpicc --showme:compile\`"
export OPENMPI_LINK_FLAGS="\`mpicc --showme:link\`" export OPENMPI_LINK_FLAGS="\`mpicc --showme:link\`"
# Set the OpenFOAM compilation flags # Set the foam-extend compilation flags
export PINC=\$OPENMPI_COMPILE_FLAGS export PINC=\$OPENMPI_COMPILE_FLAGS
export PLIBS=\$OPENMPI_LINK_FLAGS export PLIBS=\$OPENMPI_LINK_FLAGS
@ -183,7 +183,7 @@ fi
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries # Load %{name}-%{version} libraries and binaries
@ -210,7 +210,7 @@ setenv OPENMPI_INCLUDE_DIR "\`mpicc --showme:incdirs\`"
setenv OPENMPI_COMPILE_FLAGS "\`mpicc --showme:compile\`" setenv OPENMPI_COMPILE_FLAGS "\`mpicc --showme:compile\`"
setenv OPENMPI_LINK_FLAGS "\`mpicc --showme:link\`" setenv OPENMPI_LINK_FLAGS "\`mpicc --showme:link\`"
# Set the OpenFOAM compilation flags # Set the foam-extend compilation flags
setenv PINC \`echo \$OPENMPI_COMPILE_FLAGS\` setenv PINC \`echo \$OPENMPI_COMPILE_FLAGS\`
setenv PLIBS \`echo \$OPENMPI_LINK_FLAGS\` setenv PLIBS \`echo \$OPENMPI_LINK_FLAGS\`

View file

@ -135,13 +135,13 @@ Group: Development/Tools
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -164,7 +164,7 @@ export OPENMPI_INCLUDE_DIR="\`mpicc --showme:incdirs\`"
export OPENMPI_COMPILE_FLAGS="\`mpicc --showme:compile\`" export OPENMPI_COMPILE_FLAGS="\`mpicc --showme:compile\`"
export OPENMPI_LINK_FLAGS="\`mpicc --showme:link\`" export OPENMPI_LINK_FLAGS="\`mpicc --showme:link\`"
# Set the OpenFOAM compilation flags # Set the foam-extend compilation flags
export PINC=\$OPENMPI_COMPILE_FLAGS export PINC=\$OPENMPI_COMPILE_FLAGS
export PLIBS=\$OPENMPI_LINK_FLAGS export PLIBS=\$OPENMPI_LINK_FLAGS
@ -187,7 +187,7 @@ fi
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries # Load %{name}-%{version} libraries and binaries
@ -214,7 +214,7 @@ setenv OPENMPI_INCLUDE_DIR "\`mpicc --showme:incdirs\`"
setenv OPENMPI_COMPILE_FLAGS "\`mpicc --showme:compile\`" setenv OPENMPI_COMPILE_FLAGS "\`mpicc --showme:compile\`"
setenv OPENMPI_LINK_FLAGS "\`mpicc --showme:link\`" setenv OPENMPI_LINK_FLAGS "\`mpicc --showme:link\`"
# Set the OpenFOAM compilation flags # Set the foam-extend compilation flags
setenv PINC "\$OPENMPI_COMPILE_FLAGS" setenv PINC "\$OPENMPI_COMPILE_FLAGS"
setenv PLIBS "\$OPENMPI_LINK_FLAGS" setenv PLIBS "\$OPENMPI_LINK_FLAGS"

View file

@ -135,13 +135,13 @@ Group: Development/Tools
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -164,7 +164,7 @@ export OPENMPI_INCLUDE_DIR="\`mpicc --showme:incdirs\`"
export OPENMPI_COMPILE_FLAGS="\`mpicc --showme:compile\`" export OPENMPI_COMPILE_FLAGS="\`mpicc --showme:compile\`"
export OPENMPI_LINK_FLAGS="\`mpicc --showme:link\`" export OPENMPI_LINK_FLAGS="\`mpicc --showme:link\`"
# Set the OpenFOAM compilation flags # Set the foam-extend compilation flags
export PINC=\$OPENMPI_COMPILE_FLAGS export PINC=\$OPENMPI_COMPILE_FLAGS
export PLIBS=\$OPENMPI_LINK_FLAGS export PLIBS=\$OPENMPI_LINK_FLAGS
@ -187,7 +187,7 @@ fi
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries # Load %{name}-%{version} libraries and binaries
@ -214,7 +214,7 @@ setenv OPENMPI_INCLUDE_DIR "\`mpicc --showme:incdirs\`"
setenv OPENMPI_COMPILE_FLAGS "\`mpicc --showme:compile\`" setenv OPENMPI_COMPILE_FLAGS "\`mpicc --showme:compile\`"
setenv OPENMPI_LINK_FLAGS "\`mpicc --showme:link\`" setenv OPENMPI_LINK_FLAGS "\`mpicc --showme:link\`"
# Set the OpenFOAM compilation flags # Set the foam-extend compilation flags
setenv PINC "\$OPENMPI_COMPILE_FLAGS" setenv PINC "\$OPENMPI_COMPILE_FLAGS"
setenv PLIBS "\$OPENMPI_LINK_FLAGS" setenv PLIBS "\$OPENMPI_LINK_FLAGS"

View file

@ -118,13 +118,13 @@ Patch1: ParMetis-3.1.1.patch
cp build/*/libparmetis/lib* $RPM_BUILD_ROOT/%{_installPrefix}/lib cp build/*/libparmetis/lib* $RPM_BUILD_ROOT/%{_installPrefix}/lib
cp build/*/libmetis/lib* $RPM_BUILD_ROOT/%{_installPrefix}/lib cp build/*/libmetis/lib* $RPM_BUILD_ROOT/%{_installPrefix}/lib
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -143,7 +143,7 @@ export PARMETIS_INCLUDE_DIR=\$PARMETIS_DIR/include
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -114,13 +114,13 @@ Group: Development/Tools
# We need to use the INSTALL_ROOT= option instead # We need to use the INSTALL_ROOT= option instead
make install INSTALL_ROOT=$RPM_BUILD_ROOT make install INSTALL_ROOT=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -137,7 +137,7 @@ export QT_LIB_DIR=\$QT_DIR/lib
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -114,13 +114,13 @@ Group: Development/Tools
# We need to use the INSTALL_ROOT= option instead # We need to use the INSTALL_ROOT= option instead
make install INSTALL_ROOT=$RPM_BUILD_ROOT make install INSTALL_ROOT=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -137,7 +137,7 @@ export QT_LIB_DIR=\$QT_DIR/lib
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -127,13 +127,13 @@ Group: Development/Tools
make install INSTALL_ROOT=$RPM_BUILD_ROOT make install INSTALL_ROOT=$RPM_BUILD_ROOT
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -150,7 +150,7 @@ export QT_LIB_DIR=\$QT_DIR/lib
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -113,13 +113,13 @@ Patch0: scotch-5.1.10b_patch_0
mkdir -p $RPM_BUILD_ROOT%{_installPrefix} mkdir -p $RPM_BUILD_ROOT%{_installPrefix}
make install prefix=$RPM_BUILD_ROOT%{_installPrefix} make install prefix=$RPM_BUILD_ROOT%{_installPrefix}
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -137,7 +137,7 @@ export SCOTCH_INCLUDE_DIR=\$SCOTCH_DIR/include
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -118,13 +118,13 @@ Patch1: scotch-6.0.0_patch_darwin
mkdir -p $RPM_BUILD_ROOT%{_installPrefix} mkdir -p $RPM_BUILD_ROOT%{_installPrefix}
make install prefix=$RPM_BUILD_ROOT%{_installPrefix} make install prefix=$RPM_BUILD_ROOT%{_installPrefix}
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -142,7 +142,7 @@ export SCOTCH_INCLUDE_DIR=\$SCOTCH_DIR/include
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -101,13 +101,13 @@ Group: Development/Tools
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
cp ./src/include/Zoltan_config.h $RPM_BUILD_ROOT/%{_installPrefix}/include cp ./src/include/Zoltan_config.h $RPM_BUILD_ROOT/%{_installPrefix}/include
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -123,7 +123,7 @@ export ZOLTAN_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$W
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -113,13 +113,13 @@ Group: Development/Tools
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
cp ./src/include/Zoltan_config.h $RPM_BUILD_ROOT/%{_installPrefix}/include cp ./src/include/Zoltan_config.h $RPM_BUILD_ROOT/%{_installPrefix}/include
# Creation of OpenFOAM specific .csh and .sh files" # Creation of foam-extend specific .csh and .sh files"
echo "" echo ""
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}" echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
echo "" echo ""
# #
# Generate package specific .sh file for OpenFOAM # Generate package specific .sh file for foam-extend
# #
mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
@ -135,7 +135,7 @@ export ZOLTAN_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$W
DOT_SH_EOF DOT_SH_EOF
# #
# Generate package specific .csh file for OpenFOAM # Generate package specific .csh file for foam-extend
# #
cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
# Load %{name}-%{version} libraries and binaries if available # Load %{name}-%{version} libraries and binaries if available

View file

@ -246,24 +246,36 @@ rpm_populateRPMvault()
echo " Current content of the local RPM vault:" echo " Current content of the local RPM vault:"
ls -axlt $rpmVault ls -axlt $rpmVault
echo "" echo ""
} }
# #
# Remove an installed package # Remove an installed package
# #
uninstallPackage() uninstallPackage()
{ {
pkg="$1"; pkg="$1";
if [ -d $WM_THIRD_PARTY_DIR/packages/${pkg} ]; then
set -x echo "Removing ${pkg}"
rm -f $WM_THIRD_PARTY_DIR/rpmBuild/RPMS/$architecture/${pkg}*.rpm [ -f $WM_THIRD_PARTY_DIR/rpmBuild/RPMS/$architecture/${pkg}*.rpm ] && \
rm -f $WM_THIRD_PARTY_DIR/rpmBuild/TGZS/$architecture/${pkg}.tgz rm -f $WM_THIRD_PARTY_DIR/rpmBuild/RPMS/$architecture/${pkg}*.rpm || \
rm -rf $WM_THIRD_PARTY_DIR/rpmBuild/BUILD/${pkg}* echo "Not found: $WM_THIRD_PARTY_DIR/rpmBuild/RPMS/$architecture/${pkg}*.rpm"
rm -rf $WM_THIRD_PARTY_DIR/packages/$pkg [ -f $WM_THIRD_PARTY_DIR/rpmBuild/SOURCES/${pkg}.tar.gz ] && \
set +x rm -f $WM_THIRD_PARTY_DIR/rpmBuild/SOURCES/${pkg}.tar.gz || \
echo "Not found: $WM_THIRD_PARTY_DIR/rpmBuild/SOURCES/${pkg}.tar.gz"
[ -f $WM_THIRD_PARTY_DIR/rpmBuild/TGZS/$architecture/${pkg}.tgz ] && \
rm -f $WM_THIRD_PARTY_DIR/rpmBuild/TGZS/$architecture/${pkg}.tgz || \
echo "Not found: $WM_THIRD_PARTY_DIR/rpmBuild/TGZS/$architecture/${pkg}.tgz"
[ -d $WM_THIRD_PARTY_DIR/rpmBuild/BUILD/${pkg}* ] && \
rm -rf $WM_THIRD_PARTY_DIR/rpmBuild/BUILD/${pkg}* || \
echo "Not found: $WM_THIRD_PARTY_DIR/rpmBuild/BUILD/${pkg}*"
if [ "$2" = "alsoPackage" ]; then
[ -d $WM_THIRD_PARTY_DIR/packages/$pkg ] && \
rm -rf $WM_THIRD_PARTY_DIR/packages/$pkg || \
echo "Not found: $WM_THIRD_PARTY_DIR/packages/$pkg"
else else
echo "Package ${pkg} is already removed." echo "Add option alsoPackage to remove the installed files."
fi fi
echo
} }
# ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file

View file

@ -0,0 +1,3 @@
potentialDyMFoam.C
EXE = $(FOAM_APPBIN)/potentialDyMFoam

View file

@ -0,0 +1,14 @@
EXE_INC = \
-I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-ldynamicFvMesh \
-ldynamicMesh \
-lengine \
-lmeshTools \
-lfiniteVolume \
-llduSolvers \
-L$(MESQUITE_LIB_DIR) -lmesquite

View file

@ -0,0 +1,57 @@
{
wordList pcorrTypes(p.boundaryField().types());
for (label i=0; i<p.boundaryField().size(); i++)
{
if (p.boundaryField()[i].fixesValue())
{
pcorrTypes[i] = fixedValueFvPatchScalarField::typeName;
}
}
volScalarField pcorr
(
IOobject
(
"pcorr",
runTime.timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh,
dimensionedScalar("pcorr", p.dimensions(), 0.0),
pcorrTypes
);
// Initialise flux with interpolated velocity
phi = fvc::interpolate(U) & mesh.Sf();
if (pcorr.needReference())
{
fvc::makeRelative(phi, U);
adjustPhi(phi, U, pcorr);
fvc::makeAbsolute(phi, U);
}
for(int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
{
fvScalarMatrix pcorrEqn
(
fvm::laplacian(rAU, pcorr) == fvc::div(phi)
);
pcorrEqn.setReference(pRefCell, pRefValue);
pcorrEqn.solve();
if (nonOrth == nNonOrthCorr)
{
phi -= pcorrEqn.flux();
}
// Fluxes are corrected to absolute velocity and further corrected
// later. HJ, 6/Feb/2009
}
}
#include "continuityErrs.H"

View file

@ -0,0 +1,50 @@
Info<< "Reading field p\n" << endl;
volScalarField p
(
IOobject
(
"p",
runTime.timeName(),
mesh,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
mesh
);
Info<< "Reading field U\n" << endl;
volVectorField U
(
IOobject
(
"U",
runTime.timeName(),
mesh,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
mesh
);
if (args.optionFound("resetU"))
{
U.internalField() = vector::zero;
}
surfaceScalarField phi
(
IOobject
(
"phi",
runTime.timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
fvc::interpolate(U) & mesh.Sf()
);
label pRefCell = 0;
scalar pRefValue = 0.0;
setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);

View file

@ -0,0 +1,145 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / 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/>.
Application
potentialDyMFoam
Description
Transient solver for potential flow with dynamic mesh.
Author
Hrvoje Jasak, Wikki Ltd. All rights reserved.
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
#include "dynamicFvMesh.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
int main(int argc, char *argv[])
{
argList::validOptions.insert("resetU", "");
argList::validOptions.insert("writep", "");
# include "setRootCase.H"
# include "createTime.H"
# include "createDynamicFvMesh.H"
# include "createFields.H"
# include "initTotalVolume.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info<< "\nStarting time loop\n" << endl;
while (runTime.loop())
{
# include "readPISOControls.H"
# include "checkTotalVolume.H"
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
bool meshChanged = mesh.update();
reduce(meshChanged, orOp<bool>());
p.internalField() = 0;
if (args.optionFound("resetU"))
{
U.internalField() = vector::zero;
}
# include "volContinuity.H"
// Solve potential flow equations
adjustPhi(phi, U, p);
for (int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
{
p.storePrevIter();
fvScalarMatrix pEqn
(
fvm::laplacian
(
dimensionedScalar
(
"1",
dimTime/p.dimensions()*dimensionSet(0, 2, -2, 0, 0),
1
),
p
)
==
fvc::div(phi)
);
pEqn.setReference(pRefCell, pRefValue);
pEqn.solve();
if (nonOrth == nNonOrthCorr)
{
phi -= pEqn.flux();
}
else
{
p.relax();
}
}
Info<< "continuity error = "
<< mag(fvc::div(phi))().weightedAverage(mesh.V()).value()
<< endl;
U = fvc::reconstruct(phi);
U.correctBoundaryConditions();
Info<< "Interpolated U error = "
<< (sqrt(sum(sqr((fvc::interpolate(U) & mesh.Sf()) - phi)))
/sum(mesh.magSf())).value()
<< endl;
// Calculate velocity magnitude
{
volScalarField magU = mag(U);
Info<< "mag(U): max: " << gMax(magU.internalField())
<< " min: " << gMin(magU.internalField()) << endl;
}
runTime.write();
Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
<< " ClockTime = " << runTime.elapsedClockTime() << " s"
<< nl << endl;
}
Info<< "End\n" << endl;
return(0);
}
// ************************************************************************* //

View file

@ -32,7 +32,6 @@ Description
#include "fvCFD.H" #include "fvCFD.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
int main(int argc, char *argv[]) int main(int argc, char *argv[])

View file

@ -0,0 +1,3 @@
dbnsFoam.C
EXE = $(FOAM_APPBIN)/dbnsFoam

View file

@ -0,0 +1,12 @@
EXE_INC = \
-I$(LIB_SRC)/dbns/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
EXE_LIBS = \
-lfiniteVolume \
-lbasicThermophysicalModels \
-lspecie \
-ldbns

View file

@ -0,0 +1,83 @@
Info<< "Reading thermophysical properties\n" << endl;
autoPtr<basicPsiThermo> thermo
(
basicPsiThermo::New(mesh)
);
// Primitive variables
volScalarField& h = thermo->h();
volScalarField& p = thermo->p();
const volScalarField& T = thermo->T();
Info<< "Reading field rho\n" << endl;
volScalarField rho
(
IOobject
(
"rho",
runTime.timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
thermo->rho()
);
Info<< "Reading field U\n" << endl;
volVectorField U
(
IOobject
(
"U",
runTime.timeName(),
mesh,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
mesh
);
// Conservative variables
volVectorField rhoU
(
IOobject
(
"rhoU",
runTime.timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE
),
rho*U
);
volScalarField rhoE
(
IOobject
(
"rhoE",
runTime.timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE
),
rho*(h + 0.5*magSqr(U)) - p
);
// Create numeric flux
// numericFlux<roeFlux, BarthJespersenLimiter> dbnsFlux
numericFlux<rusanovFlux, BarthJespersenLimiter> dbnsFlux
(
p,
U,
T,
thermo()
);
// Create mass flux alias for easier coupling with other code components
const surfaceScalarField& phi = dbnsFlux.rhoFlux();

View file

@ -0,0 +1,124 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / 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/>.
Application
dbnsFoam
Description
Density-based compressible explicit time-marching flow solver
using enthalpy based thermo packages
Author
Hrvoje Jasak
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
#include "basicPsiThermo.H"
#include "bound.H"
#include "hllcFlux.H"
#include "roeFlux.H"
#include "rusanovFlux.H"
#include "betaFlux.H"
#include "MDLimiter.H"
#include "firstOrderLimiter.H"
#include "BarthJespersenLimiter.H"
#include "VenkatakrishnanLimiter.H"
#include "numericFlux.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
int main(int argc, char *argv[])
{
# include "setRootCase.H"
# include "createTime.H"
# include "createMesh.H"
# include "createFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info<< "\nStarting time loop\n" << endl;
// Runge-Kutta coefficient
scalarList beta(4);
beta[0] = 0.1100;
beta[1] = 0.2766;
beta[2] = 0.5000;
beta[3] = 1.0000;
// Switch off solver messages
lduMatrix::debug = 0;
while (runTime.run())
{
# include "readTimeControls.H"
# include "readFieldBounds.H"
# include "compressibleCourantNo.H"
# include "setDeltaT.H"
runTime++;
Info<< "\n Time = " << runTime.value() << endl;
// Low storage Runge-Kutta time integration
forAll (beta, i)
{
// Solve the approximate Riemann problem for this time step
dbnsFlux.computeFlux();
// Time integration
solve
(
1.0/beta[i]*fvm::ddt(rho)
+ fvc::div(dbnsFlux.rhoFlux())
);
solve
(
1.0/beta[i]*fvm::ddt(rhoU)
+ fvc::div(dbnsFlux.rhoUFlux())
);
solve
(
1.0/beta[i]*fvm::ddt(rhoE)
+ fvc::div(dbnsFlux.rhoEFlux())
);
# include "updateFields.H"
}
runTime.write();
Info<< " ExecutionTime = "
<< runTime.elapsedCpuTime()
<< " s\n" << endl;
}
Info<< "\n end \n";
return(0);
}
// ************************************************************************* //

View file

@ -0,0 +1,3 @@
dbnsTurbFoam.C
EXE = $(FOAM_APPBIN)/dbnsTurbFoam

View file

@ -0,0 +1,15 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
-I$(LIB_SRC)/dbns/lnInclude
EXE_LIBS = \
-lfiniteVolume \
-lbasicThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModel \
-lcompressibleRASModels \
-lcompressibleLESModels \
-ldbns

View file

@ -0,0 +1,94 @@
Info<< "Reading thermophysical properties\n" << endl;
autoPtr<basicPsiThermo> thermo
(
basicPsiThermo::New(mesh)
);
// Primitive variables
volScalarField& h = thermo->h();
volScalarField& p = thermo->p();
const volScalarField& T = thermo->T();
Info<< "Reading field rho\n" << endl;
volScalarField rho
(
IOobject
(
"rho",
runTime.timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
thermo->rho()
);
Info<< "Reading field U\n" << endl;
volVectorField U
(
IOobject
(
"U",
runTime.timeName(),
mesh,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
mesh
);
// Conservative variables
volVectorField rhoU
(
IOobject
(
"rhoU",
runTime.timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE
),
rho*U
);
volScalarField rhoE
(
IOobject
(
"rhoE",
runTime.timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE
),
rho*(h + 0.5*magSqr(U)) - p
);
// Create numeric flux
numericFlux<rusanovFlux, BarthJespersenLimiter> dbnsFlux
(
p,
U,
T,
thermo()
);
// Create mass flux alias for easier coupling with other code components
const surfaceScalarField& phi = dbnsFlux.rhoFlux();
Info<< "Creating turbulence model\n" << endl;
autoPtr<compressible::turbulenceModel> turbulence
(
compressible::turbulenceModel::New
(
rho,
U,
phi,
thermo
)
);

View file

@ -0,0 +1,133 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / 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/>.
Application
dbnsTurbFoamHEqn
Description
Density-based compressible explicit time-marching flow solver
using enthalpy-based thermo packages
Author
Hrvoje Jasak
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
#include "basicPsiThermo.H"
#include "turbulenceModel.H"
#include "bound.H"
#include "hllcFlux.H"
#include "roeFlux.H"
#include "rusanovFlux.H"
#include "betaFlux.H"
#include "MDLimiter.H"
#include "firstOrderLimiter.H"
#include "BarthJespersenLimiter.H"
#include "VenkatakrishnanLimiter.H"
#include "numericFlux.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
int main(int argc, char *argv[])
{
# include "setRootCase.H"
# include "createTime.H"
# include "createMesh.H"
# include "createFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info<< "\nStarting time loop\n" << endl;
// Runge-Kutta coefficient
scalarList beta(4);
beta[0] = 0.1100;
beta[1] = 0.2766;
beta[2] = 0.5000;
beta[3] = 1.0000;
while (runTime.run())
{
# include "readTimeControls.H"
# include "readFieldBounds.H"
# include "compressibleCourantNo.H"
# include "setDeltaT.H"
runTime++;
Info<< "\n Time = " << runTime.value() << endl;
// Switch off solver messages for diagonal solver RK
lduMatrix::debug = 0;
// Low storage Runge-Kutta time integration
forAll (beta, i)
{
// Solve the approximate Riemann problem for this time step
dbnsFlux.computeFlux();
// Time integration
solve
(
1.0/beta[i]*fvm::ddt(rho)
+ fvc::div(dbnsFlux.rhoFlux())
);
solve
(
1.0/beta[i]*fvm::ddt(rhoU)
+ fvc::div(dbnsFlux.rhoUFlux())
+ fvc::div(turbulence->devRhoReff())
);
solve
(
1.0/beta[i]*fvm::ddt(rhoE)
+ fvc::div(dbnsFlux.rhoEFlux())
+ fvc::div(turbulence->devRhoReff() & U)
- fvc::laplacian(turbulence->alphaEff(), h)
);
# include "updateFields.H"
}
// Switch on solver messages for turbulence
lduMatrix::debug = 1;
turbulence->correct();
runTime.write();
Info<< " ExecutionTime = "
<< runTime.elapsedCpuTime()
<< " s\n" << endl;
}
Info<< "\n end \n";
return(0);
}
// ************************************************************************* //

View file

@ -0,0 +1,3 @@
steadyCompressibleFoam.C
EXE = $(FOAM_APPBIN)/steadyCompressibleFoam

View file

@ -0,0 +1,13 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/turbulenceModels \
-I$(LIB_SRC)/turbulenceModels/compressible/RAS/RASModel \
EXE_LIBS = \
-lfiniteVolume \
-lmeshTools \
-lbasicThermophysicalModels \
-lspecie \
-lcompressibleRASModels \
-llduSolvers

View file

@ -0,0 +1,18 @@
// Solve the momentum equation
U.storePrevIter();
fvVectorMatrix UEqn
(
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
);
UEqn.relax();
eqnResidual = solve
(
UEqn == -fvc::grad(p)
).initialResidual();
maxResidual = max(eqnResidual, maxResidual);

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