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

Jump to bottom

Pass tidal heating to Aragog and SPIDER #282

Merged
merged 23 commits into from
Nov 25, 2024
Merged

Pass tidal heating to Aragog and SPIDER #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
0bdb7aa
Pass tidal heating to Aragog, SPIDER, Dummy
nichollsh Nov 21, 2024
ea5f24a
Update tidal heating in Aragog
nichollsh Nov 21, 2024
f51eb02
Update aragog dependency
nichollsh Nov 21, 2024
af34caa
Update configs
nichollsh Nov 21, 2024
2469eaa
Remove warning for tides
nichollsh Nov 21, 2024
3e7fa92
Update test configs
nichollsh Nov 21, 2024
792bf0e
Testing tidal heating. Update logging
nichollsh Nov 21, 2024
405fbe8
Update dummy test to include dummy tides
nichollsh Nov 22, 2024
3be73a0
Update physical test
nichollsh Nov 22, 2024
3dc3e83
Fix comment
nichollsh Nov 22, 2024
b26d559
Fig bug where F_atm_lim undefined when prevent_warming=False
nichollsh Nov 22, 2024
82e6a70
Store tidal constants
nichollsh Nov 22, 2024
5d9898c
Patch for macos deps
nichollsh Nov 22, 2024
dc491bf
Patch for macos deps
nichollsh Nov 22, 2024
198f999
Patch for macos deps
nichollsh Nov 22, 2024
3d8dcfa
Patch for macos deps
nichollsh Nov 22, 2024
5c94cfb
Patch for macos deps
nichollsh Nov 22, 2024
8242d6d
Patch for macos deps
nichollsh Nov 22, 2024
8874da4
Patch for macos deps
nichollsh Nov 22, 2024
16a813e
Patch for macos deps
nichollsh Nov 22, 2024
d7a9f11
Patch for macos deps
nichollsh Nov 22, 2024
511143d
Update configs
nichollsh Nov 25, 2024
853125a
Pass tidal_heating to aragog only in Setup function
nichollsh Nov 25, 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
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions input/hd63433d.toml
View file
Open in desktop
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
View file
Open in desktop
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
Loading