Skip to content

Commit efd26ed

Browse files
zhichen3zhichen3
authored
Merge branch 'development' into log_screen
2 parents f528713 + 64af4cf commit efd26ed

22 files changed

+55
-142
lines changed

‎CMakeLists.txt‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ function(setup_target_for_microphysics_compilation network_name output_dir)
4141
execute_process(COMMAND python3 "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/util/build_scripts/write_probin.py" --pa "${EOSparamfile} ${networkparamfile}
4242
${VODEparamfile} ${integrationparamfile}" --use_namespace WORKING_DIRECTORY ${output_dir}/)
4343

44-
set(gamma_law_sources ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/interfaces/eos_data.cpp
45-
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/interfaces/network_initialization.cpp
44+
set(gamma_law_sources ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/interfaces/network_initialization.cpp
4645
${output_dir}/extern_parameters.cpp PARENT_SCOPE)
4746
execute_process(COMMAND python3 "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/general_null/write_network.py" --header_template "${networkheadertemplatefile}" --header_output "${networkpropfile}" -s "${networkfile}" WORKING_DIRECTORY ${output_dir}/)
4847

@@ -82,9 +81,7 @@ function(setup_target_for_microphysics_compilation network_name output_dir)
8281
${networkparamfile} ${VODEparamfile} ${integrationparamfile} " --use_namespace WORKING_DIRECTORY ${output_dir}/)
8382
endif()
8483

85-
set(primordial_chem_sources ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/interfaces/eos_data.cpp
86-
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/interfaces/network_initialization.cpp
87-
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/EOS/primordial_chem/actual_eos_data.cpp
84+
set(primordial_chem_sources ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/interfaces/network_initialization.cpp
8885
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/primordial_chem/actual_network_data.cpp
8986
${output_dir}/extern_parameters.cpp PARENT_SCOPE)
9087

@@ -130,11 +127,9 @@ function(setup_target_for_microphysics_compilation network_name output_dir)
130127
endif()
131128

132129
#unlike primordial chem, we also include actual_network_data.cpp here because it is in there that we read in the Semenov opacity table
133-
set(metal_chem_sources ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/interfaces/eos_data.cpp
134-
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/interfaces/network_initialization.cpp
135-
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/EOS/metal_chem/actual_eos_data.cpp
136-
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/metal_chem/actual_network_data.cpp
137-
${output_dir}/extern_parameters.cpp PARENT_SCOPE)
130+
set(metal_chem_sources ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/interfaces/network_initialization.cpp
131+
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/networks/metal_chem/actual_network_data.cpp
132+
${output_dir}/extern_parameters.cpp PARENT_SCOPE)
138133

139134

140135
#below for NAUX

‎EOS/breakout/Make.package‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
CEXE_headers += actual_eos.H
22
CEXE_headers += actual_eos_data.H
3-
CEXE_sources += actual_eos_data.cpp

‎EOS/breakout/actual_eos_data.H‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
#include <AMReX.H>
55
#include <AMReX_REAL.H>
66

7-
extern AMREX_GPU_MANAGED amrex::Real gamma_const;
7+
inline AMREX_GPU_MANAGED amrex::Real gamma_const;
88

99
#endif

‎EOS/breakout/actual_eos_data.cpp‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎EOS/helmholtz/Make.package‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
CEXE_headers += actual_eos.H
22
CEXE_headers += actual_eos_data.H
3-
CEXE_sources += actual_eos_data.cpp

‎EOS/helmholtz/actual_eos_data.H‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ namespace helmholtz
99

1010
using namespace amrex::literals;
1111

12-
extern AMREX_GPU_MANAGED int do_coulomb;
13-
extern AMREX_GPU_MANAGED int input_is_constant;
12+
inline AMREX_GPU_MANAGED int do_coulomb;
13+
inline AMREX_GPU_MANAGED int input_is_constant;
1414

1515
// for the tables
1616

@@ -26,34 +26,34 @@ namespace helmholtz
2626
constexpr amrex::Real dstp = (dhi - dlo) / (static_cast<amrex::Real>(imax-1));
2727
constexpr amrex::Real dstpi = 1.0e0_rt / dstp;
2828

29-
extern AMREX_GPU_MANAGED amrex::Real d[imax];
30-
extern AMREX_GPU_MANAGED amrex::Real t[jmax];
29+
inline AMREX_GPU_MANAGED amrex::Real d[imax];
30+
inline AMREX_GPU_MANAGED amrex::Real t[jmax];
3131

32-
extern AMREX_GPU_MANAGED amrex::Real ttol;
33-
extern AMREX_GPU_MANAGED amrex::Real dtol;
32+
inline AMREX_GPU_MANAGED amrex::Real ttol;
33+
inline AMREX_GPU_MANAGED amrex::Real dtol;
3434

3535
// for the helmholtz free energy tables
36-
extern AMREX_GPU_MANAGED amrex::Real f[jmax][imax][9];
36+
inline AMREX_GPU_MANAGED amrex::Real f[jmax][imax][9];
3737

3838
// for the pressure derivative with density tables
39-
extern AMREX_GPU_MANAGED amrex::Real dpdf[jmax][imax][4];
39+
inline AMREX_GPU_MANAGED amrex::Real dpdf[jmax][imax][4];
4040

4141
// for chemical potential tables
42-
extern AMREX_GPU_MANAGED amrex::Real ef[jmax][imax][4];
42+
inline AMREX_GPU_MANAGED amrex::Real ef[jmax][imax][4];
4343

4444
// for the number density tables
45-
extern AMREX_GPU_MANAGED amrex::Real xf[jmax][imax][4];
45+
inline AMREX_GPU_MANAGED amrex::Real xf[jmax][imax][4];
4646

4747
// for storing the differences
48-
extern AMREX_GPU_MANAGED amrex::Real dt_sav[jmax];
49-
extern AMREX_GPU_MANAGED amrex::Real dt2_sav[jmax];
50-
extern AMREX_GPU_MANAGED amrex::Real dti_sav[jmax];
51-
extern AMREX_GPU_MANAGED amrex::Real dt2i_sav[jmax];
52-
53-
extern AMREX_GPU_MANAGED amrex::Real dd_sav[imax];
54-
extern AMREX_GPU_MANAGED amrex::Real dd2_sav[imax];
55-
extern AMREX_GPU_MANAGED amrex::Real ddi_sav[imax];
56-
extern AMREX_GPU_MANAGED amrex::Real dd2i_sav[imax];
48+
inline AMREX_GPU_MANAGED amrex::Real dt_sav[jmax];
49+
inline AMREX_GPU_MANAGED amrex::Real dt2_sav[jmax];
50+
inline AMREX_GPU_MANAGED amrex::Real dti_sav[jmax];
51+
inline AMREX_GPU_MANAGED amrex::Real dt2i_sav[jmax];
52+
53+
inline AMREX_GPU_MANAGED amrex::Real dd_sav[imax];
54+
inline AMREX_GPU_MANAGED amrex::Real dd2_sav[imax];
55+
inline AMREX_GPU_MANAGED amrex::Real ddi_sav[imax];
56+
inline AMREX_GPU_MANAGED amrex::Real dd2i_sav[imax];
5757

5858
// 2006 CODATA physical constants
5959
constexpr amrex::Real h = 6.6260689633e-27;

‎EOS/helmholtz/actual_eos_data.cpp‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎EOS/metal_chem/Make.package‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
CEXE_headers += actual_eos.H
22
CEXE_headers += actual_eos_data.H
3-
CEXE_sources += actual_eos_data.cpp

‎EOS/metal_chem/actual_eos_data.H‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <AMReX_REAL.H>
66
#include <network.H>
77

8-
extern AMREX_GPU_MANAGED amrex::Real gammas[NumSpec];
9-
extern AMREX_GPU_MANAGED amrex::Real spmasses[NumSpec];
8+
inline AMREX_GPU_MANAGED amrex::Real gammas[NumSpec];
9+
inline AMREX_GPU_MANAGED amrex::Real spmasses[NumSpec];
1010

1111
#endif

‎EOS/metal_chem/actual_eos_data.cpp‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)