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

Merge escape2 branch to master #140

Merged
merged 19 commits into from
Aug 22, 2024
Merged

Merge escape2 branch to master #140

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
670f24a
Changed name of efficiency_factor in escape.cfg file
EmmaPostolec Aug 8, 2024
eeb3c98
Try to make Fxuv_star_SI_full and age_star_mors global variables : fa…
EmmaPostolec Aug 8, 2024
5ff6428
Try to make Fxuv_star_SI_full and age_star_mors global variables : fa…
EmmaPostolec Aug 9, 2024
92b5fd5
comparison dummy vs escape : step 1 : plot
EmmaPostolec Aug 9, 2024
a05ae24
Comparison escape : Zephyrus vs dummy plot (dummy simulation failed)
EmmaPostolec Aug 12, 2024
b554812
Fix minor changes to run dummy escape w Tim
EmmaPostolec Aug 12, 2024
a10013a
Config file : escape.cfg = dummy2.cfg (except for escape_model) to do…
EmmaPostolec Aug 12, 2024
7c520ac
Minor changes in config files for accurate comparison + try to use Gr…
EmmaPostolec Aug 14, 2024
05187be
New config files for escape simulation on the cluster
EmmaPostolec Aug 15, 2024
83cc5b6
Comparison different value of escape
EmmaPostolec Aug 15, 2024
ad14481
Add plot for total inventory + M_atm for escape grid simulations : ne…
EmmaPostolec Aug 15, 2024
c2b8fd3
Plots to check MLR + Total mass species decrease w time : ok
EmmaPostolec Aug 16, 2024
605950c
Cleaning all escape related files before pull request w master
EmmaPostolec Aug 19, 2024
37e8a7d
GridPROTEUS.py file like in the master branch (removed my changes)
EmmaPostolec Aug 21, 2024
6541e6c
Added 2 missing config file : t1c.cfg and jgr_grid.cfg
EmmaPostolec Aug 21, 2024
97cd50f
Changes in config files for merging
EmmaPostolec Aug 21, 2024
a6c9580
Removed the try_start_time folder w config file in input folder
EmmaPostolec Aug 21, 2024
488e355
Revert some changes.
lsoucasse Aug 21, 2024
2d23c35
Delete bugging log.
lsoucasse Aug 21, 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 input/dummy.cfg
View file
Open in desktop
timlichtenberg marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ F_crit = 0.2 # Model will terminate when |F_atm| < F_
# Atmospheric escape
escape_model = 2 # Escape model to be used, 0: None | 1: ZEPHYRUS | 2: Dummy
escape_stop = 3e-4 # Terminate when atm mass drops below this fraction of its initial mass
escape_dummy_rate = 2e7 # Bulk escape rate for dummy escape model [kg s-1]
escape_dummy_rate = 4.151e3 # Bulk escape rate for dummy escape model [kg s-1]

# Method for solving for T(p) profile
atmosphere_model = 2 # Atmosphere model to be used, 0: JANUS | 1: AGNI | 2: Dummy
Expand Down
82 changes: 45 additions & 37 deletions input/jgr_grid.cfg → input/dummy2.cfg
View file
Open in desktop
timlichtenberg marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
########## PROTEUS configuration file
# this file is exactly the same config file as escape.cfg but for dummy escape.

##### Star configuration

Expand All @@ -8,8 +9,9 @@ star_radius_modern = 1 # R_sun, radius of star (TODAY)
star_temperature_modern = 5772.0 # K, temperature of star (TODAY)
star_luminosity_modern = 1 # L_sun, luminosity of star (TODAY) used for Baraffe model
star_age_modern = 4.567e9 # yr, age of star (TODAY)
star_rot_pctle = 60.0
star_rot_pctle = 50.0
star_spectrum = stellar_spectra/Named/sun.txt # Stellar spectrum file at 1 AU (TODAY)
star_omega = 1.0 # Star rotation rate [Omega_sun, rad s-1]

##### Planet configuration
mean_distance = 1 # AU, star-planet distance
Expand All @@ -21,38 +23,40 @@ asf_scalefactor = 0.375 # absorbed solar flux scale factor = 3/8
albedo_s = 0.1 # surface albedo
albedo_pl = 0.1 # Bond albedo (scattering)

eccentricity = 0.017 # Earth eccentricity [dimensionless]

P_top = 1.0e-5 # bar, Pressure at TOA

##### PROTEUS settings

iter_max = 9000
log_level = INFO
log_level = DEBUG

# Output subdirectory name (relative to output folder)
dir_output = grid_template
dir_output = dummy2

# Choose times
time_star = 100.0e6 # yr, time since star formation
time_target = 4.567e+9 # yr, target time for MO evolution

# SOCRATES spectral file to use (relative to FWL_DATA folder)
spectral_file = spectral_files/Dayspring/256/Dayspring.sf
spectral_file = spectral_files/Frostflow/48/Frostflow.sf

# Stellar heating toggle, 0: disabled | 1: enabled
stellar_heating = 1

# Time-stepping stuff
plot_iterfreq = 25 # Plotting frequency, 0: wait until completion | n: every n iterations
plot_format = png # Plotting image file format
sspec_dt_update = 1e6 # Time intervals at which to re-calculate the stellar spectrum
plot_iterfreq = 1 # Plotting frequency, 0: wait until completion | n: every n iterations
plot_format = pdf # Plotting image file format
sspec_dt_update = 1e9 # Time intervals at which to re-calculate the stellar spectrum
sinst_dt_update = 1e2 # Time intervals at which to re-calculate the instellation
dt_maximum = 3e5 # Maximum time-step
dt_minimum = 2e2 # Minimum time-step
dt_maximum = 3e7 # Maximum time-step
dt_minimum = 3e2 # Minimum time-step
dt_method = 1 # Time-stepping method, 0: proportional | 1: adaptive | 2: maximum
dt_propconst = 52.0 # Proportionality constant for dt_method=0
dt_atol = 0.002 # Step size atol
dt_rtol = 0.05 # Step size rtol
dt_initial = 8e2 # Inital step size
dt_atol = 0.02 # Step size atol
dt_rtol = 0.07 # Step size rtol
dt_initial = 1e4 # Inital step size

# Flux convergence scheme and tolerances for surface equilibration
shallow_ocean_layer = 0 # 0: off | 1: on
Expand All @@ -62,41 +66,44 @@ skin_k = 2.0 # W m-1 K-1
prevent_warming = 1 # Require that the planet only cool down over time, 0: disabled | 1: enabled

# Break at solidification?
solid_stop = 1
phi_crit = 0.005 # melt fraction
solid_stop = 1 # Enable this break condition
phi_crit = 0.005 # Model terminates with Phi_global < phi_crit

# Break at steady state?
steady_stop = 1
steady_flux = 0.8 # Maximum absolute value of F_atm allowed for convergence
steady_dprel = 1.0e-9 # Percentage change in melt fraction over time (dp/p)/dt*100
steady_stop = 1 # Enable this break condition
steady_flux = 0.8 # Maximum absolute value of F_atm allowed for convergence
steady_dprel = 1.0e-9 # Percentage change in melt fraction over time (dp/p)/dt*100

# Break at small flux?
emit_stop = 1 # Enable this break condition
F_crit = 0.2 # Model will terminate when |F_atm| < F_crit
F_crit = 0.2 # Critical flux, below which the model will terminate

# Atmospheric escape
escape_model = 0 # Escape model to be used, 0: None | 1: ZEPHYRUS | 2: Dummy
escape_model = 2 # Escape model to be used, 0: None | 1: ZEPHYRUS | 2: Dummy
escape_stop = 3e-4 # Terminate when atm mass drops below this fraction of its initial mass
escape_dummy_rate = 0.0 # Bulk escape rate for dummy escape model [kg s-1]
escape_dummy_rate = 5e8 # Bulk escape rate for dummy escape model [kg s-1]
efficiency_factor = 0.15 # Efficiency factor for energy-limited escape (varies typically 0.1 < epsilon < 0.6) [dimensionless]
escape_el_tidal_correction = 0 # Tidal correction factor, 0: None | 1: yes [dimensionless]


# Method for solving for T(p) profile
atmosphere_model = 0 # Atmosphere model to be used, 0: JANUS | 1: AGNI
atmosphere_surf_state = 2 # Atmosphere bottom edge boundary condition, 0: free | 1: fixed at T_surf | 2: conductive skin

# Number of levels
atmosphere_nlev = 200
atmosphere_nlev = 250

# Temperature limits throughout atmosphere [K]
min_temperature = 0.5
max_temperature = 5000.0

# Tropopause type, 0: none | 1: skin temperature | 2: dynamic
tropopause = 1

# Clouds
water_cloud = 0 # enable water cloud radiative effects? (1: yes, 0: no)
alpha_cloud = 0.0 # condensate retention fraction (1 -> fully retained)

# Tropopause type, 0: none | 1: skin temperature | 2: dynamic
tropopause = 1

# Rayleigh scattering, 0: Disabled | 1: Enabled
rayleigh = 1

Expand All @@ -105,7 +112,7 @@ atmosphere_chemistry = 0

##### SPIDER-specific settings

interior_nlev = 280
interior_nlev = 220
grain_size = 0.1

# Mixing length parameterization: 1: variable | 2: constant
Expand All @@ -118,20 +125,20 @@ solver_tolerance = 1.0e-10
tsurf_poststep_change = 20.0

# Maximum fractional surface temperature change [fraction]
tsurf_poststep_change_frac = 0.009
tsurf_poststep_change_frac = 0.01

# Fractional core radius
planet_coresize = 0.55

# Initial entropy conditions for interior
ic_adiabat_entropy = 2980.0
ic_adiabat_entropy = 2600.0
ic_dsdr = -4.698e-06

# Atmosphere heat flux start guess, adjusted during runtime [W/m^2]
F_atm = 3.0E5
F_atm = 8.0E4

# Oxygen fugacity offset relative to the IW buffer (log10 units)
fO2_shift_IW = 0
fO2_shift_IW = 4

# Enable solving for initial partial pressures (0: off | 1: on)
solvevol_use_params = 1
Expand All @@ -140,8 +147,8 @@ solvevol_use_params = 1
Phi_global = 1.0 # Mantle melt fraction initial guess
CH_ratio = 1.0 # C/H ratio
hydrogen_earth_oceans = 6.0 # Hydrogen inventory in units of equivalent Earth oceans
nitrogen_ppmw = 2.0 # Nitrogen inventory in ppmw relative to mantle mass
sulfur_ppmw = 0.0 # Sulfur inventory in ppmw relative to mass of melt
nitrogen_ppmw = 2.0 # Nitrogen inventory in ppmw relative to mass of melt
sulfur_ppmw = 200.0 # Sulfur inventory in ppmw relative to mass of melt

# Prescribed injected partial pressures [bar]
# Summed with solvepp results when solvepp_enabled = 1
Expand All @@ -151,20 +158,21 @@ H2O_initial_bar = 0.0
CO2_included = 1
CO2_initial_bar = 0.0

H2_included = 1
H2_initial_bar = 0.0
N2_included = 1
N2_initial_bar = 0.0

S2_included = 1
S2_initial_bar = 0.0

SO2_included = 0
SO2_initial_bar = 0.0

CH4_included = 1
H2_included = 0
H2_initial_bar = 0.0

CH4_included = 0
CH4_initial_bar = 0.0

CO_included = 1
CO_included = 0
CO_initial_bar = 0.0

N2_included = 1
N2_initial_bar = 0.0
20 changes: 10 additions & 10 deletions input/escape.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ P_top = 1.0e-5 # bar, Pressure at TOA
##### PROTEUS settings

iter_max = 9000
log_level = INFO
log_level = DEBUG

# Output subdirectory name (relative to output folder)
dir_output = earth_demo
dir_output = escape

# Choose times
time_star = 100.0e6 # yr, time since star formation
time_target = 4.567e+9 # yr, target time for MO evolution

# SOCRATES spectral file to use (relative to FWL_DATA folder)
spectral_file = spectral_files/Frostflow/256/Frostflow.sf
spectral_file = spectral_files/Frostflow/48/Frostflow.sf

# Stellar heating toggle, 0: disabled | 1: enabled
stellar_heating = 1
Expand Down Expand Up @@ -80,8 +80,8 @@ F_crit = 0.2 # Critical flux, below which the model w
# Atmospheric escape
escape_model = 1 # Escape model to be used, 0: None | 1: ZEPHYRUS | 2: Dummy
escape_stop = 3e-4 # Terminate when atm mass drops below this fraction of its initial mass
escape_dummy_rate = 0.0 # Bulk escape rate for dummy escape model [kg s-1]
escape_el_rate = 0.15 # Efficiency factor for energy-limited escape (varies typically 0.1 < epsilon < 0.6) [dimensionless]
escape_dummy_rate = 4e3 # Bulk escape rate for dummy escape model [kg s-1]
timlichtenberg marked this conversation as resolved.
Show resolved Hide resolved
efficiency_factor = 0.50 # Efficiency factor for energy-limited escape (varies typically 0.1 < epsilon < 0.6) [dimensionless]
escape_el_tidal_correction = 0 # Tidal correction factor, 0: None | 1: yes [dimensionless]


Expand Down Expand Up @@ -140,7 +140,7 @@ F_atm = 8.0E4
fO2_shift_IW = 4

# Enable solving for initial partial pressures (0: off | 1: on)
solvevol_use_params = 0
solvevol_use_params = 1

# Parameters used to solve for initial partial pressures (when solvepp_use_params = 1)
Phi_global = 1.0 # Mantle melt fraction initial guess
Expand All @@ -152,16 +152,16 @@ sulfur_ppmw = 200.0 # Sulfur inventory in ppmw relative to m
# Prescribed injected partial pressures [bar]
# Summed with solvepp results when solvepp_enabled = 1
H2O_included = 1
H2O_initial_bar = 30.0
H2O_initial_bar = 0.0

CO2_included = 1
CO2_initial_bar = 30.0
CO2_initial_bar = 0.0

N2_included = 1
N2_initial_bar = 30.0
N2_initial_bar = 0.0

S2_included = 1
S2_initial_bar = 30.0
S2_initial_bar = 0.0

SO2_included = 0
SO2_initial_bar = 0.0
Expand Down
Loading