IIT-EnergySystemModels · timmy61109 · Aug 8, 2021 · Aug 8, 2021 · Aug 8, 2021 · Aug 8, 2021
diff --git a/doc/img/Escudo.png → docs/img/Escudo.png b/doc/img/Escudo.png → docs/img/Escudo.png
diff --git a/doc/img/logoIIT.gif → docs/img/logoIIT.gif b/doc/img/logoIIT.gif → docs/img/logoIIT.gif
diff --git a/doc/img/oT_Map_Network_MAF2030.png → docs/img/oT_Map_Network_MAF2030.png b/doc/img/oT_Map_Network_MAF2030.png → docs/img/oT_Map_Network_MAF2030.png
diff --git a/doc/img/oT_Map_Network_sSEP.png → docs/img/oT_Map_Network_sSEP.png b/doc/img/oT_Map_Network_sSEP.png → docs/img/oT_Map_Network_sSEP.png
diff --git a/doc/img/oT_Plot_MapNetwork_9n.png → docs/img/oT_Plot_MapNetwork_9n.png b/doc/img/oT_Plot_MapNetwork_9n.png → docs/img/oT_Plot_MapNetwork_9n.png
diff --git a/...g/oT_Plot_TechnologyEnergy_ES_MAF2030.png → ...g/oT_Plot_TechnologyEnergy_ES_MAF2030.png b/...g/oT_Plot_TechnologyEnergy_ES_MAF2030.png → ...g/oT_Plot_TechnologyEnergy_ES_MAF2030.png
diff --git a/...T_Plot_TechnologyOutput_sc01_y2030_9n.png → ...T_Plot_TechnologyOutput_sc01_y2030_9n.png b/...T_Plot_TechnologyOutput_sc01_y2030_9n.png → ...T_Plot_TechnologyOutput_sc01_y2030_9n.png
diff --git a/doc/img/open-entrance_logo.png → docs/img/open-entrance_logo.png b/doc/img/open-entrance_logo.png → docs/img/open-entrance_logo.png
diff --git a/doc/img/openTEPES.png → docs/img/openTEPES.png b/doc/img/openTEPES.png → docs/img/openTEPES.png
diff --git a/doc/rst/ContactUs.rst → docs/rst/ContactUs.rst b/doc/rst/ContactUs.rst → docs/rst/ContactUs.rst
diff --git a/doc/rst/Download.rst → docs/rst/Download.rst b/doc/rst/Download.rst → docs/rst/Download.rst
diff --git a/doc/rst/InputData.rst → docs/rst/InputData.rst b/doc/rst/InputData.rst → docs/rst/InputData.rst
diff --git a/doc/rst/Introduction.rst → docs/rst/Introduction.rst b/doc/rst/Introduction.rst → docs/rst/Introduction.rst
diff --git a/doc/rst/MathematicalFormulation.rst → docs/rst/MathematicalFormulation.rst b/doc/rst/MathematicalFormulation.rst → docs/rst/MathematicalFormulation.rst
diff --git a/doc/rst/OutputResults.rst → docs/rst/OutputResults.rst b/doc/rst/OutputResults.rst → docs/rst/OutputResults.rst
diff --git a/doc/rst/Papers.rst → docs/rst/Papers.rst b/doc/rst/Papers.rst → docs/rst/Papers.rst
diff --git a/doc/rst/Projects.rst → docs/rst/Projects.rst b/doc/rst/Projects.rst → docs/rst/Projects.rst
diff --git a/doc/rst/conf.py → docs/rst/conf.py b/doc/rst/conf.py → docs/rst/conf.py
diff --git a/doc/rst/index.rst → docs/rst/index.rst b/doc/rst/index.rst → docs/rst/index.rst
diff --git a/doc/rst/openTEPES.png → docs/rst/openTEPES.png b/doc/rst/openTEPES.png → docs/rst/openTEPES.png
diff --git a/openTEPES/__init__.py b/openTEPES/__init__.py
@@ -16,9 +16,9 @@
 """
 __version__ = "3.1.2"
 
-from .openTEPES_Main             import main
-from .openTEPES                  import *
-from .openTEPES_InputData        import *
+from .openTEPES_Main import main
+from .openTEPES import *
+from .openTEPES_InputData import *
 from .openTEPES_ModelFormulation import *
-from .openTEPES_OutputResults    import *
-from .openTEPES_ProblemSolving   import *
+from .openTEPES_OutputResults import *
+from .openTEPES_ProblemSolving import *
diff --git a/openTEPES/openTEPES.py b/openTEPES/openTEPES.py
@@ -8,19 +8,20 @@
 
 from pyomo.environ import ConcreteModel, Set
 
-from .openTEPES_InputData        import InputData, SettingUpVariables
+from .openTEPES_InputData import InputData, SettingUpVariables
 from .openTEPES_ModelFormulation import InvestmentModelFormulation, GenerationOperationModelFormulation, NetworkSwitchingModelFormulation, NetworkOperationModelFormulation
-from .openTEPES_ProblemSolving   import ProblemSolving
-from .openTEPES_OutputResults    import InvestmentResults, GenerationOperationResults, ESSOperationResults, FlexibilityResults, NetworkOperationResults, MarginalResults, EconomicResults, NetworkMapResults
+from .openTEPES_ProblemSolving import ProblemSolving
+from .openTEPES_OutputResults import InvestmentResults, GenerationOperationResults, ESSOperationResults, FlexibilityResults, NetworkOperationResults, MarginalResults, EconomicResults, NetworkMapResults
 
 
 def openTEPES_run(DirName, CaseName, SolverName):
 
     InitialTime = time.time()
     _path = os.path.join(DirName, CaseName)
 
-    #%% model declaration
-    mTEPES = ConcreteModel('Open Generation and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - Version 3.1.2 - July 12, 2021')
+    # %% model declaration
+    mTEPES = ConcreteModel(
+        'Open Generation and Transmission Operation and Expansion Planning Model with RES and ESS (openTEPES) - Version 3.1.2 - July 12, 2021')
 
     pIndLogConsole = 1
 
@@ -34,49 +35,113 @@ def openTEPES_run(DirName, CaseName, SolverName):
     InvestmentModelFormulation(mTEPES, mTEPES, pIndLogConsole)
 
     # iterative model formulation for each stage of a year
-    for sc,p,st in mTEPES.scc*mTEPES.pp*mTEPES.stt:
+    for sc, p, st in mTEPES.scc * mTEPES.pp * mTEPES.stt:
         # activate only scenario, period and load levels to formulate
         mTEPES.del_component(mTEPES.sc)
-        mTEPES.del_component(mTEPES.p )
+        mTEPES.del_component(mTEPES.p)
         mTEPES.del_component(mTEPES.st)
-        mTEPES.del_component(mTEPES.n )
+        mTEPES.del_component(mTEPES.n)
         mTEPES.del_component(mTEPES.n2)
-        mTEPES.sc = Set(initialize=mTEPES.scc, ordered=True, doc='scenarios',   filter=lambda mTEPES,scc: scc in mTEPES.scc and sc == scc and mTEPES.pScenProb   [scc])
-        mTEPES.p  = Set(initialize=mTEPES.pp,  ordered=True, doc='periods',     filter=lambda mTEPES,pp : pp  in                p  == pp                              )
-        mTEPES.st = Set(initialize=mTEPES.stt, ordered=True, doc='stages',      filter=lambda mTEPES,stt: stt in mTEPES.stt and st == stt and mTEPES.pStageWeight[stt] and sum(1 for (st, nn) in mTEPES.s2n))
-        mTEPES.n  = Set(initialize=mTEPES.nn,  ordered=True, doc='load levels', filter=lambda mTEPES,nn : nn  in mTEPES.pDuration and (st,nn) in mTEPES.s2n)
-        mTEPES.n2 = Set(initialize=mTEPES.nn,  ordered=True, doc='load levels', filter=lambda mTEPES,nn : nn  in mTEPES.pDuration and (st,nn) in mTEPES.s2n)
+        mTEPES.sc = Set(
+            initialize=mTEPES.scc,
+            ordered=True,
+            doc='scenarios',
+            filter=lambda mTEPES,
+            scc: scc in mTEPES.scc and sc == scc and mTEPES.pScenProb[scc])
+        mTEPES.p = Set(
+            initialize=mTEPES.pp,
+            ordered=True,
+            doc='periods',
+            filter=lambda mTEPES,
+            pp: pp in p == pp)
+        mTEPES.st = Set(
+            initialize=mTEPES.stt,
+            ordered=True,
+            doc='stages',
+            filter=lambda mTEPES,
+            stt: stt in mTEPES.stt and st == stt and mTEPES.pStageWeight[stt] and sum(
+                1 for (
+                    st,
+                    nn) in mTEPES.s2n))
+        mTEPES.n = Set(
+            initialize=mTEPES.nn,
+            ordered=True,
+            doc='load levels',
+            filter=lambda mTEPES,
+            nn: nn in mTEPES.pDuration and (
+                st,
+                nn) in mTEPES.s2n)
+        mTEPES.n2 = Set(
+            initialize=mTEPES.nn,
+            ordered=True,
+            doc='load levels',
+            filter=lambda mTEPES,
+            nn: nn in mTEPES.pDuration and (
+                st,
+                nn) in mTEPES.s2n)
 
         # operation model objective function and constraints by stage
         GenerationOperationModelFormulation(mTEPES, mTEPES, pIndLogConsole, st)
-        NetworkSwitchingModelFormulation   (mTEPES, mTEPES, pIndLogConsole, st)
-        NetworkOperationModelFormulation   (mTEPES, mTEPES, pIndLogConsole, st)
-
-    StartTime         = time.time()
-    mTEPES.write(_path+'/openTEPES_'+CaseName+'.lp', io_options={'symbolic_solver_labels': True})  # create lp-format file
+        NetworkSwitchingModelFormulation(mTEPES, mTEPES, pIndLogConsole, st)
+        NetworkOperationModelFormulation(mTEPES, mTEPES, pIndLogConsole, st)
+
+    StartTime = time.time()
+    mTEPES.write(
+        _path +
+        '/openTEPES_' +
+        CaseName +
+        '.lp',
+        io_options={
+            'symbolic_solver_labels': True})  # create lp-format file
     WritingLPFileTime = time.time() - StartTime
-    StartTime         = time.time()
-    print('Writing LP file                        ... ', round(WritingLPFileTime), 's')
+    StartTime = time.time()
+    print(
+        'Writing LP file                        ... ',
+        round(WritingLPFileTime),
+        's')
 
     ProblemSolving(DirName, CaseName, SolverName, mTEPES, mTEPES)
 
     mTEPES.del_component(mTEPES.sc)
-    mTEPES.del_component(mTEPES.p )
+    mTEPES.del_component(mTEPES.p)
     mTEPES.del_component(mTEPES.st)
-    mTEPES.del_component(mTEPES.n )
-    mTEPES.sc = Set(initialize=mTEPES.scc, ordered=True, doc='scenarios',   filter=lambda mTEPES,scc: scc in mTEPES.scc and mTEPES.pScenProb   [scc])
-    mTEPES.p  = Set(initialize=mTEPES.pp,  ordered=True, doc='periods',     filter=lambda mTEPES,pp : pp  in p  == pp                               )
-    mTEPES.st = Set(initialize=mTEPES.stt, ordered=True, doc='stages',      filter=lambda mTEPES,stt: stt in mTEPES.stt and mTEPES.pStageWeight[stt] and sum(1 for (stt, nn) in mTEPES.s2n))
-    mTEPES.n  = Set(initialize=mTEPES.nn,  ordered=True, doc='load levels', filter=lambda mTEPES,nn : nn  in                mTEPES.pDuration        )
-
-    InvestmentResults         (DirName, CaseName, mTEPES, mTEPES)
+    mTEPES.del_component(mTEPES.n)
+    mTEPES.sc = Set(
+        initialize=mTEPES.scc,
+        ordered=True,
+        doc='scenarios',
+        filter=lambda mTEPES,
+        scc: scc in mTEPES.scc and mTEPES.pScenProb[scc])
+    mTEPES.p = Set(
+        initialize=mTEPES.pp,
+        ordered=True,
+        doc='periods',
+        filter=lambda mTEPES,
+        pp: pp in p == pp)
+    mTEPES.st = Set(
+        initialize=mTEPES.stt,
+        ordered=True,
+        doc='stages',
+        filter=lambda mTEPES,
+        stt: stt in mTEPES.stt and mTEPES.pStageWeight[stt] and sum(
+            1 for (
+                stt,
+                nn) in mTEPES.s2n))
+    mTEPES.n = Set(
+        initialize=mTEPES.nn,
+        ordered=True,
+        doc='load levels',
+        filter=lambda mTEPES,
+        nn: nn in mTEPES.pDuration)
+
+    InvestmentResults(DirName, CaseName, mTEPES, mTEPES)
     GenerationOperationResults(DirName, CaseName, mTEPES, mTEPES)
-    ESSOperationResults       (DirName, CaseName, mTEPES, mTEPES)
-    FlexibilityResults        (DirName, CaseName, mTEPES, mTEPES)
-    NetworkOperationResults   (DirName, CaseName, mTEPES, mTEPES)
-    MarginalResults           (DirName, CaseName, mTEPES, mTEPES)
-    EconomicResults           (DirName, CaseName, mTEPES, mTEPES)
-    NetworkMapResults         (DirName, CaseName, mTEPES, mTEPES)
+    ESSOperationResults(DirName, CaseName, mTEPES, mTEPES)
+    FlexibilityResults(DirName, CaseName, mTEPES, mTEPES)
+    NetworkOperationResults(DirName, CaseName, mTEPES, mTEPES)
+    MarginalResults(DirName, CaseName, mTEPES, mTEPES)
+    EconomicResults(DirName, CaseName, mTEPES, mTEPES)
+    NetworkMapResults(DirName, CaseName, mTEPES, mTEPES)
 
     TotalTime = time.time() - InitialTime
     print('Total time                             ... ', round(TotalTime), 's')