reorganized input files

Nicholaswogan · Oct 30, 2023 · 981391b · 981391b
1 parent 214d6cf
commit 981391b
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 103 deletions.
diff --git a/examples/EarlyMars.ipynb b/examples/EarlyMars.ipynb
@@ -19,7 +19,7 @@
     {
      "data": {
       "text/plain": [
-       "<threadpoolctl.threadpool_limits at 0x1077d50c0>"
+       "<threadpoolctl.threadpool_limits at 0x1083dd3d0>"
       ]
      },
      "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
@@ -19,7 +19,7 @@
     {
      "data": {
       "text/plain": [
-       "<threadpoolctl.threadpool_limits at 0x1303bacd0>"
+       "<threadpoolctl.threadpool_limits at 0x12728cc10>"
       ]
      },
      "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 → templates/AdiabatClimate/Earth/settings.yaml b/templates/runaway_greenhouse/settings.yaml → templates/AdiabatClimate/Earth/settings.yaml
diff --git a/templates/EarlyMars/Sun_3.8Ga.txt → templates/AdiabatClimate/Mars/Sun_3.8Ga.txt b/templates/EarlyMars/Sun_3.8Ga.txt → templates/AdiabatClimate/Mars/Sun_3.8Ga.txt
diff --git a/templates/EarlyMars/settings.yaml → templates/AdiabatClimate/Mars/settings.yaml b/templates/EarlyMars/settings.yaml → templates/AdiabatClimate/Mars/settings.yaml
diff --git a/templates/runaway_greenhouse/species.yaml → templates/AdiabatClimate/species.yaml b/templates/runaway_greenhouse/species.yaml → templates/AdiabatClimate/species.yaml
diff --git a/templates/EarlyMars/species.yaml b/templates/EarlyMars/species.yaml
diff --git 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)