Skip to content

Commit bab1bef

Browse files
zingalezingale
committed
more cleaning
1 parent ca3156b commit bab1bef

File tree

17 files changed

+173
-202
lines changed

17 files changed

+173
-202
lines changed

‎unit_test/burn_cell/burn_cell.H

+17-17
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ void burn_cell_c()
2828

2929
// Echo initial conditions at burn and fill burn state input
3030

31-
std::cout << "Maximum Time (s): " << tmax << std::endl;
32-
std::cout << "State Density (g/cm^3): " << density << std::endl;
33-
std::cout << "State Temperature (K): " << temperature << std::endl;
31+
std::cout << "Maximum Time (s): " << unit_test_rp::tmax << std::endl;
32+
std::cout << "State Density (g/cm^3): " << unit_test_rp::density << std::endl;
33+
std::cout << "State Temperature (K): " << unit_test_rp::temperature << std::endl;
3434
for (int n = 0; n < NumSpec; ++n) {
3535
std::cout << "Mass Fraction (" << short_spec_names_cxx[n] << "): " << massfractions[n] << std::endl;
3636
}
3737

3838
burn_t burn_state;
3939

4040
eos_t eos_state;
41-
eos_state.rho = density;
42-
eos_state.T = temperature;
41+
eos_state.rho = unit_test_rp::density;
42+
eos_state.T = unit_test_rp::temperature;
4343
for (int n = 0; n < NumSpec; n++) {
4444
eos_state.xn[n] = massfractions[n];
4545
}
@@ -68,7 +68,7 @@ void burn_cell_c()
6868

6969
// normalize -- just in case
7070

71-
if (! skip_initial_normalization) {
71+
if (! unit_test_rp::skip_initial_normalization) {
7272
normalize_abundances_burn(burn_state);
7373
}
7474

@@ -95,18 +95,18 @@ void burn_cell_c()
9595
// we will divide the total integration time into nsteps that are
9696
// logarithmically spaced
9797

98-
if (tfirst == 0.0_rt) {
99-
if (nsteps == 1) {
100-
tfirst = tmax;
98+
if (unit_test_rp::tfirst == 0.0_rt) {
99+
if (unit_test_rp::nsteps == 1) {
100+
unit_test_rp::tfirst = unit_test_rp::tmax;
101101
} else {
102-
tfirst = tmax / nsteps;
102+
unit_test_rp::tfirst = unit_test_rp::tmax / static_cast<amrex::Real>(unit_test_rp::nsteps);
103103
}
104104
}
105105
amrex::Real dlogt = 0.0_rt;
106-
if (nsteps == 1) {
107-
dlogt = (std::log10(tmax) - std::log10(tfirst));
106+
if (unit_test_rp::nsteps == 1) {
107+
dlogt = (std::log10(unit_test_rp::tmax) - std::log10(unit_test_rp::tfirst));
108108
} else {
109-
dlogt = (std::log10(tmax) - std::log10(tfirst)) / (nsteps - 1);
109+
dlogt = (std::log10(unit_test_rp::tmax) - std::log10(unit_test_rp::tfirst)) / static_cast<amrex::Real>(unit_test_rp::nsteps - 1);
110110
}
111111

112112
// save the initial state -- we'll use this to determine
@@ -145,11 +145,11 @@ void burn_cell_c()
145145

146146
int nstep_int = 0;
147147

148-
for (int n = 0; n < nsteps; n++){
148+
for (int n = 0; n < unit_test_rp::nsteps; n++){
149149

150150
// compute the time we wish to integrate to
151151

152-
amrex::Real tend = std::pow(10.0_rt, std::log10(tfirst) + dlogt * n);
152+
amrex::Real tend = std::pow(10.0_rt, std::log10(unit_test_rp::tfirst) + dlogt * n);
153153
amrex::Real dt = tend - t;
154154

155155
burner(burn_state, dt);
@@ -190,7 +190,7 @@ void burn_cell_c()
190190

191191
std::cout << "------------------------------------" << std::endl;
192192
std::cout << "successful? " << burn_state.success << std::endl;
193-
std::cout << " - Hnuc = " << (burn_state.e - burn_state_in.e) / tmax << std::endl;
193+
std::cout << " - Hnuc = " << (burn_state.e - burn_state_in.e) / unit_test_rp::tmax << std::endl;
194194
std::cout << " - added e = " << burn_state.e - burn_state_in.e << std::endl;
195195
std::cout << " - final T = " << burn_state.T << std::endl;
196196

@@ -211,7 +211,7 @@ void burn_cell_c()
211211
std::cout << "species creation rates: " << std::endl;
212212
for (int n = 0; n < NumSpec; ++n) {
213213
std::cout << "omegadot(" << short_spec_names_cxx[n] << "): "
214-
<< (burn_state.xn[n] - burn_state_in.xn[n]) / tmax << std::endl;
214+
<< (burn_state.xn[n] - burn_state_in.xn[n]) / unit_test_rp::tmax << std::endl;
215215
}
216216

217217
std::cout << "number of steps taken: " << nstep_int << std::endl;

‎unit_test/burn_cell_metal_chem/burn_cell.H

+40-42
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ amrex::Real grav_constant = C::Gconst;
1515
AMREX_INLINE
1616
auto burn_cell_c() -> int {
1717

18-
using namespace unit_test_rp;
19-
2018
burn_t state;
2119

2220
amrex::Real numdens[NumSpec] = {-1.0};
@@ -30,113 +28,113 @@ auto burn_cell_c() -> int {
3028
switch (n) {
3129

3230
case 1:
33-
numdens[n - 1] = primary_species_1;
31+
numdens[n - 1] = unit_test_rp::primary_species_1;
3432
break;
3533
case 2:
36-
numdens[n - 1] = primary_species_2;
34+
numdens[n - 1] = unit_test_rp::primary_species_2;
3735
break;
3836
case 3:
39-
numdens[n - 1] = primary_species_3;
37+
numdens[n - 1] = unit_test_rp::primary_species_3;
4038
break;
4139
case 4:
42-
numdens[n - 1] = primary_species_4;
40+
numdens[n - 1] = unit_test_rp::primary_species_4;
4341
break;
4442
case 5:
45-
numdens[n - 1] = primary_species_5;
43+
numdens[n - 1] = unit_test_rp::primary_species_5;
4644
break;
4745
case 6:
48-
numdens[n - 1] = primary_species_6;
46+
numdens[n - 1] = unit_test_rp::primary_species_6;
4947
break;
5048
case 7:
51-
numdens[n - 1] = primary_species_7;
49+
numdens[n - 1] = unit_test_rp::primary_species_7;
5250
break;
5351
case 8:
54-
numdens[n - 1] = primary_species_8;
52+
numdens[n - 1] = unit_test_rp::primary_species_8;
5553
break;
5654
case 9:
57-
numdens[n - 1] = primary_species_9;
55+
numdens[n - 1] = unit_test_rp::primary_species_9;
5856
break;
5957
case 10:
60-
numdens[n - 1] = primary_species_10;
58+
numdens[n - 1] = unit_test_rp::primary_species_10;
6159
break;
6260
case 11:
63-
numdens[n - 1] = primary_species_11;
61+
numdens[n - 1] = unit_test_rp::primary_species_11;
6462
break;
6563
case 12:
66-
numdens[n - 1] = primary_species_12;
64+
numdens[n - 1] = unit_test_rp::primary_species_12;
6765
break;
6866
case 13:
69-
numdens[n - 1] = primary_species_13;
67+
numdens[n - 1] = unit_test_rp::primary_species_13;
7068
break;
7169
case 14:
72-
numdens[n - 1] = primary_species_14;
70+
numdens[n - 1] = unit_test_rp::primary_species_14;
7371
break;
7472
case 15:
75-
numdens[n - 1] = primary_species_15;
73+
numdens[n - 1] = unit_test_rp::primary_species_15;
7674
break;
7775
case 16:
78-
numdens[n - 1] = primary_species_16;
76+
numdens[n - 1] = unit_test_rp::primary_species_16;
7977
break;
8078
case 17:
81-
numdens[n - 1] = primary_species_17*metal;
79+
numdens[n - 1] = unit_test_rp::primary_species_17*metal;
8280
break;
8381
case 18:
84-
numdens[n - 1] = primary_species_18;
82+
numdens[n - 1] = unit_test_rp::primary_species_18;
8583
break;
8684
case 19:
87-
numdens[n - 1] = primary_species_19;
85+
numdens[n - 1] = unit_test_rp::primary_species_19;
8886
break;
8987
case 20:
90-
numdens[n - 1] = primary_species_20;
88+
numdens[n - 1] = unit_test_rp::primary_species_20;
9189
break;
9290
case 21:
93-
numdens[n - 1] = primary_species_21;
91+
numdens[n - 1] = unit_test_rp::primary_species_21;
9492
break;
9593
case 22:
96-
numdens[n - 1] = primary_species_22;
94+
numdens[n - 1] = unit_test_rp::primary_species_22;
9795
break;
9896
case 23:
99-
numdens[n - 1] = primary_species_23*metal;
97+
numdens[n - 1] = unit_test_rp::primary_species_23*metal;
10098
break;
10199
case 24:
102-
numdens[n - 1] = primary_species_24;
100+
numdens[n - 1] = unit_test_rp::primary_species_24;
103101
break;
104102
case 25:
105-
numdens[n - 1] = primary_species_25;
103+
numdens[n - 1] = unit_test_rp::primary_species_25;
106104
break;
107105
case 26:
108-
numdens[n - 1] = primary_species_26;
106+
numdens[n - 1] = unit_test_rp::primary_species_26;
109107
break;
110108
case 27:
111-
numdens[n - 1] = primary_species_27;
109+
numdens[n - 1] = unit_test_rp::primary_species_27;
112110
break;
113111
case 28:
114-
numdens[n - 1] = primary_species_28;
112+
numdens[n - 1] = unit_test_rp::primary_species_28;
115113
break;
116114
case 29:
117-
numdens[n - 1] = primary_species_29;
115+
numdens[n - 1] = unit_test_rp::primary_species_29;
118116
break;
119117
case 30:
120-
numdens[n - 1] = primary_species_30;
118+
numdens[n - 1] = unit_test_rp::primary_species_30;
121119
break;
122120
case 31:
123-
numdens[n - 1] = primary_species_31;
121+
numdens[n - 1] = unit_test_rp::primary_species_31;
124122
break;
125123
case 32:
126-
numdens[n - 1] = primary_species_32;
124+
numdens[n - 1] = unit_test_rp::primary_species_32;
127125
break;
128126
case 33:
129-
numdens[n - 1] = primary_species_33;
127+
numdens[n - 1] = unit_test_rp::primary_species_33;
130128
break;
131129
case 34:
132-
numdens[n - 1] = primary_species_34;
130+
numdens[n - 1] = unit_test_rp::primary_species_34;
133131
break;
134132
}
135133
}
136134

137135
//scale number densities by initial ninit
138136
for (n = 0; n < NumSpec; ++n) {
139-
numdens[n] *= ninit;
137+
numdens[n] *= unit_test_rp::ninit;
140138
}
141139

142140
//if metallicity is 0, reset metal number densities to 0
@@ -156,15 +154,15 @@ auto burn_cell_c() -> int {
156154
std::cout << "Dust2gas Ratio: " << network_rp::dust2gas_ratio << std::endl;
157155
std::cout << " " << std::endl;
158156

159-
std::cout << "Maximum Time (s): " << tmax << std::endl;
160-
std::cout << "State Temperature (K): " << temperature << std::endl;
157+
std::cout << "Maximum Time (s): " << unit_test_rp::tmax << std::endl;
158+
std::cout << "State Temperature (K): " << unit_test_rp::temperature << std::endl;
161159
for (n = 0; n < NumSpec; ++n) {
162160
std::cout << "Number Density input (" << short_spec_names_cxx[n]
163161
<< "): " << numdens[n] << std::endl;
164162
}
165163

166164
amrex::Real TCMB = 2.73*(1.0 + network_rp::redshift);
167-
state.T = amrex::max(temperature, TCMB);
165+
state.T = amrex::max(unit_test_rp::temperature, TCMB);
168166
// set initial Tdust to CMB
169167
state.aux[0] = TCMB;
170168

@@ -222,7 +220,7 @@ auto burn_cell_c() -> int {
222220
amrex::Real dd = rhotot;
223221
amrex::Real dd1 = 0.0_rt;
224222

225-
for (n = 0; n < nsteps; n++) {
223+
for (n = 0; n < unit_test_rp::nsteps; n++) {
226224

227225
dd1 = dd;
228226

@@ -234,7 +232,7 @@ auto burn_cell_c() -> int {
234232

235233
// find the freefall time
236234
amrex::Real tff = std::sqrt(M_PI * 3.0 / (32.0 * rhotmp * grav_constant));
237-
amrex::Real dt = tff_reduc * tff;
235+
amrex::Real dt = unit_test_rp::tff_reduc * tff;
238236
// scale the density
239237
dd += dt * (dd / tff);
240238

‎unit_test/burn_cell_primordial_chem/burn_cell.H

+19-21
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ amrex::Real grav_constant = 6.674e-8;
1515
AMREX_INLINE
1616
auto burn_cell_c() -> int {
1717

18-
using namespace unit_test_rp;
19-
2018
burn_t state;
2119

2220
amrex::Real numdens[NumSpec] = {-1.0};
@@ -25,60 +23,60 @@ auto burn_cell_c() -> int {
2523
switch (n) {
2624

2725
case 1:
28-
numdens[n - 1] = primary_species_1;
26+
numdens[n - 1] = unit_test_rp::primary_species_1;
2927
break;
3028
case 2:
31-
numdens[n - 1] = primary_species_2;
29+
numdens[n - 1] = unit_test_rp::primary_species_2;
3230
break;
3331
case 3:
34-
numdens[n - 1] = primary_species_3;
32+
numdens[n - 1] = unit_test_rp::primary_species_3;
3533
break;
3634
case 4:
37-
numdens[n - 1] = primary_species_4;
35+
numdens[n - 1] = unit_test_rp::primary_species_4;
3836
break;
3937
case 5:
40-
numdens[n - 1] = primary_species_5;
38+
numdens[n - 1] = unit_test_rp::primary_species_5;
4139
break;
4240
case 6:
43-
numdens[n - 1] = primary_species_6;
41+
numdens[n - 1] = unit_test_rp::primary_species_6;
4442
break;
4543
case 7:
46-
numdens[n - 1] = primary_species_7;
44+
numdens[n - 1] = unit_test_rp::primary_species_7;
4745
break;
4846
case 8:
49-
numdens[n - 1] = primary_species_8;
47+
numdens[n - 1] = unit_test_rp::primary_species_8;
5048
break;
5149
case 9:
52-
numdens[n - 1] = primary_species_9;
50+
numdens[n - 1] = unit_test_rp::primary_species_9;
5351
break;
5452
case 10:
55-
numdens[n - 1] = primary_species_10;
53+
numdens[n - 1] = unit_test_rp::primary_species_10;
5654
break;
5755
case 11:
58-
numdens[n - 1] = primary_species_11;
56+
numdens[n - 1] = unit_test_rp::primary_species_11;
5957
break;
6058
case 12:
61-
numdens[n - 1] = primary_species_12;
59+
numdens[n - 1] = unit_test_rp::primary_species_12;
6260
break;
6361
case 13:
64-
numdens[n - 1] = primary_species_13;
62+
numdens[n - 1] = unit_test_rp::primary_species_13;
6563
break;
6664
case 14:
67-
numdens[n - 1] = primary_species_14;
65+
numdens[n - 1] = unit_test_rp::primary_species_14;
6866
break;
6967
}
7068
}
7169

7270
// Echo initial conditions at burn and fill burn state input
7371

74-
std::cout << "Maximum Time (s): " << tmax << std::endl;
75-
std::cout << "State Temperature (K): " << temperature << std::endl;
72+
std::cout << "Maximum Time (s): " << unit_test_rp::tmax << std::endl;
73+
std::cout << "State Temperature (K): " << unit_test_rp::temperature << std::endl;
7674
for (int n = 0; n < NumSpec; ++n) {
7775
std::cout << "Number Density input (" << short_spec_names_cxx[n]
7876
<< "): " << numdens[n] << std::endl;
7977
}
8078

81-
state.T = temperature;
79+
state.T = unit_test_rp::temperature;
8280

8381
// find the density in g/cm^3
8482
amrex::Real rhotot = 0.0_rt;
@@ -150,7 +148,7 @@ auto burn_cell_c() -> int {
150148
amrex::Real dd = rhotot;
151149
amrex::Real dd1 = 0.0_rt;
152150

153-
for (int n = 0; n < nsteps; n++) {
151+
for (int n = 0; n < unit_test_rp::nsteps; n++) {
154152

155153
dd1 = dd;
156154

@@ -162,7 +160,7 @@ auto burn_cell_c() -> int {
162160

163161
// find the freefall time
164162
amrex::Real tff = std::sqrt(M_PI * 3.0 / (32.0 * rhotmp * grav_constant));
165-
amrex::Real dt = tff_reduc * tff;
163+
amrex::Real dt = unit_test_rp::tff_reduc * tff;
166164
// scale the density
167165
dd += dt * (dd / tff);
168166

0 commit comments

Comments
 (0)