Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
6 changes: 5 additions & 1 deletion binary/work/inlist_project
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
&binary_job

inlist_names(1) = 'inlist1'
inlist_names(1) = 'inlist1'
inlist_names(2) = 'inlist2'

evolve_both_stars = .false.
Expand All @@ -19,3 +19,7 @@
max_tries_to_achieve = 20

/ ! end of binary_controls namelist

&pgbinary

/ ! end of pgbinary namelist
26 changes: 19 additions & 7 deletions star/private/pgstar_support.f90
Original file line number Diff line number Diff line change
Expand Up @@ -742,25 +742,31 @@ subroutine set_grid_minmax(&
! use given if it isn't = 101
use_given_xmin = abs(given_xmin + 101.0) > 1e-6
if (xaxis_by == 'mass' .and. given_xmin < 0 .and. use_given_xmin) then
xmin = maxval(xvec(1:nz)) + given_xmin
xmin = maxval(xvec(1:nz), mask=.not. is_bad(xvec(1:nz))) + given_xmin
else if (use_given_xmin) then
xmin = given_xmin
else if (xaxis_by == 'logxm' .or. xaxis_by == 'logxq') then
xmin = minval(xvec(2:nz))
xmin = minval(xvec(2:nz), mask=.not. is_bad(xvec(2:nz)))
else
xmin = minval(xvec(1:nz))
xmin = minval(xvec(1:nz), mask=.not. is_bad(xvec(1:nz)))
end if

use_given_xmax = abs(given_xmax + 101.0) > 1e-6
if (xaxis_by == 'mass' .and. given_xmax < 0 .and. use_given_xmax) then
xmax = maxval(xvec(1:nz)) + given_xmax
xmax = maxval(xvec(1:nz), mask=.not. is_bad(xvec(1:nz))) + given_xmax
else if (use_given_xmax) then
xmax = given_xmax
else
xmax = maxval(xvec(1:nz))
xmax = maxval(xvec(1:nz), mask=.not. is_bad(xvec(1:nz)))
end if
dx = xmax - xmin

if (is_bad(dx)) then
xmax = given_xmax
xmin = given_xmin
dx = xmax - xmin
end if

if (.not. use_given_xmin) xmin = xmin - margin * dx
if (.not. use_given_xmax) xmax = xmax + margin * dx

Expand Down Expand Up @@ -854,17 +860,23 @@ subroutine set_ytop_ybot(&
if (use_given_ymin) then
ymin = given_ymin
else
ymin = minval(yvec(1:npts))
ymin = minval(yvec(1:npts), mask=.not. is_bad(yvec(1:npts)))
end if

use_given_ymax = abs(given_ymax + 101.0) > 1e-6
if (use_given_ymax) then
ymax = given_ymax
else
ymax = maxval(yvec(1:npts))
ymax = maxval(yvec(1:npts), mask=.not. is_bad(yvec(1:npts)))
end if
dy = ymax - ymin

if (is_bad(dy)) then
ymax = given_ymax
ymin = given_ymin
dy = ymax - ymin
end if

if (.not. use_given_ymin) ymin = ymin - ymargin * dy
if (.not. use_given_ymax) ymax = ymax + ymargin * dy

Expand Down
Loading