From 7e3fe9490432da5269fdb2a5339ab7ddeb6d3961 Mon Sep 17 00:00:00 2001 From: Zhi Date: Mon, 10 Jul 2023 19:38:42 -0400 Subject: [PATCH] use constexpr --- networks/aprox13/actual_network.H | 8 ++++---- networks/aprox13/actual_network_data.cpp | 5 ----- networks/aprox19/actual_network.H | 8 ++++---- networks/aprox19/actual_network_data.cpp | 5 ----- networks/aprox21/actual_network.H | 8 ++++---- networks/aprox21/actual_network_data.cpp | 5 ----- networks/iso7/actual_network.H | 8 ++++---- networks/iso7/actual_network_data.cpp | 5 ----- 8 files changed, 16 insertions(+), 36 deletions(-) diff --git a/networks/aprox13/actual_network.H b/networks/aprox13/actual_network.H index aaebec7205..50f4143146 100644 --- a/networks/aprox13/actual_network.H +++ b/networks/aprox13/actual_network.H @@ -33,10 +33,10 @@ namespace network namespace NSE_INDEX { // p_index is for photoionization proton - extern AMREX_GPU_MANAGED int p_index; - extern AMREX_GPU_MANAGED int h1_index; - extern AMREX_GPU_MANAGED int n_index; - extern AMREX_GPU_MANAGED int he4_index; + constexpr int p_index= -1; + constexpr int h1_index = -1; + constexpr int n_index = -1; + constexpr int he4_index = 0; extern AMREX_GPU_MANAGED bool initialized; } #endif diff --git a/networks/aprox13/actual_network_data.cpp b/networks/aprox13/actual_network_data.cpp index 008afc9eef..9c20b3c397 100644 --- a/networks/aprox13/actual_network_data.cpp +++ b/networks/aprox13/actual_network_data.cpp @@ -10,11 +10,6 @@ namespace network #ifdef NSE_NET namespace NSE_INDEX { - // p_index is for photoionization proton - AMREX_GPU_MANAGED int p_index = -1; - AMREX_GPU_MANAGED int h1_index = -1; - AMREX_GPU_MANAGED int n_index = -1; - AMREX_GPU_MANAGED int he4_index = 0; AMREX_GPU_MANAGED bool initialized = false; } #endif diff --git a/networks/aprox19/actual_network.H b/networks/aprox19/actual_network.H index 8dee741e8c..2c959d9bee 100644 --- a/networks/aprox19/actual_network.H +++ b/networks/aprox19/actual_network.H @@ -58,10 +58,10 @@ namespace table namespace NSE_INDEX { // p_index is for photoionization proton - extern AMREX_GPU_MANAGED int p_index; - extern AMREX_GPU_MANAGED int h1_index; - extern AMREX_GPU_MANAGED int n_index; - extern AMREX_GPU_MANAGED int he4_index; + constexpr int p_index = 18; + constexpr int h1_index = 0; + constexpr int n_index = 17; + constexpr int he4_index = 2; extern AMREX_GPU_MANAGED bool initialized; } #endif diff --git a/networks/aprox19/actual_network_data.cpp b/networks/aprox19/actual_network_data.cpp index aa3ae62ac4..73f592d3d9 100644 --- a/networks/aprox19/actual_network_data.cpp +++ b/networks/aprox19/actual_network_data.cpp @@ -26,11 +26,6 @@ namespace table #ifdef NSE_NET namespace NSE_INDEX { - // p_index is for photoionization proton - AMREX_GPU_MANAGED int p_index = 18; - AMREX_GPU_MANAGED int h1_index = 0; - AMREX_GPU_MANAGED int n_index = 17; - AMREX_GPU_MANAGED int he4_index = 2; AMREX_GPU_MANAGED bool initialized = false; } #endif diff --git a/networks/aprox21/actual_network.H b/networks/aprox21/actual_network.H index 452dc32c1c..b626f31d9b 100644 --- a/networks/aprox21/actual_network.H +++ b/networks/aprox21/actual_network.H @@ -32,10 +32,10 @@ namespace network namespace NSE_INDEX { // p_index is for photoionization proton - extern AMREX_GPU_MANAGED int p_index; - extern AMREX_GPU_MANAGED int h1_index; - extern AMREX_GPU_MANAGED int n_index; - extern AMREX_GPU_MANAGED int he4_index; + constexpr int p_index = 20; + constexpr int h1_index = 0; + constexpr int n_index = 19; + constexpr int he4_index = 2; extern AMREX_GPU_MANAGED bool initialized; } #endif diff --git a/networks/aprox21/actual_network_data.cpp b/networks/aprox21/actual_network_data.cpp index 202a0ac14e..af1dbc3171 100644 --- a/networks/aprox21/actual_network_data.cpp +++ b/networks/aprox21/actual_network_data.cpp @@ -10,11 +10,6 @@ namespace network #ifdef NSE_NET namespace NSE_INDEX { - // p_index is for photoionization proton - AMREX_GPU_MANAGED int p_index = 20; - AMREX_GPU_MANAGED int h1_index = 0; - AMREX_GPU_MANAGED int n_index = 19; - AMREX_GPU_MANAGED int he4_index = 2; AMREX_GPU_MANAGED bool initialized = false; } #endif diff --git a/networks/iso7/actual_network.H b/networks/iso7/actual_network.H index 40aabd4059..e973f7f633 100644 --- a/networks/iso7/actual_network.H +++ b/networks/iso7/actual_network.H @@ -31,10 +31,10 @@ namespace network namespace NSE_INDEX { // p_index is for photoionization proton - extern AMREX_GPU_MANAGED int p_index; - extern AMREX_GPU_MANAGED int h1_index; - extern AMREX_GPU_MANAGED int n_index; - extern AMREX_GPU_MANAGED int he4_index; + constexpr int p_index = -1; + constexpr int h1_index = -1; + constexpr int n_index = -1; + constexpr int he4_index = 0; extern AMREX_GPU_MANAGED bool initialized; } #endif diff --git a/networks/iso7/actual_network_data.cpp b/networks/iso7/actual_network_data.cpp index 8c7e70fda6..4777ac38ed 100644 --- a/networks/iso7/actual_network_data.cpp +++ b/networks/iso7/actual_network_data.cpp @@ -11,11 +11,6 @@ namespace network #ifdef NSE_NET namespace NSE_INDEX { - // p_index is for photoionization proton - AMREX_GPU_MANAGED int p_index = -1; - AMREX_GPU_MANAGED int h1_index = -1; - AMREX_GPU_MANAGED int n_index = -1; - AMREX_GPU_MANAGED int he4_index = 0; AMREX_GPU_MANAGED bool initialized = false; } #endif