Skip to content

Table and mixture EOS #96

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

Open
adamdempsey90 wants to merge 46 commits into
base: develop
Choose a base branch
from
Open

Table and mixture EOS #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
84dfe67
unlock spiner in singularity-eos for artemis use
adamdempsey90 Sep 12, 2025
4322016
Add spiner EOS and a new ideal gas h-he mixture
adamdempsey90 Sep 26, 2025
e83ea1e
Merge remote-tracking branch 'origin/develop' into dempsey/table
adamdempsey90 Sep 26, 2025
03e0f0d
require ideal gas
adamdempsey90 Sep 27, 2025
8eb21a2
require ideal gas
adamdempsey90 Sep 27, 2025
227998f
add bulk modulus and temperature as prim vars
adamdempsey90 Sep 27, 2025
081ab93
updates for more general eos
adamdempsey90 Sep 27, 2025
3d3c2c7
remove ref to gamma gas
adamdempsey90 Sep 27, 2025
179e520
cleanup and save/load everything needed
adamdempsey90 Sep 27, 2025
7b6f6a2
create new `gas/eos` nodes
adamdempsey90 Sep 27, 2025
4a3512d
Add new shock tube input for ideal gasses
adamdempsey90 Sep 27, 2025
c764b4a
Get working on gpu
adamdempsey90 Sep 29, 2025
e7f8cee
Update input files for new eos
adamdempsey90 Sep 29, 2025
6423beb
Be explicit about the string type
adamdempsey90 Sep 30, 2025
5b77435
set wl_ibl correctly
adamdempsey90 Sep 30, 2025
bdc08f3
Revert
adamdempsey90 Oct 1, 2025
0bb08d3
add new hllc solver that uses different wave speeds
adamdempsey90 Oct 3, 2025
2188dca
correct gas eos block name
adamdempsey90 Oct 3, 2025
9d5cf7a
make the general hllc the default
adamdempsey90 Oct 3, 2025
ee23061
Create root finding functions to get things from pressure and either …
adamdempsey90 Oct 4, 2025
d4e7de9
relax restrictions on ideal gas and use new EOS functions
adamdempsey90 Oct 4, 2025
80b10b1
Add temp unit to params
adamdempsey90 Oct 6, 2025
050211f
Use the already computed bulk modulus for time step
adamdempsey90 Oct 6, 2025
f29087f
Pass eos around by reference. Fix bug in dpdr
adamdempsey90 Oct 6, 2025
802c072
format
adamdempsey90 Oct 6, 2025
421c5a3
Revert the fix as this is causing more problems that will be fixed in…
adamdempsey90 Oct 7, 2025
75c8e92
use table logic was backwards
adamdempsey90 Oct 10, 2025
d530f0f
using ghllc requires ideal gas
adamdempsey90 Oct 10, 2025
cabd2b4
Rename
adamdempsey90 Oct 10, 2025
531473f
Merge remote-tracking branch 'origin/develop' into dempsey/table
adamdempsey90 Oct 10, 2025
bd5fb20
Merge remote-tracking branch 'origin/develop' into dempsey/table
adamdempsey90 Oct 13, 2025
9fa8afa
Add more hdf5 env variables in the cray presets
adamdempsey90 Oct 13, 2025
8341444
Merge branch 'dempsey/table' of github.com:lanl/artemis into dempsey/…
adamdempsey90 Oct 13, 2025
574f873
Correct nbody temp calculation
adamdempsey90 Oct 14, 2025
cff9d68
format
adamdempsey90 Oct 14, 2025
1756e77
cleanup
adamdempsey90 Oct 21, 2025
e04b7fe
Merge remote-tracking branch 'origin/develop' into dempsey/table
adamdempsey90 Oct 21, 2025
a01b5a0
Merge branch 'dempsey/table' of github.com:lanl/artemis into dempsey/…
adamdempsey90 Oct 21, 2025
367a398
Merge remote-tracking branch 'origin/develop' into dempsey/table
adamdempsey90 Nov 5, 2025
2a19ac4
Merge remote-tracking branch 'origin/develop' into dempsey/table
adamdempsey90 Nov 7, 2025
af01ca0
Read mu for all eos
adamdempsey90 Nov 7, 2025
547528f
Remove duplicates
adamdempsey90 Nov 7, 2025
e23421e
Actually integrate HSE if non-ideal EOS
adamdempsey90 Nov 7, 2025
3c262cc
Have extrap try to use the isothermal compressibility
adamdempsey90 Nov 12, 2025
84256a0
Extrapolate at the current temperature, not the initial
adamdempsey90 Nov 12, 2025
40ea064
correct_recon now becomes post_recon templated on fluid type. We use …
adamdempsey90 Nov 12, 2025
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: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,12 @@ if(ARTEMIS_ENABLE_HDF5)
"-DARTEMIS_ENABLE_HDF5=OFF")
endif()
set(SINGULARITY_USE_HDF5 ON CACHE BOOL "" FORCE)
set(SINGULARITY_USE_SPINER ON CACHE BOOL "" FORCE)
set(PARTHENON_DISABLE_HDF5 OFF CACHE BOOL "" FORCE)
else()
set(SINGULARITY_USE_HDF5 OFF CACHE BOOL "" FORCE)
set(SINGULARITY_USE_SPINER ON CACHE BOOL "" FORCE)
set(SINGULARITY_USE_SPINER_WITH_HDF5 OFF CACHE BOOL "" FORCE)
set(PARTHENON_DISABLE_HDF5 ON CACHE BOOL "" FORCE)
endif()

Expand Down
18 changes: 18 additions & 0 deletions CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@
"Kokkos_ENABLE_DEBUG_BOUNDS_CHECK": "ON",
"CMAKE_CXX_COMPILER": "CC",
"HDF5_INCLUDE_DIR": "$env{HDF5_ROOT}/include",
"HDF5_INCLUDE_DIRS": "$env{HDF5_ROOT}/include",
"HDF5_LIBRARIES": "$env{HDF5_ROOT}/lib",
"HDF5_HL_LIBRARIES": "$env{HDF5_ROOT}/lib",
"PARTHENON_DISABLE_HDF5_COMPRESSION": "ON"
}
},
Expand All @@ -75,6 +78,9 @@
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
"CMAKE_CXX_COMPILER": "CC",
"HDF5_INCLUDE_DIR": "$env{HDF5_ROOT}/include",
"HDF5_INCLUDE_DIRS": "$env{HDF5_ROOT}/include",
"HDF5_LIBRARIES": "$env{HDF5_ROOT}/lib",
"HDF5_HL_LIBRARIES": "$env{HDF5_ROOT}/lib",
"PARTHENON_DISABLE_HDF5_COMPRESSION": "ON"
}
},
Expand All @@ -89,6 +95,9 @@
"ARTEMIS_ENABLE_CUDA": "ON",
"Kokkos_ARCH_AMPERE80": "ON",
"HDF5_INCLUDE_DIR": "$env{HDF5_ROOT}/include",
"HDF5_INCLUDE_DIRS": "$env{HDF5_ROOT}/include",
"HDF5_LIBRARIES": "$env{HDF5_ROOT}/lib",
"HDF5_HL_LIBRARIES": "$env{HDF5_ROOT}/lib",
"PARTHENON_DISABLE_HDF5_COMPRESSION": "ON",
"NUM_GPU_DEVICES_PER_NODE": "4"
}
Expand All @@ -103,6 +112,9 @@
"ARTEMIS_ENABLE_CUDA": "ON",
"Kokkos_ARCH_AMPERE80": "ON",
"HDF5_INCLUDE_DIR": "$env{HDF5_ROOT}/include",
"HDF5_INCLUDE_DIRS": "$env{HDF5_ROOT}/include",
"HDF5_LIBRARIES": "$env{HDF5_ROOT}/lib",
"HDF5_HL_LIBRARIES": "$env{HDF5_ROOT}/lib",
"PARTHENON_DISABLE_HDF5_COMPRESSION": "ON",
"NUM_GPU_DEVICES_PER_NODE": "4"
}
Expand All @@ -118,6 +130,9 @@
"ARTEMIS_ENABLE_CUDA": "ON",
"Kokkos_ARCH_HOPPER90": "ON",
"HDF5_INCLUDE_DIR": "$env{HDF5_ROOT}/include",
"HDF5_INCLUDE_DIRS": "$env{HDF5_ROOT}/include",
"HDF5_LIBRARIES": "$env{HDF5_ROOT}/lib",
"HDF5_HL_LIBRARIES": "$env{HDF5_ROOT}/lib",
"PARTHENON_DISABLE_HDF5_COMPRESSION": "ON",
"NUM_GPU_DEVICES_PER_NODE": "4"
}
Expand All @@ -131,6 +146,9 @@
"CMAKE_CXX_COMPILER": "$env{ARTEMIS_HOME}/external/parthenon/external/Kokkos/bin/nvcc_wrapper",
"ARTEMIS_ENABLE_CUDA": "ON",
"HDF5_INCLUDE_DIR": "$env{HDF5_ROOT}/include",
"HDF5_INCLUDE_DIRS": "$env{HDF5_ROOT}/include",
"HDF5_LIBRARIES": "$env{HDF5_ROOT}/lib",
"HDF5_HL_LIBRARIES": "$env{HDF5_ROOT}/lib",
"PARTHENON_DISABLE_HDF5_COMPRESSION": "ON",
"Kokkos_ARCH_HOPPER90": "ON",
"NUM_GPU_DEVICES_PER_NODE": "4"
Expand Down
2 changes: 2 additions & 0 deletions inputs/advection/advection.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ dust = true
cfl = 0.9
reconstruct = plm
riemann = hllc

<gas/eos/ideal>
gamma = 1.66666666667

<dust>
Expand Down
4 changes: 3 additions & 1 deletion inputs/blast/blast.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,14 @@ gas = true

<gas>
cfl = 0.3
gamma = 1.4 # gamma = C_p/C_v
reconstruct = plm
riemann = hlle
dfloor = 1.0e-10
siefloor = 1.0e-10

<gas/eos/ideal>
gamma = 1.4 # gamma = C_p/C_v

<problem>
d0 = 1.0
p0 = 1.0e-5
Expand Down
4 changes: 3 additions & 1 deletion inputs/blast/blast_amr.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ gas = true

<gas>
cfl = 0.3
gamma = 1.4 # gamma = C_p/C_v
reconstruct = plm
riemann = hlle
dfloor = 1.0e-10
Expand All @@ -73,6 +72,9 @@ refine_field = pressure
refine_type = gradient
refine_thr = 10.0

<gas/eos/ideal>
gamma = 1.4 # gamma = C_p/C_v

<problem>
d0 = 1.0
p0 = 1.0e-5
Expand Down
4 changes: 3 additions & 1 deletion inputs/diffusion/alpha_disk.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,14 @@ viscosity = true

<gas>
cfl = 0.3
gamma = 1.0001
reconstruct = plm
riemann = hllc
dfloor = 1.0e-10
siefloor = 1.0e-15

<gas/eos/ideal>
gamma = 1.0001

<gas/viscosity>
type = alpha
alpha = 1.0e-3
Expand Down
4 changes: 3 additions & 1 deletion inputs/diffusion/conduction.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,14 @@ drag = true

<gas>
cfl = 0.3
gamma = 1.66667
reconstruct = plm
riemann = hllc
dfloor = 1.0e-10
siefloor = 1.0e-15

<gas/eos/ideal>
gamma = 1.66667

<gas/conductivity>
type = conductivity
cond = 1.0e-1
Expand Down
4 changes: 3 additions & 1 deletion inputs/diffusion/gaussian_bump.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,14 @@ conduction = true

<gas>
cfl = 0.3
gamma = 1.000001
reconstruct = plm
riemann = hllc
dfloor = 1.0e-10
siefloor = 1.0e-10

<gas/eos/ideal>
gamma = 1.000001

<gas/viscosity>
type = constant
nu = 5.0e-3
Expand Down
4 changes: 3 additions & 1 deletion inputs/disk/binary_cyl.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,15 @@ rotating_frame = true
cfl = 0.3
reconstruct = plm
riemann = hllc
gamma = 1.00001
dfloor = 1.0e-10
siefloor = 1.0e-10
refine_field = pressure
refine_type = gradient
refine_thr = 3.0

<gas/eos/ideal>
gamma = 1.00001

<rotating_frame>
omega = 1.0

Expand Down
4 changes: 3 additions & 1 deletion inputs/disk/binary_nbody_cyl.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ rotating_frame = true

<gas>
cfl = 0.3
gamma = 1.00001
reconstruct = plm
riemann = hllc
dfloor = 1.0e-10
Expand All @@ -84,6 +83,9 @@ refine_field = pressure
refine_type = gradient
refine_thr = 3.0

<gas/eos/ideal>
gamma = 1.00001


<rotating_frame>
omega = 1.0
Expand Down
4 changes: 3 additions & 1 deletion inputs/disk/cb_disk.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,14 @@ drag = true

<gas>
cfl = 0.3
gamma = 1.4
reconstruct = plm
riemann = hllc
dfloor = 1.0e-6
siefloor = 1.0e-6

<gas/eos/ideal>
gamma = 1.4

<gas/viscosity>
type = constant
nu = 1e-3
Expand Down
4 changes: 3 additions & 1 deletion inputs/disk/disk_alpha.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,14 @@ cooling = true

<gas>
cfl = 0.3
gamma = 1.4
reconstruct = plm
riemann = hllc
dfloor = 1.0e-10
siefloor = 1.0e-10

<gas/eos/ideal>
gamma = 1.4

<gas/viscosity>
type = alpha
alpha = 1e-2
Expand Down
4 changes: 3 additions & 1 deletion inputs/disk/disk_axi.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,14 @@ rotating_frame = true

<gas>
cfl = 0.3
gamma = 1.4
reconstruct = plm
riemann = hlle
dfloor = 1.0e-10
siefloor = 1.0e-10

<gas/eos/ideal>
gamma = 1.4

<rotating_frame>
omega = 1.0

Expand Down
4 changes: 3 additions & 1 deletion inputs/disk/disk_cart.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,14 @@ viscosity = true

<gas>
cfl = 0.9
gamma = 1.4
reconstruct = plm
riemann = hllc
dfloor = 1.0e-10
siefloor = 1.0e-10

<gas/eos/ideal>
gamma = 1.4

<gas/viscosity>
type = alpha
alpha = 1e-3
Expand Down
4 changes: 3 additions & 1 deletion inputs/disk/disk_collision.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,14 @@ cooling = true

<gas>
cfl = 0.3
gamma = 1.4
reconstruct = plm
riemann = hllc
dfloor = 1.0e-10
siefloor = 1.0e-10

<gas/eos/ideal>
gamma = 1.4

<gravity/nbody>
mtot = 1.0

Expand Down
4 changes: 3 additions & 1 deletion inputs/disk/disk_cyl.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,14 @@ rotating_frame = true

<gas>
cfl = 0.3
gamma = 1.4
reconstruct = plm
riemann = hllc
dfloor = 1.0e-10
siefloor = 1.0e-10

<gas/eos/ideal>
gamma = 1.4

<rotating_frame>
omega = 1.0

Expand Down
4 changes: 3 additions & 1 deletion inputs/disk/disk_nbody_cyl.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,14 @@ viscosity = true

<gas>
cfl = 0.3
gamma = 1.4
reconstruct = plm
riemann = hllc
dfloor = 1.0e-10
siefloor = 1.0e-10

<gas/eos/ideal>
gamma = 1.4

<gas/viscosity>
type = alpha
alpha = 1e-3
Expand Down
4 changes: 3 additions & 1 deletion inputs/disk/disk_sph.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,15 @@ rotating_frame = true

<gas>
cfl = 0.3
gamma = 1.4
reconstruct = plm
riemann = hlle
dfloor = 1.0e-10
siefloor = 1.0e-10


<gas/eos/ideal>
gamma = 1.4

<rotating_frame>
omega = 1.0

Expand Down
4 changes: 3 additions & 1 deletion inputs/drag/simple_drag.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,14 @@ drag = true

<gas>
cfl = 0.3
gamma = 1.4 # gamma = C_p/C_v
reconstruct = plm
riemann = hlle
dfloor = 1.0e-10
siefloor = 1.0e-10

<gas/eos/ideal>
gamma = 1.4 # gamma = C_p/C_v

<dust>
cfl = 0.3
nspecies = 4
Expand Down
4 changes: 3 additions & 1 deletion inputs/kh/kh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,10 @@ gas = true

<gas>
cfl = 0.3
gamma = 1.4 # gamma = C_p/C_v
reconstruct = plm
riemann = hllc
dfloor = 1.0e-10
siefloor = 1.0e-10

<gas/eos/ideal>
gamma = 1.4 # gamma = C_p/C_v
2 changes: 2 additions & 0 deletions inputs/linwave/linear_wave.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ dust = false
cfl = 0.9
reconstruct = plm
riemann = hllc

<gas/eos/ideal>
gamma = 1.66666666667

<problem>
Expand Down
2 changes: 2 additions & 0 deletions inputs/linwave/linear_wave_amr.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ refine_type = magnitude
refine_thr = 1.0008
deref_thr = 1.0008

<gas/eos/ideal>

<problem>
nperiod = 5 # Number of wave crossing periods to evolve simulation
wave_flag = 0 # Wave family number ([0-4] for adiabatic hydro)
Expand Down
4 changes: 3 additions & 1 deletion inputs/lw/lw.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,10 @@ gas = true

<gas>
cfl = 0.3
gamma = 1.4 # gamma = C_p/C_v
reconstruct = plm
riemann = hllc
dfloor = 1.0e-10
siefloor = 1.0e-10

<gas/eos/ideal>
gamma = 1.4 # gamma = C_p/C_v
Loading