Small changes.

Open-Power-System-Data · Oct 28, 2016 · 321fbdc · 321fbdc
1 parent d48412c
commit 321fbdc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 52 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ Testing.ipynb
 .ipynb_checkpoints/Testing-checkpoint.ipynb
 .ipynb_checkpoints/
 weather_data_result.csv
+datapackage.json
diff --git a/download.ipynb b/download.ipynb
@@ -286,9 +286,9 @@
     "# Northeastern point: 55,036823°N, 11,349297°E\n",
     "# Southwestern point: 53,366266°N, 7,887088°E\n",
     "\n",
-    "# Northeastern coordinate \n",
+    "# Southwestern coordinate \n",
     "lat_1, lon_1 = 53.366266, 7.887088\n",
-    "# Southwestern coordinate\n",
+    "# Northeastern coordinate\n",
     "lat_2, lon_2 = 55.036823, 11.349297\n",
     "\n",
     "def translate_lat_to_geos5_native(latitude):\n",
@@ -907,7 +907,6 @@
    },
    "outputs": [],
    "source": [
-    "df['v_100m'] = np.nan\n",
     "df.drop('DISPH', axis=1, inplace=True)\n",
     "df.drop(['time', 'date'], axis=1, inplace=True)\n",
     "df.drop(['U2M', 'U10M', 'U50M', 'V2M', 'V10M', 'V50M'], axis=1, inplace=True)\n",
@@ -943,7 +942,7 @@
     "\n",
     "# Change order of the columns\n",
     "columns = ['timestamp', 'cumulated hours', 'lat', 'lon',\n",
-    "        'v1', 'v2', 'v_50m', 'v_100m',\n",
+    "        'v1', 'v2', 'v_50m',\n",
     "        'h_v1', 'h_v2', 'z0']\n",
     "df = df[columns]"
    ]
@@ -1053,53 +1052,6 @@
     "    resp. unifies alternative manual data obtaining methods in a single \n",
     "    script.\n",
     "version: \"2016-10-21\"\n",
-    "resources:\n",
-    "    - path: renewable_power_plants_DE.csv\n",
-    "      format: csv\n",
-    "      encoding: UTF-8\n",
-    "      missingValue: \"\"\n",
-    "      schema:         \n",
-    "          fields:\n",
-    "            - name: timestamp\n",
-    "              type: timestamp\n",
-    "              format: YYYY-MM-DDThh:mm:ssZ\n",
-    "              description: Timestap \n",
-    "            - name:  cumulated hours\n",
-    "              type: int\n",
-    "              description: Cumulated hours over the defined timerange\n",
-    "            - name: lat\n",
-    "              description: Latitude\n",
-    "              type: string\n",
-    "            - name: lon\n",
-    "              description: Longitude\n",
-    "              type: float\n",
-    "            - name: v1\n",
-    "              description: Windspeed at displacement height + 2m\n",
-    "              type: float\n",
-    "              unit: m\n",
-    "            - name:  v2\n",
-    "              description: Windspeed at displacement height + 10m\n",
-    "              type: float\n",
-    "              unit: m\n",
-    "            - name: v_50m\n",
-    "              description: Windspeed at 50m height\n",
-    "              type: float\n",
-    "              unit: m\n",
-    "            - name: v_100m\n",
-    "              description: Windspeed at 100m height\n",
-    "              type: float\n",
-    "              unit: m\n",
-    "            - name: h_v1 \n",
-    "              description: Height of v1\n",
-    "              type: float\n",
-    "              unit: m\n",
-    "            - name:  h_v2\n",
-    "              description: Height of v2\n",
-    "              type: float\n",
-    "              unit: m\n",
-    "            - name: z0\n",
-    "              description: Roughness length\n",
-    "              type: string\n",
     "keywords: [Open Power System Data, MERRA-2, wind, solar, ]\n",
     "geographical-scope: Worldwide\n",
     "licenses:\n",
@@ -1140,7 +1092,7 @@
  "metadata": {
   "anaconda-cloud": {},
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python [default]",
    "language": "python",
    "name": "python3"
   },