Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhance flexibility for read MESA routine #605

Merged
merged 2 commits into from
Dec 9, 2024
Merged

Enhance flexibility for read MESA routine #605

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
304ab17
(readwrite_mesa) Add a few more options for column names
ryosuke-hirai Dec 9, 2024
9c5df94
(readwrite_mesa) Add a few more options for column names
ryosuke-hirai Dec 9, 2024
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
37 changes: 31 additions & 6 deletions src/setup/readwrite_mesa.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,9 @@ subroutine read_mesa(filepath,rho,r,pres,m,ene,temp,X_in,Z_in,Xfrac,Yfrac,Mstar,
call read_column_labels(iu,nheaderlines,ncols,nlabels,header)
if (nlabels /= ncols) print*,' WARNING: different number of labels compared to columns'

allocate(m(lines),r(lines),pres(lines),rho(lines),ene(lines), &
temp(lines),Xfrac(lines),Yfrac(lines))
allocate(m(lines))
m = -1d0
allocate(r,pres,rho,ene,temp,Xfrac,Yfrac,source=m)

over_directions: do idir=1,2 ! try backwards, then forwards
if (idir==1) then
Expand Down Expand Up @@ -137,27 +138,44 @@ subroutine read_mesa(filepath,rho,r,pres,m,ene,temp,X_in,Z_in,Xfrac,Yfrac,Mstar,
case('mass','#mass','m')
m = dat(1:lines,i)
if (ismesafile .or. maxval(m) < 1.e-10*solarm) m = m * solarm ! If reading MESA profile, 'mass' is in units of Msun
case('logM','log_mass')
m = 10**dat(1:lines,i)
if (ismesafile .or. maxval(m) < 1.e-10*solarm) m = m * solarm ! If reading MESA profile, 'mass' is in units of Msun
case('rho','density')
rho = dat(1:lines,i)
case('logrho')
case('logrho','logRho')
rho = 10**(dat(1:lines,i))
case('energy','e_int','e_internal')
ene = dat(1:lines,i)
case('logE')
ene = 10**dat(1:lines,i)
case('radius_cm')
r = dat(1:lines,i)
case('radius_km')
r = dat(1:lines,i) * 1e5
case('radius','r')
r = dat(1:lines,i)
if (ismesafile .or. maxval(r) < 1e-10*solarr) r = r * solarr
case('logr')
case('logr','logR')
r = (10**dat(1:lines,i)) * solarr
case('logR_cm')
r = 10**dat(1:lines,i)
case('pressure','p')
pres = dat(1:lines,i)
case('logP')
pres = 10**dat(1:lines,i)
case('temperature','t')
temp = dat(1:lines,i)
case('x_mass_fraction_h','xfrac')
case('logT')
temp = 10**dat(1:lines,i)
case('x_mass_fraction_h','x_mass_fraction_H','x','xfrac','h1')
Xfrac = dat(1:lines,i)
case('y_mass_fraction_he','yfrac')
case('log_x')
Xfrac = 10**dat(1:lines,i)
case('y_mass_fraction_he','y_mass_fraction_He','y','yfrac','he4')
Yfrac = dat(1:lines,i)
case('log_y')
Yfrac = 10**dat(1:lines,i)
case default
got_column = .false.
end select
Expand All @@ -176,6 +194,13 @@ subroutine read_mesa(filepath,rho,r,pres,m,ene,temp,X_in,Z_in,Xfrac,Yfrac,Mstar,
enddo over_directions
close(iu)

if(min(minval(m),minval(r),minval(pres),minval(rho),minval(ene))<0d0)ierr = 1

if (ierr /= 0) then
print "(a,/)",' ERROR reading MESA file [missing required columns]'
return
endif

if (.not. usecgs) then
m = m / umass
r = r / udist
Expand Down
Loading