Skip to content
Open
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions star/defaults/controls.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -2369,7 +2369,7 @@

! ::

make_gradr_sticky_in_solver_iters = .false.
make_gradr_sticky_in_solver_iters = .true.
min_logT_for_make_gradr_sticky_in_solver_iters = 1d99


Expand Down Expand Up @@ -8776,7 +8776,7 @@

! ::

max_corr_jump_limit = 1d6
max_corr_jump_limit = 1d12


! resid_norm_jump_limit
Expand All @@ -8796,7 +8796,7 @@

! ::

max_resid_jump_limit = 1d6
max_resid_jump_limit = 1d12


! convergence_ignore_equL_residuals
Expand Down Expand Up @@ -9204,7 +9204,7 @@

! ::

use_gold2_tolerances = .false.
use_gold2_tolerances = .true.
steps_before_use_gold2_tolerances = -1

! if >= 0, then after this many steps in run, act as if use_gold2_tolerances true
Expand Down
2 changes: 1 addition & 1 deletion star/private/hydro_temperature.f90
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ subroutine do1_dlnT_dm_eqn(s, k, nvar, ierr)
lnTdiff = dT/Tpoint ! use this in place of lnT(k-1)-lnT(k)
delm = (s% dm(k) + s% dm(k-1))/2

resid = delm*dlnTdm - lnTdiff
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused. This seems to be the only change left in hydro_temperature? So nothing changed but the inlist toggles?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, basically.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, then I'd advocate of reverting even this change (its just brackets), so it's clear only inlists changed.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ahh yes, I missed the brackets. good call.

resid = (delm*dlnTdm - lnTdiff)
s% equ(i_equL, k) = resid%val

if (is_bad(s% equ(i_equL, k))) then
Expand Down
1 change: 0 additions & 1 deletion star/private/mix_info.f90
Original file line number Diff line number Diff line change
Expand Up @@ -1651,7 +1651,6 @@ subroutine update_rotation_mixing_info(s, ierr)
if (am_nu_DSI_factor >= 0 .and. am_nu_DSI_factor /= s% D_DSI_factor) okay = .false.
if (am_nu_SH_factor >= 0 .and. am_nu_SH_factor /= s% D_SH_factor) okay = .false.
if (am_nu_SSI_factor >= 0 .and. am_nu_SSI_factor /= s% D_SSI_factor) okay = .false.
if (am_nu_DSI_factor >= 0 .and. am_nu_DSI_factor /= s% D_DSI_factor) okay = .false.
if (am_nu_ES_factor >= 0 .and. am_nu_ES_factor /= s% D_ES_factor) okay = .false.
if (am_nu_GSF_factor >= 0 .and. am_nu_GSF_factor /= s% D_GSF_factor) okay = .false.
if (am_nu_ST_factor >= 0 .and. am_nu_ST_factor /= s% D_ST_factor) okay = .false.
Expand Down
2 changes: 1 addition & 1 deletion star/private/photo_in.f90
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ subroutine read_star_photo(s, fname, ierr)
s% dq(1:nz), s% xa(:,1:nz), s% xh(:,1:nz), &
s% omega(1:nz), s% j_rot(1:nz), s% mlt_vc(1:nz), s% conv_vel(1:nz), &
s% D_ST_start(1:nz), s% nu_ST_start(1:nz), & ! needed for ST time smoothing
s% have_ST_start_info
s% have_ST_start_info, s% mstar_old ! needed for ST time smoothing

call read_part_number(iounit)
if (failed('rsp_num_periods')) return
Expand Down
2 changes: 1 addition & 1 deletion star/private/photo_out.f90
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ subroutine output_star_photo(s,iounit,ierr)
s% dq(1:nz), s% xa(:,1:nz), s% xh(:,1:nz), &
s% omega(1:nz), s% j_rot(1:nz), s% mlt_vc(1:nz), s% conv_vel(1:nz), &
s% D_ST_start(1:nz), s% nu_ST_start(1:nz), & ! needed for ST time smoothing
s% have_ST_start_info
s% have_ST_start_info, s% mstar_old ! needed for ST time smoothing

call write_part_number(iounit)
write(iounit) &
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
! look for the string 'RELAXED VALUE FOR TEST SUITE' to find the adjusted values

energy_eqn_option = 'dedt'
convergence_ignore_equL_residuals = .true.
convergence_ignore_equL_residuals = .false.
use_gold2_tolerances = .true.
limit_for_rel_error_in_energy_conservation = -1
hard_limit_for_rel_error_in_energy_conservation = -1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@
energy_eqn_option = 'dedt'
max_tries_for_implicit_wind = 0 ! Recommend 10 for a production run

convergence_ignore_equL_residuals = .true.
convergence_ignore_equL_residuals = .false.
make_gradr_sticky_in_solver_iters = .true.
xa_scale = 1d-5
iter_for_resid_tol2 = 10
Expand Down
6 changes: 3 additions & 3 deletions star/test_suite/1M_pre_ms_to_wd/inlist_to_end_core_he_burn
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
change_D_omega_flag = .true.
new_D_omega_flag = .true.

!pgstar_flag = .true.
pgstar_flag = .true.

/ ! end of star_job namelist

Expand All @@ -40,10 +40,10 @@
xa_central_lower_limit_species(1) = 'he4'
xa_central_lower_limit(1) = 0.0001

energy_eqn_option = 'eps_grav'
energy_eqn_option = 'dedt'
use_gold2_tolerances = .true.

convergence_ignore_equL_residuals = .true.
convergence_ignore_equL_residuals = .false.

num_trace_history_values = 2
trace_history_value_name(1) = 'rel_E_err'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@
energy_eqn_option = 'dedt'
max_tries_for_implicit_wind = 0 ! Recommend 10 for a production run

convergence_ignore_equL_residuals = .true.
convergence_ignore_equL_residuals = .false.
make_gradr_sticky_in_solver_iters = .true.
xa_scale = 1d-5
iter_for_resid_tol2 = 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@

energy_eqn_option = 'dedt'
include_composition_in_eps_grav = .true.
convergence_ignore_equL_residuals = .true.
convergence_ignore_equL_residuals = .false.
ignore_too_large_correction = .true.
warn_rates_for_high_temp = .true.
max_safe_logT_for_rates = 10.5d0
Expand Down
2 changes: 1 addition & 1 deletion star/test_suite/ccsn_IIp/inlist_edep
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@

use_dPrad_dm_form_of_T_gradient_eqn = .true.

convergence_ignore_equL_residuals = .true.
convergence_ignore_equL_residuals = .false.

limit_for_rel_error_in_energy_conservation = 1d99
hard_limit_for_rel_error_in_energy_conservation = 1d99
Expand Down
2 changes: 1 addition & 1 deletion star/test_suite/ccsn_IIp/inlist_end_infall
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@


! solver controls
convergence_ignore_equL_residuals = .true.
convergence_ignore_equL_residuals = .false.


! output controls
Expand Down
2 changes: 1 addition & 1 deletion star/test_suite/ccsn_IIp/inlist_infall
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
hard_limit_for_rel_error_in_energy_conservation = 1d99

! solver controls
convergence_ignore_equL_residuals = .true.
convergence_ignore_equL_residuals = .false.

! output controls
terminal_interval = 10
Expand Down
2 changes: 1 addition & 1 deletion star/test_suite/ccsn_IIp/inlist_shock_common
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
tiny_corr_coeff_limit = 999999
solver_itermin_until_reduce_min_corr_coeff = 999999
max_resid_jump_limit = 1d99 ! turn this off until fix residuals
convergence_ignore_equL_residuals = .true.
convergence_ignore_equL_residuals = .false.

! output controls

Expand Down
Loading