diff --git a/examples/EarlyMars.ipynb b/examples/EarlyMars.ipynb index 97b19aa..37ca6c5 100644 --- a/examples/EarlyMars.ipynb +++ b/examples/EarlyMars.ipynb @@ -19,7 +19,7 @@ { "data": { "text/plain": [ - "" + "" ] }, "execution_count": 1, @@ -43,9 +43,9 @@ "metadata": {}, "outputs": [], "source": [ - "c = AdiabatClimate('../templates/EarlyMars/species.yaml', \n", - " '../templates/EarlyMars/settings.yaml', \n", - " '../templates/EarlyMars/Sun_3.8Ga.txt')\n", + "c = AdiabatClimate('../templates/AdiabatClimate/species.yaml', \n", + " '../templates/AdiabatClimate/Mars/settings.yaml', \n", + " '../templates/AdiabatClimate/Mars/Sun_3.8Ga.txt')\n", "c.P_top = 1.0\n", "c.solve_for_T_trop = True" ] @@ -60,7 +60,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "['H2O', 'CO2', 'N2', 'H2', 'CH4', 'CO', 'NH3']\n" + "['H2O', 'CO2', 'N2', 'H2', 'CH4', 'CO', 'O2']\n" ] } ], @@ -213,7 +213,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.9" + "version": "3.11.5" } }, "nbformat": 4, diff --git a/examples/Tutorial_AdiabatClimate.ipynb b/examples/Tutorial_AdiabatClimate.ipynb index 89d166a..85613ba 100644 --- a/examples/Tutorial_AdiabatClimate.ipynb +++ b/examples/Tutorial_AdiabatClimate.ipynb @@ -19,7 +19,7 @@ { "data": { "text/plain": [ - "" + "" ] }, "execution_count": 1, @@ -56,8 +56,8 @@ "metadata": {}, "outputs": [], "source": [ - "species_file = '../templates/runaway_greenhouse/species.yaml' # Species and their thermodynamic properties\n", - "settings_file = '../templates/runaway_greenhouse/settings.yaml' # Planet properties, and radiative transfer settings\n", + "species_file = '../templates/AdiabatClimate/species.yaml' # Species and their thermodynamic properties\n", + "settings_file = '../templates/AdiabatClimate/Earth/settings.yaml' # Planet properties, and radiative transfer settings\n", "star_file = '../templates/ModernEarth/Sun_Now.txt' # The stellar flux\n", "\n", "c = AdiabatClimate(species_file, \n", diff --git a/templates/runaway_greenhouse/settings.yaml b/templates/AdiabatClimate/Earth/settings.yaml similarity index 100% rename from templates/runaway_greenhouse/settings.yaml rename to templates/AdiabatClimate/Earth/settings.yaml diff --git a/templates/EarlyMars/Sun_3.8Ga.txt b/templates/AdiabatClimate/Mars/Sun_3.8Ga.txt similarity index 100% rename from templates/EarlyMars/Sun_3.8Ga.txt rename to templates/AdiabatClimate/Mars/Sun_3.8Ga.txt diff --git a/templates/EarlyMars/settings.yaml b/templates/AdiabatClimate/Mars/settings.yaml similarity index 100% rename from templates/EarlyMars/settings.yaml rename to templates/AdiabatClimate/Mars/settings.yaml diff --git a/templates/runaway_greenhouse/species.yaml b/templates/AdiabatClimate/species.yaml similarity index 100% rename from templates/runaway_greenhouse/species.yaml rename to templates/AdiabatClimate/species.yaml diff --git a/templates/EarlyMars/species.yaml b/templates/EarlyMars/species.yaml deleted file mode 100644 index 8786944..0000000 --- a/templates/EarlyMars/species.yaml +++ /dev/null @@ -1,92 +0,0 @@ -atoms: -- {name: H, mass: 1.00797} -- {name: N, mass: 14.0067} -- {name: O, mass: 15.9994} -- {name: C, mass: 12.011} - -species: -- name: H2O - composition: {H: 2, O: 1} - thermo: - model: Shomate - temperature-ranges: [0.0, 1700.0, 6000.0] - data: - - [30.092, 6.832514, 6.793435, -2.53448, 0.082139, -250.881, 223.3967] - - [41.96426, 8.622053, -1.49978, 0.098119, -11.15764, -272.1797, 219.7809] - saturation: - model: LinearLatentHeat - mu: 18.01534 - T-ref: 373.15 - P-ref: 1.0142e6 - T-triple: 273.15 - T-critical: 647.0 - vaporization: {a: 2.841421e+10, b: -1.399732e+07} - sublimation: {a: 2.746884e+10, b: 4.181527e+06} - super-critical: {a: 1.793161e+12, b: 0.0} - note: From the NIST database -- name: CO2 - composition: {C: 1, O: 2} - thermo: - model: Shomate - temperature-ranges: [0.0, 1200.0, 6000.0] - data: - - [24.99735, 55.18696, -33.69137, 7.948387, -0.136638, -403.6075, 228.2431] - - [58.16639, 2.720074, -0.492289, 0.038844, -6.447293, -425.9186, 263.6125] - saturation: - model: LinearLatentHeat - mu: 44.01 - T-ref: 250.0 - P-ref: 17843676.678142548 - T-triple: 216.58 - T-critical: 304.13 - vaporization: {a: 4.656475e+09, b: -3.393595e+06} - sublimation: {a: 6.564668e+09, b: -3.892217e+06} - super-critical: {a: 1.635908e+11, b: 0.0} - note: From the NIST database -- name: N2 - composition: {N: 2} - thermo: - model: Shomate - temperature-ranges: [0.0, 6000.0] - data: - - [26.09, 8.22, -1.98, 0.16, 0.04, -7.99, 221.02] - note: From the NIST database -- name: H2 - composition: {H: 2} - thermo: - model: Shomate - temperature-ranges: [0.0, 1000.0, 2500.0, 6000.0] - data: - - [33.066178, -11.36342, 11.432816, -2.772874, -0.158558, -9.980797, - 172.708] - - [18.563083, 12.257357, -2.859786, 0.268238, 1.97799, -1.147438, 156.2881] - - [43.41356, -4.293079, 1.272428, -0.096876, -20.53386, -38.51515, 162.0814] - note: From the NIST database -- name: CH4 - composition: {C: 1, H: 4} - thermo: - model: Shomate - temperature-ranges: [0.0, 1300.0, 6000.0] - data: - - [-0.703029, 108.4773, -42.52157, 5.862788, 0.678565, -76.84376, 158.7163] - - [85.81217, 11.26467, -2.114146, 0.13819, -26.42221, -153.5327, 224.4143] - note: From the NIST database -- name: CO - composition: {C: 1, O: 1} - thermo: - model: Shomate - temperature-ranges: [0.0, 1300.0, 6000.0] - data: - - [25.56759, 6.09613, 4.054656, -2.671301, 0.131021, -118.0089, 227.3665] - - [35.1507, 1.300095, -0.205921, 0.01355, -3.28278, -127.8375, 231.712] - note: From the NIST database -- name: NH3 - composition: {N: 1, H: 3} - thermo: - model: Shomate - temperature-ranges: [0.0, 1400.0, 6000.0] - data: - - [20.0, 49.77119, -15.37599, 1.921168, 0.1892, -53.3066, 203.8591] - - [52.02, 18.48801, -3.765128, 0.248541, -12.458, -85.5389, 223.8022] - note: From the NIST database - diff --git a/tests/test_adiabat.f90 b/tests/test_adiabat.f90 index e8f8051..581753a 100644 --- a/tests/test_adiabat.f90 +++ b/tests/test_adiabat.f90 @@ -11,8 +11,8 @@ program test integer :: i procedure(ocean_solubility_fcn), pointer :: ocean_fcn_ptr - c = AdiabatClimate('../templates/runaway_greenhouse/species.yaml', & - '../templates/runaway_greenhouse/settings.yaml', & + c = AdiabatClimate('../templates/AdiabatClimate/species.yaml', & + '../templates/AdiabatClimate/Earth/settings.yaml', & '../templates/ModernEarth/Sun_now.txt', & '../clima/data', & err)