Changed country specific historic passenger vehicle fuel type data to simpler...

Changed country specific historic passenger vehicle fuel type data to simpler format compatible with many countries

src/benopt.gms

@@ -167,7 +167,7 @@ ghgEmisT1(year)                                  ktCO2eq per PJ
 ghgEmisGateWheel(year,tech)                      ktCO2eq per PJ
 powerMixEmis(year)                               ktCO2eq per PJ
 ghgRef(year,market)                              ktCO2eq per PJ
-historicFuelDemand(year,fuel)
+historicFuelDemand(year,fuel)                    Fuel demand development constraint based on past fleet
 *newICEVPJ(year)                                  yearly new ICEV fuel demand (PJ)
 newVehicSharePass(year)                          share of new vehicles yearly in the passenger road sector
 residualLoad(d,year)                             residualLoad

src/setCountryData.m

@@ -82,6 +82,6 @@ s.ghgEFPowerData            =   techData.data.powerEmissions(1+indexCountry,[201
 %The number of historic passenger vehicles in each fuel type
 %(Diesel,Hybrid (excl. Plug-in-hybrid),Plug-in-Hybrid,Battery electric/Fuel
 %cell,Natural gas (incl. LPG),Flex-Fuel,Petrol)
-s.fuelTypePassengerVehicles =   techData.data.vehicleMarket(20:50,14:20);
+s.fuelTypePassengerVehicles =   techData.data.countryData(90:96,indexCountry);%data.vehicleMarket(20:50,14:20);
 
 end
\ No newline at end of file

src/setData.m

@@ -363,8 +363,8 @@ s.passengerVehicleKMtot =   s.personKMtot./s.personPerVehicle;
 s.vehicleLifeT          =   14;
 s.passengerVehicleKMperVehicle  =   s.passengerVehicleKMtot./s.totalVehicles;
 
-s.newVehiclesPerYear    =     linspace(s.totalVehicles/s.vehicleLifeT,s.totalVehicles/s.vehicleLifeT,s.runTime); %This assumed a constant passenger vehicle fleet
-s.newVehicSharePass     =       s.newVehiclesPerYear/s.totalVehicles;
+s.newVehiclesPerYear    =   linspace(s.totalVehicles/s.vehicleLifeT,s.totalVehicles/s.vehicleLifeT,s.runTime); %This assumes a constant passenger vehicle fleet
+s.newVehicSharePass     =   s.newVehiclesPerYear/s.totalVehicles;
 s.EVincreaseFactor      =   1.5;
 s.EVincreaseFactorLow   =   1.3;
 s.EVnewStart            =   s.EVstart*(s.EVincreaseFactor-1);
@@ -379,12 +379,19 @@ s.annuityFactorVehicle  =   ...
 %(Diesel,Hybrid (excl. Plug-in-hybrid),Plug-in-Hybrid,Battery electric/Fuel
 %cell,Natural gas (incl. LPG),Flex-Fuel,Petrol)
 % s.fuelTypePassengerVehicles =   techData.data.vehicleMarket(20:50,14:20);
-s.passengerVehiclesTotal    =   sum(s.fuelTypePassengerVehicles,2);
-s.fuelTypePassengerVehiclesMainFuels = s.fuelTypePassengerVehicles(:,[1 7 5]);
+
+for i=1:3 %Decommission of historic Diesel, Petrol and Gas vehicles
+    s.fuelTypePassengerVehiclesMainFuels1(1:s.vehicleLifeT,i) =   linspace(s.fuelTypePassengerVehicles(i),0,s.vehicleLifeT);
+end
+s.fuelTypePassengerVehiclesMainFuels                =   zeros(s.runTime,3);
+s.fuelTypePassengerVehiclesMainFuels(1:s.vehicleLifeT,1:3)                =   s.fuelTypePassengerVehiclesMainFuels1;
+
+s.passengerVehiclesTotal    =   sum(s.fuelTypePassengerVehicles,1);
+% s.fuelTypePassengerVehiclesMainFuels = s.fuelTypePassengerVehicles(:,[1 7 5]);
 
 s.fuelTypeSharePassengerVehicles   =   ...
-    s.fuelTypePassengerVehicles(:,[1 7 5])./s.totalVehicles;         
-%Diesel, Petrol, Gas vehicles 2017-2030
+    s.fuelTypePassengerVehiclesMainFuels./s.passengerVehiclesTotal;%s.totalVehicles;         
+
 s.fuelTypeSharePassengerVehicles(isnan(s.fuelTypeSharePassengerVehicles))=0;
 
 s.sharePassengerICEVsTotal  =   sum(s.fuelTypeSharePassengerVehicles,2);