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
Planned maintenance at 14:00 - platform may be offline until 15:00 (UK times)
Open sidebar
Development
openfoam
Commits
e06171fe
Commit
e06171fe
authored
Nov 20, 2009
by
graham
Browse files
Merge branch 'master' of
ssh://graham@hunt//home/noisy3/OpenFOAM/OpenFOAM-dev
parents
5f8fc645
0f2af420
Changes
15
Hide whitespace changes
Inline
Side-by-side
applications/test/DimensionedField/DimensionedFieldTest.C
deleted
100644 → 0
View file @
5f8fc645
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 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
\*---------------------------------------------------------------------------*/
#include
"argList.H"
#include
"Time.H"
#include
"DimensionedFields.H"
#include
"DimensionedSphericalTensorField.H"
#include
"vector.H"
#include
"tensor.H"
#include
"GeoMesh.H"
using
namespace
Foam
;
namespace
Foam
{
class
vMesh
{
public:
vMesh
()
{}
label
size
()
const
{
return
10
;
}
};
};
template
<>
const
word
Foam
::
DimensionedField
<
scalar
,
GeoMesh
<
vMesh
>
>::
typeName
(
"dimenionedScalarField"
);
template
<>
const
word
Foam
::
DimensionedField
<
vector
,
GeoMesh
<
vMesh
>
>::
typeName
(
"dimenionedVectorField"
);
template
<>
const
word
Foam
::
DimensionedField
<
tensor
,
GeoMesh
<
vMesh
>
>::
typeName
(
"dimenionedTensorField"
);
template
<>
const
word
Foam
::
DimensionedField
<
sphericalTensor
,
GeoMesh
<
vMesh
>
>::
typeName
(
"dimenionedSphericalTensorField"
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Main program:
int
main
(
int
argc
,
char
*
argv
[])
{
# include "setRootCase.H"
# include "createTime.H"
vMesh
vm
;
DimensionedField
<
scalar
,
GeoMesh
<
vMesh
>
>
dsf
(
IOobject
(
"dsf"
,
runTime
.
timeName
(),
runTime
,
IOobject
::
MUST_READ
,
IOobject
::
NO_WRITE
),
vm
);
Info
<<
dsf
<<
endl
;
dsf
+=
dsf
;
dsf
-=
dimensionedScalar
(
"5"
,
dsf
.
dimensions
(),
5
.
0
);
Info
<<
dsf
<<
endl
;
Info
<<
sqr
(
dsf
+
dsf
)
-
sqr
(
dsf
+
dsf
)
<<
endl
;
DimensionedField
<
vector
,
GeoMesh
<
vMesh
>
>
dvf
(
IOobject
(
"dvf"
,
runTime
.
timeName
(),
runTime
,
IOobject
::
MUST_READ
,
IOobject
::
NO_WRITE
),
vm
);
Info
<<
(
dvf
^
(
dvf
^
dvf
))
<<
endl
;
Info
<<
"End
\n
"
<<
endl
;
return
0
;
}
// ************************************************************************* //
applications/test/DimensionedField/Make/files
deleted
100644 → 0
View file @
5f8fc645
DimensionedFieldTest.C
EXE = $(FOAM_USER_APPBIN)/DimensionedFieldTest
applications/test/DimensionedField/Make/options
deleted
100644 → 0
View file @
5f8fc645
/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
/* EXE_LIBS = -lfiniteVolume */
applications/test/HashTable3/hashTableTest3.C
View file @
e06171fe
...
...
@@ -33,7 +33,6 @@ Description
#include
"HashPtrTable.H"
#include
"Map.H"
#include
"StaticHashTable.H"
#include
"HashTbl.H"
#include
"cpuTime.H"
using
namespace
Foam
;
...
...
@@ -53,7 +52,7 @@ int main(int argc, char *argv[])
// Map<label> map(2 * nSize);
// HashTable<label, label, Hash<label> > map(2 * nSize);
// StaticHashTable<label, label, Hash<label> > map(2 * nSize);
HashTbl
<
label
,
label
,
Hash
<
label
>
>
map
(
2
*
nSize
);
HashT
a
bl
e
<
label
,
label
,
Hash
<
label
>
>
map
(
2
*
nSize
);
Info
<<
"Constructed map of size: "
<<
nSize
<<
" (size "
<<
map
.
size
()
<<
" capacity "
<<
map
.
capacity
()
<<
") "
...
...
applications/test/Matrix/MatrixTest.C
View file @
e06171fe
...
...
@@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include
"Matrix.H"
#include
"
Square
Matrix.H"
#include
"vector.H"
using
namespace
Foam
;
...
...
@@ -34,7 +34,7 @@ using namespace Foam;
int
main
(
int
argc
,
char
*
argv
[])
{
Matrix
<
scalar
>
hmm
(
3
,
3
);
Square
Matrix
<
scalar
>
hmm
(
3
);
hmm
[
0
][
0
]
=
-
3
.
0
;
hmm
[
0
][
1
]
=
10
.
0
;
...
...
@@ -46,27 +46,27 @@ int main(int argc, char *argv[])
hmm
[
2
][
1
]
=
6
.
0
;
hmm
[
2
][
2
]
=
1
.
0
;
Info
<<
hmm
<<
endl
<<
hmm
-
2
.
0
*
(
-
hmm
)
<<
endl
;
//
Info<< hmm << endl << hmm - 2.0*(-hmm) << endl;
Info
<<
max
(
hmm
)
<<
endl
;
Info
<<
min
(
hmm
)
<<
endl
;
Matrix
<
scalar
>
hmm2
(
3
,
3
,
1
.
0
);
Square
Matrix
<
scalar
>
hmm2
(
3
,
1
.
0
);
hmm
=
hmm2
;
Info
<<
hmm
<<
endl
;
Matrix
<
scalar
>
hmm3
(
Sin
);
Square
Matrix
<
scalar
>
hmm3
(
Sin
);
Info
<<
hmm3
<<
endl
;
Matrix
<
scalar
>
hmm4
;
Square
Matrix
<
scalar
>
hmm4
;
hmm4
=
hmm2
;
Info
<<
hmm4
<<
endl
;
Matrix
<
scalar
>
hmm5
;
Square
Matrix
<
scalar
>
hmm5
;
hmm4
=
hmm5
;
Info
<<
hmm5
<<
endl
;
...
...
applications/test/ODETest/ODETest.C
View file @
e06171fe
...
...
@@ -69,7 +69,7 @@ public:
const
scalar
x
,
const
scalarField
&
y
,
scalarField
&
dfdx
,
Matrix
<
scalar
>
&
dfdy
scalarSquareMatrix
&
dfdy
)
const
{
dfdx
[
0
]
=
0
.
0
;
...
...
applications/test/PtrList/PtrListTest.C
View file @
e06171fe
...
...
@@ -57,6 +57,8 @@ public:
Info
<<
"delete Scalar: "
<<
data_
<<
endl
;
}
autoPtr
<
Scalar
>
clone
()
const
;
friend
Ostream
&
operator
<<
(
Ostream
&
os
,
const
Scalar
&
val
)
{
os
<<
val
.
data_
;
...
...
applications/test/UIndirectListTest/UIndirectListTest.C
View file @
e06171fe
...
...
@@ -84,11 +84,11 @@ int main(int argc, char *argv[])
// test List operations
List
<
double
>
flatList
=
UIndirectList
<
double
>
(
completeList
,
addresses
);
Info
<<
"List
assign
ed from UIndirectList: "
<<
flatList
<<
endl
;
List
<
double
>
flatList
(
UIndirectList
<
double
>
(
completeList
,
addresses
)
)
;
Info
<<
"List
construct
ed from UIndirectList: "
<<
flatList
<<
endl
;
List
<
double
>
flatList
2
(
UIndirectList
<
double
>
(
completeList
,
addresses
)
)
;
Info
<<
"List
construct
ed from UIndirectList: "
<<
flatList
2
<<
endl
;
flatList
=
UIndirectList
<
double
>
(
completeList
,
addresses
);
Info
<<
"List
assign
ed from UIndirectList: "
<<
flatList
<<
endl
;
flatList
.
append
(
UIndirectList
<
double
>
(
completeList
,
addresses
));
Info
<<
"List::append(UIndirectList): "
<<
flatList
<<
endl
;
...
...
applications/test/parallel/parallelTest.C
View file @
e06171fe
...
...
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
// Sync how many to send
labelListList
allNTrans
(
Pstream
::
nProcs
());
allNTrans
[
Pstream
::
myProcNo
()]
=
nSend
;
combineReduce
(
allNTrans
,
mapDistribute
::
listEq
());
combineReduce
(
allNTrans
,
UPstream
::
listEq
());
// Collect items to be sent
labelListList
sendMap
(
Pstream
::
nProcs
());
...
...
@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
toMaster
<<
data
;
}
Perr
<<
"slave receiving from master "
Perr
<<
"slave receiving from master "
<<
Pstream
::
masterNo
()
<<
endl
;
IPstream
fromMaster
(
Pstream
::
blocking
,
Pstream
::
masterNo
());
fromMaster
>>
data
;
...
...
applications/test/slicedField/slicedFieldTest.C
View file @
e06171fe
...
...
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Application
vol
Field
sliced
Field
Test
Description
...
...
@@ -32,16 +32,16 @@ Description
#include
"fvCFD.H"
#include
"SlicedGeometricField.H"
#include
"slicedFvPatchFields.H"
#include
"slicedSurfaceFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
int
main
(
int
argc
,
char
*
argv
[])
{
#include
"setRootCase.H"
# include "setRootCase.H"
# include "createTime.H"
# include "createMesh.H"
#include
"createTime.H"
#include
"createMesh.H"
Info
<<
"Reading field p
\n
"
<<
endl
;
volScalarField
p
...
...
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
Info
<<
C
<<
endl
;
Info
<<
(
C
&
U
)
<<
endl
;
SlicedGeometricField
<
vector
,
fvPatchField
,
slicedFvPatchField
,
surfaceMesh
>
SlicedGeometricField
<
vector
,
fv
s
PatchField
,
slicedFv
s
PatchField
,
surfaceMesh
>
Sf
(
IOobject
...
...
@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
mesh
.
faceAreas
()
);
Info
<<
Sf
<<
endl
;
//
Info<< Sf << endl;
return
0
;
}
...
...
applications/test/testPointEdgeWave/testPointEdgeWave.C
View file @
e06171fe
...
...
@@ -48,8 +48,6 @@ int main(int argc, char *argv[])
# include "createTime.H"
# include "createPolyMesh.H"
pointMesh
pMesh
(
mesh
);
const
polyBoundaryMesh
&
patches
=
mesh
.
boundaryMesh
();
// Get name of patch
...
...
@@ -99,7 +97,7 @@ int main(int argc, char *argv[])
PointEdgeWave
<
pointEdgePoint
>
wallCalc
(
pM
esh
,
m
esh
,
wallPoints
,
wallInfo
,
...
...
@@ -119,7 +117,7 @@ int main(int argc, char *argv[])
IOobject
::
NO_READ
,
IOobject
::
AUTO_WRITE
),
p
Mesh
,
p
ointMesh
::
New
(
mesh
)
,
dimensionedScalar
(
"wallDist"
,
dimLength
,
0
.
0
)
);
...
...
applications/test/volField/volFieldTest.C
View file @
e06171fe
...
...
@@ -34,11 +34,10 @@ Application
int
main
(
int
argc
,
char
*
argv
[])
{
#include
"setRootCase.H"
# include "setRootCase.H"
# include "createTime.H"
# include "createMesh.H"
#include
"createTime.H"
#include
"createMesh.H"
Info
<<
"Reading field p
\n
"
<<
endl
;
volScalarField
p
...
...
@@ -70,12 +69,9 @@ int main(int argc, char *argv[])
mesh
);
# include "createPhi.H"
//Info<< transform(dimensionedTensor("I", dimless, 0.1*I), U) << endl;
#include
"createPhi.H"
GeometricField
<
s
pherical
Tensor
,
fvPatchField
,
volMesh
>
st
GeometricField
<
s
ymm
Tensor
,
fvPatchField
,
volMesh
>
st
(
IOobject
(
...
...
@@ -86,8 +82,8 @@ int main(int argc, char *argv[])
IOobject
::
NO_WRITE
),
mesh
,
dimensioned
<
s
pherical
Tensor
>
(
"st"
,
dimless
,
s
pherical
Tensor
::
I
),
zeroGradientFvPatchS
pherical
TensorField
::
typeName
dimensioned
<
s
ymm
Tensor
>
(
"st"
,
dimless
,
s
ymm
Tensor
::
one
),
zeroGradientFvPatchS
ymm
TensorField
::
typeName
);
//Info<< fvc::div(st) << endl;
...
...
src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
View file @
e06171fe
...
...
@@ -105,7 +105,7 @@ template<class Key, class Hash>
void
Foam
::
HashSet
<
Key
,
Hash
>::
operator
&=
(
const
HashSet
<
Key
,
Hash
>&
rhs
)
{
// Remove elements not also found in rhs
for
(
iterator
iter
=
this
->
c
begin
();
iter
!=
this
->
c
end
();
++
iter
)
for
(
iterator
iter
=
this
->
begin
();
iter
!=
this
->
end
();
++
iter
)
{
if
(
!
rhs
.
found
(
iter
.
key
()))
{
...
...
@@ -145,8 +145,6 @@ void Foam::HashSet<Key, Hash>::operator-=(const HashSet<Key, Hash>& rhs)
}
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
/* * * * * * * * * * * * * * * * Global operators * * * * * * * * * * * * * */
template
<
class
Key
,
class
Hash
>
...
...
src/OpenFOAM/matrices/Matrix/Matrix.C
View file @
e06171fe
...
...
@@ -235,12 +235,12 @@ void Foam::Matrix<Form, Type>::operator=(const Matrix<Form, Type>& a)
template
<
class
Form
,
class
Type
>
const
Type
&
Foam
::
max
(
const
Matrix
<
Form
,
Type
>&
a
)
{
label
nm
=
a
.
n
_
*
a
.
m
_
;
label
nm
=
a
.
n
()
*
a
.
m
()
;
if
(
nm
)
{
label
curMaxI
=
0
;
const
Type
*
v
=
a
.
v_
[
0
];
const
Type
*
v
=
a
[
0
];
for
(
register
label
i
=
1
;
i
<
nm
;
i
++
)
{
...
...
@@ -267,12 +267,12 @@ const Type& Foam::max(const Matrix<Form, Type>& a)
template
<
class
Form
,
class
Type
>
const
Type
&
Foam
::
min
(
const
Matrix
<
Form
,
Type
>&
a
)
{
label
nm
=
a
.
n
_
*
a
.
m
_
;
label
nm
=
a
.
n
()
*
a
.
m
()
;
if
(
nm
)
{
label
curMinI
=
0
;
const
Type
*
v
=
a
.
v_
[
0
];
const
Type
*
v
=
a
[
0
];
for
(
register
label
i
=
1
;
i
<
nm
;
i
++
)
{
...
...
@@ -301,14 +301,14 @@ const Type& Foam::min(const Matrix<Form, Type>& a)
template
<
class
Form
,
class
Type
>
Form
Foam
::
operator
-
(
const
Matrix
<
Form
,
Type
>&
a
)
{
Form
na
(
a
.
n
_
,
a
.
m
_
);
Form
na
(
a
.
n
()
,
a
.
m
()
);
if
(
a
.
n
_
&&
a
.
m
_
)
if
(
a
.
n
()
&&
a
.
m
()
)
{
Type
*
nav
=
na
.
v_
[
0
];
const
Type
*
av
=
a
.
v_
[
0
];
Type
*
nav
=
na
[
0
];
const
Type
*
av
=
a
[
0
];
label
nm
=
a
.
n
_
*
a
.
m
_
;
label
nm
=
a
.
n
()
*
a
.
m
()
;
for
(
register
label
i
=
0
;
i
<
nm
;
i
++
)
{
nav
[
i
]
=
-
av
[
i
];
...
...
@@ -322,33 +322,33 @@ Form Foam::operator-(const Matrix<Form, Type>& a)
template
<
class
Form
,
class
Type
>
Form
Foam
::
operator
+
(
const
Matrix
<
Form
,
Type
>&
a
,
const
Matrix
<
Form
,
Type
>&
b
)
{
if
(
a
.
n
_
!=
b
.
n
_
)
if
(
a
.
n
()
!=
b
.
n
()
)
{
FatalErrorIn
(
"Matrix<Form, Type>::operator+(const Matrix<Form, Type>&, const Matrix<Form, Type>&)"
)
<<
"attempted add matrices with different number of rows: "
<<
a
.
n
_
<<
", "
<<
b
.
n
_
<<
a
.
n
()
<<
", "
<<
b
.
n
()
<<
abort
(
FatalError
);
}
if
(
a
.
m
_
!=
b
.
m
_
)
if
(
a
.
m
()
!=
b
.
m
()
)
{
FatalErrorIn
(
"Matrix<Form, Type>::operator+(const Matrix<Form, Type>&, const Matrix<Form, Type>&)"
)
<<
"attempted add matrices with different number of columns: "
<<
a
.
m
_
<<
", "
<<
b
.
m
_
<<
a
.
m
()
<<
", "
<<
b
.
m
()
<<
abort
(
FatalError
);
}
Form
ab
(
a
.
n
_
,
a
.
m
_
);
Form
ab
(
a
.
n
()
,
a
.
m
()
);
Type
*
abv
=
ab
.
v_
[
0
];
const
Type
*
av
=
a
.
v_
[
0
];
const
Type
*
bv
=
b
.
v_
[
0
];
Type
*
abv
=
ab
[
0
];
const
Type
*
av
=
a
[
0
];
const
Type
*
bv
=
b
[
0
];
label
nm
=
a
.
n
_
*
a
.
m
_
;
label
nm
=
a
.
n
()
*
a
.
m
()
;
for
(
register
label
i
=
0
;
i
<
nm
;
i
++
)
{
abv
[
i
]
=
av
[
i
]
+
bv
[
i
];
...
...
@@ -361,33 +361,33 @@ Form Foam::operator+(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
template
<
class
Form
,
class
Type
>
Form
Foam
::
operator
-
(
const
Matrix
<
Form
,
Type
>&
a
,
const
Matrix
<
Form
,
Type
>&
b
)
{
if
(
a
.
n
_
!=
b
.
n
_
)
if
(
a
.
n
()
!=
b
.
n
()
)
{
FatalErrorIn
(
"Matrix<Form, Type>::operator-(const Matrix<Form, Type>&, const Matrix<Form, Type>&)"
)
<<
"attempted add matrices with different number of rows: "
<<
a
.
n
_
<<
", "
<<
b
.
n
_
<<
a
.
n
()
<<
", "
<<
b
.
n
()
<<
abort
(
FatalError
);
}
if
(
a
.
m
_
!=
b
.
m
_
)
if
(
a
.
m
()
!=
b
.
m
()
)
{
FatalErrorIn
(
"Matrix<Form, Type>::operator-(const Matrix<Form, Type>&, const Matrix<Form, Type>&)"
)
<<
"attempted add matrices with different number of columns: "
<<
a
.
m
_
<<
", "
<<
b
.
m
_
<<
a
.
m
()
<<
", "
<<
b
.
m
()
<<
abort
(
FatalError
);
}
Form
ab
(
a
.
n
_
,
a
.
m
_
);
Form
ab
(
a
.
n
()
,
a
.
m
()
);
Type
*
abv
=
ab
.
v_
[
0
];
const
Type
*
av
=
a
.
v_
[
0
];
const
Type
*
bv
=
b
.
v_
[
0
];
Type
*
abv
=
ab
[
0
];
const
Type
*
av
=
a
[
0
];
const
Type
*
bv
=
b
[
0
];
label
nm
=
a
.
n
_
*
a
.
m
_
;
label
nm
=
a
.
n
()
*
a
.
m
()
;
for
(
register
label
i
=
0
;
i
<
nm
;
i
++
)
{
abv
[
i
]
=
av
[
i
]
-
bv
[
i
];
...
...
@@ -400,14 +400,14 @@ Form Foam::operator-(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
template
<
class
Form
,
class
Type
>
Form
Foam
::
operator
*
(
const
scalar
s
,
const
Matrix
<
Form
,
Type
>&
a
)
{
Form
sa
(
a
.
n
_
,
a
.
m
_
);
Form
sa
(
a
.
n
()
,
a
.
m
()
);
if
(
a
.
n
_
&&
a
.
m
_
)
if
(
a
.
n
()
&&
a
.
m
()
)
{
Type
*
sav
=
sa
.
v_
[
0
];
const
Type
*
av
=
a
.
v_
[
0
];
Type
*
sav
=
sa
[
0
];
const
Type
*
av
=
a
[
0
];
label
nm
=
a
.
n
_
*
a
.
m
_
;
label
nm
=
a
.
n
()
*
a
.
m
()
;
for
(
register
label
i
=
0
;
i
<
nm
;
i
++
)
{
sav
[
i
]
=
s
*
av
[
i
];
...
...
src/OpenFOAM/matrices/Matrix/Matrix.H
View file @
e06171fe
...
...
@@ -161,10 +161,10 @@ public:
// Member operators
//- Return subscript-checked
element
of Matrix.
//- Return subscript-checked
row
of Matrix.
inline
Type
*
operator
[](
const
label
);
//- Return subscript-checked
element
of constant Matrix.
//- Return subscript-checked
row
of constant Matrix.
inline
const
Type
*
operator
[](
const
label
)
const
;
//- Assignment operator. Takes linear time.
...
...
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