zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry
2013-03-07 17:23:38 +00:00
parent 757a539e36 2045d5d730
commit 2776655e00
19 changed files with 131 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
README.html
View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
lang="en" xml:lang="en">
<head> <head>
<title>OpenFOAM README for version dev</title> <title>OpenFOAM README for version 2.2.0</title>
<meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/> <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
<meta name="title" content="OpenFOAM README for version 2.2.0"/>
<meta name="generator" content="Org-mode"/> <meta name="generator" content="Org-mode"/>
<meta name="generated" content="15th August 2011"/> <meta name="generated" content="11th January 2013"/>
<meta name="author" content="The OpenFOAM Foundation"/> <meta name="author" content="The OpenFOAM Foundation"/>
<meta name="description" content=""/> <meta name="description" content=""/>
<meta name="keywords" content=""/> <meta name="keywords" content=""/>
@ -44,6 +44,12 @@ lang="en" xml:lang="en">
dt { font-weight: bold; } dt { font-weight: bold; }
div.figure { padding: 0.5em; } div.figure { padding: 0.5em; }
div.figure p { text-align: center; } div.figure p { text-align: center; }
div.inlinetask {
padding:10px;
border:2px solid gray;
margin:10px;
background: #ffffcc;
}
textarea { overflow-x: auto; } textarea { overflow-x: auto; }
.linenr { font-size:smaller } .linenr { font-size:smaller }
.code-highlighted {background-color:#ffff00;} .code-highlighted {background-color:#ffff00;}
@ -79,30 +85,35 @@ lang="en" xml:lang="en">
</head> </head>
<body> <body>
<div id="content">
<h1 class="title">OpenFOAM README for version dev</h1> <div id="preamble">
</div>
<div id="content">
<h1 class="title">OpenFOAM README for version 2.2.0</h1>
<div id="table-of-contents"> <div id="table-of-contents">
<h2>Table of Contents</h2> <h2>Table of Contents</h2>
<div id="text-table-of-contents"> <div id="text-table-of-contents">
<ul> <ul>
<li><a href="#sec-1">1 About OpenFOAM </a></li> <li><a href="#sec-1">1 About OpenFOAM</a></li>
<li><a href="#sec-2">2 Copyright </a></li> <li><a href="#sec-2">2 Copyright</a></li>
<li><a href="#sec-3">3 Download and installation instructions </a></li> <li><a href="#sec-3">3 Download and installation instructions</a></li>
<li><a href="#sec-4">4 Release notes </a></li> <li><a href="#sec-4">4 Release notes</a></li>
<li><a href="#sec-5">5 Documentation </a></li> <li><a href="#sec-5">5 Documentation</a></li>
<li><a href="#sec-6">6 Support and development contracts </a></li> <li><a href="#sec-6">6 Support and development contracts</a></li>
<li><a href="#sec-7">7 Reporting Bugs in OpenFOAM </a></li> <li><a href="#sec-7">7 Reporting Bugs in OpenFOAM</a></li>
</ul> </ul>
</div> </div>
</div> </div>
<div id="outline-container-1" class="outline-2"> <div id="outline-container-1" class="outline-2">
<h2 id="sec-1"><span class="section-number-2">1</span> About OpenFOAM </h2> <h2 id="sec-1"><span class="section-number-2">1</span> About OpenFOAM</h2>
<div class="outline-text-2" id="text-1"> <div class="outline-text-2" id="text-1">
<p> OpenFOAM is a free, open source computational fluid dynamics (CFD) software <p> OpenFOAM is a free, open source computational fluid dynamcis (CFD) software
package released by the OpenFOAM Foundation. It has a large user base across package released by the OpenFOAM Foundation. It has a large user base across
most areas of engineering and science, from both commercial and academic most areas of engineering and science, from both commercial and academic
organisations. OpenFOAM has an extensive range of features to solve anything organisations. OpenFOAM has an extensive range of features to solve anything
@ -114,7 +125,7 @@ lang="en" xml:lang="en">
</div> </div>
<div id="outline-container-2" class="outline-2"> <div id="outline-container-2" class="outline-2">
<h2 id="sec-2"><span class="section-number-2">2</span> Copyright </h2> <h2 id="sec-2"><span class="section-number-2">2</span> Copyright</h2>
<div class="outline-text-2" id="text-2"> <div class="outline-text-2" id="text-2">
<p> OpenFOAM is free software: you can redistribute it and/or modify it under the <p> OpenFOAM is free software: you can redistribute it and/or modify it under the
@ -129,7 +140,7 @@ lang="en" xml:lang="en">
</div> </div>
<div id="outline-container-3" class="outline-2"> <div id="outline-container-3" class="outline-2">
<h2 id="sec-3"><span class="section-number-2">3</span> Download and installation instructions </h2> <h2 id="sec-3"><span class="section-number-2">3</span> Download and installation instructions</h2>
<div class="outline-text-2" id="text-3"> <div class="outline-text-2" id="text-3">
<ul> <ul>
@ -144,17 +155,17 @@ lang="en" xml:lang="en">
</div> </div>
<div id="outline-container-4" class="outline-2"> <div id="outline-container-4" class="outline-2">
<h2 id="sec-4"><span class="section-number-2">4</span> Release notes </h2> <h2 id="sec-4"><span class="section-number-2">4</span> Release notes</h2>
<div class="outline-text-2" id="text-4"> <div class="outline-text-2" id="text-4">
<p> <a href="http://www.OpenFOAM.com/version2.0.0">http://www.OpenFOAM.com/version2.0.0</a> <p> <a href="http://www.OpenFOAM.org/version2.2.0">http://www.OpenFOAM.org/version2.2.0</a>
</p> </p>
</div> </div>
</div> </div>
<div id="outline-container-5" class="outline-2"> <div id="outline-container-5" class="outline-2">
<h2 id="sec-5"><span class="section-number-2">5</span> Documentation </h2> <h2 id="sec-5"><span class="section-number-2">5</span> Documentation</h2>
<div class="outline-text-2" id="text-5"> <div class="outline-text-2" id="text-5">
<p> <a href="http://www.OpenFOAM.com/docs">http://www.OpenFOAM.com/docs</a> <p> <a href="http://www.OpenFOAM.com/docs">http://www.OpenFOAM.com/docs</a>
@ -164,7 +175,7 @@ lang="en" xml:lang="en">
</div> </div>
<div id="outline-container-6" class="outline-2"> <div id="outline-container-6" class="outline-2">
<h2 id="sec-6"><span class="section-number-2">6</span> Support and development contracts </h2> <h2 id="sec-6"><span class="section-number-2">6</span> Support and development contracts</h2>
<div class="outline-text-2" id="text-6"> <div class="outline-text-2" id="text-6">
<p> <a href="http://www.OpenFOAM.com/support">http://www.OpenFOAM.com/support</a> <p> <a href="http://www.OpenFOAM.com/support">http://www.OpenFOAM.com/support</a>
@ -174,17 +185,19 @@ lang="en" xml:lang="en">
</div> </div>
<div id="outline-container-7" class="outline-2"> <div id="outline-container-7" class="outline-2">
<h2 id="sec-7"><span class="section-number-2">7</span> Reporting Bugs in OpenFOAM </h2> <h2 id="sec-7"><span class="section-number-2">7</span> Reporting Bugs in OpenFOAM</h2>
<div class="outline-text-2" id="text-7"> <div class="outline-text-2" id="text-7">
<p> <a href="http://www.OpenFOAM.com/bugs">http://www.OpenFOAM.com/bugs</a> <p> <a href="http://www.OpenFOAM.com/bugs">http://www.OpenFOAM.com/bugs</a>
</p></div> </p></div>
</div> </div>
<div id="postamble">
<p class="date">Date: 15th August 2011</p>
<p class="creator">Org version 7.5 with Emacs version 23</p>
<a href="http://validator.w3.org/check?uri=referer">Validate XHTML 1.0</a>
</div> </div>
<div id="postamble">
<p class="date">Date: 11th January 2013</p>
<p class="creator">Org version 7.8.11 with Emacs version 24</p>
<a href="http://validator.w3.org/check?uri=referer">Validate XHTML 1.0</a>
</div> </div>
</body> </body>
</html> </html>

10
README.org
View File

@ -1,14 +1,14 @@
# -*- mode: org; -*- # -*- mode: org; -*-
# #
#+TITLE: OpenFOAM README for version dev #+TITLE: OpenFOAM README for version 2.2.0
#+AUTHOR: The OpenFOAM Foundation #+AUTHOR: The OpenFOAM Foundation
#+DATE: 15th August 2011 #+DATE: 11th January 2013
#+LINK: http://www.openfoam.org #+LINK: http://www.openfoam.org
#+OPTIONS: author:nil ^:{} #+OPTIONS: author:nil ^:{}
# Copyright (c) 2011 OpenFOAM Foundation. # Copyright (c) 2013 OpenFOAM Foundation.
* About OpenFOAM * About OpenFOAM
OpenFOAM is a free, open source computational fluid dynamics (CFD) software OpenFOAM is a free, open source computational fluid dynamcis (CFD) software
package released by the OpenFOAM Foundation. It has a large user base across package released by the OpenFOAM Foundation. It has a large user base across
most areas of engineering and science, from both commercial and academic most areas of engineering and science, from both commercial and academic
organisations. OpenFOAM has an extensive range of features to solve anything organisations. OpenFOAM has an extensive range of features to solve anything
@ -28,7 +28,7 @@
[[http://www.OpenFOAM.org/git.php]] [[http://www.OpenFOAM.org/git.php]]
* Release notes * Release notes
[[http://www.OpenFOAM.com/version2.0.0]] [[http://www.OpenFOAM.org/version2.2.0]]
* Documentation * Documentation
[[http://www.OpenFOAM.com/docs]] [[http://www.OpenFOAM.com/docs]]

5
applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
View File

@ -1,9 +1,6 @@
Info<< "Reading thermophysical properties\n" << endl; Info<< "Reading thermophysical properties\n" << endl;
autoPtr<rhoThermo> pThermo autoPtr<rhoThermo> pThermo(rhoThermo::New(mesh));
(
rhoThermo::New(mesh)
);
rhoThermo& thermo = pThermo(); rhoThermo& thermo = pThermo();
thermo.validate(args.executable(), "h", "e"); thermo.validate(args.executable(), "h", "e");

98
bin/tools/foamConfigurePaths
View File

@ -36,11 +36,11 @@ usage() {
usage: ${0##*/} usage: ${0##*/}
--foamInstall dir specify installation directory (e.g. /opt) --foamInstall dir specify installation directory (e.g. /opt)
--projectName name specify project name (e.g. openfoam170) --projectName name specify project name (e.g. openfoam220)
--projectVersion ver specify project version (e.g. 1.7.x) --projectVersion ver specify project version (e.g. 2.2.0)
--archOption arch specify architecture option (only 32 or 64 applicable) --archOption arch specify architecture option (only 32 or 64 applicable)
--paraviewInstall dir specify ParaView_DIR (e.g. /opt/paraviewopenfoam380) --paraviewInstall dir specify ParaView_DIR (e.g. /opt/paraviewopenfoam3120)
--paraviewVersion ver specify ParaView_VERSION (e.g. 3.14.1) --paraviewVersion ver specify ParaView_VERSION (e.g. 3.12.0)
* hardcode paths to installation * hardcode paths to installation
@ -51,26 +51,51 @@ USAGE
# Function to do replacement on file. Checks if any replacement has been done. # Function to do replacement on file. Checks if any replacement has been done.
# inlineSed <file> <sedCommand> <description> # inlineSed <file> <sedCommand> <description>
#_inlineSed()
#{
# [ -f "$1" ] || {
# echo "Missing file: $1"
# exit 1
# }
#
# backup="temp.$$"
# cp $1 $backup
# sed -i -e "$2" $1
#
# if cmp $1 $backup > /dev/null 2>&1
# then
# echo "Failed: $3 in $1"
# rm $backup 2>/dev/null
# exit 1
# else
# echo "Okay: $3 in $1"
# rm $backup 2>/dev/null
# fi
#
# return 0
#}
# Function to do replacement on file. Checks if any replacement has been done.
# _inlineSed <file> <regexp> <replacement> <msg>
_inlineSed() _inlineSed()
{ {
[ -f "$1" ] || { file="$1"
echo "Missing file: $1"
[ -f "$file" ] || {
echo "Missing file: $file"
exit 1 exit 1
} }
backup="temp.$$" regexp="$2"
cp $1 $backup replacement="$3"
sed -i -e "$2" $1 msg="$4"
if cmp $1 $backup > /dev/null 2>&1 cmd='/^[^#]/s@'"$regexp"'@'"$replacement"'@'
then
echo "Failed: $3 in $1" grep -q "$regexp" "$file" && sed -i -e "$cmd" "$file" || \
rm $backup 2>/dev/null (echo "Failed: $msg in $file" && exit 1)
exit 1
else echo "Okay: $msg in $file"
echo "Okay: $3 in $1"
rm $backup 2>/dev/null
fi
return 0 return 0
} }
@ -93,7 +118,8 @@ do
# replace foamInstall=... # replace foamInstall=...
_inlineSed \ _inlineSed \
etc/bashrc \ etc/bashrc \
'/^[^#]/s@foamInstall=.*@foamInstall='"$foamInstall@" \ 'foamInstall=.*' \
'foamInstall='"$foamInstall" \
"Replacing foamInstall setting by '$foamInstall'" "Replacing foamInstall setting by '$foamInstall'"
shift 2 shift 2
;; ;;
@ -103,7 +129,8 @@ do
# replace WM_PROJECT_DIR=... # replace WM_PROJECT_DIR=...
_inlineSed \ _inlineSed \
etc/bashrc \ etc/bashrc \
'/^[^#]/s@WM_PROJECT_DIR=.*@WM_PROJECT_DIR=$WM_PROJECT_INST_DIR/'"$projectName@" \ 'WM_PROJECT_DIR=.*' \
'WM_PROJECT_DIR=$WM_PROJECT_INST_DIR/'"$projectName" \
"Replacing WM_PROJECT_DIR setting by $projectName" "Replacing WM_PROJECT_DIR setting by $projectName"
shift 2 shift 2
;; ;;
@ -111,11 +138,13 @@ do
[ "$#" -ge 2 ] || usage "'$1' option requires an argument" [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
projectVersion="$2" projectVersion="$2"
# replace WM_PROJECT_VERSION=... # replace WM_PROJECT_VERSION=...
# No checking since might already be set.
echo "Replacing WM_PROJECT_VERSION setting by $projectVersion" echo "Replacing WM_PROJECT_VERSION setting by $projectVersion"
sed -i \ _inlineSed \
'/^[^#]/s@WM_PROJECT_VERSION=.*@WM_PROJECT_VERSION='"$projectVersion@" \ etc/bashrc \
etc/bashrc 'WM_PROJECT_VERSION=.*' \
'WM_PROJECT_VERSION='"$projectVersion" \
"Replacing WM_PROJECT_VERSION setting by $projectVersion"
shift 2 shift 2
;; ;;
-archOption | --archOption) -archOption | --archOption)
@ -127,8 +156,9 @@ do
# replace WM_ARCH_OPTION=... # replace WM_ARCH_OPTION=...
_inlineSed \ _inlineSed \
etc/bashrc \ etc/bashrc \
'/^[^#]/s@WM_ARCH_OPTION=.*@WM_ARCH_OPTION='"$archOption@" \ 'WM_ARCH_OPTION=.*' \
"Replacing WM_ARCH_OPTION setting by '$archOption'" 'WM_ARCH_OPTION='"$archOption" \
"Replacing WM_ARCH_OPTION setting by '$archOption'"
else else
echo "WM_ARCH_OPTION already set to $archOption" echo "WM_ARCH_OPTION already set to $archOption"
fi fi
@ -140,7 +170,8 @@ do
# replace ParaView_DIR=... # replace ParaView_DIR=...
_inlineSed \ _inlineSed \
etc/config/paraview.sh \ etc/config/paraview.sh \
'/^[^#]/s@ParaView_DIR=.*@ParaView_DIR='"$paraviewInstall@" \ 'ParaView_DIR=.*' \
'ParaView_DIR='"$paraviewInstall" \
"Replacing ParaView_DIR setting by '$paraviewInstall'" "Replacing ParaView_DIR setting by '$paraviewInstall'"
shift 2 shift 2
;; ;;
@ -150,8 +181,9 @@ do
# replace ParaView_VERSION=... # replace ParaView_VERSION=...
_inlineSed \ _inlineSed \
etc/config/paraview.sh \ etc/config/paraview.sh \
'/^[^#]/s@ParaView_VERSION=.*@ParaView_VERSION='"$paraviewVersion@" \ 'ParaView_VERSION=.*' \
"Replacing ParaView_VERSION setting by '$paraviewVersion'" 'ParaView_VERSION='"$paraviewVersion" \
"Replacing ParaView_VERSION setting by '$paraviewVersion'"
shift 2 shift 2
;; ;;
*) *)
@ -168,13 +200,15 @@ done
# Set WM_MPLIB=SYSTEMOPENMPI always # Set WM_MPLIB=SYSTEMOPENMPI always
_inlineSed \ _inlineSed \
etc/bashrc \ etc/bashrc \
'/^[^#]/s@export WM_MPLIB=.*@export WM_MPLIB=SYSTEMOPENMPI@' \ 'export WM_MPLIB=.*' \
'export WM_MPLIB=SYSTEMOPENMPI' \
"Replacing WM_MPLIB setting by 'SYSTEMOPENMPI'" "Replacing WM_MPLIB setting by 'SYSTEMOPENMPI'"
## set foamCompiler=system always ## set foamCompiler=system always
#_inlineSed \ #_inlineSed \
# etc/bashrc \ # etc/bashrc \
# '/^[^#]/s@foamCompiler=.*@foamCompiler=system@' \ # 'foamCompiler=.*' \
# 'foamCompiler=system' \
# "Replacing foamCompiler setting by 'system'" # "Replacing foamCompiler setting by 'system'"
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

2
src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
src/regionModels/pyrolysisModels/noPyrolysis/noPyrolysis.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

67
src/regionModels/surfaceFilmModels/submodels/kinematic/force/surfaceShearForce/surfaceShearForce.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -76,70 +76,11 @@ tmp<fvVectorMatrix> surfaceShearForce::correct(volVectorField& U)
const volScalarField& delta = film.delta(); const volScalarField& delta = film.delta();
const volVectorField& Up = film.UPrimary(); const volVectorField& Up = film.UPrimary();
// film surface linear coeff to apply to velocity // laminar case - employ simple coeff-based model
tmp<volScalarField> tCs; const volScalarField& rhop = film.rhoPrimary();
volScalarField Cs("Cs", Cf_*rhop*mag(Up - U));
typedef compressible::turbulenceModel turbModel;
if (film.primaryMesh().foundObject<turbModel>("turbulenceModel"))
{
// local reference to turbulence model
const turbModel& turb =
film.primaryMesh().lookupObject<turbModel>("turbulenceModel");
// calculate and store the stress on the primary region
const volSymmTensorField primaryReff(turb.devRhoReff());
// create stress field on film
// - note boundary condition types (mapped)
// - to map, the field name must be the same as the field on the
// primary region
volSymmTensorField Reff
(
IOobject
(
primaryReff.name(),
film.regionMesh().time().timeName(),
film.regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
film.regionMesh(),
dimensionedSymmTensor
(
"zero",
primaryReff.dimensions(),
symmTensor::zero
),
film.mappedFieldAndInternalPatchTypes<symmTensor>()
);
// map stress from primary region to film region
Reff.correctBoundaryConditions();
dimensionedScalar U0("SMALL", U.dimensions(), SMALL);
volVectorField UHat("UHat", (Up - U)/(mag(Up - U) + U0));
// shear stress tangential to the film
volVectorField tauTan
(
"tauTan",
UHat & (Reff + film.nHat()*(-film.nHat() & Reff))
);
// note: Cf_ 'should' be 1 in this case
tCs = Cf_*mag(tauTan)/(mag(Up - U) + U0);
}
else
{
// laminar case - employ simple coeff-based model
const volScalarField& rhop = film.rhoPrimary();
tCs = Cf_*rhop*mag(Up - U);
}
dimensionedScalar d0("SMALL", delta.dimensions(), SMALL); dimensionedScalar d0("SMALL", delta.dimensions(), SMALL);
// linear coeffs to apply to velocity
const volScalarField& Cs = tCs();
volScalarField Cw("Cw", mu/(0.3333*(delta + d0))); volScalarField Cw("Cw", mu/(0.3333*(delta + d0)));
Cw.min(5000.0); Cw.min(5000.0);

2
src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermos.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

6
tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs
View File

@ -3,7 +3,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# License # License
@ -83,7 +83,7 @@ type -P gnuplot &>/dev/null || {
exit 1 exit 1
} }
SETSDIR="../sets" SETSDIR="../postProcessing/sets"
if [ ! -d $SETSDIR ] if [ ! -d $SETSDIR ]
then then
@ -93,7 +93,7 @@ fi
# paths to data # paths to data
LATESTTIME=`ls $SETSDIR` LATESTTIME=`ls $SETSDIR`
OFDATAROOT=../sets/$LATESTTIME OFDATAROOT=$SETSDIR/$LATESTTIME
EXPTDATAROOT=./exptData EXPTDATAROOT=./exptData

2
tutorials/lagrangian/sprayFoam/aachenBomb/chemkin/therm.dat
View File

@ -6,7 +6,7 @@ C7H16 P10/85C 7.H 16. 0. 0.G 200.000 6000.000 1000. 1
-2.49753662E-07 9.84877715E-11-2.67688904E+04-1.59096837E+01-2.25846141E+04 4 -2.49753662E-07 9.84877715E-11-2.67688904E+04-1.59096837E+01-2.25846141E+04 4
O2 ATcT06O 2. 0. 0. 0.G 200.000 6000.000 1000. 1 O2 ATcT06O 2. 0. 0. 0.G 200.000 6000.000 1000. 1
3.45852381E+00 1.04045351E-03-2.79664041E-07 3.11439672E-11-8.55656058E-16 2 3.45852381E+00 1.04045351E-03-2.79664041E-07 3.11439672E-11-8.55656058E-16 2
1.0dev 63E+04 4.15264119E+00 3.78535371E+00-3.21928540E-03 1.12323443E-05 3 1.02229063E+04 4.15264119E+00 3.78535371E+00-3.21928540E-03 1.12323443E-05 3
-1.17254068E-08 4.17659585E-12 1.02922572E+04 3.27320239E+00 1.13558105E+04 4 -1.17254068E-08 4.17659585E-12 1.02922572E+04 3.27320239E+00 1.13558105E+04 4
N2 G 8/02N 2. 0. 0. 0.G 200.000 6000.000 1000. 1 N2 G 8/02N 2. 0. 0. 0.G 200.000 6000.000 1000. 1
2.95257637E+00 1.39690040E-03-4.92631603E-07 7.86010195E-11-4.60755204E-15 2 2.95257637E+00 1.39690040E-03-4.92631603E-07 7.86010195E-11-4.60755204E-15 2