From 3529b6beec05dac7be6cf983520776b44cabab90 Mon Sep 17 00:00:00 2001 From: Carles Tena Date: Thu, 30 Apr 2020 10:48:59 +0200 Subject: [PATCH 1/3] MONARCH writer to float (32 bits) --- hermesv3_bu/writer/monarch_writer.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/hermesv3_bu/writer/monarch_writer.py b/hermesv3_bu/writer/monarch_writer.py index 9502352..f37a1be 100755 --- a/hermesv3_bu/writer/monarch_writer.py +++ b/hermesv3_bu/writer/monarch_writer.py @@ -141,7 +141,7 @@ class MonarchWriter(Writer): self.logger.write_log('\tCreating NetCDF variables', message_level=2) self.logger.write_log('\t\tCreating time variable', message_level=3) - time = netcdf.createVariable('time', np.float64, ('time',)) + time = netcdf.createVariable('time', 'f', ('time',)) time.units = 'hours since {0}'.format(self.date_array[0].strftime("%Y-%m-%d %H:%M:%S")) time.standard_name = "time" time.calendar = "gregorian" @@ -149,35 +149,35 @@ class MonarchWriter(Writer): time[:] = date2num(self.date_array, time.units, calendar=time.calendar) self.logger.write_log('\t\tCreating lev variable', message_level=3) - lev = netcdf.createVariable('lev', np.float64, ('lev',)) + lev = netcdf.createVariable('lev', 'f', ('lev',)) lev.units = Unit("m").symbol lev.positive = 'up' lev[:] = self.grid.vertical_desctiption self.logger.write_log('\t\tCreating lat variable', message_level=3) - lats = netcdf.createVariable('lat', np.float64, lat_dim) + lats = netcdf.createVariable('lat', 'f', lat_dim) lats.units = "degrees_north" lats.axis = "Y" lats.long_name = "latitude coordinate" lats.standard_name = "latitude" lats[:] = self.grid.center_latitudes lats.bounds = "lat_bnds" - lat_bnds = netcdf.createVariable('lat_bnds', np.float64, lat_dim + ('nv',)) + lat_bnds = netcdf.createVariable('lat_bnds', 'f', lat_dim + ('nv',)) lat_bnds[:] = self.grid.boundary_latitudes self.logger.write_log('\t\tCreating lon variable', message_level=3) - lons = netcdf.createVariable('lon', np.float64, lon_dim) + lons = netcdf.createVariable('lon', 'f', lon_dim) lons.units = "degrees_east" lons.axis = "X" lons.long_name = "longitude coordinate" lons.standard_name = "longitude" lons[:] = self.grid.center_longitudes lons.bounds = "lon_bnds" - lon_bnds = netcdf.createVariable('lon_bnds', np.float64, lon_dim + ('nv',)) + lon_bnds = netcdf.createVariable('lon_bnds', 'f', lon_dim + ('nv',)) lon_bnds[:] = self.grid.boundary_longitudes self.logger.write_log('\t\tCreating rlat variable', message_level=3) - rlat = netcdf.createVariable('rlat', np.float64, ('rlat',)) + rlat = netcdf.createVariable('rlat', 'f', ('rlat',)) rlat.long_name = "latitude in rotated pole grid" rlat.units = Unit("degrees").symbol rlat.standard_name = "grid_latitude" @@ -185,7 +185,7 @@ class MonarchWriter(Writer): # Rotated Longitude self.logger.write_log('\t\tCreating rlon variable', message_level=3) - rlon = netcdf.createVariable('rlon', np.float64, ('rlon',)) + rlon = netcdf.createVariable('rlon', 'f', ('rlon',)) rlon.long_name = "longitude in rotated pole grid" rlon.units = Unit("degrees").symbol rlon.standard_name = "grid_longitude" @@ -195,13 +195,13 @@ class MonarchWriter(Writer): for var_name in self.pollutant_info.index: self.logger.write_log('\t\tCreating {0} variable'.format(var_name), message_level=3) - # var = netcdf.createVariable(var_name, np.float64, ('time', 'lev',) + var_dim, + # var = netcdf.createVariable(var_name, 'f', ('time', 'lev',) + var_dim, # chunksizes=self.rank_distribution[0]['shape']) if self.compression: - var = netcdf.createVariable(var_name, np.float64, ('time', 'lev',) + var_dim, + var = netcdf.createVariable(var_name, 'f', ('time', 'lev',) + var_dim, zlib=True, complevel=self.compression_level) else: - var = netcdf.createVariable(var_name, np.float64, ('time', 'lev',) + var_dim) + var = netcdf.createVariable(var_name, 'f', ('time', 'lev',) + var_dim) if self.comm_write.Get_size() > 1: var.set_collective(True) -- GitLab From 8cb88e397c9059233157cffb83a70165722142d6 Mon Sep 17 00:00:00 2001 From: Carles Tena Date: Mon, 4 May 2020 12:08:42 +0200 Subject: [PATCH 2/3] MONARCH writer to float (32 bits) --- CHANGELOG | 6 ++++++ hermesv3_bu/__init__.py | 2 +- hermesv3_bu/grids/grid_rotated_nested.py | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 070b464..e08e1b5 100755 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +1.0.2 + 2020/05/04 + + - MONARCH writer from 64 bits to 32 + - Corrected bug on rotated nested domains + 1.0.1 2020/04/09 diff --git a/hermesv3_bu/__init__.py b/hermesv3_bu/__init__.py index 5c4105c..7863915 100755 --- a/hermesv3_bu/__init__.py +++ b/hermesv3_bu/__init__.py @@ -1 +1 @@ -__version__ = "1.0.1" +__version__ = "1.0.2" diff --git a/hermesv3_bu/grids/grid_rotated_nested.py b/hermesv3_bu/grids/grid_rotated_nested.py index 9b5ed39..7d196e1 100755 --- a/hermesv3_bu/grids/grid_rotated_nested.py +++ b/hermesv3_bu/grids/grid_rotated_nested.py @@ -192,7 +192,7 @@ class RotatedNestedGrid(Grid): boundary_latitudes=self.boundary_latitudes, boundary_longitudes=self.boundary_longitudes, rotated=True, rotated_lats=self.rlat, rotated_lons=self.rlon, - north_pole_lat=90 - self.attributes['new_pole_latitude_degrees'], + north_pole_lat=self.attributes['new_pole_latitude_degrees'], north_pole_lon=self.attributes['new_pole_longitude_degrees']) self.logger.write_log("\tGrid created at '{0}'".format(self.netcdf_path), 3) self.logger.write_time_log('RotatedNestedGrid', 'write_netcdf', timeit.default_timer() - spent_time, 3) -- GitLab From 2e190add44dec9ceff673ebab08d2e890628f1e7 Mon Sep 17 00:00:00 2001 From: Carles Tena Date: Mon, 4 May 2020 12:10:30 +0200 Subject: [PATCH 3/3] release 1.0.2 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index e08e1b5..827673c 100755 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ 1.0.2 2020/05/04 + - Point source height increment from 1.2 to 1.8 - MONARCH writer from 64 bits to 32 - Corrected bug on rotated nested domains -- GitLab