diff --git a/hermesv3_bu/sectors/livestock_sector.py b/hermesv3_bu/sectors/livestock_sector.py index 51c4c69b247184216159ff05df20c8f9e90cda9b..9e3cfcdd2d0d87aae816cba729e7e0e113e52115 100755 --- a/hermesv3_bu/sectors/livestock_sector.py +++ b/hermesv3_bu/sectors/livestock_sector.py @@ -915,7 +915,7 @@ class LivestockSector(Sector): if animal.Code.startswith(tuple(self.animal_list)): # Storage emissions out_df.loc[:, out_p] += (animals_df[animal['Code']] * animals_df['FD_storage']).multiply( - animal['EF_storage']) + animal['EF_storage'] * self.speciation_profile.loc[animal['Code'][:-3], out_p]) # From kg NOX-N to mol NO out_df.loc[:, out_p] = out_df.loc[:, out_p].multiply( @@ -939,8 +939,8 @@ class LivestockSector(Sector): if len(not_pollutants) > 0: if self.comm.Get_rank() == 0: warn('The pollutants {0} cannot be calculated on the Livestock sector'.format(not_pollutants)) - self.logger.write_time_log('LivestockSector', 'calculate_day_emissions', timeit.default_timer() - spent_time) + self.logger.write_time_log('LivestockSector', 'calculate_day_emissions', timeit.default_timer() - spent_time) return out_df def calculate_daily_emissions_dict(self, animals_df): diff --git a/hermesv3_bu/writer/default_writer.py b/hermesv3_bu/writer/default_writer.py index b25d1aead2eaec2dacf5c10ab51dd9a0e6d8f60b..5bde50bb8bcab1f262f3445ec05b92eee0f18cf8 100755 --- a/hermesv3_bu/writer/default_writer.py +++ b/hermesv3_bu/writer/default_writer.py @@ -243,7 +243,7 @@ class DefaultWriter(Writer): elif self.grid.grid_type == 'Lambert Conformal Conic': mapping = netcdf.createVariable('Lambert_Conformal', 'i') mapping.grid_mapping_name = "lambert_conformal_conic" - mapping.standard_parallel = "{0}, {1}".format(self.grid.attributes['lat_1'], self.grid.attributes['lat_2']) + mapping.standard_parallel = [self.grid.attributes['lat_1'], self.grid.attributes['lat_2']] mapping.longitude_of_central_meridian = self.grid.attributes['lon_0'] mapping.latitude_of_projection_origin = self.grid.attributes['lat_0']