From 62216c5d046ca1811748f1435f082af65b955b21 Mon Sep 17 00:00:00 2001
From: Bill Ladwig <ladwig@ucar.edu>
Date: Mon, 19 Sep 2016 16:37:57 -0600
Subject: [PATCH] Updated notebooks.  Conda recipe changed to use latest libgcc
 since continuum broke the 4.8.5 build by excluding libgfortran in build 2

---
 conda_recipe/meta.yaml             |  4 ++--
 doc/source/conf.py                 |  2 +-
 test/ipynb/WRF_Workshop_Demo.ipynb | 10 +++++-----
 test/ipynb/WRF_python_demo.ipynb   | 23 ++++++++++++++++-------
 test/ipynb/nocopy_test.ipynb       | 11 ++++++-----
 5 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/conda_recipe/meta.yaml b/conda_recipe/meta.yaml
index 9a8b978..10a4595 100644
--- a/conda_recipe/meta.yaml
+++ b/conda_recipe/meta.yaml
@@ -19,13 +19,13 @@ requirements:
     - wrapt
     - gcc
     - python
-    - libgcc 4.8.5
+    - libgcc
 
   run:
     - numpy x.x
     - python
     - wrapt 
-    - libgcc 4.8.5
+    - libgcc
     - xarray
 
 test:
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 9fafa25..c1ec1b8 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -48,7 +48,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'wrf-python'
-copyright = u'2016, Bill Ladwig'
+copyright = u'2016, UCAR'
 author = u'Bill Ladwig'
 
 # The version info for the project you're documenting, acts as replacement for
diff --git a/test/ipynb/WRF_Workshop_Demo.ipynb b/test/ipynb/WRF_Workshop_Demo.ipynb
index 286c478..a2f0a3e 100644
--- a/test/ipynb/WRF_Workshop_Demo.ipynb
+++ b/test/ipynb/WRF_Workshop_Demo.ipynb
@@ -424,21 +424,21 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 2",
+   "display_name": "Python 3",
    "language": "python",
-   "name": "python2"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
-    "version": 2
+    "version": 3
    },
    "file_extension": ".py",
    "mimetype": "text/x-python",
    "name": "python",
    "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython2",
-   "version": "2.7.11"
+   "pygments_lexer": "ipython3",
+   "version": "3.5.2"
   }
  },
  "nbformat": 4,
diff --git a/test/ipynb/WRF_python_demo.ipynb b/test/ipynb/WRF_python_demo.ipynb
index 8c41754..b647315 100644
--- a/test/ipynb/WRF_python_demo.ipynb
+++ b/test/ipynb/WRF_python_demo.ipynb
@@ -948,7 +948,7 @@
     "pivot_point = (t2.shape[-2] / 2, t2.shape[-1] / 2) \n",
     "angle = 90.0\n",
     "\n",
-    "t2_line = interpline(t2, pivot_point=pivot_point, angle=angle, inc_latlon=True)\n",
+    "t2_line = interpline(t2, pivot_point=pivot_point, angle=angle, latlon=True)\n",
     "print(t2_line)\n",
     "print(\"\\n\")\n",
     "\n",
@@ -959,7 +959,7 @@
     "start_point = (t2.shape[-2]/2, 0)\n",
     "end_point = (t2.shape[-2]/2, -1)\n",
     "\n",
-    "t2_line = interpline(t2, start_point=start_point, end_point=end_point, inc_latlon=True)\n",
+    "t2_line = interpline(t2, start_point=start_point, end_point=end_point, latlon=True)\n",
     "print(t2_line)\n",
     "print(\"\\n\")\n",
     "\n",
@@ -1017,6 +1017,15 @@
     "print(d)\n"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": true
+   },
+   "outputs": [],
+   "source": []
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -1029,21 +1038,21 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 2",
+   "display_name": "Python 3",
    "language": "python",
-   "name": "python2"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
-    "version": 2
+    "version": 3
    },
    "file_extension": ".py",
    "mimetype": "text/x-python",
    "name": "python",
    "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython2",
-   "version": "2.7.11"
+   "pygments_lexer": "ipython3",
+   "version": "3.5.2"
   }
  },
  "nbformat": 4,
diff --git a/test/ipynb/nocopy_test.ipynb b/test/ipynb/nocopy_test.ipynb
index 600f913..a1220d8 100644
--- a/test/ipynb/nocopy_test.ipynb
+++ b/test/ipynb/nocopy_test.ipynb
@@ -475,6 +475,7 @@
     "only_height = (Ellipsis,) + tuple(only_height[-3:])\n",
     "\n",
     "v_in = field3d[only_height]\n",
+    "print(\"v_in\", v_in)\n",
     "z_in = z[only_height]\n",
     "z_out = np.asarray([100.,200.,300.,500.,1000.,5000.], field3d.dtype)\n",
     "\n",
@@ -556,21 +557,21 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 2",
+   "display_name": "Python 3",
    "language": "python",
-   "name": "python2"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
-    "version": 2
+    "version": 3
    },
    "file_extension": ".py",
    "mimetype": "text/x-python",
    "name": "python",
    "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython2",
-   "version": "2.7.11"
+   "pygments_lexer": "ipython3",
+   "version": "3.5.2"
   }
  },
  "nbformat": 4,