Skip to content

Commit cefe96b

Browse files
Merge pull request #10 from RMI/shorten-all-long-filenames
shorten all long filenames
2 parents 585fc93 + 2b1972b commit cefe96b

32 files changed

Lines changed: 58 additions & 27 deletions

‎renamed_files_mapping.json‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"src/opem/defaults/heavy_duty_truck/Em_Factor_Destination_to_Origin_HD_Truck.csv": "src/opem/defaults/heavy_duty_truck/Emission_Factors_of_Fuel_Combustion_for_Feedstock_and_Fuel_Transportation_Trip_From_Product_Destination_Back_to_Product_Origin_Heavy_Duty_Truck.csv",
3+
"src/opem/defaults/heavy_duty_truck/Em_Factor_Origin_to_Destination_HD_Truck.csv": "src/opem/defaults/heavy_duty_truck/Emission_Factors_of_Fuel_Combustion_for_Feedstock_and_Fuel_Transportation_Trip_From_Product_Origin_to_Product_Destination_Heavy_Duty_Truck.csv",
4+
"src/opem/defaults/heavy_duty_truck/Fuel_Econ_HD_Trucks.csv": "src/opem/defaults/heavy_duty_truck/Fuel_Economy_and_Resultant_Energy_Consumption_of_Heavy_Duty_Trucks.csv",
5+
"src/opem/defaults/combustion/Prod_Comb_EF_Fossil_Fuel_Solid.csv": "src/opem/defaults/combustion/Product_Combustion_Emission_Factors_Fossil_Fuel_Derived_Fuels_Solid.csv",
6+
"src/opem/defaults/pipeline/EF_Fuel_Comb_Pipe_Recip_Engine_Current.csv": "src/opem/defaults/pipeline/Emission_Factors_of_Fuel_Combustion-_Feedstock_and_Fuel_Transportation_From_Product_Origin_to_Product_Destination_Pipeline_Reciprocating_Engine_Current.csv",
7+
"src/opem/defaults/pipeline/EF_Fuel_Comb_Pipe_Recip_Engine_Future.csv": "src/opem/defaults/pipeline/Emission_Factors_of_Fuel_Combustion-_Feedstock_and_Fuel_Transportation_From_Product_Origin_to_Product_Destination_Pipeline_Reciprocating_Engine_Future.csv",
8+
"src/opem/defaults/pipeline/EF_Fuel_Comb_Pipe_Turbine.csv": "src/opem/defaults/pipeline/Emission_Factors_of_Fuel_Combustion_Feedstock_and_Fuel_Transportation_From_Product_Origin_to_Product_Destination_Pipeline_Turbine.csv",
9+
"src/opem/defaults/rail/EF_Fuel_Comb_Rail_Dest_to_Orig_Loco.csv": "src/opem/defaults/rail/Emission_Factors_of_Fuel_Combustion_for_Feedstock_and_Fuel_Transportation_Trip_From_Product_Destination_Back_to_Product_Origin_Locomotive.csv",
10+
"src/opem/defaults/rail/EF_Fuel_Comb_Rail_Orig_to_Dest_Loco.csv": "src/opem/defaults/rail/Emission_Factors_of_Fuel_Combustion_for_Feedstock_and_Fuel_Transportation_Trip_From_Product_Origin_to_Product_Destination_Locomotive.csv",
11+
"src/opem/defaults/tanker_barge/Barge_Transport_Forward_CH4.csv": "src/opem/defaults/tanker_barge/Barge_Emissions_From_Transport_Barge_Forward_Journey_CH4.csv",
12+
"src/opem/defaults/tanker_barge/Barge_Transport_Forward_CO2.csv": "src/opem/defaults/tanker_barge/Barge_Emissions_From_Transport_Barge_Forward_Journey_CO2.csv",
13+
"src/opem/defaults/tanker_barge/Barge_Transport_Forward_CO2eq.csv": "src/opem/defaults/tanker_barge/Barge_Emissions_From_Transport_Barge_Forward_Journey_CO2eq.csv",
14+
"src/opem/defaults/tanker_barge/Barge_Transport_Forward_N2O.csv": "src/opem/defaults/tanker_barge/Barge_Emissions_From_Transport_Barge_Forward_Journey_N20.csv",
15+
"src/opem/defaults/tanker_barge/Cargo_Payload_Transport_Mode_Fuel_Type.csv": "src/opem/defaults/tanker_barge/Cargo_Payload_by_Transportation_Mode_and_by_Product_Fuel_Type.csv",
16+
"src/opem/defaults/tanker_barge/EF_Fuel_Comb_Barge_Orig_to_Dest.csv": "src/opem/defaults/tanker_barge/Emission_Factors_of_Fuel_Combustion_Feedstock_and_Fuel_Transportation_From_Product_Origin_to_Product_Destination_Barge.csv",
17+
"src/opem/defaults/tanker_barge/EF_Fuel_Comb_O_Tanker_Orig_to_Dest.csv": "src/opem/defaults/tanker_barge/Emission_Factors_of_Fuel_Combustion_Feedstock_and_Fuel_Transportation_From_Product_Origin_to_Product_Destination_Ocean_Tanker.csv",
18+
"src/opem/defaults/tanker_barge/EF_Fuel_Comb_Barge_Dest_to_Orig.csv": "src/opem/defaults/tanker_barge/Emission_Factors_of_Fuel_Combustion_for_Feedstock_and_Fuel_Transportation_Trip_From_Product_Destination_Back_to_Product_Origin_Barge.csv",
19+
"src/opem/defaults/tanker_barge/EF_Fuel_Comb_O_Tanker_Dest_to_Orig.csv": "src/opem/defaults/tanker_barge/Emission_Factors_of_Fuel_Combustion_for_Feedstock_and_Fuel_Transportation_Trip_From_Product_Destination_Back_to_Product_Origin_Ocean_Tanker.csv",
20+
"src/opem/defaults/tanker_barge/Energy_Consump_Dest_to_Orig.csv": "src/opem/defaults/tanker_barge/Energy_Consumption_Trip_From_Product_Destination_Back_to_Origin.csv",
21+
"src/opem/defaults/tanker_barge/Energy_Consump_Orig_to_Dest.csv": "src/opem/defaults/tanker_barge/Energy_Consumption_Trip_From_Product_Origin_to_Destination.csv",
22+
"src/opem/defaults/tanker_barge/Horsepower_Req_O_Tanker_Barge_Cargo_Cap.csv": "src/opem/defaults/tanker_barge/Horsepower_Requirements_for_Ocean_Tanker_and_Barges_Calculated_With_Cargo_Capacity.csv",
23+
"src/opem/defaults/tanker_barge/O_Tanker_Transport_Backhaul_CH4.csv": "src/opem/defaults/tanker_barge/Ocean_Tanker_Emissions_From_Transport_Ocean_Tanker_Backhaul_CH4.csv",
24+
"src/opem/defaults/tanker_barge/O_Tanker_Transport_Backhaul_CO2.csv": "src/opem/defaults/tanker_barge/Ocean_Tanker_Emissions_From_Transport_Ocean_Tanker_Backhaul_CO2.csv",
25+
"src/opem/defaults/tanker_barge/O_Tanker_Transport_Backhaul_CO2eq.csv": "src/opem/defaults/tanker_barge/Ocean_Tanker_Emissions_From_Transport_Ocean_Tanker_Backhaul_CO2eq.csv",
26+
"src/opem/defaults/tanker_barge/O_Tanker_Transport_Backhaul_N2O.csv": "src/opem/defaults/tanker_barge/Ocean_Tanker_Emissions_From_Transport_Ocean_Tanker_Backhaul_N2O.csv",
27+
"src/opem/defaults/tanker_barge/O_Tanker_Transport_Forward_CH4.csv": "src/opem/defaults/tanker_barge/Ocean_Tanker_Emissions_From_Transport_Ocean_Tanker_Forward_Journey_CH4.csv",
28+
"src/opem/defaults/tanker_barge/O_Tanker_Transport_Forward_CO2.csv": "src/opem/defaults/tanker_barge/Ocean_Tanker_Emissions_From_Transport_Ocean_Tanker_Forward_Journey_CO2.csv",
29+
"src/opem/defaults/tanker_barge/O_Tanker_Transport_Forward_CO2eq.csv": "src/opem/defaults/tanker_barge/Ocean_Tanker_Emissions_From_Transport_Ocean_Tanker_Forward_Journey_CO2eq.csv",
30+
"src/opem/defaults/tanker_barge/O_Tanker_Transport_Forward_N2O.csv": "src/opem/defaults/tanker_barge/Ocean_Tanker_Emissions_From_Transport_Ocean_Tanker_Forward_Journey_N2O.csv"
31+
}

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# For a discussion on single-sourcing the version across setup.py and the
2020
# project code, see
2121
# https://packaging.python.org/en/latest/single_source_version.html
22-
version='1.3',
22+
version='1.3.2',
2323

2424
# This is a one-line description or tagline of what your project does. This
2525
# corresponds to the "Summary" metadata field:

‎src/opem/combustion/combustion_EF.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def __post_init__(self, user_input):
147147
# CALCULATED
148148
product_combustion_emission_factors_derived_solids: Dict = field(
149149
default_factory=lambda: build_dict_from_defaults(
150-
'Product_Combustion_Emission_Factors_Fossil_Fuel_Derived_Fuels_Solid', 'combustion'))
150+
'Prod_Comb_EF_Fossil_Fuel_Solid', 'combustion'))
151151

152152
# Prod CombustEF sheet, table: Product Combustion Emission Factors -- Natural Gas
153153
# CALCULATED

src/opem/defaults/combustion/Product_Combustion_Emission_Factors_Fossil_Fuel_Derived_Fuels_Solid.csv renamed to src/opem/defaults/combustion/Prod_Comb_EF_Fossil_Fuel_Solid.csv

File renamed without changes.

src/opem/defaults/pipeline/Emission_Factors_of_Fuel_Combustion-_Feedstock_and_Fuel_Transportation_From_Product_Origin_to_Product_Destination_Pipeline_Reciprocating_Engine_Current.csv renamed to src/opem/defaults/pipeline/EF_Fuel_Comb_Pipe_Recip_Engine_Current.csv

File renamed without changes.

src/opem/defaults/pipeline/Emission_Factors_of_Fuel_Combustion-_Feedstock_and_Fuel_Transportation_From_Product_Origin_to_Product_Destination_Pipeline_Reciprocating_Engine_Future.csv renamed to src/opem/defaults/pipeline/EF_Fuel_Comb_Pipe_Recip_Engine_Future.csv

File renamed without changes.

src/opem/defaults/pipeline/Emission_Factors_of_Fuel_Combustion_Feedstock_and_Fuel_Transportation_From_Product_Origin_to_Product_Destination_Pipeline_Turbine.csv renamed to src/opem/defaults/pipeline/EF_Fuel_Comb_Pipe_Turbine.csv

File renamed without changes.

src/opem/defaults/rail/Emission_Factors_of_Fuel_Combustion_for_Feedstock_and_Fuel_Transportation_Trip_From_Product_Destination_Back_to_Product_Origin_Locomotive.csv renamed to src/opem/defaults/rail/EF_Fuel_Comb_Rail_Dest_to_Orig_Loco.csv

File renamed without changes.

src/opem/defaults/rail/Emission_Factors_of_Fuel_Combustion_for_Feedstock_and_Fuel_Transportation_Trip_From_Product_Origin_to_Product_Destination_Locomotive.csv renamed to src/opem/defaults/rail/EF_Fuel_Comb_Rail_Orig_to_Dest_Loco.csv

File renamed without changes.

src/opem/defaults/tanker_barge/Barge_Emissions_From_Transport_Barge_Forward_Journey_CH4.csv renamed to src/opem/defaults/tanker_barge/Barge_Transport_Forward_CH4.csv

File renamed without changes.

0 commit comments

Comments
 (0)