Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename the numeric type template parameter from dual_t to number_t #1616

Merged
merged 2 commits into from
Jul 17, 2024
Merged

Rename the numeric type template parameter from dual_t to number_t #1616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7208bb
Rename the numeric type template parameter from dual_t to number_t
yut23 Jul 17, 2024
b7f6478
Merge branch 'development' into rename-dual_t-template-parameter
yut23 Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions interfaces/rhs_type.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,15 @@ struct rate_tab_t
}
};

// dual_t is currently only used in the screening routines
template <typename dual_t = amrex::Real>
// number_t is currently only used in the screening routines
template <typename number_t = amrex::Real>
struct rhs_state_t
{
amrex::Real rho;
tf_t tf;
rate_tab_t tab;
#ifdef SCREENING
plasma_state_t<dual_t> pstate;
plasma_state_t<number_t> pstate;
#endif
amrex::Real y_e;
amrex::Real eta;
Expand Down
12 changes: 6 additions & 6 deletions networks/aprox13/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,9 +782,9 @@ namespace RHS {
return data;
}

template<int rate, typename dual_t>
template<int rate, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
void evaluate_analytical_rate (const rhs_state_t<dual_t>& state, rate_t& rates)
void evaluate_analytical_rate (const rhs_state_t<number_t>& state, rate_t& rates)
{
using namespace Species;
using namespace Rates;
Expand Down Expand Up @@ -884,9 +884,9 @@ namespace RHS {
}
}

template<int rate, typename dual_t>
template<int rate, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
void postprocess_rate ([[maybe_unused]] const rhs_state_t<dual_t>& state, rate_t& rates,
void postprocess_rate ([[maybe_unused]] const rhs_state_t<number_t>& state, rate_t& rates,
rate_t& rates1, rate_t& rates2, rate_t& rates3)
{
using namespace Species;
Expand Down Expand Up @@ -968,9 +968,9 @@ namespace RHS {
}
}

template<int spec, typename dual_t>
template<int spec, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<dual_t>& rhs_state, amrex::Real const& dydt)
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<number_t>& rhs_state, amrex::Real const& dydt)
{
return dydt * network::mion<spec>() * C::Legacy::enuc_conv2;
}
Expand Down
12 changes: 6 additions & 6 deletions networks/aprox19/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1335,9 +1335,9 @@ namespace RHS {
return data;
}

template<int rate, typename dual_t>
template<int rate, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
void evaluate_analytical_rate (const rhs_state_t<dual_t>& state, rate_t& rates)
void evaluate_analytical_rate (const rhs_state_t<number_t>& state, rate_t& rates)
{
using namespace Species;
using namespace Rates;
Expand Down Expand Up @@ -1505,9 +1505,9 @@ namespace RHS {
}
}

template<int rate, typename dual_t>
template<int rate, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
void postprocess_rate (const rhs_state_t<dual_t>& state, rate_t& rates,
void postprocess_rate (const rhs_state_t<number_t>& state, rate_t& rates,
rate_t& rates1, rate_t& rates2, rate_t& rates3)
{
using namespace Species;
Expand Down Expand Up @@ -1835,9 +1835,9 @@ namespace RHS {
}
}

template<int spec, typename dual_t>
template<int spec, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<dual_t>& rhs_state, amrex::Real const& dydt)
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<number_t>& rhs_state, amrex::Real const& dydt)
{
return dydt * network::mion<spec>() * C::Legacy::enuc_conv2;
}
Expand Down
12 changes: 6 additions & 6 deletions networks/aprox21/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1471,9 +1471,9 @@ namespace RHS {
return data;
}

template<int rate, typename dual_t>
template<int rate, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
void evaluate_analytical_rate (const rhs_state_t<dual_t>& state, rate_t& rates)
void evaluate_analytical_rate (const rhs_state_t<number_t>& state, rate_t& rates)
{
using namespace Species;
using namespace Rates;
Expand Down Expand Up @@ -1645,9 +1645,9 @@ namespace RHS {
}
}

template<int rate, typename dual_t>
template<int rate, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
void postprocess_rate (const rhs_state_t<dual_t>& state, rate_t& rates,
void postprocess_rate (const rhs_state_t<number_t>& state, rate_t& rates,
rate_t& rates1, rate_t& rates2, rate_t& rates3)
{
using namespace Species;
Expand Down Expand Up @@ -2026,9 +2026,9 @@ namespace RHS {
}
}

template<int spec, typename dual_t>
template<int spec, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<dual_t>& rhs_state, amrex::Real const& dydt)
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<number_t>& rhs_state, amrex::Real const& dydt)
{
return dydt * network::mion<spec>() * C::Legacy::enuc_conv2;
}
Expand Down
12 changes: 6 additions & 6 deletions networks/ignition_chamulak/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ namespace RHS {
return data;
}

template<int rate, typename dual_t>
template<int rate, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
void evaluate_analytical_rate (const rhs_state_t<dual_t>& state, rate_t& rates)
void evaluate_analytical_rate (const rhs_state_t<number_t>& state, rate_t& rates)
{
using namespace Species;
using namespace Rates;
Expand Down Expand Up @@ -97,17 +97,17 @@ namespace RHS {
}
}

template<int rate, typename dual_t>
template<int rate, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
void postprocess_rate (const rhs_state_t<dual_t>& state, rate_t& rates,
void postprocess_rate (const rhs_state_t<number_t>& state, rate_t& rates,
rate_t& rates1, rate_t& rates2, rate_t& rates3)
{
// Nothing to do for this network.
}

template<int spec, typename dual_t>
template<int spec, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
amrex::Real ener_gener_rate (const rhs_state_t<dual_t>& rhs_state, amrex::Real const& dydt)
amrex::Real ener_gener_rate (const rhs_state_t<number_t>& rhs_state, amrex::Real const& dydt)
{
// Chamulak et al. provide the q-value resulting from C12 burning,
// given as 3 different values (corresponding to 3 different densities).
Expand Down
12 changes: 6 additions & 6 deletions networks/ignition_simple/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ namespace RHS
return data;
}

template<int rate, typename dual_t>
template<int rate, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
void evaluate_analytical_rate (const rhs_state_t<dual_t>& state, rate_t& rates)
void evaluate_analytical_rate (const rhs_state_t<number_t>& state, rate_t& rates)
{
using namespace Species;
using namespace Rates;
Expand All @@ -149,9 +149,9 @@ namespace RHS
}
}

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

template<int spec, typename dual_t>
template<int spec, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<dual_t>& rhs_state, amrex::Real const& dydt)
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<number_t>& rhs_state, amrex::Real const& dydt)
{
return dydt * network::mion<spec>() * C::Legacy::enuc_conv2;
}
Expand Down
12 changes: 6 additions & 6 deletions networks/iso7/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,9 @@ namespace RHS {
return data;
}

template<int rate, typename dual_t>
template<int rate, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
void evaluate_analytical_rate (const rhs_state_t<dual_t>& state, rate_t& rates)
void evaluate_analytical_rate (const rhs_state_t<number_t>& state, rate_t& rates)
{
using namespace Species;
using namespace Rates;
Expand Down Expand Up @@ -349,9 +349,9 @@ namespace RHS {
}
}

template<int rate, typename dual_t>
template<int rate, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
void postprocess_rate (const rhs_state_t<dual_t>& state, rate_t& rates,
void postprocess_rate (const rhs_state_t<number_t>& state, rate_t& rates,
rate_t& rates1, [[maybe_unused]] rate_t& rates2, [[maybe_unused]] rate_t& rates3)
{
using namespace Species;
Expand Down Expand Up @@ -388,9 +388,9 @@ namespace RHS {
}
}

template<int spec, typename dual_t>
template<int spec, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<dual_t>& rhs_state, amrex::Real const& dydt)
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<number_t>& rhs_state, amrex::Real const& dydt)
{
return dydt * network::mion<spec>() * C::Legacy::enuc_conv2;
}
Expand Down
12 changes: 6 additions & 6 deletions networks/powerlaw/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ namespace RHS {
return data;
}

template<int rate, typename dual_t>
template<int rate, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
void evaluate_analytical_rate (const rhs_state_t<dual_t>& state, rate_t& rates)
void evaluate_analytical_rate (const rhs_state_t<number_t>& state, rate_t& rates)
{
using namespace Species;
using namespace Rates;
Expand All @@ -73,17 +73,17 @@ namespace RHS {
}
}

template<int rate, typename dual_t>
template<int rate, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
void postprocess_rate (const rhs_state_t<dual_t>& state, rate_t& rates,
void postprocess_rate (const rhs_state_t<number_t>& state, rate_t& rates,
rate_t& rates1, rate_t& rates2, rate_t& rates3)
{
// Nothing to do for this network.
}

template<int spec, typename dual_t>
template<int spec, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<dual_t>& rhs_state, Real const& dydt)
Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<number_t>& rhs_state, Real const& dydt)
{
if constexpr (spec == 2) {
return dydt * NetworkProperties::aion(spec) * network_rp::specific_q_burn;
Expand Down
16 changes: 8 additions & 8 deletions networks/rhs.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,9 +405,9 @@ constexpr int density_exponent_reverse ()
}

// Scale a rate using the density terms.
template<int rate, typename dual_t>
template<int rate, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
void apply_density_scaling (const rhs_state_t<dual_t>& state, rate_t& rates)
void apply_density_scaling (const rhs_state_t<number_t>& state, rate_t& rates)
{
constexpr int forward_exponent = density_exponent_forward<rate>();
constexpr int reverse_exponent = density_exponent_reverse<rate>();
Expand Down Expand Up @@ -447,9 +447,9 @@ void apply_density_scaling (const rhs_state_t<dual_t>& state, rate_t& rates)

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

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

template<int rate, typename dual_t>
template<int rate, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
void construct_rate (const rhs_state_t<dual_t>& state, rate_t& rates)
void construct_rate (const rhs_state_t<number_t>& state, rate_t& rates)
{
using namespace Species;
using namespace Rates;
Expand Down
12 changes: 6 additions & 6 deletions networks/rprox/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,9 +701,9 @@ namespace RHS {
return data;
}

template<int rate, typename dual_t>
template<int rate, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
void evaluate_analytical_rate (const rhs_state_t<dual_t>& state, rate_t& rates)
void evaluate_analytical_rate (const rhs_state_t<number_t>& state, rate_t& rates)
{
using namespace Species;
using namespace Rates;
Expand Down Expand Up @@ -764,9 +764,9 @@ namespace RHS {
rates.frdt *= 1.0e-9_rt;
}

template<int rate, typename dual_t>
template<int rate, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
void postprocess_rate ([[maybe_unused]] const rhs_state_t<dual_t>& state, [[maybe_unused]] rate_t& rates,
void postprocess_rate ([[maybe_unused]] const rhs_state_t<number_t>& state, [[maybe_unused]] rate_t& rates,
[[maybe_unused]] rate_t& rates1, [[maybe_unused]] rate_t& rates2, [[maybe_unused]] rate_t& rates3)
{
using namespace Species;
Expand Down Expand Up @@ -917,9 +917,9 @@ namespace RHS {
}
}

template<int spec, typename dual_t>
template<int spec, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<dual_t>& rhs_state, amrex::Real const& dydt)
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<number_t>& rhs_state, amrex::Real const& dydt)
{
return dydt * network::bion<spec>() * C::Legacy::n_A * C::Legacy::MeV2erg;
}
Expand Down
12 changes: 6 additions & 6 deletions networks/triple_alpha_plus_cago/actual_network.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@ namespace RHS {
return data;
}

template<int rate, typename dual_t>
template<int rate, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
void evaluate_analytical_rate (const rhs_state_t<dual_t>& state, rate_t& rates)
void evaluate_analytical_rate (const rhs_state_t<number_t>& state, rate_t& rates)
{
using namespace Species;
using namespace Rates;
Expand All @@ -164,9 +164,9 @@ namespace RHS {
}
}

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

template<int spec, typename dual_t>
template<int spec, typename number_t>
AMREX_GPU_HOST_DEVICE AMREX_INLINE
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<dual_t>& rhs_state, amrex::Real const& dydt)
amrex::Real ener_gener_rate ([[maybe_unused]] const rhs_state_t<number_t>& rhs_state, amrex::Real const& dydt)
{
return dydt * network::mion<spec>() * C::Legacy::enuc_conv2;
}
Expand Down
Loading
Loading