diff --git a/conf/hermes.conf b/conf/hermes.conf index 5a5c8a92976d35207cac2ace040423fde003c649..b1b8b16aa387b917d9d530386c1840ec7c4fbfce 100755 --- a/conf/hermes.conf +++ b/conf/hermes.conf @@ -3,7 +3,7 @@ log_level = 3 input_dir = /home/Earth/ctena/Models/hermesv3_bu_data data_path = /esarchive/recon output_dir = /scratch/Earth/HERMESv3_BU_OUT/py3 -output_name = HERMES__py3_traffic_cmaq.nc +output_name = HERMES__py3_traffic_road.nc emission_summary = 0 start_date = 2016/11/29 00:00:00 # ----- end_date = start_date [DEFAULT] ----- @@ -289,12 +289,12 @@ point_source_speciation_profiles = /profiles/speciation/point_sources point_source_measured_emissions = /point_sources/measured_emis/_measured_emissions.csv [TRAFFIC SECTOR] -do_hot = 1 -do_cold = 1 -do_tyre_wear = 1 -do_brake_wear = 1 +do_hot = 0 +do_cold = 0 +do_tyre_wear = 0 +do_brake_wear = 0 do_road_wear = 1 -do_resuspension = 1 +do_resuspension = 0 resuspension_correction = 1 write_rline = 0 diff --git a/hermesv3_bu/sectors/traffic_sector.py b/hermesv3_bu/sectors/traffic_sector.py index a31d3c9c2827c1be9f91403eb27ca7a7dfb6a9e5..b4e1ae836e7978b7e1152bc694a9c6a108b80b37 100755 --- a/hermesv3_bu/sectors/traffic_sector.py +++ b/hermesv3_bu/sectors/traffic_sector.py @@ -1058,7 +1058,6 @@ class TrafficSector(Sector): speciation = self.read_profiles(speciation) del speciation['Copert_V_name'] - # Transform dataset into timestep rows instead of timestep columns df = self.transform_df(df) @@ -1073,7 +1072,7 @@ class TrafficSector(Sector): # PMC if not set(speciation.columns.values).isdisjoint(pmc_list): out_p = set(speciation.columns.values).intersection(pmc_list).pop() - speciation_by_in_p = speciation[[out_p] + ['Code']] + speciation_by_in_p = speciation[[out_p] + ['Code']].copy() speciation_by_in_p.rename(columns={out_p: 'f_{0}'.format(out_p)}, inplace=True) df_aux = df[['pm10', 'pm25', 'Fleet_Code', 'tstep', 'Link_ID']] @@ -1088,7 +1087,7 @@ class TrafficSector(Sector): involved_out_pollutants = [key for key, value in self.speciation_map.items() if value == in_p] # Selecting only necessary speciation profiles - speciation_by_in_p = speciation[involved_out_pollutants + ['Code']] + speciation_by_in_p = speciation[involved_out_pollutants + ['Code']].copy() # Adding "f_" in the formula column names for p in involved_out_pollutants: