diff --git a/Jupyter_notebooks/NES_create_netcdf_test.ipynb b/Jupyter_notebooks/NES_create_netcdf_test.ipynb index e19764cf90651dd90c8abe3cad7e715828646c5e..bf8560655eba7e1957cbd870672bf3d251492cd6 100644 --- a/Jupyter_notebooks/NES_create_netcdf_test.ipynb +++ b/Jupyter_notebooks/NES_create_netcdf_test.ipynb @@ -423,7 +423,7 @@ "Data variables:\n", " crs |S1 b''\n", "Attributes:\n", - " Conventions: CF-1.7" + " Conventions: CF-1.7" ], "text/plain": [ "\n", @@ -469,14 +469,10 @@ "inc_rlon = 0.2\n", "n_lat = 10\n", "n_lon = 10\n", - "grid_north_pole_latitude = 90\n", - "grid_north_pole_longitude = 135\n", "rotated_grid = create_nes(comm=None, info=False, projection='rotated', create_nes=True,\n", " centre_lat=centre_lat, centre_lon=centre_lon,\n", " west_boundary=west_boundary, south_boundary=south_boundary,\n", - " inc_rlat=inc_rlat, inc_rlon=inc_rlon, n_lat=n_lat, n_lon=n_lon, \n", - " grid_north_pole_latitude=grid_north_pole_latitude,\n", - " grid_north_pole_longitude=grid_north_pole_longitude)" + " inc_rlat=inc_rlat, inc_rlon=inc_rlon, n_lat=n_lat, n_lon=n_lon)" ] }, { @@ -869,7 +865,7 @@ " lon (rlat, rlon) float64 -35.0 -34.8 -34.6 ... -33.6 -33.4 -33.2\n", " rotated_pole |S1 b''\n", "Attributes:\n", - " Conventions: CF-1.7
  • Conventions :
    CF-1.7
    • " ], "text/plain": [ "\n", @@ -1321,7 +1317,7 @@ "Data variables:\n", " *empty*\n", "Attributes:\n", - " Conventions: CF-1.7" + " Conventions: CF-1.7" ], "text/plain": [ "\n", @@ -1730,23 +1726,23 @@ " station_local_code (station) |S75 b'942' b'944' ... b'38038033'\n", " station_rural_back (station) |S75 b'nan' b'nan' ... b'nan' b'nan'\n", " station_ozone_classification (station) |S75 b'nan' b'nan' ... b'nan' b'nan'\n", - " pm10 (time, station) float32 ...
    • station_code
      (station)
      |S75
      ...
      standard_name :
      array([b'AD0942A', b'AD0944A', b'AD0945A', ..., b'ES2070A', b'ES2073A',\n",
+       "       b'ES2074A'], dtype='|S75')
    • station_start_date
      (station)
      |S75
      ...
      standard_name :
      array([b'2004-06-17', b'2006-02-10', b'2011-05-01', ..., b'2015-01-01',\n",
+       "       b'2015-01-03', b'nan'], dtype='|S75')
    • station_zone
      (station)
      |S75
      ...
      standard_name :
      array([b'nan', b'nan', b'nan', ..., b'farming', b'nature', b'nature'],\n",
+       "      dtype='|S75')
    • lat
      (station)
      float32
      ...
      units :
      degrees_north
      standard_name :
      latitude
      array([42.509724, 42.516945, 42.53488 , ..., 40.94667 , 28.09148 , 28.47544 ],\n",
+       "      dtype=float32)
    • street_type
      (station)
      |S75
      ...
      standard_name :
      array([b'nan', b'nan', b'nan', ..., b'nan', b'nan', b'nan'], dtype='|S75')
    • country_code
      (station)
      |S75
      ...
      standard_name :
      array([b'AD', b'AD', b'AD', ..., b'ES', b'ES', b'ES'], dtype='|S75')
    • ccaa
      (station)
      |S75
      ...
      standard_name :
      array([b'nan', b'nan', b'nan', ..., b'aragon', b'canarias', b'canarias'],\n",
+       "      dtype='|S75')
    • station_name
      (station)
      |S75
      ...
      standard_name :
      array([b'escaldes-engordany', b'engolasters', b'envalira', ...,\n",
+       "       b'monagregagrav', b'el calvario-ss gomera', b'palmetum'], dtype='|S75')
    • station_area
      (station)
      |S75
      ...
      standard_name :
      array([b'urban', b'rural', b'rural', ..., b'rural', b'urban', b'urban'],\n",
+       "      dtype='|S75')
    • city
      (station)
      |S75
      ...
      standard_name :
      array([b'andorra la vella', b'nan', b'nan', ..., b'calanda',\n",
+       "       b'san sebastin de la gomera', b'santa cruz de tenerife'], dtype='|S75')
    • station_emep
      (station)
      |S75
      ...
      standard_name :
      array([b'no', b'no', b'no', ..., b'no', b'no', b'no'], dtype='|S75')
    • station_type
      (station)
      |S75
      ...
      standard_name :
      array([b'background', b'background', b'background', ..., b'background',\n",
+       "       b'industrial', b'industrial'], dtype='|S75')
    • country
      (station)
      |S75
      ...
      standard_name :
      array([b'andorra', b'andorra', b'andorra', ..., b'spain', b'spain', b'spain'],\n",
+       "      dtype='|S75')
    • altitude
      (station)
      float32
      ...
      units :
      meters
      standard_name :
      altitude
      array([1.080e+03, 1.637e+03, 2.515e+03, ..., 5.700e+02, 2.000e+00, 2.000e+00],\n",
+       "      dtype=float32)
    • lon
      (station)
      float32
      ...
      units :
      degrees_east
      standard_name :
      longitude
      array([  1.539172,   1.565014,   1.716986, ...,  -0.29083 , -17.11573 ,\n",
+       "       -16.25853 ], dtype=float32)
    • station_end_date
      (station)
      |S75
      ...
      standard_name :
      array([b'nan', b'nan', b'nan', ..., b'nan', b'nan', b'nan'], dtype='|S75')
    • station_local_code
      (station)
      |S75
      ...
      standard_name :
      array([b'942', b'944', b'945', ..., b'44051005', b'38036003', b'38038033'],\n",
+       "      dtype='|S75')
    • station_rural_back
      (station)
      |S75
      ...
      standard_name :
      array([b'nan', b'nan', b'nan', ..., b'remote', b'nan', b'nan'], dtype='|S75')
    • station_ozone_classification
      (station)
      |S75
      ...
      standard_name :
      array([b'nan', b'nan', b'nan', ..., b'nan', b'nan', b'nan'], dtype='|S75')
    • pm10
      (time, station)
      float32
      ...
      units :
      ug m-3
      long_name :
      [6430392 values with dtype=float32]
    • " ], "text/plain": [ "\n", @@ -1782,7 +1778,7 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 12, "metadata": {}, "outputs": [], "source": [ @@ -1790,12 +1786,12 @@ "lat = nc.variables['lat'][:]\n", "lon = nc.variables['lon'][:]\n", "nc_points_grid = create_nes(comm=None, info=False, projection=None, create_nes=True,\n", - " lat=lat, lon=lon)" + " lat=lat, lon=lon)" ] }, { "cell_type": "code", - "execution_count": 14, + "execution_count": 13, "metadata": {}, "outputs": [ { @@ -1814,7 +1810,7 @@ }, { "cell_type": "code", - "execution_count": 15, + "execution_count": 14, "metadata": {}, "outputs": [ { @@ -2181,8 +2177,8 @@ "Data variables:\n", " *empty*\n", "Attributes:\n", - " Conventions: CF-1.7" + " Conventions: CF-1.7" ], "text/plain": [ "\n", @@ -2198,7 +2194,7 @@ " Conventions: CF-1.7" ] }, - "execution_count": 15, + "execution_count": 14, "metadata": {}, "output_type": "execute_result" } diff --git a/nes/create_nes.py b/nes/create_nes.py index 9aa278b8af9d37c87aa59802b1b6fb20e9454783..f074eace79180b89f487e71dfc7865d27ef2a116 100644 --- a/nes/create_nes.py +++ b/nes/create_nes.py @@ -27,7 +27,7 @@ def create_nes(comm=None, info=False, projection=None, create_nes=True, **kwargs required_vars = ['lat_orig', 'lon_orig', 'inc_lat', 'inc_lon', 'n_lat', 'n_lon'] elif projection == 'rotated': required_vars = ['centre_lat', 'centre_lon', 'west_boundary', 'south_boundary', 'inc_rlat', 'inc_rlon', - 'n_lat', 'n_lon', 'grid_north_pole_latitude', 'grid_north_pole_longitude'] + 'n_lat', 'n_lon'] elif projection == 'lcc': required_vars = ['lat_1', 'lat_2', 'lon_0', 'lat_0', 'nx', 'ny', 'inc_x', 'inc_y', 'x_0', 'y_0'] elif projection == 'mercator': diff --git a/nes/nc_projections/rotated_nes.py b/nes/nc_projections/rotated_nes.py index c027ab2c7e5d23dd6fb5871a32de2da579647818..fa5b921d5723dc24c8f1a3f6b723ba3b91e24e97 100644 --- a/nes/nc_projections/rotated_nes.py +++ b/nes/nc_projections/rotated_nes.py @@ -92,8 +92,8 @@ class RotatedNes(Nes): projection = {'data': None, 'dimensions': (), 'grid_mapping_name': 'rotated_latitude_longitude', - 'grid_north_pole_latitude': kwargs['grid_north_pole_latitude'], - 'grid_north_pole_longitude': kwargs['grid_north_pole_longitude'], + 'grid_north_pole_latitude': 90 - kwargs['centre_lat'], + 'grid_north_pole_longitude': -180 + kwargs['centre_lon'], } else: