replace AMREX_PARALLEL_FOR_3D -> amrex::ParallelFor (#1752)

zingale · web-flow · commit af2a9441f04b · 2025-02-13T13:17:39.000-05:00
diff --git a/unit_test/test_aprox_rates/aprox_rates_util.cpp b/unit_test/test_aprox_rates/aprox_rates_util.cpp
@@ -24,7 +24,8 @@ void aprox_rates_test(const Box& bx,
 
   const int ini56 = network_spec_index("nickel-56");
 
-  AMREX_PARALLEL_FOR_3D(bx, i, j, k,
+  amrex::ParallelFor(bx,
+  [=] AMREX_GPU_HOST_DEVICE (int i, int j, int k)
   {
 
     eos_extra_t eos_state;
@@ -444,7 +445,8 @@ void aprox_rates_extra_c12ag(const Box& bx,
 
     const int ini56 = network_spec_index("nickel-56");
 
-    AMREX_PARALLEL_FOR_3D(bx, i, j, k,
+    amrex::ParallelFor(bx,
+    [=] AMREX_GPU_HOST_DEVICE (int i, int j, int k)
     {
 
         eos_extra_t eos_state;
diff --git a/unit_test/test_conductivity/conductivity_util.cpp b/unit_test/test_conductivity/conductivity_util.cpp
@@ -22,7 +22,8 @@ void cond_test_C(const amrex::Box& bx,
   const int ih1 = network_spec_index("hydrogen-1");
   const int ihe4 = network_spec_index("helium-4");
 
-  AMREX_PARALLEL_FOR_3D(bx, i, j, k,
+  amrex::ParallelFor(bx,
+  [=] AMREX_GPU_HOST_DEVICE (int i, int j, int k)
   {
 
     // set the composition -- approximately solar
diff --git a/unit_test/test_eos/eos_util.cpp b/unit_test/test_eos/eos_util.cpp
@@ -26,7 +26,8 @@ void eos_test_C(const Box& bx,
   const int ihe4 = network_spec_index("helium-4");
 
 
-  AMREX_PARALLEL_FOR_3D(bx, i, j, k,
+  amrex::ParallelFor(bx,
+  [=] AMREX_GPU_HOST_DEVICE (int i, int j, int k)
   {
 
     // set the composition -- approximately solar
diff --git a/unit_test/test_jac/main.cpp b/unit_test/test_jac/main.cpp
@@ -172,7 +172,8 @@ void main_main ()
 
         auto s = state.array(mfi);
 
-        AMREX_PARALLEL_FOR_3D(bx, i, j, k,
+        amrex::ParallelFor(bx,
+        [=] AMREX_GPU_HOST_DEVICE (int i, int j, int k)
         {
             do_jac(i, j, k, s, vars);
         });
diff --git a/unit_test/test_rhs/main.cpp b/unit_test/test_rhs/main.cpp
@@ -180,7 +180,8 @@ void main_main ()
 
         auto s = state.array(mfi);
 
-        AMREX_PARALLEL_FOR_3D(bx, i, j, k,
+        amrex::ParallelFor(bx,
+        [=] AMREX_GPU_HOST_DEVICE (int i, int j, int k)
         {
             do_rhs(i, j, k, s, vars);
         });
diff --git a/unit_test/test_sdc/main.cpp b/unit_test/test_sdc/main.cpp
@@ -197,7 +197,8 @@ void main_main ()
         auto s = state.array(mfi);
         auto n_rhs = integrator_n_rhs.array(mfi);
 
-        AMREX_PARALLEL_FOR_3D(bx, i, j, k,
+        amrex::ParallelFor(bx,
+        [=] AMREX_GPU_HOST_DEVICE (int i, int j, int k)
         {
             bool success = do_react(vars, i, j, k, s, n_rhs);
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@ void aprox_rates_test(const Box& bx,`
`24`	`24`
`25`	`25`	`const int ini56 = network_spec_index("nickel-56");`
`26`	`26`
`27`		`- AMREX_PARALLEL_FOR_3D(bx, i, j, k,`
	`27`	`+ amrex::ParallelFor(bx,`
	`28`	`+ [=] AMREX_GPU_HOST_DEVICE (int i, int j, int k)`
`28`	`29`	`{`
`29`	`30`
`30`	`31`	`eos_extra_t eos_state;`
`@@ -444,7 +445,8 @@ void aprox_rates_extra_c12ag(const Box& bx,`
`444`	`445`
`445`	`446`	`const int ini56 = network_spec_index("nickel-56");`
`446`	`447`
`447`		`- AMREX_PARALLEL_FOR_3D(bx, i, j, k,`
	`448`	`+ amrex::ParallelFor(bx,`
	`449`	`+ [=] AMREX_GPU_HOST_DEVICE (int i, int j, int k)`
`448`	`450`	`{`
`449`	`451`
`450`	`452`	`eos_extra_t eos_state;`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@ void cond_test_C(const amrex::Box& bx,`
`22`	`22`	`const int ih1 = network_spec_index("hydrogen-1");`
`23`	`23`	`const int ihe4 = network_spec_index("helium-4");`
`24`	`24`
`25`		`- AMREX_PARALLEL_FOR_3D(bx, i, j, k,`
	`25`	`+ amrex::ParallelFor(bx,`
	`26`	`+ [=] AMREX_GPU_HOST_DEVICE (int i, int j, int k)`
`26`	`27`	`{`
`27`	`28`
`28`	`29`	`// set the composition -- approximately solar`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,8 @@ void eos_test_C(const Box& bx,`
`26`	`26`	`const int ihe4 = network_spec_index("helium-4");`
`27`	`27`
`28`	`28`
`29`		`- AMREX_PARALLEL_FOR_3D(bx, i, j, k,`
	`29`	`+ amrex::ParallelFor(bx,`
	`30`	`+ [=] AMREX_GPU_HOST_DEVICE (int i, int j, int k)`
`30`	`31`	`{`
`31`	`32`
`32`	`33`	`// set the composition -- approximately solar`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,8 @@ void main_main ()`
`172`	`172`
`173`	`173`	`auto s = state.array(mfi);`
`174`	`174`
`175`		`- AMREX_PARALLEL_FOR_3D(bx, i, j, k,`
	`175`	`+ amrex::ParallelFor(bx,`
	`176`	`+ [=] AMREX_GPU_HOST_DEVICE (int i, int j, int k)`
`176`	`177`	`{`
`177`	`178`	`do_jac(i, j, k, s, vars);`
`178`	`179`	`});`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,8 @@ void main_main ()`
`180`	`180`
`181`	`181`	`auto s = state.array(mfi);`
`182`	`182`
`183`		`- AMREX_PARALLEL_FOR_3D(bx, i, j, k,`
	`183`	`+ amrex::ParallelFor(bx,`
	`184`	`+ [=] AMREX_GPU_HOST_DEVICE (int i, int j, int k)`
`184`	`185`	`{`
`185`	`186`	`do_rhs(i, j, k, s, vars);`
`186`	`187`	`});`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,8 @@ void main_main ()`
`197`	`197`	`auto s = state.array(mfi);`
`198`	`198`	`auto n_rhs = integrator_n_rhs.array(mfi);`
`199`	`199`
`200`		`- AMREX_PARALLEL_FOR_3D(bx, i, j, k,`
	`200`	`+ amrex::ParallelFor(bx,`
	`201`	`+ [=] AMREX_GPU_HOST_DEVICE (int i, int j, int k)`
`201`	`202`	`{`
`202`	`203`	`bool success = do_react(vars, i, j, k, s, n_rhs);`
`203`	`204`