From 8313992dfc13eba6c5c86c6a7fa518a34caa043f Mon Sep 17 00:00:00 2001 From: erogluorhan Date: Thu, 19 Nov 2020 10:49:58 -0700 Subject: [PATCH 1/3] Reset maintainers list --- conda_recipe/meta.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/conda_recipe/meta.yaml b/conda_recipe/meta.yaml index 1b83f52..be0dcc8 100644 --- a/conda_recipe/meta.yaml +++ b/conda_recipe/meta.yaml @@ -52,8 +52,6 @@ about: extra: recipe-maintainers: - - bladwig1 - - marylhaley - - david-ian-brown - - khallock + - michaelavs + - erogluorhan From a15e73ff55709f833a3735d5bbbaa873ad465c79 Mon Sep 17 00:00:00 2001 From: erogluorhan Date: Thu, 19 Nov 2020 21:54:47 -0700 Subject: [PATCH 2/3] Bumped conda recipe versions --- conda_recipe/meta.yaml | 2 +- conda_recipe/meta.yaml.develop | 8 +++----- conda_recipe/meta.yaml.release | 8 +++----- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/conda_recipe/meta.yaml b/conda_recipe/meta.yaml index be0dcc8..495ed7e 100644 --- a/conda_recipe/meta.yaml +++ b/conda_recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.1.0" %} +{% set version = "1.3.2.5" %} package: name: wrf-python diff --git a/conda_recipe/meta.yaml.develop b/conda_recipe/meta.yaml.develop index 9ab332b..6c19b2a 100644 --- a/conda_recipe/meta.yaml.develop +++ b/conda_recipe/meta.yaml.develop @@ -1,4 +1,4 @@ -{% set version = "1.1.0" %} +{% set version = "1.3.2.5" %} package: name: wrf-python @@ -52,7 +52,5 @@ about: extra: recipe-maintainers: - - bladwig1 - - marylhaley - - david-ian-brown - - khallock \ No newline at end of file + - michaelavs + - erogluorhan \ No newline at end of file diff --git a/conda_recipe/meta.yaml.release b/conda_recipe/meta.yaml.release index f38235e..f7a957c 100644 --- a/conda_recipe/meta.yaml.release +++ b/conda_recipe/meta.yaml.release @@ -1,4 +1,4 @@ -{% set version = "1.1.0" %} +{% set version = "1.3.2.5" %} package: name: wrf-python @@ -53,8 +53,6 @@ about: extra: recipe-maintainers: - - bladwig1 - - marylhaley - - david-ian-brown - - khallock + - michaelavs + - erogluorhan \ No newline at end of file From 4a960291360e28e1440dcb90968b237a81370ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20G=C3=A1mez?= Date: Wed, 20 Jan 2021 13:11:28 +0100 Subject: [PATCH 3/3] Fix proj params. Issue #127 --- src/wrf/projection.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/wrf/projection.py b/src/wrf/projection.py index 021b7f1..670e67a 100644 --- a/src/wrf/projection.py +++ b/src/wrf/projection.py @@ -531,7 +531,7 @@ class LambertConformal(WrfProj): _cf_params["standard_parallel"] = self._std_parallels _cf_params["longitude_of_central_meridian"] = self.stand_lon _cf_params["latitude_of_projection_origin"] = self.moad_cen_lat - _cf_params["semi_major_axis"] = Constants.WRF_EARTH_RADIUS + _cf_params["earth_radius"] = Constants.WRF_EARTH_RADIUS return _cf_params @@ -602,7 +602,7 @@ class LambertConformal(WrfProj): if _ismissing(self.truelat2) else self.truelat2) - _proj4 = ("+proj=lcc +units=meters +a={} +b={} +lat_1={} " + _proj4 = ("+proj=lcc +units=m +a={} +b={} +lat_1={} " "+lat_2={} +lat_0={} +lon_0={} +nadgrids=@null".format( Constants.WRF_EARTH_RADIUS, Constants.WRF_EARTH_RADIUS, @@ -654,6 +654,7 @@ class Mercator(WrfProj): _cf_params["grid_mapping_name"] = "mercator" _cf_params["longitude_of_projection_origin"] = self.stand_lon _cf_params["standard_parallel"] = self.truelat1 + _cf_params["earth_radius"] = Constants.WRF_EARTH_RADIUS return _cf_params @@ -714,7 +715,7 @@ class Mercator(WrfProj): def _proj4(self): - _proj4 = ("+proj=merc +units=meters +a={} +b={} " + _proj4 = ("+proj=merc +units=m +a={} +b={} " "+lon_0={} +lat_ts={} +nadgrids=@null".format( Constants.WRF_EARTH_RADIUS, Constants.WRF_EARTH_RADIUS, @@ -762,6 +763,7 @@ class PolarStereographic(WrfProj): self.stand_lon) _cf_params["standard_parallel"] = self.truelat1 _cf_params["latitude_of_projection_origin"] = self._hemi + _cf_params["earth_radius"] = Constants.WRF_EARTH_RADIUS return _cf_params @@ -821,7 +823,7 @@ class PolarStereographic(WrfProj): return _cartopy def _proj4(self): - _proj4 = ("+proj=stere +units=meters +a={} +b={} " + _proj4 = ("+proj=stere +units=m +a={} +b={} " "+lat0={} +lon_0={} +lat_ts={} +nadgrids=@null".format( Constants.WRF_EARTH_RADIUS, Constants.WRF_EARTH_RADIUS, @@ -864,6 +866,7 @@ class LatLon(WrfProj): def _cf_params(self): _cf_params = {} _cf_params["grid_mapping_name"] = "latitude_longitude" + _cf_params["earth_radius"] = Constants.WRF_EARTH_RADIUS return _cf_params def _pyngl(self, geobounds, **kwargs): @@ -920,7 +923,7 @@ class LatLon(WrfProj): [geobounds.bottom_left.lat, geobounds.top_right.lat]) def _proj4(self): - _proj4 = ("+proj=eqc +units=meters +a={} +b={} " + _proj4 = ("+proj=eqc +units=m +a={} +b={} " "+lon_0={} +nadgrids=@null".format( Constants.WRF_EARTH_RADIUS, Constants.WRF_EARTH_RADIUS, @@ -1037,6 +1040,7 @@ class RotatedLatLon(WrfProj): _cf_params["grid_north_pole_latitude"] = self._bm_cart_pole_lat _cf_params["grid_north_pole_longitude"] = self.pole_lon _cf_params["north_pole_grid_longitude"] = self._bm_lon_0 + _cf_params["earth_radius"] = Constants.WRF_EARTH_RADIUS return _cf_params