Skip to content

Commit 629ebf8

Browse files
authored
Merge pull request #980 from oemof/feature/integrate_tsam
Integrate TSAM mode in oemof.solph
2 parents 077813e + 4992c29 commit 629ebf8

22 files changed

+2912
-140
lines changed

examples/flexible_modelling/saturating_storage.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
"""
3333

3434
import pandas as pd
35-
from pyomo import environ as po
3635
from matplotlib import pyplot as plt
36+
from pyomo import environ as po
3737

3838
from oemof import solph
3939

examples/simple_dispatch/simple_dispatch.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
from oemof.solph import Model
5555
from oemof.solph import create_time_index
5656
from oemof.solph import views
57+
from oemof.solph.components import Converter
5758
from oemof.solph.components import Sink
5859
from oemof.solph.components import Source
59-
from oemof.solph.components import Converter
6060

6161

6262
def main():

examples/storage_level_constraint/storage_level_constraint.py

-5
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@
3030
"""
3131

3232

33-
import pandas as pd
34-
from oemof.solph import Bus, EnergySystem, Flow, Model
35-
from oemof.solph.components import GenericStorage, Source, Sink
36-
from oemof.solph.processing import results
37-
3833
import matplotlib.pyplot as plt
3934
import pandas as pd
4035

0 commit comments

Comments
 (0)