diff --git a/src/paraview-plugins/foamPv/foamPvCoreTemplates.C b/src/paraview-plugins/foamPv/foamPvCoreTemplates.C index 8d40eee752adc6da7df56b6a8f3ec0ee0287831a..c3c95a1f1248f1f2b17ce617be03760ba4e444b9 100644 --- a/src/paraview-plugins/foamPv/foamPvCoreTemplates.C +++ b/src/paraview-plugins/foamPv/foamPvCoreTemplates.C @@ -118,7 +118,7 @@ Foam::label Foam::foamPvCore::addToSelection if (iter.found()) { - return addToArray(select, prefix, iter.object().sortedToc()); + return addToArray(select, prefix, iter.val().sortedToc()); } return 0; @@ -137,7 +137,7 @@ Foam::label Foam::foamPvCore::addToSelection if (iter.found()) { - return addToArray(select, iter.object().sortedToc(), suffix); + return addToArray(select, iter.val().sortedToc(), suffix); } return 0; diff --git a/src/paraview-plugins/vtkPVFoam/vtkPVFoam.C b/src/paraview-plugins/vtkPVFoam/vtkPVFoam.C index 2e6850c57b940378ff375ab8eaaab444bd78054f..0c951bdab466a3eba45e8804b5da32ebd37ce853 100644 --- a/src/paraview-plugins/vtkPVFoam/vtkPVFoam.C +++ b/src/paraview-plugins/vtkPVFoam/vtkPVFoam.C @@ -144,9 +144,9 @@ bool Foam::vtkPVFoam::addOutputBlock const word shortName = getFoamName(longName); auto iter = cache.find(longName); - if (iter.found() && iter.object().dataset) + if (iter.found() && iter.val().dataset) { - auto dataset = iter.object().dataset; + auto dataset = iter.val().dataset; if (singleDataset) { @@ -540,13 +540,13 @@ void Foam::vtkPVFoam::Update // 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(); } } else if (oldDecomp != decomposePoly_) @@ -554,8 +554,8 @@ void Foam::vtkPVFoam::Update // poly-decompose changed - dispose of cached values forAllIters(cachedVtu_, iter) { - iter.object().clearGeom(); - iter.object().clear(); + iter.val().clearGeom(); + iter.val().clear(); } } } diff --git a/src/paraview-plugins/vtkPVFoam/vtkPVFoamFieldTemplates.C b/src/paraview-plugins/vtkPVFoam/vtkPVFoamFieldTemplates.C index 6cb7a81cde77fe360d6e787af557cfd7c4079cdb..1790c2dffe0d37f72c1a916b647190be80872991 100644 --- a/src/paraview-plugins/vtkPVFoam/vtkPVFoamFieldTemplates.C +++ b/src/paraview-plugins/vtkPVFoam/vtkPVFoamFieldTemplates.C @@ -91,13 +91,13 @@ void Foam::vtkPVFoam::convertVolField const auto& longName = selectedPartIds_[partId]; 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 continue; } - foamVtpData& vtpData = iter.object(); + foamVtpData& vtpData = iter.val(); auto dataset = vtpData.dataset; const labelUList& patchIds = vtpData.additionalIds(); @@ -195,13 +195,13 @@ void Foam::vtkPVFoam::convertVolField const word zoneName = getFoamName(longName); 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 continue; } - foamVtpData& vtpData = iter.object(); + foamVtpData& vtpData = iter.val(); auto dataset = vtpData.dataset; const faceZoneMesh& zMesh = mesh.faceZones(); @@ -236,12 +236,12 @@ void Foam::vtkPVFoam::convertVolField const word selectName = getFoamName(longName); 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 continue; } - foamVtpData& vtpData = iter.object(); + foamVtpData& vtpData = iter.val(); auto dataset = vtpData.dataset; vtkSmartPointer<vtkFloatArray> cdata = convertFaceFieldToVTK @@ -270,7 +270,7 @@ void Foam::vtkPVFoam::convertVolFields forAllConstIters(objects, iter) { // Restrict to GeometricField<Type, ...> - const auto& ioobj = *(iter.object()); + const auto& ioobj = *(iter.val()); if (ioobj.headerClassName() == FieldType::typeName) { @@ -320,7 +320,7 @@ void Foam::vtkPVFoam::convertDimFields forAllConstIters(objects, iter) { // Restrict to DimensionedField<Type, ...> - const auto& ioobj = *(iter.object()); + const auto& ioobj = *(iter.val()); if (ioobj.headerClassName() != FieldType::typeName) { @@ -404,13 +404,13 @@ void Foam::vtkPVFoam::convertVolFieldBlock const auto& longName = selectedPartIds_[partId]; 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 continue; } - foamVtuData& vtuData = iter.object(); + foamVtuData& vtuData = iter.val(); auto dataset = vtuData.dataset; vtkSmartPointer<vtkFloatArray> cdata = convertVolFieldToVTK @@ -459,7 +459,7 @@ void Foam::vtkPVFoam::convertAreaFields forAllConstIters(objects, iter) { // Restrict to GeometricField<Type, ...> - const auto& ioobj = *(iter.object()); + const auto& ioobj = *(iter.val()); if (ioobj.headerClassName() == FieldType::typeName) { @@ -478,14 +478,14 @@ void Foam::vtkPVFoam::convertAreaFields const auto& longName = selectedPartIds_[partId]; 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 continue; } - foamVtpData& vtpData = iter.object(); + foamVtpData& vtpData = iter.val(); auto dataset = vtpData.dataset; vtkSmartPointer<vtkFloatArray> cdata = convertFieldToVTK @@ -535,7 +535,7 @@ void Foam::vtkPVFoam::convertPointFields forAllConstIters(objects, iter) { // Restrict to this GeometricField<Type, ...> - const auto& ioobj = *(iter.object()); + const auto& ioobj = *(iter.val()); const word& fieldName = ioobj.name(); if (ioobj.headerClassName() != FieldType::typeName) @@ -568,13 +568,13 @@ void Foam::vtkPVFoam::convertPointFields const auto& longName = selectedPartIds_[partId]; 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 continue; } - foamVtpData& vtpData = iter.object(); + foamVtpData& vtpData = iter.val(); auto dataset = vtpData.dataset; const labelUList& patchIds = vtpData.additionalIds(); @@ -605,13 +605,13 @@ void Foam::vtkPVFoam::convertPointFields const word zoneName = getFoamName(longName); 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 continue; } - foamVtpData& vtpData = iter.object(); + foamVtpData& vtpData = iter.val(); auto dataset = vtpData.dataset; const label zoneId = mesh.faceZones().findZoneID(zoneName); @@ -673,13 +673,13 @@ void Foam::vtkPVFoam::convertPointFieldBlock const auto& longName = selectedPartIds_[partId]; 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 continue; } - foamVtuData& vtuData = iter.object(); + foamVtuData& vtuData = iter.val(); auto dataset = vtuData.dataset; vtkSmartPointer<vtkFloatArray> pdata = convertPointField @@ -794,7 +794,7 @@ void Foam::vtkPVFoam::convertLagrangianFields forAllConstIters(objects, iter) { // Restrict to IOField<Type> - const auto& ioobj = *(iter.object()); + const auto& ioobj = *(iter.val()); if (ioobj.headerClassName() == IOField<Type>::typeName) { diff --git a/src/paraview-plugins/vtkPVFoam/vtkPVFoamFields.C b/src/paraview-plugins/vtkPVFoam/vtkPVFoamFields.C index 88ed5f9574eae71258acee24dc8c917af1fdb0d7..0ab260c70b3acd3e75d11b64141443dd034fb040 100644 --- a/src/paraview-plugins/vtkPVFoam/vtkPVFoamFields.C +++ b/src/paraview-plugins/vtkPVFoam/vtkPVFoamFields.C @@ -255,12 +255,12 @@ void Foam::vtkPVFoam::convertLagrangianFields() const word cloudName = getFoamName(longName); 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 continue; } - auto dataset = iter.object().dataset; + auto dataset = iter.val().dataset; // Get the Lagrangian fields for this time and this cloud // but only keep selected fields diff --git a/src/paraview-plugins/vtkPVFoam/vtkPVFoamMeshLagrangian.C b/src/paraview-plugins/vtkPVFoam/vtkPVFoamMeshLagrangian.C index 378e8fcd55f0c009c03f3e6575a2025afdd1e082..ad47bcc72db97872a516f5513f7af89c92a59353 100644 --- a/src/paraview-plugins/vtkPVFoam/vtkPVFoamMeshLagrangian.C +++ b/src/paraview-plugins/vtkPVFoam/vtkPVFoamMeshLagrangian.C @@ -80,9 +80,9 @@ vtkSmartPointer<vtkPolyData> Foam::vtkPVFoam::lagrangianVTKMesh vtkpoints->SetNumberOfPoints(parcels.size()); vtkIdType particleId = 0; - forAllConstIters(parcels, iter) + for (const passiveParticle& p : parcels) { - vtkpoints->SetPoint(particleId, iter().position().v_); + vtkpoints->SetPoint(particleId, p.position().v_); ++particleId; } diff --git a/src/paraview-plugins/vtkPVFoam/vtkPVFoamUpdateInfo.C b/src/paraview-plugins/vtkPVFoam/vtkPVFoamUpdateInfo.C index eb99abc5a90796ea133d59396b0701022219c748..52e8bd2d4750fa2605a4e59fb468e0cea5817b69 100644 --- a/src/paraview-plugins/vtkPVFoam/vtkPVFoamUpdateInfo.C +++ b/src/paraview-plugins/vtkPVFoam/vtkPVFoamUpdateInfo.C @@ -276,7 +276,7 @@ void Foam::vtkPVFoam::updateInfoPatches forAllConstIters(groups, iter) { const auto& groupName = iter.key(); - const auto& patchIDs = iter.object(); + const auto& patchIDs = iter.val(); label nFaces = 0; for (auto patchId : patchIDs) @@ -392,7 +392,7 @@ void Foam::vtkPVFoam::updateInfoPatches forAllConstIters(groups, iter) { const auto& groupName = iter.key(); - const auto& patchIDs = iter.object(); + const auto& patchIDs = iter.val(); const string dpyName = "group/" + groupName; displayNames.append(dpyName); @@ -715,7 +715,7 @@ void Foam::vtkPVFoam::updateInfoLagrangianFields forAllConstIters(localFields, iter) { - fields(iter.key()) |= iter.object(); + fields(iter.key()) |= iter.val(); } } }