From 4860d31c0a93488505c0109d43a8072fef4b584d Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 25 Sep 2019 15:03:01 +0200 Subject: [PATCH] STYLE: use updated HashTable iterator names --- src/catalyst/areaMesh/catalystFaMesh.C | 6 ++--- src/catalyst/areaMesh/foamVtkFaMeshAdaptor.C | 10 ++++----- .../foamVtkFaMeshAdaptorFieldTemplates.C | 6 ++--- .../areaMesh/foamVtkFaMeshAdaptorFields.C | 2 +- src/catalyst/catalystCoprocess.C | 4 +++- src/catalyst/catalystFunctionObject.C | 4 +++- src/catalyst/catalystFunctionObject.H | 4 +++- src/catalyst/volMesh/catalystFvMesh.C | 10 +++++---- src/catalyst/volMesh/catalystFvMesh.H | 4 +++- src/catalyst/volMesh/foamVtkFvMeshAdaptor.C | 22 +++++++++---------- .../foamVtkFvMeshAdaptorFieldTemplates.C | 8 +++---- .../volMesh/foamVtkFvMeshAdaptorFields.C | 4 ++-- .../volMesh/foamVtkFvMeshAdaptorGeom.C | 10 ++++----- 13 files changed, 52 insertions(+), 42 deletions(-) diff --git a/src/catalyst/areaMesh/catalystFaMesh.C b/src/catalyst/areaMesh/catalystFaMesh.C index 8d1980a..1463089 100644 --- a/src/catalyst/areaMesh/catalystFaMesh.C +++ b/src/catalyst/areaMesh/catalystFaMesh.C @@ -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::New(*(iter.object())); + autoPtr::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); diff --git a/src/catalyst/areaMesh/foamVtkFaMeshAdaptor.C b/src/catalyst/areaMesh/foamVtkFaMeshAdaptor.C index e09e3d5..8dec553 100644 --- a/src/catalyst/areaMesh/foamVtkFaMeshAdaptor.C +++ b/src/catalyst/areaMesh/foamVtkFaMeshAdaptor.C @@ -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; } } diff --git a/src/catalyst/areaMesh/foamVtkFaMeshAdaptorFieldTemplates.C b/src/catalyst/areaMesh/foamVtkFaMeshAdaptorFieldTemplates.C index b04583d..b9dbddb 100644 --- a/src/catalyst/areaMesh/foamVtkFaMeshAdaptorFieldTemplates.C +++ b/src/catalyst/areaMesh/foamVtkFaMeshAdaptorFieldTemplates.C @@ -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 cdata = convertAreaFieldToVTK diff --git a/src/catalyst/areaMesh/foamVtkFaMeshAdaptorFields.C b/src/catalyst/areaMesh/foamVtkFaMeshAdaptorFields.C index 7b301fa..416c969 100644 --- a/src/catalyst/areaMesh/foamVtkFaMeshAdaptorFields.C +++ b/src/catalyst/areaMesh/foamVtkFaMeshAdaptorFields.C @@ -53,7 +53,7 @@ Foam::wordHashSet Foam::vtk::faMeshAdaptor::knownFields if (fieldTypes::area.found(clsName)) { - allFields += iter.object(); + allFields += iter.val(); } } diff --git a/src/catalyst/catalystCoprocess.C b/src/catalyst/catalystCoprocess.C index f34b892..d4a5c1a 100644 --- a/src/catalyst/catalystCoprocess.C +++ b/src/catalyst/catalystCoprocess.C @@ -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. diff --git a/src/catalyst/catalystFunctionObject.C b/src/catalyst/catalystFunctionObject.C index 957dd5c..f114cc5 100644 --- a/src/catalyst/catalystFunctionObject.C +++ b/src/catalyst/catalystFunctionObject.C @@ -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. diff --git a/src/catalyst/catalystFunctionObject.H b/src/catalyst/catalystFunctionObject.H index e829aa9..59ba0d7 100644 --- a/src/catalyst/catalystFunctionObject.H +++ b/src/catalyst/catalystFunctionObject.H @@ -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. diff --git a/src/catalyst/volMesh/catalystFvMesh.C b/src/catalyst/volMesh/catalystFvMesh.C index dc6ccee..c4db7a7 100644 --- a/src/catalyst/volMesh/catalystFvMesh.C +++ b/src/catalyst/volMesh/catalystFvMesh.C @@ -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::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); diff --git a/src/catalyst/volMesh/catalystFvMesh.H b/src/catalyst/volMesh/catalystFvMesh.H index e9eb873..b313d71 100644 --- a/src/catalyst/volMesh/catalystFvMesh.H +++ b/src/catalyst/volMesh/catalystFvMesh.H @@ -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. diff --git a/src/catalyst/volMesh/foamVtkFvMeshAdaptor.C b/src/catalyst/volMesh/foamVtkFvMeshAdaptor.C index 790bb13..7cc6ca7 100644 --- a/src/catalyst/volMesh/foamVtkFvMeshAdaptor.C +++ b/src/catalyst/volMesh/foamVtkFvMeshAdaptor.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2017-2018 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2017-2019 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::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::New(); diff --git a/src/catalyst/volMesh/foamVtkFvMeshAdaptorFieldTemplates.C b/src/catalyst/volMesh/foamVtkFvMeshAdaptorFieldTemplates.C index 33e304e..6ccebd3 100644 --- a/src/catalyst/volMesh/foamVtkFvMeshAdaptorFieldTemplates.C +++ b/src/catalyst/volMesh/foamVtkFvMeshAdaptorFieldTemplates.C @@ -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 diff --git a/src/catalyst/volMesh/foamVtkFvMeshAdaptorFields.C b/src/catalyst/volMesh/foamVtkFvMeshAdaptorFields.C index a527dd5..298b24e 100644 --- a/src/catalyst/volMesh/foamVtkFvMeshAdaptorFields.C +++ b/src/catalyst/volMesh/foamVtkFvMeshAdaptorFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2017-2018 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2017-2019 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(); } } diff --git a/src/catalyst/volMesh/foamVtkFvMeshAdaptorGeom.C b/src/catalyst/volMesh/foamVtkFvMeshAdaptorGeom.C index 444e6fb..659947f 100644 --- a/src/catalyst/volMesh/foamVtkFvMeshAdaptorGeom.C +++ b/src/catalyst/volMesh/foamVtkFvMeshAdaptorGeom.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2017-2018 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2017-2019 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(); -- GitLab