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

Dummy tidal heating #275

Merged
merged 15 commits into from
Nov 20, 2024
Merged

Dummy tidal heating #275

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
56f683f
Prescribed tidal heating
nichollsh Nov 19, 2024
6a702ec
Update plots. Add warning for SPIDER and Aragog with tides
nichollsh Nov 19, 2024
1ab02ad
Update plot
nichollsh Nov 19, 2024
f94902d
Code style
nichollsh Nov 19, 2024
b88e89c
Moved orbital/tidal stuff into single call from proteus main loop. Up…
nichollsh Nov 19, 2024
ecb5adc
Update configs
nichollsh Nov 19, 2024
c2045c9
Update dummy test. Update global plot: do not plot data from init steps
nichollsh Nov 19, 2024
15b8259
Update tests
nichollsh Nov 19, 2024
4294ccb
Store radiogenic heat flux calculated by interior model - this also c…
nichollsh Nov 20, 2024
8697040
Code style. Structure plot ticks
nichollsh Nov 20, 2024
f09566d
Update tests. Code style
nichollsh Nov 20, 2024
d5e4c44
Github CI
nichollsh Nov 20, 2024
f303b05
Update dummy test data
nichollsh Nov 20, 2024
3c39898
Update cfg comments
nichollsh Nov 20, 2024
35fbd09
Set initial M_int guess when calculating structure from R_int, rather…
nichollsh Nov 20, 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 @@ -24,7 +24,7 @@ jobs:
python-version: ['3.11', '3.13']
include:
- os: ubuntu-latest
INSTALL_DEPS: sudo apt-get install libnetcdff-dev netcdf-bin
INSTALL_DEPS: sudo apt-get update; sudo apt-get install libnetcdff-dev netcdf-bin
CC: gcc
CXX: g++
FC: gfortran
Expand Down
12 changes: 8 additions & 4 deletions input/aragog.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ author = "Harrison Nicholls, Tim Lichtenberg"
atol = 0.02 # Step size atol
rtol = 0.11 # Step size rtol

# termination criteria
# Termination criteria
# Set enabled=true/false in each section to enable/disable that termination criterion
[params.stop]

# required number of iterations
Expand All @@ -68,8 +69,9 @@ author = "Harrison Nicholls, Tim Lichtenberg"

# radiative equilibrium
[params.stop.radeqm]
enabled = false
F_crit = 0.2 # W m-2, model will terminate when |F_atm| < F_crit
enabled = true
atol = 0.2 # absolute tolerance [W m-2]
rtol = 1e-3 # relative tolerance

# steady state
[params.stop.steady]
Expand Down Expand Up @@ -108,9 +110,11 @@ author = "Harrison Nicholls, Tim Lichtenberg"
zenith_angle = 48.19 # degrees
s0_factor = 0.375 # dimensionless

# No module specifically for tides / orbital dynamics
module = "none"

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


# Planetary structure - physics table
[struct]
Expand Down
12 changes: 8 additions & 4 deletions input/default.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ author = "Harrison Nicholls, Tim Lichtenberg"
atol = 0.02 # Step size atol
rtol = 0.07 # Step size rtol

# termination criteria
# Termination criteria
# Set enabled=true/false in each section to enable/disable that termination criterion
[params.stop]

# required number of iterations
Expand All @@ -69,11 +70,12 @@ author = "Harrison Nicholls, Tim Lichtenberg"
# radiative equilibrium
[params.stop.radeqm]
enabled = true
F_crit = 0.2 # W m-2, model will terminate when |F_atm| < F_crit
atol = 0.2 # absolute tolerance [W m-2]
rtol = 1e-3 # relative tolerance

# steady state
[params.stop.steady]
enabled = true
enabled = false
F_crit = 0.8 # Maximum absolute value of F_atm allowed for convergence
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is in W m-2 as well,right?

dprel = 1.0e-9 # Percentage change in melt fraction over time (dp/p)/dt*100

Expand Down Expand Up @@ -108,9 +110,11 @@ author = "Harrison Nicholls, Tim Lichtenberg"
zenith_angle = 48.19 # degrees
s0_factor = 0.375 # dimensionless

# No module specifically for tides / orbital dynamics
module = "none"

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


# Planetary structure - physics table
[struct]
Expand Down
11 changes: 7 additions & 4 deletions input/dummy.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ author = "Harrison Nicholls, Tim Lichtenberg"
atol = 0.02 # Step size atol
rtol = 0.10 # Step size rtol

# termination criteria
# Termination criteria
# Set enabled=true/false in each section to enable/disable that termination criterion
[params.stop]

# required number of iterations
Expand All @@ -69,7 +70,8 @@ author = "Harrison Nicholls, Tim Lichtenberg"
# radiative equilibrium
[params.stop.radeqm]
enabled = false
F_crit = 0.2 # W m-2, model will terminate when |F_atm| < F_crit
atol = 0.2 # absolute tolerance [W m-2]
rtol = 1e-3 # relative tolerance

# steady state
[params.stop.steady]
Expand Down Expand Up @@ -108,9 +110,10 @@ author = "Harrison Nicholls, Tim Lichtenberg"
zenith_angle = 48.19 # degrees
s0_factor = 0.375 # dimensionless

# No module specifically for tides / orbital dynamics
module = "none"
module = "dummy"

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

# Planetary structure - physics table
[struct]
Expand Down
12 changes: 8 additions & 4 deletions input/hd63433d.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ author = "Harrison Nicholls, Tim Lichtenberg"
atol = 0.02 # Step size atol
rtol = 0.07 # Step size rtol

# termination criteria
# Termination criteria
# Set enabled=true/false in each section to enable/disable that termination criterion
[params.stop]

# required number of iterations
Expand All @@ -69,11 +70,12 @@ author = "Harrison Nicholls, Tim Lichtenberg"
# radiative equilibrium
[params.stop.radeqm]
enabled = true
F_crit = 0.1 # W m-2, model will terminate when |F_atm| < F_crit
atol = 0.1 # absolute tolerance [W m-2]
rtol = 1e-3 # relative tolerance

# steady state
[params.stop.steady]
enabled = true
enabled = false
F_crit = 1.8 # Maximum absolute value of F_atm allowed for convergence
dprel = 3.0e-10 # Percentage change in melt fraction over time (dp/p)/dt*100

Expand Down Expand Up @@ -108,9 +110,11 @@ author = "Harrison Nicholls, Tim Lichtenberg"
zenith_angle = 54.74 # degrees
s0_factor = 0.25 # dimensionless

# No module specifically for tides / orbital dynamics
module = "none"

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


# Planetary structure - physics table
[struct]
Expand Down
12 changes: 8 additions & 4 deletions input/k218b.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ author = "Harrison Nicholls, Tim Lichtenberg"
atol = 0.03 # Step size atol
rtol = 0.15 # Step size rtol

# termination criteria
# Termination criteria
# Set enabled=true/false in each section to enable/disable that termination criterion
[params.stop]

# required number of iterations
Expand All @@ -69,11 +70,12 @@ author = "Harrison Nicholls, Tim Lichtenberg"
# radiative equilibrium
[params.stop.radeqm]
enabled = true
F_crit = 0.1 # W m-2, model will terminate when |F_atm| < F_crit
atol = 0.1 # absolute tolerance [W m-2]
rtol = 1e-3 # relative tolerance

# steady state
[params.stop.steady]
enabled = true
enabled = false
F_crit = 1.8 # Maximum absolute value of F_atm allowed for convergence
dprel = 3.0e-10 # Percentage change in melt fraction over time (dp/p)/dt*100

Expand Down Expand Up @@ -108,9 +110,11 @@ author = "Harrison Nicholls, Tim Lichtenberg"
zenith_angle = 54.74 # degrees
s0_factor = 0.25 # dimensionless

# No module specifically for tides / orbital dynamics
module = "none"

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


# Planetary structure - physics table
[struct]
Expand Down
Loading
Loading