Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
bdab6481
Commit
bdab6481
authored
Mar 02, 2010
by
mattijs
Browse files
Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev
parents
de673c5e
803556d7
Changes
112
Hide whitespace changes
Inline
Side-by-side
applications/Allwmake
View file @
bdab6481
...
...
@@ -10,7 +10,7 @@ wmakeCheckPwd "$WM_PROJECT_DIR/applications" || {
set
-x
wmake all solvers
wmake all utilities
wmake all solvers
# ----------------------------------------------------------------- end-of-file
applications/test/fileName/fileNameTest.C
View file @
bdab6481
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-200
9
OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-20
1
0 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -69,7 +69,7 @@ int main()
word
name
;
fileName
path
(
SubList
<
word
>
(
wrdList
,
wrdList
.
size
()
-
start
,
start
));
fileName
path2
=
"."
/
path
;
fileName
path2
=
"."
/
path
;
IOobject
::
fileNameComponents
(
...
...
applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
View file @
bdab6481
...
...
@@ -91,23 +91,20 @@ cspace ","{space}
alpha [_A-Za-z]
digit [0-9]
dec_digit [0-9]
octal_digit [0-7]
hex_digit [0-9a-fA-F]
identifier {alpha}({alpha}|{digit})*
integer {
dec_
digit}+
label [1-9]{
dec_
digit}*
integer {digit}+
label [1-9]{digit}*
exponent_part [eE][-+]?{digit}+
fractional_constant [-+]?(({digit}*"."{digit}+)|({digit}+"."?))
double
(({fractional_constant}{exponent_part}?)|({digit}+{exponent_part}))
floatNum
(({fractional_constant}{exponent_part}?)|({digit}+{exponent_part}))
x {
double
}
y {
double
}
z {
double
}
value {
double
}
x {
floatNum
}
y {
floatNum
}
z {
floatNum
}
value {
floatNum
}
node ^{space}"N"{cspace}
element ^{space}"EN"{cspace}
...
...
applications/utilities/mesh/conversion/foamToStarMesh/Make/options
View file @
bdab6481
EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/conversion/lnInclude
-I$(LIB_SRC)/conversion/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude
EXE_LIBS = \
-lconversion
applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
View file @
bdab6481
...
...
@@ -95,24 +95,14 @@ int yyFlexLexer::yywrap()
one_space [ \t\f\r]
space {one_space}*
some_space {one_space}+
cspace ","{space}
spaceNl ({space}|\n)*
alpha [_[:alpha:]]
digit [[:digit:]]
dec_digit [[:digit:]]
octal_digit [0-7]
hex_digit [[:xdigit:]]
lbrac "("
rbrac ")"
quote \"
dash "-"
dotColonDash [.:-]
identifier {alpha}({alpha}|{digit})*
integer {dec_digit}+
label [0-9]{dec_digit}*
dotColonDash [.:-]
label [0-9]{digit}*
zeroLabel {digit}*
word ({alpha}|{digit}|{dotColonDash})*
...
...
@@ -120,14 +110,14 @@ word ({alpha}|{digit}|{dotColonDash})*
exponent_part [eE][-+]?{digit}+
fractional_constant [-+]?(({digit}*"."{digit}+)|({digit}+"."?))
double ((({fractional_constant}{exponent_part}?)|({digit}+{exponent_part}))|0)
floatNum ((({fractional_constant}{exponent_part}?)|({digit}+{exponent_part}))|0)
x {floatNum}
y {floatNum}
z {floatNum}
x {double}
y {double}
z {double}
scalar {double}
labelListElement {space}{zeroLabel}
scalarListElement {space}{
double
}
scalarListElement {space}{
floatNum
}
labelList ({labelListElement}+{space})
scalarList ({scalarListElement}+{space})
...
...
applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C
View file @
bdab6481
...
...
@@ -884,7 +884,7 @@ void starMesh::createCoupleMatches()
<<
"newSlaveEdges: "
<<
newSlaveEdges
<<
endl
;
# endif
edge
startEdge
;
edge
startEdge
(
-
1
,
-
1
)
;
// Remember where the start edge was found:
// 0 for not found
...
...
applications/utilities/mesh/conversion/star4ToFoam/Make/options
View file @
bdab6481
EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/conversion/lnInclude
-I$(LIB_SRC)/conversion/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude
EXE_LIBS = \
-lconversion
applications/utilities/mesh/manipulation/setSet/Allwmake
View file @
bdab6481
#!/bin/sh
cd
${
0
%/*
}
||
exit
1
# run from this directory
READLINE
=
0
if
[
-f
/usr/include/readline/readline.h
]
then
echo
"Found readline/readline.h -- enabling readline support."
READLINE
=
1
export
READLINE
=
1
export
READLINELINK
=
"-lreadline -lncurses"
break
else
# no readline/readline.h -- disabling readline support
export
READLINE
=
0
unset
READLINELINK
fi
export
READLINE
wmake
# ----------------------------------------------------------------- end-of-file
applications/utilities/mesh/manipulation/setSet/Make/options
View file @
bdab6481
/* NB: trailing zero after define improves robustness */
EXE_INC = \
-DREADLINE=$(READLINE) \
-DREADLINE=$(READLINE)
0
\
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
...
...
applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
View file @
bdab6481
...
...
@@ -440,7 +440,7 @@ int main(int argc, char *argv[])
(
databases
[
procI
].
findInstance
(
regionDir
/
polyMesh
::
meshSubDir
,
regionDir
/
polyMesh
::
meshSubDir
,
"points"
)
);
...
...
@@ -469,10 +469,10 @@ int main(int argc, char *argv[])
"points"
,
databases
[
procI
].
findInstance
(
regionDir
/
polyMesh
::
meshSubDir
,
regionDir
/
polyMesh
::
meshSubDir
,
"points"
),
regionDir
/
polyMesh
::
meshSubDir
,
regionDir
/
polyMesh
::
meshSubDir
,
databases
[
procI
],
IOobject
::
MUST_READ
,
IOobject
::
NO_WRITE
,
...
...
applications/utilities/parallelProcessing/redistributeMeshPar/Make/options
View file @
bdab6481
...
...
@@ -8,5 +8,4 @@ EXE_LIBS = \
-lfiniteVolume \
-ldecompositionMethods \
-lmeshTools \
-ldynamicMesh \
-L$(FOAM_MPI_LIBBIN) -lparMetisDecompositionMethod
-ldynamicMesh
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml
View file @
bdab6481
...
...
@@ -82,6 +82,19 @@
</Documentation>
</IntVectorProperty>
<!-- Use VTK Polyhedron check-box -->
<IntVectorProperty
name=
"UseVTKPolyhedron"
command=
"SetUseVTKPolyhedron"
number_of_elements=
"1"
default_values=
"0"
animateable=
"0"
>
<BooleanDomain
name=
"bool"
/>
<Documentation>
Use vtkPolyhedron instead of decomposing polyhedra
</Documentation>
</IntVectorProperty>
<!-- Include Sets check-box -->
<IntVectorProperty
name=
"UiIncludeSets"
...
...
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.cxx
View file @
bdab6481
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 200
9
-2009 OpenCFD Ltd.
\\ / A nd | Copyright (C) 20
1
0-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.h
View file @
bdab6481
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 200
9
-2009 OpenCFD Ltd.
\\ / A nd | Copyright (C) 20
1
0-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx
View file @
bdab6481
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2008-200
9
OpenCFD Ltd.
\\ / A nd | Copyright (C) 2008-20
1
0 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -83,6 +83,7 @@ vtkPV3FoamReader::vtkPV3FoamReader()
SkipZeroTime
=
0
;
ExtrapolatePatches
=
0
;
UseVTKPolyhedron
=
0
;
IncludeSets
=
0
;
IncludeZones
=
0
;
ShowPatchNames
=
0
;
...
...
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.h
View file @
bdab6481
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2008-200
9
OpenCFD Ltd.
\\ / A nd | Copyright (C) 2008-20
1
0 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -102,6 +102,11 @@ public:
vtkSetMacro
(
ExtrapolatePatches
,
int
);
vtkGetMacro
(
ExtrapolatePatches
,
int
);
// Description:
// FOAM use vtkPolyhedron instead of decomposing polyhedra
vtkSetMacro
(
UseVTKPolyhedron
,
int
);
vtkGetMacro
(
UseVTKPolyhedron
,
int
);
// Description:
// FOAM read sets control
virtual
void
SetIncludeSets
(
int
);
...
...
@@ -217,6 +222,7 @@ private:
int
SkipZeroTime
;
int
ExtrapolatePatches
;
int
UseVTKPolyhedron
;
int
IncludeSets
;
int
IncludeZones
;
int
ShowPatchNames
;
...
...
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkOpenFOAMPoints.H
View file @
bdab6481
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-200
9
OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-20
1
0 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkOpenFOAMTupleRemap.H
0 → 100644
View file @
bdab6481
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM 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 2 of the License, or (at your
option) any later version.
OpenFOAM 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 OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
InClass
vtkPV3Foam
\*---------------------------------------------------------------------------*/
#ifndef vtkOpenFOAMTupleRemap_H
#define vtkOpenFOAMTupleRemap_H
// OpenFOAM includes
#include
"StaticAssert.H"
#include
"Swap.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template
<
class
Type
>
inline
void
vtkOpenFOAMTupleRemap
(
float
vec
[]);
// a symmTensor specialization to remap OpenFOAM -> ParaView naming order
// Qt/Core/pqScalarBarRepresentation.cxx defines this order
// { "XX", "YY", "ZZ", "XY", "YZ", "XZ" }
// in pqScalarBarRepresentation::getDefaultComponentLabel()
// whereas OpenFOAM uses this order
// { XX, XY, XZ, YY, YZ, ZZ }
//
// for extra safety, assert that symmTensor indeed has 6 components
StaticAssert
(
Foam
::
symmTensor
::
nComponents
==
6
);
// Template specialization for symmTensor
template
<
>
inline
void
vtkOpenFOAMTupleRemap
<
Foam
::
symmTensor
>
(
float
vec
[])
{
Foam
::
Swap
(
vec
[
1
],
vec
[
3
]);
// swap XY <-> YY
Foam
::
Swap
(
vec
[
2
],
vec
[
5
]);
// swap XZ <-> ZZ
}
template
<
class
Type
>
inline
void
vtkOpenFOAMTupleRemap
(
float
vec
[])
{}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
View file @
bdab6481
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-200
9
OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-20
1
0 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
View file @
bdab6481
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-200
9
OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-20
1
0 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
Prev
1
2
3
4
5
6
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment