Skip to content

Commit ff237ed

Browse files
nichollshnichollsh
committed
Version 0.8.4. New plot for pressure vs height (new cfg option). Pressure grid uses a smaller topmost level to avoid issues with extrapolation with low opacity compositions. New tests for making plots. Flag for updating (or not) the mixing ratios for radtrans post-saturation check. Fixed loop instability from SIMD when reading SOCRATES radout. Ensures that input stellar spectrum is strictly ascending in wavelength. Minor changes to notebooks
1 parent 62191fd commit ff237ed

16 files changed

Lines changed: 442 additions & 202 deletions

‎CITATION.cff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ authors:
55
given-names: "Harrison"
66
orcid: "https://orcid.org/0000-0002-8368-4641"
77
title: "AGNI"
8-
version: 0.8.3
8+
version: 0.8.4
99
doi: 10.xx/xx.xx
1010
date-released: 2024-09-20
1111
url: "https://github.com/nichollsh/AGNI"

‎Project.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "AGNI"
22
uuid = "ede838c1-9ec3-4ebe-8ae8-da4091b3f21c"
33
authors = ["Harrison Nicholls <harrison.nicholls@physics.ox.ac.uk>"]
4-
version = "0.8.3"
4+
version = "0.8.4"
55

66
[deps]
77
ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"

‎codemeta.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
"keywords": "physics, radiative transfer, exoplanets, astronomy, convection, radiation, planets, atmospheres",
2020
"license": "GPL v3.0",
2121
"title": "AGNI",
22-
"version": "0.8.3"
22+
"version": "0.8.4"
2323
}

‎misc/L98-59d.ipynb‎

Lines changed: 269 additions & 144 deletions
Large diffs are not rendered by default.

‎res/config/55cnce_chem.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ title = "Roughly 55 Cancri e @ fO2=IW"
5959
albedo = true
6060
mixing_ratios = true
6161
animate = true
62-
62+
height = true

‎res/config/L-98-59d.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ title = "L 98-59 d"
6060
albedo = true
6161
mixing_ratios = true
6262
animate = true
63-
63+
height = true

‎res/config/condense.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ title = "Condensation test"
6565
albedo = true
6666
mixing_ratios = true
6767
animate = true
68-
68+
height = true

‎res/config/default.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ title = "Default" # Name for this configuration file
6868
albedo = true # Plot spectral albedo?
6969
mixing_ratios = true # Plot mixing ratios?
7070
animate = false # Make animation from runtime plots?
71-
71+
height = true # Plot hydrostatic solution for height?

‎res/config/hotdry.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ title = "Hot and dry"
6464
albedo = true
6565
mixing_ratios = true
6666
animate = true
67-
67+
height = true

‎src/AGNI.jl‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -282,35 +282,36 @@ module AGNI
282282
spfile_name::String = cfg["files" ]["input_sf"]
283283
star_file::String = cfg["files" ]["input_star"]
284284
nlev_centre::Int = cfg["execution"]["num_levels"]
285-
flag_cnt::Bool = cfg["execution" ]["continua"]
286-
flag_ray::Bool = cfg["execution" ]["rayleigh"]
287-
flag_cld::Bool = cfg["execution" ]["cloud"]
288-
flag_aer::Bool = cfg["execution" ]["aerosol"]
289-
overlap::Int = cfg["execution" ]["overlap_method"]
290-
thermo_funct::Bool = cfg["execution" ]["thermo_funct"]
291-
incl_convect::Bool = cfg["execution" ]["convection"]
292-
incl_sens::Bool = cfg["execution" ]["sensible_heat"]
293-
incl_latent::Bool = cfg["execution" ]["latent_heat"]
294-
sol_type::Int = cfg["execution" ]["solution_type"]
295-
solvers_cmd::Array{String,1} = cfg["execution" ]["solvers"]
296-
initial_req::Array{String,1} = cfg["execution" ]["initial_state"]
297-
dx_max::Float64 = cfg["execution" ]["dx_max"]
298-
linesearch::Int = cfg["execution" ]["linesearch"]
299-
easy_start::Bool = cfg["execution" ]["easy_start"]
300-
conv_atol::Float64 = cfg["execution" ]["converge_atol"]
301-
conv_rtol::Float64 = cfg["execution" ]["converge_rtol"]
302-
max_steps::Int = cfg["execution" ]["max_steps"]
303-
max_runtime::Float64 = cfg["execution" ]["max_runtime"]
285+
flag_cnt::Bool = cfg["execution"]["continua"]
286+
flag_ray::Bool = cfg["execution"]["rayleigh"]
287+
flag_cld::Bool = cfg["execution"]["cloud"]
288+
flag_aer::Bool = cfg["execution"]["aerosol"]
289+
overlap::Int = cfg["execution"]["overlap_method"]
290+
thermo_funct::Bool = cfg["execution"]["thermo_funct"]
291+
incl_convect::Bool = cfg["execution"]["convection"]
292+
incl_sens::Bool = cfg["execution"]["sensible_heat"]
293+
incl_latent::Bool = cfg["execution"]["latent_heat"]
294+
sol_type::Int = cfg["execution"]["solution_type"]
295+
solvers_cmd::Array{String,1} = cfg["execution"]["solvers"]
296+
initial_req::Array{String,1} = cfg["execution"]["initial_state"]
297+
dx_max::Float64 = cfg["execution"]["dx_max"]
298+
linesearch::Int = cfg["execution"]["linesearch"]
299+
easy_start::Bool = cfg["execution"]["easy_start"]
300+
conv_atol::Float64 = cfg["execution"]["converge_atol"]
301+
conv_rtol::Float64 = cfg["execution"]["converge_rtol"]
302+
max_steps::Int = cfg["execution"]["max_steps"]
303+
max_runtime::Float64 = cfg["execution"]["max_runtime"]
304304

305305
# plotting stuff
306-
plt_run::Bool = cfg["plots" ]["at_runtime"]
307-
plt_tmp::Bool = cfg["plots" ]["temperature"]
308-
plt_flx::Bool = cfg["plots" ]["fluxes"]
309-
plt_cff::Bool = cfg["plots" ]["contribution"]
310-
plt_ems::Bool = cfg["plots" ]["emission"]
311-
plt_alb::Bool = cfg["plots" ]["albedo"]
312-
plt_vmr::Bool = cfg["plots" ]["mixing_ratios"]
313-
plt_ani::Bool = cfg["plots" ]["animate"]
306+
plt_run::Bool = cfg["plots"]["at_runtime"]
307+
plt_tmp::Bool = cfg["plots"]["temperature"]
308+
plt_flx::Bool = cfg["plots"]["fluxes"]
309+
plt_cff::Bool = cfg["plots"]["contribution"]
310+
plt_ems::Bool = cfg["plots"]["emission"]
311+
plt_alb::Bool = cfg["plots"]["albedo"]
312+
plt_vmr::Bool = cfg["plots"]["mixing_ratios"]
313+
plt_hei::Bool = cfg["plots"]["height"]
314+
plt_ani::Bool = cfg["plots"]["animate"]
314315
plt_ani = plt_ani && plt_tmp
315316

316317
# Read OPTIONAL configuration options from dict
@@ -537,6 +538,7 @@ module AGNI
537538
plt_flx && plotting.plot_fluxes(atmos, joinpath(atmos.OUT_DIR,"plot_fluxes.png"), incl_mlt=incl_convect, incl_eff=(sol_type==3), incl_cdct=incl_conduct, incl_latent=incl_latent)
538539
plt_ems && plotting.plot_emission(atmos, joinpath(atmos.OUT_DIR,"plot_emission.png"))
539540
plt_alb && plotting.plot_albedo(atmos, joinpath(atmos.OUT_DIR,"plot_albedo.png"))
541+
plt_hei && plotting.plot_height(atmos, joinpath(atmos.OUT_DIR,"plot_height.png"))
540542

541543
# Deallocate atmosphere
542544
@info "Deallocating memory"

0 commit comments

Comments
 (0)