Skip to content

Commit

Permalink
Merge branch 'development' into convert_triple_alpha
Browse files Browse the repository at this point in the history
  • Loading branch information
@maxpkatz
maxpkatz authored Jul 21, 2023
2 parents d8cd205 + 030cddb commit 5719e84
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 178 deletions.
30 changes: 30 additions & 0 deletions interfaces/rhs_type.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,36 @@ struct rhs_t {
int additional_reaction_1;
int additional_reaction_2;
int additional_reaction_3;

constexpr rhs_t ()
: species_A(-1),
species_B(-1),
species_C(-1),
species_D(-1),
species_E(-1),
species_F(-1),
number_A(0),
number_B(0),
number_C(0),
number_D(0),
number_E(0),
number_F(0),
exponent_A(0),
exponent_B(0),
exponent_C(0),
exponent_D(0),
exponent_E(0),
exponent_F(0),
forward_branching_ratio(1.0_rt),
reverse_branching_ratio(1.0_rt),
apply_identical_particle_factor(1),
rate_can_be_tabulated(1),
screen_forward_reaction(1),
screen_reverse_reaction(1),
additional_reaction_1(-1),
additional_reaction_2(-1),
additional_reaction_3(-1)
{}
};

constexpr amrex::Real tab_tlo = 6.0e0_rt;
Expand Down
37 changes: 1 addition & 36 deletions networks/aprox13/actual_network.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,42 +181,7 @@ namespace RHS {
using namespace Species;
using namespace Rates;

rhs_t data{};

data.species_A = -1;
data.species_B = -1;
data.species_C = -1;
data.species_D = -1;
data.species_E = -1;
data.species_F = -1;

data.number_A = 0;
data.number_B = 0;
data.number_C = 0;
data.number_D = 0;
data.number_E = 0;
data.number_F = 0;

data.exponent_A = 0;
data.exponent_B = 0;
data.exponent_C = 0;
data.exponent_D = 0;
data.exponent_E = 0;
data.exponent_F = 0;

data.forward_branching_ratio = 1.0;
data.reverse_branching_ratio = 1.0;

data.apply_identical_particle_factor = 1;

data.rate_can_be_tabulated = 1;

data.screen_forward_reaction = 1;
data.screen_reverse_reaction = 1;

data.additional_reaction_1 = -1;
data.additional_reaction_2 = -1;
data.additional_reaction_3 = -1;
rhs_t data;

switch (rate) {

Expand Down
37 changes: 1 addition & 36 deletions networks/aprox19/actual_network.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,42 +237,7 @@ namespace RHS {
using namespace Species;
using namespace Rates;

rhs_t data{};

data.species_A = -1;
data.species_B = -1;
data.species_C = -1;
data.species_D = -1;
data.species_E = -1;
data.species_F = -1;

data.number_A = 0;
data.number_B = 0;
data.number_C = 0;
data.number_D = 0;
data.number_E = 0;
data.number_F = 0;

data.exponent_A = 0;
data.exponent_B = 0;
data.exponent_C = 0;
data.exponent_D = 0;
data.exponent_E = 0;
data.exponent_F = 0;

data.forward_branching_ratio = 1.0;
data.reverse_branching_ratio = 1.0;

data.apply_identical_particle_factor = 1;

data.rate_can_be_tabulated = 1;

data.screen_forward_reaction = 1;
data.screen_reverse_reaction = 1;

data.additional_reaction_1 = -1;
data.additional_reaction_2 = -1;
data.additional_reaction_3 = -1;
rhs_t data;

switch (rate) {

Expand Down
37 changes: 1 addition & 36 deletions networks/aprox21/actual_network.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,42 +239,7 @@ namespace RHS {
using namespace Species;
using namespace Rates;

rhs_t data{};

data.species_A = -1;
data.species_B = -1;
data.species_C = -1;
data.species_D = -1;
data.species_E = -1;
data.species_F = -1;

data.number_A = 0;
data.number_B = 0;
data.number_C = 0;
data.number_D = 0;
data.number_E = 0;
data.number_F = 0;

data.exponent_A = 0;
data.exponent_B = 0;
data.exponent_C = 0;
data.exponent_D = 0;
data.exponent_E = 0;
data.exponent_F = 0;

data.forward_branching_ratio = 1.0;
data.reverse_branching_ratio = 1.0;

data.apply_identical_particle_factor = 1;

data.rate_can_be_tabulated = 1;

data.screen_forward_reaction = 1;
data.screen_reverse_reaction = 1;

data.additional_reaction_1 = -1;
data.additional_reaction_2 = -1;
data.additional_reaction_3 = -1;
rhs_t data;

switch (rate) {

Expand Down
37 changes: 1 addition & 36 deletions networks/ignition_simple/actual_network.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,42 +115,7 @@ namespace RHS
using namespace Species;
using namespace Rates;

rhs_t data{};

data.species_A = -1;
data.species_B = -1;
data.species_C = -1;
data.species_D = -1;
data.species_E = -1;
data.species_F = -1;

data.number_A = 0;
data.number_B = 0;
data.number_C = 0;
data.number_D = 0;
data.number_E = 0;
data.number_F = 0;

data.exponent_A = 0;
data.exponent_B = 0;
data.exponent_C = 0;
data.exponent_D = 0;
data.exponent_E = 0;
data.exponent_F = 0;

data.forward_branching_ratio = 1.0_rt;
data.reverse_branching_ratio = 1.0_rt;

data.apply_identical_particle_factor = 1;

data.rate_can_be_tabulated = 1;

data.screen_forward_reaction = 1;
data.screen_reverse_reaction = 1;

data.additional_reaction_1 = -1;
data.additional_reaction_2 = -1;
data.additional_reaction_3 = -1;
rhs_t data;

switch (rate) {

Expand Down
35 changes: 1 addition & 34 deletions networks/iso7/actual_network.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,43 +138,10 @@ namespace RHS {
using namespace Species;
using namespace Rates;

rhs_t data{};
rhs_t data;

data.species_A = -1;
data.species_B = -1;
data.species_C = -1;
data.species_D = -1;
data.species_E = -1;
data.species_F = -1;

data.number_A = 0;
data.number_B = 0;
data.number_C = 0;
data.number_D = 0;
data.number_E = 0;
data.number_F = 0;

data.exponent_A = 0;
data.exponent_B = 0;
data.exponent_C = 0;
data.exponent_D = 0;
data.exponent_E = 0;
data.exponent_F = 0;

data.forward_branching_ratio = 1.0_rt;
data.reverse_branching_ratio = 1.0_rt;

data.apply_identical_particle_factor = 1;

data.rate_can_be_tabulated = 1;

data.screen_forward_reaction = 1;
data.screen_reverse_reaction = 0; // For consistency with original iso7

data.additional_reaction_1 = -1;
data.additional_reaction_2 = -1;
data.additional_reaction_3 = -1;

switch (rate) {

case He4_He4_He4_to_C12:
Expand Down

0 comments on commit 5719e84

Please sign in to comment.