Merge all retrieval/grid code to dev

HISTORY.rst

@@ -2,6 +2,9 @@
 
 History
 -------
+3.2 (2024-7-8)
+~~~~~~~~~~~~~~
+* Disequilibrium climate modeling
 
 3.1 (2023-3-23)
 ~~~~~~~~~~~~~~~

docs/notebooks/climate/12a_BrownDwarf.ipynb

@@ -536,7 +536,9 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## `xarray` model storage with post-processed models "
+    "## Post Process High Resolution Spectrum Easily with Xarray\n",
+    "\n",
+    "This is the same thing as above but using our xarray output from climate as input "
    ]
   },
   {
@@ -545,6 +547,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "opa_mon = jdi.opannection()\n",
+    "\n",
+    "hi_res = jdi.input_xarray(preserve_clima,opa_mon, calculation='browndwarf')\n",
+    "\n",
+    "df_spec = hi_res.spectrum(opa_mon, calculation='thermal', full_output=True)\n",
+    "\n",
     "preserve_hires = jdi.output_xarray(df_spec, hi_res)"
    ]
   },
@@ -581,7 +589,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.5"
+   "version": "3.11.8"
   },
   "nbsphinx": {
    "execute": "never"

docs/notebooks/climate/12b_Exoplanet.ipynb

@@ -262,6 +262,22 @@
     "\n"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Save run with xarray"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "preserve_clima = jdi.output_xarray(out, cl_run)#,savefile='output.nc')"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -318,6 +334,35 @@
    "source": [
     "adiabat, dtdp, pressure = jpi.pt_adiabat(out, cl_run)"
    ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Postprocess High-Res Spectra"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "opa_mon = jdi.opannection()\n",
+    "\n",
+    "hi_res = jdi.input_xarray(preserve_clima,opa_mon, calculation='planet')\n",
+    "\n",
+    "df_spec = hi_res.spectrum(opa_mon, calculation='thermal+transmission', full_output=True)\n",
+    "\n",
+    "preserve_hires = jdi.output_xarray(df_spec, hi_res)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
@@ -336,7 +381,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.5"
+   "version": "3.11.8"
   },
   "toc": {
    "base_numbering": 1,