Skip to content

Commit d749349

Browse files
committed
remove sdc_burn_tol_factor
we never use this and it doesn't seem like it will be needed since we've made so many improvements to the integrators.
1 parent ca9e532 commit d749349

File tree

4 files changed

+24
-33
lines changed

4 files changed

+24
-33
lines changed

integration/BackwardEuler/actual_integrator_sdc.H

+8-10
Original file line numberDiff line numberDiff line change
@@ -59,36 +59,34 @@ void actual_integrator (BurnT& state, const amrex::Real dt, bool is_retry=false)
5959

6060
// Set the tolerances.
6161

62-
amrex::Real sdc_tol_fac = std::pow(integrator_rp::sdc_burn_tol_factor, state.num_sdc_iters - state.sdc_iter - 1);
63-
6462
// we use 1-based indexing inside of BackwardEuler, so we need to shift the
6563
// indices SRHO, SFS, etc by 1
6664

6765
amrex::Real sdc_min_density = amrex::min(state.rho, state.rho_orig + state.ydot_a[SRHO] * dt);
6866

6967
if (!is_retry) {
7068

71-
be.atol_enuc = sdc_min_density * atol_enuc * sdc_tol_fac;
72-
be.rtol_enuc = rtol_enuc * sdc_tol_fac;
69+
be.atol_enuc = sdc_min_density * atol_enuc;
70+
be.rtol_enuc = rtol_enuc;
7371

7472
// Note: we define the input atol for species to refer only to the
7573
// mass fraction part, and we multiply by a representative density
7674
// so that atol becomes an absolutely tolerance on (rho X)
7775

78-
be.atol_spec = sdc_min_density * atol_spec * sdc_tol_fac;
79-
be.rtol_spec = rtol_spec * sdc_tol_fac;
76+
be.atol_spec = sdc_min_density * atol_spec;
77+
be.rtol_spec = rtol_spec;
8078

8179
} else {
8280

83-
be.atol_enuc = sdc_min_density * retry_atol_enuc * sdc_tol_fac;
84-
be.rtol_enuc = retry_rtol_enuc * sdc_tol_fac;
81+
be.atol_enuc = sdc_min_density * retry_atol_enuc;
82+
be.rtol_enuc = retry_rtol_enuc;
8583

8684
// Note: we define the input atol for species to refer only to the
8785
// mass fraction part, and we multiply by a representative density
8886
// so that atol becomes an absolutely tolerance on (rho X)
8987

90-
be.atol_spec = sdc_min_density * retry_atol_spec * sdc_tol_fac;
91-
be.rtol_spec = retry_rtol_spec * sdc_tol_fac;
88+
be.atol_spec = sdc_min_density * retry_atol_spec;
89+
be.rtol_spec = retry_rtol_spec;
9290

9391
}
9492

integration/RKC/actual_integrator_sdc.H

+8-10
Original file line numberDiff line numberDiff line change
@@ -58,36 +58,34 @@ void actual_integrator (BurnT& state, amrex::Real dt, bool is_retry=false)
5858

5959
// Set the tolerances.
6060

61-
amrex::Real sdc_tol_fac = std::pow(sdc_burn_tol_factor, state.num_sdc_iters - state.sdc_iter - 1);
62-
6361
// we use 1-based indexing inside of RKC, so we need to shift the
6462
// indices SRHO, SFS, etc by 1
6563

6664
amrex::Real sdc_min_density = amrex::min(state.rho, state.rho_orig + state.ydot_a[SRHO] * dt);
6765

6866
if (!is_retry) {
6967

70-
rkc_state.atol_enuc = sdc_min_density * atol_enuc * sdc_tol_fac;
71-
rkc_state.rtol_enuc = rtol_enuc * sdc_tol_fac;
68+
rkc_state.atol_enuc = sdc_min_density * atol_enuc;
69+
rkc_state.rtol_enuc = rtol_enuc;
7270

7371
// Note: we define the input atol for species to refer only to the
7472
// mass fraction part, and we multiply by a representative density
7573
// so that atol becomes an absolutely tolerance on (rho X)
7674

77-
rkc_state.atol_spec = sdc_min_density * atol_spec * sdc_tol_fac;
78-
rkc_state.rtol_spec = rtol_spec * sdc_tol_fac;
75+
rkc_state.atol_spec = sdc_min_density * atol_spec;
76+
rkc_state.rtol_spec = rtol_spec;
7977

8078
} else {
8179

82-
rkc_state.atol_enuc = sdc_min_density * retry_atol_enuc * sdc_tol_fac;
83-
rkc_state.rtol_enuc = retry_rtol_enuc * sdc_tol_fac;
80+
rkc_state.atol_enuc = sdc_min_density * retry_atol_enuc;
81+
rkc_state.rtol_enuc = retry_rtol_enuc;
8482

8583
// Note: we define the input atol for species to refer only to the
8684
// mass fraction part, and we multiply by a representative density
8785
// so that atol becomes an absolutely tolerance on (rho X)
8886

89-
rkc_state.atol_spec = sdc_min_density * retry_atol_spec * sdc_tol_fac;
90-
rkc_state.rtol_spec = retry_rtol_spec * sdc_tol_fac;
87+
rkc_state.atol_spec = sdc_min_density * retry_atol_spec;
88+
rkc_state.rtol_spec = retry_rtol_spec;
9189

9290
}
9391

integration/VODE/actual_integrator_sdc.H

+8-10
Original file line numberDiff line numberDiff line change
@@ -71,36 +71,34 @@ void actual_integrator (BurnT& state, amrex::Real dt, bool is_retry=false)
7171

7272
// Set the tolerances.
7373

74-
amrex::Real sdc_tol_fac = std::pow(integrator_rp::sdc_burn_tol_factor, state.num_sdc_iters - state.sdc_iter - 1);
75-
7674
// we use 1-based indexing inside of VODE, so we need to shift the
7775
// indices SRHO, SFS, etc by 1
7876

7977
amrex::Real sdc_min_density = amrex::min(state.rho, state.rho_orig + state.ydot_a[SRHO] * dt);
8078

8179
if (!is_retry) {
8280

83-
vode_state.atol_enuc = sdc_min_density * atol_enuc * sdc_tol_fac;
84-
vode_state.rtol_enuc = rtol_enuc * sdc_tol_fac;
81+
vode_state.atol_enuc = sdc_min_density * atol_enuc;
82+
vode_state.rtol_enuc = rtol_enuc;
8583

8684
// Note: we define the input atol for species to refer only to the
8785
// mass fraction part, and we multiply by a representative density
8886
// so that atol becomes an absolutely tolerance on (rho X)
8987

90-
vode_state.atol_spec = sdc_min_density * atol_spec * sdc_tol_fac;
91-
vode_state.rtol_spec = rtol_spec * sdc_tol_fac;
88+
vode_state.atol_spec = sdc_min_density * atol_spec;
89+
vode_state.rtol_spec = rtol_spec;
9290

9391
} else {
9492

95-
vode_state.atol_enuc = sdc_min_density * retry_atol_enuc * sdc_tol_fac;
96-
vode_state.rtol_enuc = retry_rtol_enuc * sdc_tol_fac;
93+
vode_state.atol_enuc = sdc_min_density * retry_atol_enuc;
94+
vode_state.rtol_enuc = retry_rtol_enuc;
9795

9896
// Note: we define the input atol for species to refer only to the
9997
// mass fraction part, and we multiply by a representative density
10098
// so that atol becomes an absolutely tolerance on (rho X)
10199

102-
vode_state.atol_spec = sdc_min_density * retry_atol_spec * sdc_tol_fac;
103-
vode_state.rtol_spec = retry_rtol_spec * sdc_tol_fac;
100+
vode_state.atol_spec = sdc_min_density * retry_atol_spec;
101+
vode_state.rtol_spec = retry_rtol_spec;
104102

105103
}
106104

integration/_parameters

-3
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@ use_number_densities bool 0
8484
# flag for tuning on the subtraction of internal energy
8585
subtract_internal_energy bool 1
8686

87-
# SDC iteration tolerance adjustment factor
88-
sdc_burn_tol_factor real 1.e0
89-
9087
# do we scale the ODE system we integrate to make it O(1)?
9188
# for Strang, this simply means scaling e by the initial energy?
9289
scale_system bool 0

0 commit comments

Comments
 (0)