Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
catalyst
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Community
catalyst
Commits
4860d31c
Commit
4860d31c
authored
Sep 25, 2019
by
Mark Olesen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
STYLE: use updated HashTable iterator names
parent
ceb54d68
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
52 additions
and
42 deletions
+52
-42
src/catalyst/areaMesh/catalystFaMesh.C
src/catalyst/areaMesh/catalystFaMesh.C
+3
-3
src/catalyst/areaMesh/foamVtkFaMeshAdaptor.C
src/catalyst/areaMesh/foamVtkFaMeshAdaptor.C
+5
-5
src/catalyst/areaMesh/foamVtkFaMeshAdaptorFieldTemplates.C
src/catalyst/areaMesh/foamVtkFaMeshAdaptorFieldTemplates.C
+3
-3
src/catalyst/areaMesh/foamVtkFaMeshAdaptorFields.C
src/catalyst/areaMesh/foamVtkFaMeshAdaptorFields.C
+1
-1
src/catalyst/catalystCoprocess.C
src/catalyst/catalystCoprocess.C
+3
-1
src/catalyst/catalystFunctionObject.C
src/catalyst/catalystFunctionObject.C
+3
-1
src/catalyst/catalystFunctionObject.H
src/catalyst/catalystFunctionObject.H
+3
-1
src/catalyst/volMesh/catalystFvMesh.C
src/catalyst/volMesh/catalystFvMesh.C
+6
-4
src/catalyst/volMesh/catalystFvMesh.H
src/catalyst/volMesh/catalystFvMesh.H
+3
-1
src/catalyst/volMesh/foamVtkFvMeshAdaptor.C
src/catalyst/volMesh/foamVtkFvMeshAdaptor.C
+11
-11
src/catalyst/volMesh/foamVtkFvMeshAdaptorFieldTemplates.C
src/catalyst/volMesh/foamVtkFvMeshAdaptorFieldTemplates.C
+4
-4
src/catalyst/volMesh/foamVtkFvMeshAdaptorFields.C
src/catalyst/volMesh/foamVtkFvMeshAdaptorFields.C
+2
-2
src/catalyst/volMesh/foamVtkFvMeshAdaptorGeom.C
src/catalyst/volMesh/foamVtkFvMeshAdaptorGeom.C
+5
-5
No files found.
src/catalyst/areaMesh/catalystFaMesh.C
View file @
4860d31c
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2018
-2019
OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -67,7 +67,7 @@ void Foam::catalyst::faMeshInput::update()
if
(
!
backends_
.
found
(
areaName
))
{
auto
backend
=
autoPtr
<
Foam
::
vtk
::
faMeshAdaptor
>::
New
(
*
(
iter
.
object
()));
autoPtr
<
Foam
::
vtk
::
faMeshAdaptor
>::
New
(
*
(
iter
.
val
()));
// Apply any configuration options
// ...
...
...
@@ -187,7 +187,7 @@ Foam::label Foam::catalyst::faMeshInput::addChannels(dataQuery& dataq)
wordHashSet
allFields
;
forAllConstIters
(
backends_
,
iter
)
{
allFields
+=
iter
.
object
()
->
knownFields
(
selectFields_
);
allFields
+=
iter
.
val
()
->
knownFields
(
selectFields_
);
}
dataq
.
set
(
name
(),
allFields
);
...
...
src/catalyst/areaMesh/foamVtkFaMeshAdaptor.C
View file @
4860d31c
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2018
-2019
OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -75,8 +75,8 @@ void Foam::vtk::faMeshAdaptor::updateContent(const wordRes& selectFields)
// Eliminate cached values that would be unreliable
forAllIters
(
cachedVtp_
,
iter
)
{
iter
.
object
().
clearGeom
();
iter
.
object
().
clear
();
iter
.
val
().
clearGeom
();
iter
.
val
().
clear
();
}
}
...
...
@@ -111,9 +111,9 @@ Foam::vtk::faMeshAdaptor::output(const wordRes& select)
{
const
auto
&
longName
=
internalName
;
auto
iter
=
cachedVtp_
.
find
(
longName
);
if
(
iter
.
found
()
&&
iter
.
object
().
dataset
)
if
(
iter
.
found
()
&&
iter
.
val
().
dataset
)
{
vtkmesh
=
iter
.
object
().
dataset
;
vtkmesh
=
iter
.
val
().
dataset
;
}
}
...
...
src/catalyst/areaMesh/foamVtkFaMeshAdaptorFieldTemplates.C
View file @
4860d31c
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2018
-2019
OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -66,12 +66,12 @@ void Foam::vtk::faMeshAdaptor::convertAreaField
const
auto
&
longName
=
internalName
;
auto
iter
=
cachedVtp_
.
find
(
longName
);
if
(
!
iter
.
found
()
||
!
iter
.
object
().
dataset
)
if
(
!
iter
.
found
()
||
!
iter
.
val
().
dataset
)
{
// Should not happen, but for safety require a vtk geometry
return
;
}
foamVtpData
&
vtpData
=
iter
.
object
();
foamVtpData
&
vtpData
=
iter
.
val
();
auto
dataset
=
vtpData
.
dataset
;
vtkSmartPointer
<
vtkFloatArray
>
cdata
=
convertAreaFieldToVTK
...
...
src/catalyst/areaMesh/foamVtkFaMeshAdaptorFields.C
View file @
4860d31c
...
...
@@ -53,7 +53,7 @@ Foam::wordHashSet Foam::vtk::faMeshAdaptor::knownFields
if
(
fieldTypes
::
area
.
found
(
clsName
))
{
allFields
+=
iter
.
object
();
allFields
+=
iter
.
val
();
}
}
...
...
src/catalyst/catalystCoprocess.C
View file @
4860d31c
...
...
@@ -3,7 +3,9 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2018 CINECA
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2018 CINECA
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
...
...
src/catalyst/catalystFunctionObject.C
View file @
4860d31c
...
...
@@ -3,7 +3,9 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2018 CINECA
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2018 CINECA
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
...
...
src/catalyst/catalystFunctionObject.H
View file @
4860d31c
...
...
@@ -3,7 +3,9 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2018 CINECA
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2018 CINECA
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
...
...
src/catalyst/volMesh/catalystFvMesh.C
View file @
4860d31c
...
...
@@ -2,8 +2,10 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2018 CINECA
\\ / A nd | Copyright (C) 2018-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2018 CINECA
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
...
...
@@ -67,7 +69,7 @@ void Foam::catalyst::fvMeshInput::update()
auto
backend
=
autoPtr
<
Foam
::
vtk
::
fvMeshAdaptor
>::
New
(
*
(
iter
.
object
()),
*
(
iter
.
val
()),
channelOpt_
,
selectPatches_
);
...
...
@@ -203,7 +205,7 @@ Foam::label Foam::catalyst::fvMeshInput::addChannels(dataQuery& dataq)
wordHashSet
allFields
;
forAllConstIters
(
backends_
,
iter
)
{
allFields
+=
iter
.
object
()
->
knownFields
(
selectFields_
);
allFields
+=
iter
.
val
()
->
knownFields
(
selectFields_
);
}
dataq
.
set
(
name
(),
allFields
);
...
...
src/catalyst/volMesh/catalystFvMesh.H
View file @
4860d31c
...
...
@@ -3,7 +3,9 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2018 CINECA
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2018 CINECA
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
...
...
src/catalyst/volMesh/foamVtkFvMeshAdaptor.C
View file @
4860d31c
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2017-201
8
OpenCFD Ltd.
\\ / A nd | Copyright (C) 2017-201
9
OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -251,13 +251,13 @@ void Foam::vtk::fvMeshAdaptor::updateContent(const wordRes& selectFields)
// Eliminate cached values that would be unreliable
forAllIters
(
cachedVtp_
,
iter
)
{
iter
.
object
().
clearGeom
();
iter
.
object
().
clear
();
iter
.
val
().
clearGeom
();
iter
.
val
().
clear
();
}
forAllIters
(
cachedVtu_
,
iter
)
{
iter
.
object
().
clearGeom
();
iter
.
object
().
clear
();
iter
.
val
().
clearGeom
();
iter
.
val
().
clear
();
}
definePatchIds
();
...
...
@@ -267,8 +267,8 @@ void Foam::vtk::fvMeshAdaptor::updateContent(const wordRes& selectFields)
// poly-decompose changed - dispose of cached values
forAllIters
(
cachedVtu_
,
iter
)
{
iter
.
object
().
clearGeom
();
iter
.
object
().
clear
();
iter
.
val
().
clearGeom
();
iter
.
val
().
clear
();
}
}
...
...
@@ -310,13 +310,13 @@ Foam::vtk::fvMeshAdaptor::output(const wordRes& select)
{
const
auto
&
longName
=
internalName
();
auto
iter
=
cachedVtu_
.
find
(
longName
);
if
(
!
iter
.
found
()
||
!
iter
.
object
().
dataset
)
if
(
!
iter
.
found
()
||
!
iter
.
val
().
dataset
)
{
Pout
<<
"Cache miss for VTU "
<<
longName
<<
endl
;
break
;
// Should never happen
}
foamVtuData
&
vtuData
=
iter
.
object
();
foamVtuData
&
vtuData
=
iter
.
val
();
auto
pieces
=
vtkSmartPointer
<
vtkMultiPieceDataSet
>::
New
();
...
...
@@ -350,13 +350,13 @@ Foam::vtk::fvMeshAdaptor::output(const wordRes& select)
const
word
&
longName
=
pp
.
name
();
auto
iter
=
cachedVtp_
.
find
(
longName
);
if
(
!
iter
.
found
()
||
!
iter
.
object
().
dataset
)
if
(
!
iter
.
found
()
||
!
iter
.
val
().
dataset
)
{
Pout
<<
"Cache miss for VTP patch "
<<
longName
<<
endl
;
break
;
// Should never happen
}
foamVtpData
&
vtpData
=
iter
.
object
();
foamVtpData
&
vtpData
=
iter
.
val
();
auto
pieces
=
vtkSmartPointer
<
vtkMultiPieceDataSet
>::
New
();
...
...
src/catalyst/volMesh/foamVtkFvMeshAdaptorFieldTemplates.C
View file @
4860d31c
...
...
@@ -75,14 +75,14 @@ void Foam::vtk::fvMeshAdaptor::convertVolField
const
word
&
longName
=
pp
.
name
();
auto
iter
=
cachedVtp_
.
find
(
longName
);
if
(
!
iter
.
found
()
||
!
iter
.
object
().
dataset
)
if
(
!
iter
.
found
()
||
!
iter
.
val
().
dataset
)
{
// Should not happen, but for safety require a vtk geometry
Pout
<<
"Cache miss for VTP patch "
<<
longName
<<
endl
;
continue
;
}
foamVtpData
&
vtpData
=
iter
.
object
();
foamVtpData
&
vtpData
=
iter
.
val
();
auto
dataset
=
vtpData
.
dataset
;
// This is slightly roundabout, but we deal with groups and with
...
...
@@ -207,13 +207,13 @@ void Foam::vtk::fvMeshAdaptor::convertVolFieldInternal
const
auto
&
longName
=
internalName
();
auto
iter
=
cachedVtu_
.
find
(
longName
);
if
(
!
iter
.
found
()
||
!
iter
.
object
().
dataset
)
if
(
!
iter
.
found
()
||
!
iter
.
val
().
dataset
)
{
// Should not happen, but for safety require a vtk geometry
Pout
<<
"Cache miss for VTU "
<<
longName
<<
endl
;
return
;
}
foamVtuData
&
vtuData
=
iter
.
object
();
foamVtuData
&
vtuData
=
iter
.
val
();
auto
dataset
=
vtuData
.
dataset
;
dataset
->
GetCellData
()
->
AddArray
...
...
src/catalyst/volMesh/foamVtkFvMeshAdaptorFields.C
View file @
4860d31c
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2017-201
8
OpenCFD Ltd.
\\ / A nd | Copyright (C) 2017-201
9
OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -56,7 +56,7 @@ Foam::wordHashSet Foam::vtk::fvMeshAdaptor::knownFields
// || fieldTypes::internal.found(clsName)
)
{
allFields
+=
iter
.
object
();
allFields
+=
iter
.
val
();
}
}
...
...
src/catalyst/volMesh/foamVtkFvMeshAdaptorGeom.C
View file @
4860d31c
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2017-201
8
OpenCFD Ltd.
\\ / A nd | Copyright (C) 2017-201
9
OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -155,13 +155,13 @@ void Foam::vtk::fvMeshAdaptor::applyGhostingInternal(const labelUList& types)
const
auto
&
longName
=
internalName
();
auto
iter
=
cachedVtu_
.
find
(
longName
);
if
(
!
iter
.
found
()
||
!
iter
.
object
().
dataset
)
if
(
!
iter
.
found
()
||
!
iter
.
val
().
dataset
)
{
// Should not happen, but for safety require a vtk geometry
Pout
<<
"Cache miss for VTU "
<<
longName
<<
endl
;
return
;
}
foamVtuData
&
vtuData
=
iter
.
object
();
foamVtuData
&
vtuData
=
iter
.
val
();
auto
dataset
=
vtuData
.
dataset
;
const
labelUList
&
cellMap
=
vtuData
.
cellMap
();
...
...
@@ -231,14 +231,14 @@ void Foam::vtk::fvMeshAdaptor::applyGhostingBoundary(const labelUList& types)
const
word
&
longName
=
pp
.
name
();
auto
iter
=
cachedVtp_
.
find
(
longName
);
if
(
!
iter
.
found
()
||
!
iter
.
object
().
dataset
)
if
(
!
iter
.
found
()
||
!
iter
.
val
().
dataset
)
{
// Should not happen, but for safety require a vtk geometry
Pout
<<
"Cache miss for VTP patch "
<<
longName
<<
endl
;
continue
;
}
foamVtpData
&
vtpData
=
iter
.
object
();
foamVtpData
&
vtpData
=
iter
.
val
();
auto
dataset
=
vtpData
.
dataset
;
auto
vtkgcell
=
dataset
->
GetCellGhostArray
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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