fix merge conflicts

ProjectPythia · Aug 2, 2024 · 5884572 · 5884572
1 parent 34cfdcb
commit 5884572
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 395 deletions.
diff --git a/notebooks/example-workflows/nino3.ipynb b/notebooks/example-workflows/nino3.ipynb
@@ -89,7 +89,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -116,7 +116,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 24,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [
     {
@@ -170,8 +170,6 @@
    ],
    "source": [
     "# Download nino3 data\n",
-    "import geocat.datafiles as gcd\n",
-    "\n",
     "nino3_data = gcd.get('ascii_files/sst_nino3.dat')\n",
     "nino3_data = np.loadtxt(nino3_data)\n",
     "print(nino3_data)"
@@ -186,7 +184,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [
     {
@@ -232,7 +230,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -250,17 +248,15 @@
    ]
   },
   {
-   "cell_type": "code",
-   "execution_count": 59,
+   "cell_type": "markdown",
    "metadata": {},
-   "outputs": [],
    "source": [
     "TODO: Choosing a Complex Morlet"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 16,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {
@@ -287,7 +283,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -306,7 +302,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -316,7 +312,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 19,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [
     {
@@ -374,7 +370,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 20,
+   "execution_count": 9,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -384,7 +380,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 21,
+   "execution_count": 10,
    "metadata": {},
    "outputs": [
     {

diff --git a/notebooks/example-workflows/spy-keypad.ipynb b/notebooks/example-workflows/spy-keypad.ipynb
diff --git a/notebooks/wavelet-introduction/wavelet-basics.ipynb b/notebooks/wavelet-introduction/wavelet-basics.ipynb