From 1f02620f5b9532b723b9337bcfb3b73776597c50 Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Wed, 12 Feb 2025 18:00:45 -0500 Subject: [PATCH] replace AMREX_PARALLEL_FOR_3D -> amrex::ParallelFor --- unit_test/test_aprox_rates/aprox_rates_util.cpp | 6 ++++-- unit_test/test_conductivity/conductivity_util.cpp | 3 ++- unit_test/test_eos/eos_util.cpp | 3 ++- unit_test/test_jac/main.cpp | 3 ++- unit_test/test_rhs/main.cpp | 3 ++- unit_test/test_sdc/main.cpp | 3 ++- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/unit_test/test_aprox_rates/aprox_rates_util.cpp b/unit_test/test_aprox_rates/aprox_rates_util.cpp index 65c0dfe2d8..6f2aef365e 100644 --- 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 index ca31bd202c..38163433eb 100644 --- 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 index d778264446..ce20ab1d7a 100644 --- 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 index 2aa372b6f6..1150000fe3 100644 --- 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 index e7ee5fcb20..7aba206a96 100644 --- 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 index 9b75a9ab57..1aabb86f65 100644 --- 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);