Skip to content

Commit d37f4bc

Browse files
zingalezingale
authored
Merge branch 'development' into autodiff_aprox_rates
2 parents 3fdf278 + 17a2fa7 commit d37f4bc

File tree

13 files changed

+39
-39
lines changed

13 files changed

+39
-39
lines changed

‎networks/CNO_extras/actual_rhs.H

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ void evaluate_rates(const burn_t& state, T& rate_eval) {
5858

5959
// Calculate Reaclib rates
6060

61-
using dual_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62-
dual_t temp = state.T;
61+
using number_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62+
number_t temp = state.T;
6363
if constexpr (do_T_derivatives) {
6464
// seed the dual number for temperature before calculating anything with it
6565
autodiff::seed(temp);
6666
}
67-
plasma_state_t<dual_t> pstate{};
67+
plasma_state_t<number_t> pstate{};
6868
fill_plasma_state(pstate, temp, state.rho, Y);
6969

7070
tf_t tfactors = evaluate_tfactors(state.T);

‎networks/ECSN/actual_rhs.H

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ void evaluate_rates(const burn_t& state, T& rate_eval) {
5858

5959
// Calculate Reaclib rates
6060

61-
using dual_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62-
dual_t temp = state.T;
61+
using number_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62+
number_t temp = state.T;
6363
if constexpr (do_T_derivatives) {
6464
// seed the dual number for temperature before calculating anything with it
6565
autodiff::seed(temp);
6666
}
67-
plasma_state_t<dual_t> pstate{};
67+
plasma_state_t<number_t> pstate{};
6868
fill_plasma_state(pstate, temp, state.rho, Y);
6969

7070
tf_t tfactors = evaluate_tfactors(state.T);

‎networks/He-C-Fe-group/actual_rhs.H

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ void evaluate_rates(const burn_t& state, T& rate_eval) {
5858

5959
// Calculate Reaclib rates
6060

61-
using dual_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62-
dual_t temp = state.T;
61+
using number_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62+
number_t temp = state.T;
6363
if constexpr (do_T_derivatives) {
6464
// seed the dual number for temperature before calculating anything with it
6565
autodiff::seed(temp);
6666
}
67-
plasma_state_t<dual_t> pstate{};
67+
plasma_state_t<number_t> pstate{};
6868
fill_plasma_state(pstate, temp, state.rho, Y);
6969

7070
tf_t tfactors = evaluate_tfactors(state.T);

‎networks/ase/actual_rhs.H

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ void evaluate_rates(const burn_t& state, T& rate_eval) {
5858

5959
// Calculate Reaclib rates
6060

61-
using dual_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62-
dual_t temp = state.T;
61+
using number_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62+
number_t temp = state.T;
6363
if constexpr (do_T_derivatives) {
6464
// seed the dual number for temperature before calculating anything with it
6565
autodiff::seed(temp);
6666
}
67-
plasma_state_t<dual_t> pstate{};
67+
plasma_state_t<number_t> pstate{};
6868
fill_plasma_state(pstate, temp, state.rho, Y);
6969

7070
tf_t tfactors = evaluate_tfactors(state.T);

‎networks/ignition_reaclib/C-burn-simple/actual_rhs.H

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ void evaluate_rates(const burn_t& state, T& rate_eval) {
5858

5959
// Calculate Reaclib rates
6060

61-
using dual_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62-
dual_t temp = state.T;
61+
using number_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62+
number_t temp = state.T;
6363
if constexpr (do_T_derivatives) {
6464
// seed the dual number for temperature before calculating anything with it
6565
autodiff::seed(temp);
6666
}
67-
plasma_state_t<dual_t> pstate{};
67+
plasma_state_t<number_t> pstate{};
6868
fill_plasma_state(pstate, temp, state.rho, Y);
6969

7070
tf_t tfactors = evaluate_tfactors(state.T);

‎networks/ignition_reaclib/URCA-medium/actual_rhs.H

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ void evaluate_rates(const burn_t& state, T& rate_eval) {
5858

5959
// Calculate Reaclib rates
6060

61-
using dual_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62-
dual_t temp = state.T;
61+
using number_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62+
number_t temp = state.T;
6363
if constexpr (do_T_derivatives) {
6464
// seed the dual number for temperature before calculating anything with it
6565
autodiff::seed(temp);
6666
}
67-
plasma_state_t<dual_t> pstate{};
67+
plasma_state_t<number_t> pstate{};
6868
fill_plasma_state(pstate, temp, state.rho, Y);
6969

7070
tf_t tfactors = evaluate_tfactors(state.T);

‎networks/ignition_reaclib/URCA-simple/actual_rhs.H

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ void evaluate_rates(const burn_t& state, T& rate_eval) {
5858

5959
// Calculate Reaclib rates
6060

61-
using dual_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62-
dual_t temp = state.T;
61+
using number_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62+
number_t temp = state.T;
6363
if constexpr (do_T_derivatives) {
6464
// seed the dual number for temperature before calculating anything with it
6565
autodiff::seed(temp);
6666
}
67-
plasma_state_t<dual_t> pstate{};
67+
plasma_state_t<number_t> pstate{};
6868
fill_plasma_state(pstate, temp, state.rho, Y);
6969

7070
tf_t tfactors = evaluate_tfactors(state.T);

‎networks/nova/actual_rhs.H

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ void evaluate_rates(const burn_t& state, T& rate_eval) {
5858

5959
// Calculate Reaclib rates
6060

61-
using dual_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62-
dual_t temp = state.T;
61+
using number_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62+
number_t temp = state.T;
6363
if constexpr (do_T_derivatives) {
6464
// seed the dual number for temperature before calculating anything with it
6565
autodiff::seed(temp);
6666
}
67-
plasma_state_t<dual_t> pstate{};
67+
plasma_state_t<number_t> pstate{};
6868
fill_plasma_state(pstate, temp, state.rho, Y);
6969

7070
tf_t tfactors = evaluate_tfactors(state.T);

‎networks/nova2/actual_rhs.H

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ void evaluate_rates(const burn_t& state, T& rate_eval) {
5858

5959
// Calculate Reaclib rates
6060

61-
using dual_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62-
dual_t temp = state.T;
61+
using number_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62+
number_t temp = state.T;
6363
if constexpr (do_T_derivatives) {
6464
// seed the dual number for temperature before calculating anything with it
6565
autodiff::seed(temp);
6666
}
67-
plasma_state_t<dual_t> pstate{};
67+
plasma_state_t<number_t> pstate{};
6868
fill_plasma_state(pstate, temp, state.rho, Y);
6969

7070
tf_t tfactors = evaluate_tfactors(state.T);

‎networks/partition_test/actual_rhs.H

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ void evaluate_rates(const burn_t& state, T& rate_eval) {
5858

5959
// Calculate Reaclib rates
6060

61-
using dual_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62-
dual_t temp = state.T;
61+
using number_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62+
number_t temp = state.T;
6363
if constexpr (do_T_derivatives) {
6464
// seed the dual number for temperature before calculating anything with it
6565
autodiff::seed(temp);
6666
}
67-
plasma_state_t<dual_t> pstate{};
67+
plasma_state_t<number_t> pstate{};
6868
fill_plasma_state(pstate, temp, state.rho, Y);
6969

7070
tf_t tfactors = evaluate_tfactors(state.T);

‎networks/sn160/actual_rhs.H

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ void evaluate_rates(const burn_t& state, T& rate_eval) {
5858

5959
// Calculate Reaclib rates
6060

61-
using dual_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62-
dual_t temp = state.T;
61+
using number_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62+
number_t temp = state.T;
6363
if constexpr (do_T_derivatives) {
6464
// seed the dual number for temperature before calculating anything with it
6565
autodiff::seed(temp);
6666
}
67-
plasma_state_t<dual_t> pstate{};
67+
plasma_state_t<number_t> pstate{};
6868
fill_plasma_state(pstate, temp, state.rho, Y);
6969

7070
tf_t tfactors = evaluate_tfactors(state.T);

‎networks/subch_base/actual_rhs.H

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ void evaluate_rates(const burn_t& state, T& rate_eval) {
5858

5959
// Calculate Reaclib rates
6060

61-
using dual_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62-
dual_t temp = state.T;
61+
using number_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62+
number_t temp = state.T;
6363
if constexpr (do_T_derivatives) {
6464
// seed the dual number for temperature before calculating anything with it
6565
autodiff::seed(temp);
6666
}
67-
plasma_state_t<dual_t> pstate{};
67+
plasma_state_t<number_t> pstate{};
6868
fill_plasma_state(pstate, temp, state.rho, Y);
6969

7070
tf_t tfactors = evaluate_tfactors(state.T);

‎networks/subch_simple/actual_rhs.H

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ void evaluate_rates(const burn_t& state, T& rate_eval) {
5858

5959
// Calculate Reaclib rates
6060

61-
using dual_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62-
dual_t temp = state.T;
61+
using number_t = std::conditional_t<do_T_derivatives, autodiff::dual, amrex::Real>;
62+
number_t temp = state.T;
6363
if constexpr (do_T_derivatives) {
6464
// seed the dual number for temperature before calculating anything with it
6565
autodiff::seed(temp);
6666
}
67-
plasma_state_t<dual_t> pstate{};
67+
plasma_state_t<number_t> pstate{};
6868
fill_plasma_state(pstate, temp, state.rho, Y);
6969

7070
tf_t tfactors = evaluate_tfactors(state.T);

0 commit comments

Comments
 (0)