Merge branch 'development' into fix_par2mesh_w_terrain

Author: AMLattanzi

.github/workflows/cuda-ci.yml

@@ -21,13 +21,12 @@ jobs:
     name: CUDA v${{matrix.cuda_ver}} - Particles ${{matrix.particles}}
     strategy:
       matrix:
-        cuda_pkg: [12-0]
+        cuda_pkg: [12-2]
         particles: [OFF, ON]
         include:
-          - cuda_ver: "12.0"
-            cuda_pkg: 12-0
-          - cuda_arch: "8.0"
-            cuda_pkg: 12-0
+          - cuda_ver: "12.2"
+            cuda_pkg: 12-2
+            cuda_arch: "8.0"
     steps:
       - name: Cancel previous runs
         uses: styfle/cancel-workflow-action@0.6.0

Source/IO/ERF_Plotfile.cpp

@@ -1800,7 +1800,7 @@ ERF::WriteMultiLevelPlotfileWithTerrain (const std::string& plotfilename, int nl
             boxArrays[level] = mf[level]->boxArray();
         }
 
-        auto f = [=]() {
+        auto f = [=,this]() {
             VisMF::IO_Buffer io_buffer(VisMF::IO_Buffer_Size);
             std::string HeaderFileName(plotfilename + "/Header");
             std::ofstream HeaderFile;

Source/Particles/ERFPCUtils.cpp

@@ -363,7 +363,7 @@ void ERFPC::ExtractAndRouteOORParticles ( int
             {
                 auto& p = p_pbox[i];
                 if (p.id() <= 0) { mask_ptr[i] = 0; return; }
-                int grd = src_lev_grid(p, 0, cell_assignor);
+                int grd = src_lev_grid(p, 0, cell_assignor).first;
                 mask_ptr[i] = (grd < 0) ? 1 : 0;
             });
 
@@ -404,7 +404,7 @@ void ERFPC::ExtractAndRouteOORParticles ( int
                                               lg.k_max, zlevels, nz_lev0,
                                               lg.ref_ratio );
                     p.idata(ERFParticlesIntIdxAoS::k) = k;
-                    int grd = ag_ptr[tl](p, 0, cell_assignor);
+                    int grd = ag_ptr[tl](p, 0, cell_assignor).first;
                     if (grd >= 0) { found_lev = tl; break; }
                 }
                 tgt_ptr[i] = found_lev;