Skip to content
Snippets Groups Projects
Commit fc1f3604 authored by Didi Hou's avatar Didi Hou Committed by Administrator
Browse files

/

parent 415e81be
No related branches found
No related tags found
1 merge request!35Pre-release MAM v1.1.0
Hide whitespace changes
Inline Side-by-side
multi-area-model.ipynb
+ 34
− 238
View file @ fc1f3604
source diff could not be displayed: it is too large. Options to address this: view the blob.
multiarea_model/.ipynb_checkpoints/analysis-checkpoint.py
+ 1
− 1
View file @ fc1f3604
...@@ -902,7 +902,7 @@ class Analysis: ...@@ -902,7 +902,7 @@ class Analysis:
# print(i, area) # print(i, area)
# self.network has no attribute structure_reversed # self.network has no attribute structure_reversed
# for j, pop in enumerate(self.network.structure_reversed['V1']): # for j, pop in enumerate(self.network.structure_reversed['V1']):
for j, pop in enumerate(list(reversed(self.network.structure['V1'])): for j, pop in enumerate(list(reversed(self.network.structure['V1']))):
# for j, pop in enumerate(self.network.structure['V1']): # for j, pop in enumerate(self.network.structure['V1']):
if pop in self.network.structure[area]: if pop in self.network.structure[area]:
rate = self.pop_rates[area][pop][0] rate = self.pop_rates[area][pop][0]
......
multiarea_model/analysis.py
+ 1
− 1
View file @ fc1f3604
...@@ -902,7 +902,7 @@ class Analysis: ...@@ -902,7 +902,7 @@ class Analysis:
# print(i, area) # print(i, area)
# self.network has no attribute structure_reversed # self.network has no attribute structure_reversed
# for j, pop in enumerate(self.network.structure_reversed['V1']): # for j, pop in enumerate(self.network.structure_reversed['V1']):
for j, pop in enumerate(list(reversed(self.network.structure['V1'])): for j, pop in enumerate(list(reversed(self.network.structure['V1']))):
# for j, pop in enumerate(self.network.structure['V1']): # for j, pop in enumerate(self.network.structure['V1']):
if pop in self.network.structure[area]: if pop in self.network.structure[area]:
rate = self.pop_rates[area][pop][0] rate = self.pop_rates[area][pop][0]
......
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