Skip to content

EOS data loading refactor #1046

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

Draft
VincentVanlaer wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

EOS data loading refactor #1046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d421ceb
eos: convert helm table to hdf5
VincentVanlaer Aug 18, 2026
27b77e9
eos: make arrays in Helm_Table allocatable rather than pointers
VincentVanlaer Aug 18, 2026
f16c94d
eos: store helm table parameters in the table itself
VincentVanlaer Aug 20, 2026
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
3 changes: 1 addition & 2 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
data/star_data/zams_models/zams_z2m2_y28.data filter=lfs diff=lfs merge=lfs -text
docs/source/assets/zams_z2m2_y28_patched.data filter=lfs diff=lfs merge=lfs -text
neu/test/test_output filter=lfs diff=lfs merge=lfs -text

# Try to get github to better understand what our filetypes are
*.inc linguist-language=Fortran
*inlist* linguist-language=Fortran
Expand All @@ -20,11 +19,11 @@ neu/test/test_output filter=lfs diff=lfs merge=lfs -text
*.ph -linguist-detectable
*.[1-9] -linguist-detectable
*.in -linguist-detectable

# Things to ignore from the release
star/dev_cases_compare_pulses export-ignore
star/dev_cases_star_to_RSP2 export-ignore
star/dev_cases_test_RSP2 export-ignore
star/dev_cases_test_TDC export-ignore
star/rsp2_utils export-ignore
data/colors_data/colors_data.txz filter=lfs diff=lfs merge=lfs -text
data/eosDT_data/helm-table.hdf5 filter=lfs diff=lfs merge=lfs -text
3 changes: 3 additions & 0 deletions data/eosDT_data/helm-table.hdf5
View file
Open in desktop
Git LFS file not shown
8 changes: 4 additions & 4 deletions eos/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ SRCS_CHECK = test/src/test_eos.f90 \
test/src/eos_support.f90 \
test/src/test_eos_blend.f90 \
test/src/test_eos_support.f90
INTERNAL_DEPENDS_ON := const math utils chem num auto_diff interp_1d interp_2d
EXTERNAL_DEPENDS_ON :=
INTERNAL_DEPENDS_ON := const math utils chem num auto_diff interp_1d interp_2d forum
EXTERNAL_DEPENDS_ON := hdf5
BINTYPE := lib
INCLUDE_DIRS := -Iprivate -Ipublic -Idefaults

Expand All @@ -65,9 +65,9 @@ install-cms:
fi

install-dt:
if [ ! -r ../data/eosDT_data ]; then \
if [ ! -r ../data/eosDT_data/extract-completed ]; then \
tar -xJf eosDT_data.tar.xz -C ../data; \
xz --decompress --keep --stdout helm_table.dat.xz > ../data/eosDT_data/helm_table.dat; \
touch ../data/eosDT_data/extract-completed; \
fi

install-pc:
Expand Down
2 changes: 0 additions & 2 deletions eos/eosDT_builder/src/create_eos_files.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ program create_eosDT_files

if (whichz == 0) call Make_EoS_Files(whichz, 1d0, irad /= 0)

call free_helm_table(eos_ht)

contains

subroutine do_stop(str)
Expand Down
9 changes: 1 addition & 8 deletions eos/eosDT_builder/src/helm_opal_scvh_driver.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ module helm_opal_scvh_driver
implicit none

character(len=256) :: data_dir
integer, parameter :: imax = 261, jmax = 101 ! dimensions of our version of helm table

contains

Expand Down Expand Up @@ -62,13 +61,7 @@ subroutine setup_eos
call eos_def_init

ierr = 0
call alloc_helm_table(eos_ht, imax, jmax, ierr)
if (ierr /= 0) then
write (*, *) 'alloc helm table failed'
stop 1
end if

call read_helm_table(eos_ht, data_dir, cache_dir, temp_cache_dir, use_cache, ierr) ! initialize helm
call read_helm_table(eos_ht, data_dir, ierr) ! initialize helm
if (ierr /= 0) then
write (*, *) 'read helm table failed'
stop 1
Expand Down
3 changes: 0 additions & 3 deletions eos/helm_table.dat.xz
View file
Open in desktop

This file was deleted.

12 changes: 1 addition & 11 deletions eos/private/eos_initialize.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,6 @@ subroutine Init_eos( &
character(*), intent(IN) :: eosDT_cache_dir_in
logical, intent(in) :: use_cache
integer, intent(OUT) :: ierr ! 0 means AOK.
!integer, parameter :: imax = 261, jmax = 101
! dimensions of small version of helm table
!integer, parameter :: imax = 1081, jmax = 401
! dimensions of medium version of helm table; 40 points per decade
integer, parameter :: imax = 2701, jmax = 1001
! dimensions of large version of helm table; 100 points per decade
! helm table lives in eosDT_data
character (len=256) :: eosDT_data_dir
ierr = 0
Expand All @@ -58,11 +52,7 @@ subroutine Init_eos( &
if(use_mesa_temp_cache) call mkdir(eosDT_temp_cache_dir)
end if

call alloc_helm_table(eos_ht, imax, jmax, ierr)
if (ierr /= 0) return

call read_helm_table(eos_ht, &
eosDT_data_dir, eosDT_cache_dir, eosDT_temp_cache_dir, use_cache_for_eos, ierr)
call read_helm_table(eos_ht, eosDT_data_dir, ierr)
if (ierr /= 0) return

call eos_def_init
Expand Down
Loading
Loading