corrected spelling

OGGM · Apr 25, 2016 · 3acb41b · 3acb41b
1 parent 8e690d8
commit 3acb41b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/docs/notebooks/getting_started.ipynb b/docs/notebooks/getting_started.ipynb
@@ -11,7 +11,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# Getting started with OGGM: Öztal case study"
+    "# Getting started with OGGM: Ötztal case study"
    ]
   },
   {
@@ -44,8 +44,8 @@
    "outputs": [],
    "source": [
     "from oggm.utils import get_demo_file\n",
-    "srtm_f = get_demo_file('srtm_oeztal.tif')\n",
-    "rgi_f = get_demo_file('rgi_oeztal.shp')\n",
+    "srtm_f = get_demo_file('srtm_oetztal.tif')\n",
+    "rgi_f = get_demo_file('rgi_oetztal.shp')\n",
     "print(srtm_f)"
    ]
   },
@@ -69,14 +69,14 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "The data directory contains a subset of the RGI V4 for the Öztal:"
+    "The data directory contains a subset of the RGI V4 for the Ötztal:"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": true
+    "collapsed": false
    },
    "outputs": [],
    "source": [
@@ -119,7 +119,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Plot the glaciers of the Öztal case study:"
+    "Plot the glaciers of the Ötztal case study:"
    ]
   },
   {
@@ -168,8 +168,8 @@
    "outputs": [],
    "source": [
     "import pandas as pd\n",
-    "df_gtd = pd.read_csv(get_demo_file('RGI_GLATHIDA_oeztal.csv'))\n",
-    "df_wgms = pd.read_csv(get_demo_file('RGI_WGMS_oeztal.csv'))"
+    "df_gtd = pd.read_csv(get_demo_file('RGI_GLATHIDA_oetztal.csv'))\n",
+    "df_wgms = pd.read_csv(get_demo_file('RGI_WGMS_oetztal.csv'))"
    ]
   },
   {
@@ -210,7 +210,7 @@
    },
    "outputs": [],
    "source": [
-    "nc = salem.GeoNetcdf(get_demo_file('HISTALP_oeztal.nc'))\n",
+    "nc = salem.GeoNetcdf(get_demo_file('HISTALP_oetztal.nc'))\n",
     "t2 = np.mean(nc.get_vardata('temp'), axis=0)\n",
     "cmap.set_data(t2, nc.grid)\n",
     "cmap.set_cmap(plt.get_cmap('viridis'))\n",
@@ -301,10 +301,10 @@
    },
    "outputs": [],
    "source": [
-    "cfg.PATHS['dem_file'] = get_demo_file('srtm_oeztal.tif')\n",
-    "cfg.PATHS['climate_file'] = get_demo_file('HISTALP_oeztal.nc')\n",
-    "cfg.PATHS['wgms_rgi_links'] = get_demo_file('RGI_WGMS_oeztal.csv')\n",
-    "cfg.PATHS['glathida_rgi_links'] = get_demo_file('RGI_GLATHIDA_oeztal.csv')\n",
+    "cfg.PATHS['dem_file'] = get_demo_file('srtm_oetztal.tif')\n",
+    "cfg.PATHS['climate_file'] = get_demo_file('HISTALP_oetztal.nc')\n",
+    "cfg.PATHS['wgms_rgi_links'] = get_demo_file('RGI_WGMS_oetztal.csv')\n",
+    "cfg.PATHS['glathida_rgi_links'] = get_demo_file('RGI_GLATHIDA_oetztal.csv')\n",
     "# This is the database for the glacier divides (currently only Hintereisferner):\n",
     "cfg.set_divides_db(get_demo_file('HEF_divided.shp'))"
    ]
@@ -353,7 +353,7 @@
    "source": [
     "# Read in the RGI file\n",
     "import geopandas as gpd\n",
-    "rgi_file = get_demo_file('rgi_oeztal.shp')\n",
+    "rgi_file = get_demo_file('rgi_oetztal.shp')\n",
     "rgidf = gpd.GeoDataFrame.from_file(rgi_file)\n",
     "# Initialise directories\n",
     "# reset=True will ask for confirmation if the directories are already present: \n",
@@ -1210,21 +1210,21 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 2",
    "language": "python",
-   "name": "python3"
+   "name": "python2"
   },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
-    "version": 3
+    "version": 2
    },
    "file_extension": ".py",
    "mimetype": "text/x-python",
    "name": "python",
    "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.4.3"
+   "pygments_lexer": "ipython2",
+   "version": "2.7.11"
   }
  },
  "nbformat": 4,

diff --git a/oggm/tests/test_workflow.py b/oggm/tests/test_workflow.py
@@ -50,15 +50,15 @@ def up_to_inversion(reset=False):
     cfg.PATHS['working_dir'] = TEST_DIR
 
     cfg.set_divides_db(get_demo_file('HEF_divided.shp'))
-    cfg.PATHS['dem_file'] = get_demo_file('srtm_oeztal.tif')
+    cfg.PATHS['dem_file'] = get_demo_file('srtm_oetztal.tif')
 
     # Set up the paths and other stuffs
     cfg.set_divides_db(get_demo_file('HEF_divided.shp'))
-    cfg.PATHS['wgms_rgi_links'] = get_demo_file('RGI_WGMS_oeztal.csv')
-    cfg.PATHS['glathida_rgi_links'] = get_demo_file('RGI_GLATHIDA_oeztal.csv')
+    cfg.PATHS['wgms_rgi_links'] = get_demo_file('RGI_WGMS_oetztal.csv')
+    cfg.PATHS['glathida_rgi_links'] = get_demo_file('RGI_GLATHIDA_oetztal.csv')
 
     # Read in the RGI file
-    rgi_file = get_demo_file('rgi_oeztal.shp')
+    rgi_file = get_demo_file('rgi_oetztal.shp')
     rgidf = gpd.GeoDataFrame.from_file(rgi_file)
 
     # Params
@@ -87,7 +87,7 @@ def up_to_inversion(reset=False):
 
         # Use histalp for the actual test
         cfg.PARAMS['temp_use_local_gradient'] = True
-        cfg.PATHS['climate_file'] = get_demo_file('HISTALP_oeztal.nc')
+        cfg.PATHS['climate_file'] = get_demo_file('HISTALP_oetztal.nc')
         cfg.PATHS['cru_dir'] = '~'
         workflow.climate_tasks(gdirs)