use constexpr

AMReX-Astro · Jul 10, 2023 · 7e3fe94 · 7e3fe94
1 parent 202479b
commit 7e3fe94
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 36 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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