Commit 2759872a authored by Markus Millinger's avatar Markus Millinger
Browse files

Upodated manuscript

parent 91979ecd
This diff is collapsed.
......@@ -218,21 +218,9 @@ gamsOut.dispatchPrd2 = sum(gamsOut.dispatchPrd,4);
indexH2 = find(contains(s.techNames,{'FCEV'}));
gamsOut.DemandRoadPass = g.Demand(6,:)-s.relativeFuelEconomy(indexEl).*(gamsOut.prd(:,indexEl,6))'+(gamsOut.prd(:,indexEl,6))';
gamsOut.DemandRoadPass = gamsOut.DemandRoadPass-s.relativeFuelEconomy(indexH2).*(gamsOut.prd(:,indexH2,6))'+(gamsOut.prd(:,indexH2,6))';
% if scenario==noScenarios
% for scen=1:noScenarios
for sector = 1:11
gamsOut.DemandAdapt(sector,:) = g.Demand(sector,:)-s.relativeFuelEconomy(indexH2,sector).*(gamsOut.prd(:,indexH2,sector))'+(gamsOut.prd(:,indexH2,sector))'...
-s.relativeFuelEconomy(indexEl,sector).*(gamsOut.prd(:,indexEl,sector))'+(gamsOut.prd(:,indexEl,sector))';%+((gamsOut(scenario).prd(:,indexH2,sector))*(1-s.relativeFuelEconomy(indexH2)))';
end
% end
% end
% o.powerResUse2 = squeeze(sum(sum(o.powerResUse,4),3)); %4 to 2 dimensions (day, year)
% Overcapacity per technology (t, tech)
% o.OverCap = o.capCAP - squeeze(sum(o.prd,3)); % Biomethankapazitten von TechCH4 abziehen!
% o.OverCap = o.capCAP);
% o.OverCap(:,1) = o.OverCap(:,1) - squeeze(sum(sum(o.prd(:,[16 24 25],:),3).*gamsTemp.convEta.val(:,[1 1 1])./gamsTemp.convEta.val(:,[16 24 25]),2));
% end
end
\ No newline at end of file
......@@ -161,8 +161,6 @@ s.plantCapacityFactor = s.plantFullLoadHours./8760;
%% Definition of Biomass/ Feedstock data
% f.feedType = techData.textdata.feedstockInputData(2,3:f.numFeed+2);
%%%%%%%% GHG Feedstock
%Emissions
f.ghgSeeds = techData.data.feedstockInputData(19,1:end); %kg/ha/a
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment