diff --git a/docs/examples/DIIID_ideal_example/pentrc.in b/docs/examples/DIIID_ideal_example/pentrc.in index d6eeb3b22..2a210cb8f 100644 --- a/docs/examples/DIIID_ideal_example/pentrc.in +++ b/docs/examples/DIIID_ideal_example/pentrc.in @@ -25,8 +25,8 @@ force_xialpha = .false. ! Calculates tangential displacement from radial displacement and toroidal force balance (overwrites peq_file values) - atol_xlmda = 1e-9 ! Absolute tolerance in energy and pitch integration - rtol_xlmda = 1e-6 ! Relative tolerance in energy and pitch integration + atol_xlmda = 1e-9 ! Absolute tolerance in pitch integration (energy tolerance derived from this unless atol_x is set) + rtol_xlmda = 1e-6 ! Relative tolerance in pitch integration (energy tolerance derived from this unless rtol_x is set) atol_psi = 1e-4 ! Absolute tolerance in psi_n integration rtol_psi = 1e-4 ! Relative tolerance in psi_n integration ntheta = 128 ! Poloidal angle grid for bounce integration diff --git a/docs/examples/DIIID_kinetic_example/pentrc.in b/docs/examples/DIIID_kinetic_example/pentrc.in index bcabe4c18..f97a22ea1 100644 --- a/docs/examples/DIIID_kinetic_example/pentrc.in +++ b/docs/examples/DIIID_kinetic_example/pentrc.in @@ -25,8 +25,8 @@ force_xialpha = .false. ! Calculates tangential displacement from radial displacement and toroidal force balance (overwrites peq_file values) - atol_xlmda = 1e-9 ! Absolute tolerance in energy and pitch integration - rtol_xlmda = 1e-5 ! Relative tolerance in energy and pitch integration + atol_xlmda = 1e-9 ! Absolute tolerance in pitch integration (energy tolerance derived from this unless atol_x is set) + rtol_xlmda = 1e-5 ! Relative tolerance in pitch integration (energy tolerance derived from this unless rtol_x is set) atol_psi = 1e-3 ! Absolute tolerance in psi_n integration rtol_psi = 1e-4 ! Relative tolerance in psi_n integration ntheta = 128 ! Poloidal angle grid for bounce integration diff --git a/docs/examples/DIIID_resistive_example/pentrc.in b/docs/examples/DIIID_resistive_example/pentrc.in index 64b96f9bd..3c64fc976 100644 --- a/docs/examples/DIIID_resistive_example/pentrc.in +++ b/docs/examples/DIIID_resistive_example/pentrc.in @@ -25,8 +25,8 @@ force_xialpha = .false. ! Calculates tangential displacement from radial displacement and toroidal force balance (overwrites peq_file values) - atol_xlmda = 1e-9 ! Absolute tolerance in energy and pitch integration - rtol_xlmda = 1e-6 ! Relative tolerance in energy and pitch integration + atol_xlmda = 1e-9 ! Absolute tolerance in pitch integration (energy tolerance derived from this unless atol_x is set) + rtol_xlmda = 1e-6 ! Relative tolerance in pitch integration (energy tolerance derived from this unless rtol_x is set) atol_psi = 1e-4 ! Absolute tolerance in psi_n integration rtol_psi = 1e-4 ! Relative tolerance in psi_n integration ntheta = 128 ! Poloidal angle grid for bounce integration diff --git a/docs/examples/a10_ideal_example/pentrc.in b/docs/examples/a10_ideal_example/pentrc.in index 47ef154c3..c3c591be2 100644 --- a/docs/examples/a10_ideal_example/pentrc.in +++ b/docs/examples/a10_ideal_example/pentrc.in @@ -25,8 +25,8 @@ force_xialpha = .false. ! Calculates tangential displacement from radial displacement and toroidal force balance (overwrites peq_file values) - atol_xlmda = 1e-9 ! Absolute tolerance in energy and pitch integration - rtol_xlmda = 1e-5 ! Relative tolerance in energy and pitch integration + atol_xlmda = 1e-9 ! Absolute tolerance in pitch integration (energy tolerance derived from this unless atol_x is set) + rtol_xlmda = 1e-5 ! Relative tolerance in pitch integration (energy tolerance derived from this unless rtol_x is set) atol_psi = 1e-9 ! Absolute tolerance in psi_n integration rtol_psi = 1e-4 ! Relative tolerance in psi_n integration ntheta = 128 ! Poloidal angle grid for bounce integration diff --git a/docs/examples/a10_kinetic_example/pentrc.in b/docs/examples/a10_kinetic_example/pentrc.in index b70ccd71f..78ab995cb 100644 --- a/docs/examples/a10_kinetic_example/pentrc.in +++ b/docs/examples/a10_kinetic_example/pentrc.in @@ -25,8 +25,8 @@ force_xialpha = .false. ! Calculates tangential displacement from radial displacement and toroidal force balance (overwrites peq_file values) - atol_xlmda = 1e-9 ! Absolute tolerance in energy and pitch integration - rtol_xlmda = 1e-5 ! Relative tolerance in energy and pitch integration + atol_xlmda = 1e-9 ! Absolute tolerance in pitch integration (energy tolerance derived from this unless atol_x is set) + rtol_xlmda = 1e-5 ! Relative tolerance in pitch integration (energy tolerance derived from this unless rtol_x is set) atol_psi = 1e-9 ! Absolute tolerance in psi_n integration rtol_psi = 1e-4 ! Relative tolerance in psi_n integration ntheta = 128 ! Poloidal angle grid for bounce integration diff --git a/docs/examples/a5_tearing_example/pentrc.in b/docs/examples/a5_tearing_example/pentrc.in index 47ef154c3..c3c591be2 100644 --- a/docs/examples/a5_tearing_example/pentrc.in +++ b/docs/examples/a5_tearing_example/pentrc.in @@ -25,8 +25,8 @@ force_xialpha = .false. ! Calculates tangential displacement from radial displacement and toroidal force balance (overwrites peq_file values) - atol_xlmda = 1e-9 ! Absolute tolerance in energy and pitch integration - rtol_xlmda = 1e-5 ! Relative tolerance in energy and pitch integration + atol_xlmda = 1e-9 ! Absolute tolerance in pitch integration (energy tolerance derived from this unless atol_x is set) + rtol_xlmda = 1e-5 ! Relative tolerance in pitch integration (energy tolerance derived from this unless rtol_x is set) atol_psi = 1e-9 ! Absolute tolerance in psi_n integration rtol_psi = 1e-4 ! Relative tolerance in psi_n integration ntheta = 128 ! Poloidal angle grid for bounce integration diff --git a/docs/examples/regression_solovev_ideal_example/pentrc.in b/docs/examples/regression_solovev_ideal_example/pentrc.in index 8904bf7fc..0f702231f 100644 --- a/docs/examples/regression_solovev_ideal_example/pentrc.in +++ b/docs/examples/regression_solovev_ideal_example/pentrc.in @@ -25,8 +25,8 @@ force_xialpha = .false. ! Calculates tangential displacement from radial displacement and toroidal force balance (overwrites peq_file values) - atol_xlmda = 1e-9 ! Absolute tolerance in energy and pitch integration - rtol_xlmda = 1e-5 ! Relative tolerance in energy and pitch integration + atol_xlmda = 1e-9 ! Absolute tolerance in pitch integration (energy tolerance derived from this unless atol_x is set) + rtol_xlmda = 1e-5 ! Relative tolerance in pitch integration (energy tolerance derived from this unless rtol_x is set) atol_psi = 1e-9 ! Absolute tolerance in psi_n integration rtol_psi = 1e-4 ! Relative tolerance in psi_n integration ntheta = 128 ! Poloidal angle grid for bounce integration diff --git a/docs/examples/regression_solovev_kinetic_example/pentrc.in b/docs/examples/regression_solovev_kinetic_example/pentrc.in index 8904bf7fc..0f702231f 100644 --- a/docs/examples/regression_solovev_kinetic_example/pentrc.in +++ b/docs/examples/regression_solovev_kinetic_example/pentrc.in @@ -25,8 +25,8 @@ force_xialpha = .false. ! Calculates tangential displacement from radial displacement and toroidal force balance (overwrites peq_file values) - atol_xlmda = 1e-9 ! Absolute tolerance in energy and pitch integration - rtol_xlmda = 1e-5 ! Relative tolerance in energy and pitch integration + atol_xlmda = 1e-9 ! Absolute tolerance in pitch integration (energy tolerance derived from this unless atol_x is set) + rtol_xlmda = 1e-5 ! Relative tolerance in pitch integration (energy tolerance derived from this unless rtol_x is set) atol_psi = 1e-9 ! Absolute tolerance in psi_n integration rtol_psi = 1e-4 ! Relative tolerance in psi_n integration ntheta = 128 ! Poloidal angle grid for bounce integration diff --git a/docs/examples/regression_solovev_resistive_example/pentrc.in b/docs/examples/regression_solovev_resistive_example/pentrc.in index 8904bf7fc..0f702231f 100644 --- a/docs/examples/regression_solovev_resistive_example/pentrc.in +++ b/docs/examples/regression_solovev_resistive_example/pentrc.in @@ -25,8 +25,8 @@ force_xialpha = .false. ! Calculates tangential displacement from radial displacement and toroidal force balance (overwrites peq_file values) - atol_xlmda = 1e-9 ! Absolute tolerance in energy and pitch integration - rtol_xlmda = 1e-5 ! Relative tolerance in energy and pitch integration + atol_xlmda = 1e-9 ! Absolute tolerance in pitch integration (energy tolerance derived from this unless atol_x is set) + rtol_xlmda = 1e-5 ! Relative tolerance in pitch integration (energy tolerance derived from this unless rtol_x is set) atol_psi = 1e-9 ! Absolute tolerance in psi_n integration rtol_psi = 1e-4 ! Relative tolerance in psi_n integration ntheta = 128 ! Poloidal angle grid for bounce integration diff --git a/docs/examples/run_ideal_example/pentrc.in b/docs/examples/run_ideal_example/pentrc.in index 38b7ba7ca..59bbdc561 100644 --- a/docs/examples/run_ideal_example/pentrc.in +++ b/docs/examples/run_ideal_example/pentrc.in @@ -25,8 +25,8 @@ force_xialpha = .false. ! Calculates tangential displacement from radial displacement and toroidal force balance (overwrites peq_file values) - atol_xlmda = 1e-9 ! Absolute tolerance in energy and pitch integration - rtol_xlmda = 1e-6 ! Relative tolerance in energy and pitch integration + atol_xlmda = 1e-9 ! Absolute tolerance in pitch integration (energy tolerance derived from this unless atol_x is set) + rtol_xlmda = 1e-6 ! Relative tolerance in pitch integration (energy tolerance derived from this unless rtol_x is set) atol_psi = 1e-9 ! Absolute tolerance in psi_n integration rtol_psi = 1e-4 ! Relative tolerance in psi_n integration ntheta = 128 ! Poloidal angle grid for bounce integration diff --git a/docs/examples/run_kinetic_example/pentrc.in b/docs/examples/run_kinetic_example/pentrc.in index 4b73f750e..42438c142 100644 --- a/docs/examples/run_kinetic_example/pentrc.in +++ b/docs/examples/run_kinetic_example/pentrc.in @@ -25,8 +25,8 @@ force_xialpha = .false. ! Calculates tangential displacement from radial displacement and toroidal force balance (overwrites peq_file values) - atol_xlmda = 1e-9 ! Absolute tolerance in energy and pitch integration - rtol_xlmda = 1e-5 ! Relative tolerance in energy and pitch integration + atol_xlmda = 1e-9 ! Absolute tolerance in pitch integration (energy tolerance derived from this unless atol_x is set) + rtol_xlmda = 1e-5 ! Relative tolerance in pitch integration (energy tolerance derived from this unless rtol_x is set) atol_psi = 1e-4 ! Absolute tolerance in psi_n integration rtol_psi = 1e-4 ! Relative tolerance in psi_n integration ntheta = 128 ! Poloidal angle grid for bounce integration diff --git a/docs/examples/solovev_ideal_example/pentrc.in b/docs/examples/solovev_ideal_example/pentrc.in index a45e8f2b7..1e6663bd6 100644 --- a/docs/examples/solovev_ideal_example/pentrc.in +++ b/docs/examples/solovev_ideal_example/pentrc.in @@ -25,8 +25,8 @@ force_xialpha = .false. ! Calculates tangential displacement from radial displacement and toroidal force balance (overwrites peq_file values) - atol_xlmda = 1e-9 ! Absolute tolerance in energy and pitch integration - rtol_xlmda = 1e-6 ! Relative tolerance in energy and pitch integration + atol_xlmda = 1e-9 ! Absolute tolerance in pitch integration (energy tolerance derived from this unless atol_x is set) + rtol_xlmda = 1e-6 ! Relative tolerance in pitch integration (energy tolerance derived from this unless rtol_x is set) atol_psi = 1e-9 ! Absolute tolerance in psi_n integration rtol_psi = 1e-4 ! Relative tolerance in psi_n integration ntheta = 128 ! Poloidal angle grid for bounce integration diff --git a/docs/examples/solovev_kinetic_example/pentrc.in b/docs/examples/solovev_kinetic_example/pentrc.in index 9d8ef36bf..04b0ba568 100644 --- a/docs/examples/solovev_kinetic_example/pentrc.in +++ b/docs/examples/solovev_kinetic_example/pentrc.in @@ -25,8 +25,8 @@ force_xialpha = .false. ! Calculates tangential displacement from radial displacement and toroidal force balance (overwrites peq_file values) - atol_xlmda = 1e-9 ! Absolute tolerance in energy and pitch integration - rtol_xlmda = 1e-5 ! Relative tolerance in energy and pitch integration + atol_xlmda = 1e-9 ! Absolute tolerance in pitch integration (energy tolerance derived from this unless atol_x is set) + rtol_xlmda = 1e-5 ! Relative tolerance in pitch integration (energy tolerance derived from this unless rtol_x is set) atol_psi = 1e-9 ! Absolute tolerance in psi_n integration rtol_psi = 1e-4 ! Relative tolerance in psi_n integration ntheta = 128 ! Poloidal angle grid for bounce integration diff --git a/docs/examples/solovev_resistive_example/pentrc.in b/docs/examples/solovev_resistive_example/pentrc.in index df435f8e2..90494158f 100644 --- a/docs/examples/solovev_resistive_example/pentrc.in +++ b/docs/examples/solovev_resistive_example/pentrc.in @@ -25,8 +25,8 @@ force_xialpha = .false. ! Calculates tangential displacement from radial displacement and toroidal force balance (overwrites peq_file values) - atol_xlmda = 1e-9 ! Absolute tolerance in energy and pitch integration - rtol_xlmda = 1e-6 ! Relative tolerance in energy and pitch integration + atol_xlmda = 1e-9 ! Absolute tolerance in pitch integration (energy tolerance derived from this unless atol_x is set) + rtol_xlmda = 1e-6 ! Relative tolerance in pitch integration (energy tolerance derived from this unless rtol_x is set) atol_psi = 1e-9 ! Absolute tolerance in psi_n integration rtol_psi = 1e-5 ! Relative tolerance in psi_n integration ntheta = 128 ! Poloidal angle grid for bounce integration diff --git a/input/pentrc.in b/input/pentrc.in index 0ac0af41a..b1ba6e95c 100644 --- a/input/pentrc.in +++ b/input/pentrc.in @@ -25,8 +25,10 @@ force_xialpha = .false. ! Calculates tangential displacement from radial displacement and toroidal force balance (overwrites peq_file values) - atol_xlmda = 1e-9 ! Absolute tolerance in energy and pitch integration - rtol_xlmda = 1e-5 ! Relative tolerance in energy and pitch integration + atol_xlmda = 1e-9 ! Absolute tolerance in pitch integration (energy tolerance derived from this unless atol_x is set) + rtol_xlmda = 1e-5 ! Relative tolerance in pitch integration (energy tolerance derived from this unless rtol_x is set) + atol_x = -1 ! Absolute tolerance in energy integration. Negative (default) derives 1e-2*atol_xlmda so the nested quadrature converges + rtol_x = -1 ! Relative tolerance in energy integration. Negative (default) derives 1e-2*rtol_xlmda so the nested quadrature converges atol_psi = 1e-4 ! Absolute tolerance in psi_n integration rtol_psi = 1e-4 ! Relative tolerance in psi_n integration ntheta = 128 ! Poloidal angle grid for bounce integration diff --git a/pentrc/pentrc_interface.f90 b/pentrc/pentrc_interface.f90 index 35571f139..6814a986c 100644 --- a/pentrc/pentrc_interface.f90 +++ b/pentrc/pentrc_interface.f90 @@ -113,7 +113,7 @@ module pentrc_interface !> How much tighter the energy integration is than the pitch integration !> when atol_x/rtol_x are left at their derive-me default. - real(r8), parameter :: nested_tolerance_margin = 1e-2 + real(r8), parameter :: nested_tolerance_margin = 1e-2_r8 real(r8) :: & atol_xlmda=1e-6, &