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
14c95824
Commit
14c95824
authored
Aug 03, 2020
by
Mark OLESEN
Browse files
ENH: provide wordPair typedef in Pair.H, and separate wordPair.H
parent
6b074985
Changes
3
Hide whitespace changes
Inline
Side-by-side
applications/test/Hashing/Test-Hashing.C
View file @
14c95824
...
...
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2018-20
19
OpenCFD Ltd.
Copyright (C) 2018-20
20
OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
...
...
@@ -38,6 +38,7 @@ Description
#include
"stringList.H"
#include
"labelList.H"
#include
"labelPair.H"
#include
"wordPair.H"
#include
"edgeList.H"
#include
"faceList.H"
#include
"triFaceList.H"
...
...
@@ -154,8 +155,6 @@ void reportHashList(const UList<labelList>& list)
}
typedef
Pair
<
word
>
wordPair
;
void
reportHashList
(
const
UList
<
wordPair
>&
list
)
{
Info
<<
"contiguous = "
<<
is_contiguous
<
wordPair
>::
value
<<
nl
<<
nl
;
...
...
@@ -269,16 +268,20 @@ int main(int argc, char *argv[])
IFstream
is
(
"hashingTests"
);
if
(
!
is
.
good
())
if
(
is
.
good
())
{
Info
<<
"No
\"
hashingTests
\"
file found ...
\n
"
;
Info
<<
nl
<<
"Process "
<<
is
.
name
()
<<
" file ..."
<<
nl
;
}
while
(
is
.
good
())
else
{
const
word
listType
(
is
);
Info
<<
nl
<<
"No "
<<
is
.
name
()
<<
" file found ..."
<<
nl
;
}
if
(
listType
.
empty
())
continue
;
token
tok
;
while
(
is
.
good
()
&&
is
.
read
(
tok
)
&&
tok
.
good
())
{
const
word
listType
(
tok
.
wordToken
());
Info
<<
nl
;
IOobject
::
writeDivider
(
Info
)
<<
listType
<<
nl
;
...
...
@@ -286,7 +289,6 @@ int main(int argc, char *argv[])
if
(
listType
==
"stringList"
)
{
stringList
list
(
is
);
reportHashList
(
list
);
}
else
if
(
listType
==
"labelList"
)
...
...
src/OpenFOAM/primitives/Pair/Pair.H
View file @
14c95824
...
...
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2017-20
19
OpenCFD Ltd.
Copyright (C) 2017-20
20
OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
...
...
@@ -51,11 +51,12 @@ See also
namespace
Foam
{
// Forward
d
eclarations
// Forward
D
eclarations
template
<
class
T
>
class
Pair
;
// Common pair types
typedef
Pair
<
label
>
labelPair
;
//!< A pair of labels
typedef
Pair
<
word
>
wordPair
;
//!< A pair of words
/*---------------------------------------------------------------------------*\
...
...
@@ -67,12 +68,11 @@ class Pair
:
public
FixedList
<
T
,
2
>
{
public:
// Constructors
//-
C
onstruct
null
//-
Default c
onstruct
Pair
()
=
default
;
//- Copy construct from components
...
...
src/OpenFOAM/primitives/Pair/wordPair.H
0 → 100644
View file @
14c95824
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
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 3 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, see <http://www.gnu.org/licenses/>.
Typedef
Foam::wordPairPair
Description
A pair of wordPairs.
Typedef
Foam::wordPairList
Description
List of wordPairs.
Typedef
Foam::wordPairUList
Description
UList of wordPairs.
Typedef
Foam::wordPairSubList
Description
A SubList of wordPairs.
\*---------------------------------------------------------------------------*/
#ifndef wordPair_H
#define wordPair_H
#include
"List.H"
#include
"SubList.H"
#include
"Pair.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace
Foam
{
typedef
Pair
<
wordPair
>
wordPairPair
;
typedef
List
<
wordPair
>
wordPairList
;
typedef
UList
<
wordPair
>
wordPairUList
;
typedef
SubList
<
wordPair
>
wordPairSubList
;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //
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