Skip to content

Commit

Permalink
Merge pull request #282 from FormingWorlds/hn/tidal
Browse files Browse the repository at this point in the history
Pass tidal heating to Aragog and SPIDER
  • Loading branch information
nichollsh authored Nov 25, 2024
2 parents 58ab8ae + 853125a commit b87df7d
Show file tree
Hide file tree
Showing 33 changed files with 413 additions and 623 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
CXX: g++
FC: gfortran
- os: macos-latest
INSTALL_DEPS: brew install gfortran netcdf netcdf-fortran
INSTALL_DEPS: brew uninstall --force pkg-config; rm -f /opt/homebrew/bin/pkg-config; rm -f /opt/homebrew/share/aclocal/pkg.m4; rm -f /opt/homebrew/share/man/man1/pkg-config.1; brew install gfortran netcdf netcdf-fortran
CC: gcc
CXX: g++
FC: gfortran
Expand Down
15 changes: 8 additions & 7 deletions input/aragog.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ author = "Harrison Nicholls, Tim Lichtenberg"

# time-stepping
[params.dt]
minimum = 1e2 # yr, minimum time-step
maximum = 3e7 # yr, maximum time-step
initial = 1e2 # yr, inital step size
minimum = 3e1 # yr, minimum time-step
maximum = 1e7 # yr, maximum time-step
initial = 3e1 # yr, inital step size
starspec = 1e9 # yr, interval to re-calculate the stellar spectrum
starinst = 1e1 # yr, interval to re-calculate the instellation
method = "adaptive" # proportional | adaptive | maximum
Expand All @@ -44,7 +44,7 @@ author = "Harrison Nicholls, Tim Lichtenberg"

[params.dt.adaptive]
atol = 0.02 # Step size atol
rtol = 0.11 # Step size rtol
rtol = 0.09 # Step size rtol

# Termination criteria
# Set enabled=true/false in each section to enable/disable that termination criterion
Expand Down Expand Up @@ -110,10 +110,10 @@ author = "Harrison Nicholls, Tim Lichtenberg"
zenith_angle = 48.19 # degrees
s0_factor = 0.375 # dimensionless

module = "none"
module = "dummy"

[orbit.dummy]
H_tide = 1e-11 # Fixed tidal power density [W kg-1]
H_tide = 1e-7 # Fixed tidal power density [W kg-1]


# Planetary structure - physics table
Expand Down Expand Up @@ -179,7 +179,8 @@ author = "Harrison Nicholls, Tim Lichtenberg"
[interior]
grain_size = 0.1 # crystal settling grain size [m]
F_initial = 1e6 # Initial heat flux guess [W m-2]
radiogenic_heat = true # enable radiogenic heat production
radiogenic_heat = false # enable radiogenic heat production
tidal_heat = true # enable tidal heat production

module = "aragog" # Which interior module to use

Expand Down
1 change: 1 addition & 0 deletions input/default.toml
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ author = "Harrison Nicholls, Tim Lichtenberg"
grain_size = 0.1 # crystal settling grain size [m]
F_initial = 8.0E4 # Initial heat flux guess [W m-2]
radiogenic_heat = true # enable radiogenic heat production
tidal_heat = false # enable tidal heat production

module = "spider" # Which interior module to use

Expand Down
253 changes: 0 additions & 253 deletions input/dummy.toml

This file was deleted.

1 change: 1 addition & 0 deletions input/hd63433d.toml
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ author = "Harrison Nicholls, Tim Lichtenberg"
grain_size = 0.1 # crystal settling grain size [m]
F_initial = 1e5 # Initial heat flux guess [W m-2]
radiogenic_heat = true # enable radiogenic heat production
tidal_heat = false # enable tidal heat production

module = "spider" # Which interior module to use

Expand Down
1 change: 1 addition & 0 deletions input/k218b.toml
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ author = "Harrison Nicholls, Tim Lichtenberg"
grain_size = 0.1 # crystal settling grain size [m]
F_initial = 1e5 # Initial heat flux guess [W m-2]
radiogenic_heat = true # enable radiogenic heat production
tidal_heat = false # enable tidal heat production

module = "aragog" # Which interior module to use

Expand Down
Loading

0 comments on commit b87df7d

Please sign in to comment.