use spans() to unpack

exasim-project · Feb 15, 2025 · 139ea2c · 139ea2c
1 parent 5772724
commit 139ea2c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/src/finiteVolume/cellCentred/interpolation/linear.cpp b/src/finiteVolume/cellCentred/interpolation/linear.cpp
@@ -28,11 +28,13 @@ void computeLinearInterpolation(
 {
     const auto exec = dst.exec();
     auto dstS = dst.internalField().span();
-    const auto srcS = src.internalField().span();
-    const auto weightS = weights.internalField().span();
-    const auto ownerS = dst.mesh().faceOwner().span();
-    const auto neighS = dst.mesh().faceNeighbour().span();
-    const auto boundS = src.boundaryField().value().span();
+    const auto [srcS, weightS, ownerS, neighS, boundS] = spans(
+        src.internalField(),
+        weights.internalField(),
+        dst.mesh().faceOwner(),
+        dst.mesh().faceNeighbour(),
+        src.boundaryField().value()
+    );
     size_t nInternalFaces = dst.mesh().nInternalFaces();
 
     NeoFOAM::parallelFor(

diff --git a/src/finiteVolume/cellCentred/interpolation/upwind.cpp b/src/finiteVolume/cellCentred/interpolation/upwind.cpp
@@ -30,12 +30,14 @@ void computeUpwindInterpolation(
 {
     const auto exec = dst.exec();
     auto dstS = dst.internalField().span();
-    const auto srcS = src.internalField().span();
-    const auto weightS = weights.internalField().span();
-    const auto ownerS = dst.mesh().faceOwner().span();
-    const auto neighS = dst.mesh().faceNeighbour().span();
-    const auto boundS = src.boundaryField().value().span();
-    const auto fluxS = flux.internalField().span();
+    const auto [srcS, weightS, ownerS, neighS, boundS, fluxS] = spans(
+        src.internalField(),
+        weights.internalField(),
+        dst.mesh().faceOwner(),
+        dst.mesh().faceNeighbour(),
+        src.boundaryField().value(),
+        flux.internalField()
+    );
     size_t nInternalFaces = dst.mesh().nInternalFaces();
 
     NeoFOAM::parallelFor(