Skip to content

Commit f4d0de2

Browse files
yut23yut23
authored
Rename the numeric type template parameter from dual_t to number_t (AMReX-Astro#1616)
This is more accurate, as it may be either `amrex::Real` or a dual type.
1 parent 393f003 commit f4d0de2

File tree

14 files changed

+183
-183
lines changed

14 files changed

+183
-183
lines changed

‎interfaces/rhs_type.H

+3-3
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ struct rate_tab_t
9595
}
9696
};
9797

98-
// dual_t is currently only used in the screening routines
99-
template <typename dual_t = amrex::Real>
98+
// number_t is currently only used in the screening routines
99+
template <typename number_t = amrex::Real>
100100
struct rhs_state_t
101101
{
102102
amrex::Real rho;
103103
tf_t tf;
104104
rate_tab_t tab;
105105
#ifdef SCREENING
106-
plasma_state_t<dual_t> pstate;
106+
plasma_state_t<number_t> pstate;
107107
#endif
108108
amrex::Real y_e;
109109
amrex::Real eta;

‎networks/aprox13/actual_network.H

+6-6
Original file line numberDiff line numberDiff line change
@@ -782,9 +782,9 @@ namespace RHS {
782782
return data;
783783
}
784784

785-
template<int rate, typename dual_t>
785+
template<int rate, typename number_t>
786786
AMREX_GPU_HOST_DEVICE AMREX_INLINE
787-
void evaluate_analytical_rate (const rhs_state_t<dual_t>& state, rate_t& rates)
787+
void evaluate_analytical_rate (const rhs_state_t<number_t>& state, rate_t& rates)
788788
{
789789
using namespace Species;
790790
using namespace Rates;
@@ -884,9 +884,9 @@ namespace RHS {
884884
}
885885
}
886886

887-
template<int rate, typename dual_t>
887+
template<int rate, typename number_t>
888888
AMREX_GPU_HOST_DEVICE AMREX_INLINE
889-
void postprocess_rate ([[maybe_unused]] const rhs_state_t<dual_t>& state, rate_t& rates,
889+
void postprocess_rate ([[maybe_unused]] const rhs_state_t<number_t>& state, rate_t& rates,
890890
rate_t& rates1, rate_t& rates2, rate_t& rates3)
891891
{
892892
using namespace Species;
@@ -968,9 +968,9 @@ namespace RHS {
968968
}
969969
}
970970

971-
template<int spec, typename dual_t>
971+
template<int spec, typename number_t>
972972
AMREX_GPU_HOST_DEVICE AMREX_INLINE
973-
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<dual_t>& rhs_state, amrex::Real const& dydt)
973+
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<number_t>& rhs_state, amrex::Real const& dydt)
974974
{
975975
return dydt * network::mion<spec>() * C::Legacy::enuc_conv2;
976976
}

‎networks/aprox19/actual_network.H

+6-6
Original file line numberDiff line numberDiff line change
@@ -1335,9 +1335,9 @@ namespace RHS {
13351335
return data;
13361336
}
13371337

1338-
template<int rate, typename dual_t>
1338+
template<int rate, typename number_t>
13391339
AMREX_GPU_HOST_DEVICE AMREX_INLINE
1340-
void evaluate_analytical_rate (const rhs_state_t<dual_t>& state, rate_t& rates)
1340+
void evaluate_analytical_rate (const rhs_state_t<number_t>& state, rate_t& rates)
13411341
{
13421342
using namespace Species;
13431343
using namespace Rates;
@@ -1505,9 +1505,9 @@ namespace RHS {
15051505
}
15061506
}
15071507

1508-
template<int rate, typename dual_t>
1508+
template<int rate, typename number_t>
15091509
AMREX_GPU_HOST_DEVICE AMREX_INLINE
1510-
void postprocess_rate (const rhs_state_t<dual_t>& state, rate_t& rates,
1510+
void postprocess_rate (const rhs_state_t<number_t>& state, rate_t& rates,
15111511
rate_t& rates1, rate_t& rates2, rate_t& rates3)
15121512
{
15131513
using namespace Species;
@@ -1835,9 +1835,9 @@ namespace RHS {
18351835
}
18361836
}
18371837

1838-
template<int spec, typename dual_t>
1838+
template<int spec, typename number_t>
18391839
AMREX_GPU_HOST_DEVICE AMREX_INLINE
1840-
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<dual_t>& rhs_state, amrex::Real const& dydt)
1840+
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<number_t>& rhs_state, amrex::Real const& dydt)
18411841
{
18421842
return dydt * network::mion<spec>() * C::Legacy::enuc_conv2;
18431843
}

‎networks/aprox21/actual_network.H

+6-6
Original file line numberDiff line numberDiff line change
@@ -1471,9 +1471,9 @@ namespace RHS {
14711471
return data;
14721472
}
14731473

1474-
template<int rate, typename dual_t>
1474+
template<int rate, typename number_t>
14751475
AMREX_GPU_HOST_DEVICE AMREX_INLINE
1476-
void evaluate_analytical_rate (const rhs_state_t<dual_t>& state, rate_t& rates)
1476+
void evaluate_analytical_rate (const rhs_state_t<number_t>& state, rate_t& rates)
14771477
{
14781478
using namespace Species;
14791479
using namespace Rates;
@@ -1645,9 +1645,9 @@ namespace RHS {
16451645
}
16461646
}
16471647

1648-
template<int rate, typename dual_t>
1648+
template<int rate, typename number_t>
16491649
AMREX_GPU_HOST_DEVICE AMREX_INLINE
1650-
void postprocess_rate (const rhs_state_t<dual_t>& state, rate_t& rates,
1650+
void postprocess_rate (const rhs_state_t<number_t>& state, rate_t& rates,
16511651
rate_t& rates1, rate_t& rates2, rate_t& rates3)
16521652
{
16531653
using namespace Species;
@@ -2026,9 +2026,9 @@ namespace RHS {
20262026
}
20272027
}
20282028

2029-
template<int spec, typename dual_t>
2029+
template<int spec, typename number_t>
20302030
AMREX_GPU_HOST_DEVICE AMREX_INLINE
2031-
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<dual_t>& rhs_state, amrex::Real const& dydt)
2031+
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<number_t>& rhs_state, amrex::Real const& dydt)
20322032
{
20332033
return dydt * network::mion<spec>() * C::Legacy::enuc_conv2;
20342034
}

‎networks/ignition_chamulak/actual_network.H

+6-6
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ namespace RHS {
6565
return data;
6666
}
6767

68-
template<int rate, typename dual_t>
68+
template<int rate, typename number_t>
6969
AMREX_GPU_HOST_DEVICE AMREX_INLINE
70-
void evaluate_analytical_rate (const rhs_state_t<dual_t>& state, rate_t& rates)
70+
void evaluate_analytical_rate (const rhs_state_t<number_t>& state, rate_t& rates)
7171
{
7272
using namespace Species;
7373
using namespace Rates;
@@ -97,17 +97,17 @@ namespace RHS {
9797
}
9898
}
9999

100-
template<int rate, typename dual_t>
100+
template<int rate, typename number_t>
101101
AMREX_GPU_HOST_DEVICE AMREX_INLINE
102-
void postprocess_rate (const rhs_state_t<dual_t>& state, rate_t& rates,
102+
void postprocess_rate (const rhs_state_t<number_t>& state, rate_t& rates,
103103
rate_t& rates1, rate_t& rates2, rate_t& rates3)
104104
{
105105
// Nothing to do for this network.
106106
}
107107

108-
template<int spec, typename dual_t>
108+
template<int spec, typename number_t>
109109
AMREX_GPU_HOST_DEVICE AMREX_INLINE
110-
amrex::Real ener_gener_rate (const rhs_state_t<dual_t>& rhs_state, amrex::Real const& dydt)
110+
amrex::Real ener_gener_rate (const rhs_state_t<number_t>& rhs_state, amrex::Real const& dydt)
111111
{
112112
// Chamulak et al. provide the q-value resulting from C12 burning,
113113
// given as 3 different values (corresponding to 3 different densities).

‎networks/ignition_simple/actual_network.H

+6-6
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ namespace RHS
137137
return data;
138138
}
139139

140-
template<int rate, typename dual_t>
140+
template<int rate, typename number_t>
141141
AMREX_GPU_HOST_DEVICE AMREX_INLINE
142-
void evaluate_analytical_rate (const rhs_state_t<dual_t>& state, rate_t& rates)
142+
void evaluate_analytical_rate (const rhs_state_t<number_t>& state, rate_t& rates)
143143
{
144144
using namespace Species;
145145
using namespace Rates;
@@ -149,9 +149,9 @@ namespace RHS
149149
}
150150
}
151151

152-
template<int rate, typename dual_t>
152+
template<int rate, typename number_t>
153153
AMREX_GPU_HOST_DEVICE AMREX_INLINE
154-
void postprocess_rate ([[maybe_unused]] const rhs_state_t<dual_t>& state, [[maybe_unused]] rate_t& rates,
154+
void postprocess_rate ([[maybe_unused]] const rhs_state_t<number_t>& state, [[maybe_unused]] rate_t& rates,
155155
[[maybe_unused]] rate_t& rates1, [[maybe_unused]] rate_t& rates2, [[maybe_unused]] rate_t& rates3)
156156
{
157157
using namespace Species;
@@ -160,9 +160,9 @@ namespace RHS
160160
// Nothing to do for this network.
161161
}
162162

163-
template<int spec, typename dual_t>
163+
template<int spec, typename number_t>
164164
AMREX_GPU_HOST_DEVICE AMREX_INLINE
165-
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<dual_t>& rhs_state, amrex::Real const& dydt)
165+
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<number_t>& rhs_state, amrex::Real const& dydt)
166166
{
167167
return dydt * network::mion<spec>() * C::Legacy::enuc_conv2;
168168
}

‎networks/iso7/actual_network.H

+6-6
Original file line numberDiff line numberDiff line change
@@ -313,9 +313,9 @@ namespace RHS {
313313
return data;
314314
}
315315

316-
template<int rate, typename dual_t>
316+
template<int rate, typename number_t>
317317
AMREX_GPU_HOST_DEVICE AMREX_INLINE
318-
void evaluate_analytical_rate (const rhs_state_t<dual_t>& state, rate_t& rates)
318+
void evaluate_analytical_rate (const rhs_state_t<number_t>& state, rate_t& rates)
319319
{
320320
using namespace Species;
321321
using namespace Rates;
@@ -349,9 +349,9 @@ namespace RHS {
349349
}
350350
}
351351

352-
template<int rate, typename dual_t>
352+
template<int rate, typename number_t>
353353
AMREX_GPU_HOST_DEVICE AMREX_INLINE
354-
void postprocess_rate (const rhs_state_t<dual_t>& state, rate_t& rates,
354+
void postprocess_rate (const rhs_state_t<number_t>& state, rate_t& rates,
355355
rate_t& rates1, [[maybe_unused]] rate_t& rates2, [[maybe_unused]] rate_t& rates3)
356356
{
357357
using namespace Species;
@@ -388,9 +388,9 @@ namespace RHS {
388388
}
389389
}
390390

391-
template<int spec, typename dual_t>
391+
template<int spec, typename number_t>
392392
AMREX_GPU_HOST_DEVICE AMREX_INLINE
393-
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<dual_t>& rhs_state, amrex::Real const& dydt)
393+
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<number_t>& rhs_state, amrex::Real const& dydt)
394394
{
395395
return dydt * network::mion<spec>() * C::Legacy::enuc_conv2;
396396
}

‎networks/powerlaw/actual_network.H

+6-6
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ namespace RHS {
5353
return data;
5454
}
5555

56-
template<int rate, typename dual_t>
56+
template<int rate, typename number_t>
5757
AMREX_GPU_HOST_DEVICE AMREX_INLINE
58-
void evaluate_analytical_rate (const rhs_state_t<dual_t>& state, rate_t& rates)
58+
void evaluate_analytical_rate (const rhs_state_t<number_t>& state, rate_t& rates)
5959
{
6060
using namespace Species;
6161
using namespace Rates;
@@ -73,17 +73,17 @@ namespace RHS {
7373
}
7474
}
7575

76-
template<int rate, typename dual_t>
76+
template<int rate, typename number_t>
7777
AMREX_GPU_HOST_DEVICE AMREX_INLINE
78-
void postprocess_rate (const rhs_state_t<dual_t>& state, rate_t& rates,
78+
void postprocess_rate (const rhs_state_t<number_t>& state, rate_t& rates,
7979
rate_t& rates1, rate_t& rates2, rate_t& rates3)
8080
{
8181
// Nothing to do for this network.
8282
}
8383

84-
template<int spec, typename dual_t>
84+
template<int spec, typename number_t>
8585
AMREX_GPU_HOST_DEVICE AMREX_INLINE
86-
Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<dual_t>& rhs_state, Real const& dydt)
86+
Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<number_t>& rhs_state, Real const& dydt)
8787
{
8888
if constexpr (spec == 2) {
8989
return dydt * NetworkProperties::aion(spec) * network_rp::specific_q_burn;

‎networks/rhs.H

+8-8
Original file line numberDiff line numberDiff line change
@@ -405,9 +405,9 @@ constexpr int density_exponent_reverse ()
405405
}
406406

407407
// Scale a rate using the density terms.
408-
template<int rate, typename dual_t>
408+
template<int rate, typename number_t>
409409
AMREX_GPU_HOST_DEVICE AMREX_INLINE
410-
void apply_density_scaling (const rhs_state_t<dual_t>& state, rate_t& rates)
410+
void apply_density_scaling (const rhs_state_t<number_t>& state, rate_t& rates)
411411
{
412412
constexpr int forward_exponent = density_exponent_forward<rate>();
413413
constexpr int reverse_exponent = density_exponent_reverse<rate>();
@@ -447,9 +447,9 @@ void apply_density_scaling (const rhs_state_t<dual_t>& state, rate_t& rates)
447447

448448
#ifdef SCREENING
449449
// Apply the screening term to a given rate.
450-
template<int rate, typename dual_t>
450+
template<int rate, typename number_t>
451451
AMREX_GPU_HOST_DEVICE AMREX_INLINE
452-
void apply_screening (const rhs_state_t<dual_t>& state, rate_t& rates)
452+
void apply_screening (const rhs_state_t<number_t>& state, rate_t& rates)
453453
{
454454
// The screening behavior depends on the type of reaction. We provide screening
455455
// here for the reaction classes we know about, and any other reactions are unscreened.
@@ -622,9 +622,9 @@ void tabulate_rates ()
622622
}
623623

624624
// Evaluate a rate using the rate tables.
625-
template<int rate, typename dual_t>
625+
template<int rate, typename number_t>
626626
AMREX_GPU_HOST_DEVICE AMREX_INLINE
627-
void evaluate_tabulated_rate (const rhs_state_t<dual_t>& state, rate_t& rates)
627+
void evaluate_tabulated_rate (const rhs_state_t<number_t>& state, rate_t& rates)
628628
{
629629
rates.fr = (state.tab.alfa * rattab(rate, 1, state.tab.iat ) +
630630
state.tab.beta * rattab(rate, 1, state.tab.iat+1) +
@@ -1141,9 +1141,9 @@ constexpr amrex::Real jac_term (const burn_t& state, const rate_t& rates)
11411141
return term;
11421142
}
11431143

1144-
template<int rate, typename dual_t>
1144+
template<int rate, typename number_t>
11451145
AMREX_GPU_HOST_DEVICE AMREX_INLINE
1146-
void construct_rate (const rhs_state_t<dual_t>& state, rate_t& rates)
1146+
void construct_rate (const rhs_state_t<number_t>& state, rate_t& rates)
11471147
{
11481148
using namespace Species;
11491149
using namespace Rates;

‎networks/rprox/actual_network.H

+6-6
Original file line numberDiff line numberDiff line change
@@ -701,9 +701,9 @@ namespace RHS {
701701
return data;
702702
}
703703

704-
template<int rate, typename dual_t>
704+
template<int rate, typename number_t>
705705
AMREX_GPU_HOST_DEVICE AMREX_INLINE
706-
void evaluate_analytical_rate (const rhs_state_t<dual_t>& state, rate_t& rates)
706+
void evaluate_analytical_rate (const rhs_state_t<number_t>& state, rate_t& rates)
707707
{
708708
using namespace Species;
709709
using namespace Rates;
@@ -764,9 +764,9 @@ namespace RHS {
764764
rates.frdt *= 1.0e-9_rt;
765765
}
766766

767-
template<int rate, typename dual_t>
767+
template<int rate, typename number_t>
768768
AMREX_GPU_HOST_DEVICE AMREX_INLINE
769-
void postprocess_rate ([[maybe_unused]] const rhs_state_t<dual_t>& state, [[maybe_unused]] rate_t& rates,
769+
void postprocess_rate ([[maybe_unused]] const rhs_state_t<number_t>& state, [[maybe_unused]] rate_t& rates,
770770
[[maybe_unused]] rate_t& rates1, [[maybe_unused]] rate_t& rates2, [[maybe_unused]] rate_t& rates3)
771771
{
772772
using namespace Species;
@@ -917,9 +917,9 @@ namespace RHS {
917917
}
918918
}
919919

920-
template<int spec, typename dual_t>
920+
template<int spec, typename number_t>
921921
AMREX_GPU_HOST_DEVICE AMREX_INLINE
922-
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<dual_t>& rhs_state, amrex::Real const& dydt)
922+
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<number_t>& rhs_state, amrex::Real const& dydt)
923923
{
924924
return dydt * network::bion<spec>() * C::Legacy::n_A * C::Legacy::MeV2erg;
925925
}

‎networks/triple_alpha_plus_cago/actual_network.H

+6-6
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ namespace RHS {
149149
return data;
150150
}
151151

152-
template<int rate, typename dual_t>
152+
template<int rate, typename number_t>
153153
AMREX_GPU_HOST_DEVICE AMREX_INLINE
154-
void evaluate_analytical_rate (const rhs_state_t<dual_t>& state, rate_t& rates)
154+
void evaluate_analytical_rate (const rhs_state_t<number_t>& state, rate_t& rates)
155155
{
156156
using namespace Species;
157157
using namespace Rates;
@@ -164,9 +164,9 @@ namespace RHS {
164164
}
165165
}
166166

167-
template<int rate, typename dual_t>
167+
template<int rate, typename number_t>
168168
AMREX_GPU_HOST_DEVICE AMREX_INLINE
169-
void postprocess_rate ([[maybe_unused]] const rhs_state_t<dual_t>& state, rate_t& rates,
169+
void postprocess_rate ([[maybe_unused]] const rhs_state_t<number_t>& state, rate_t& rates,
170170
rate_t& rates1, rate_t& rates2, rate_t& rates3)
171171
{
172172
using namespace Species;
@@ -175,9 +175,9 @@ namespace RHS {
175175
// Nothing to do for this network.
176176
}
177177

178-
template<int spec, typename dual_t>
178+
template<int spec, typename number_t>
179179
AMREX_GPU_HOST_DEVICE AMREX_INLINE
180-
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<dual_t>& rhs_state, amrex::Real const& dydt)
180+
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<number_t>& rhs_state, amrex::Real const& dydt)
181181
{
182182
return dydt * network::mion<spec>() * C::Legacy::enuc_conv2;
183183
}

0 commit comments

Comments
 (0)