Skip to content

Instantly share code, notes, and snippets.

@antw
Last active August 29, 2015 14:07
Show Gist options
  • Save antw/4b6895a18ec23077bcea to your computer and use it in GitHub Desktop.
Save antw/4b6895a18ec23077bcea to your computer and use it in GitHub Desktop.
etengine#716 diffs
diff --git a/nodes/energy/energy_power_hv_network_electricity.ad b/nodes/energy/energy_power_hv_netw
index 93fe2ba..bf6d28e 100644
--- a/nodes/energy/energy_power_hv_network_electricity.ad
+++ b/nodes/energy/energy_power_hv_network_electricity.ad
@@ -1,6 +1,7 @@
- use = undefined
- energy_balance_group = electricity network
-- output.loss = elastic
+- output.loss = 0.0
+- output.electricity = 1.0
- groups = [cost_other]
- availability = 0.0
- free_co2_factor = 0.0
diff --git a/nodes/energy/energy_power_hv_network_loss.ad b/nodes/energy/energy_power_hv_network_los
index e40f737..23835af 100644
--- a/nodes/energy/energy_power_hv_network_loss.ad
+++ b/nodes/energy/energy_power_hv_network_loss.ad
@@ -4,4 +4,4 @@
- groups = []
- free_co2_factor = 0.0
-~ demand = -EB(losses, electricity)
+~ demand = 0.0
diff --git a/app/models/qernel/graph_api.rb b/app/models/qernel/graph_api.rb
index 9bf5189..501383c 100644
--- a/app/models/qernel/graph_api.rb
+++ b/app/models/qernel/graph_api.rb
@@ -81,8 +81,8 @@ class GraphApi
# Returns a numeric.
def total_demand_for_electricity
final_demand_for_electricity +
- electricity_losses_if_export_is_zero
+ electricity_losses_if_export_is_zero -
+ 89999976.45727539
end
# @return [Integer] Difference between start_year and end_year
Atlas::Edge.all.select { |e| e.reversed && e.type == :share }
# => [
#<Atlas::Edge: energy_cokesoven_transformation_coal-energy_distribution_coal_gas@coal_gas>,
#<Atlas::Edge: energy_extraction_coal-energy_distribution_coal@coal>,
#<Atlas::Edge: energy_extraction_crude_oil-energy_distribution_crude_oil@crude_oil>,
#<Atlas::Edge: energy_extraction_lignite-energy_distribution_lignite@lignite>,
#<Atlas::Edge: energy_extraction_natural_gas-energy_treatment_natural_gas@natural_gas>,
#<Atlas::Edge: energy_extraction_uranium_oxide-energy_distribution_uranium_oxide@uranium_oxide>,
#<Atlas::Edge: energy_production_bio_ethanol-energy_distribution_bio_ethanol@bio_ethanol>,
#<Atlas::Edge: energy_production_bio_oil-energy_distribution_bio_oil@bio_oil>,
#<Atlas::Edge: energy_production_biodiesel-energy_distribution_biodiesel@biodiesel>,
#<Atlas::Edge: energy_steel_blastfurnace_bat_transformation_cokes-energy_distribution_coal_gas@coal_gas>,
#<Atlas::Edge: energy_steel_blastfurnace_current_transformation_cokes-energy_distribution_coal_gas@coal_gas> ]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment