Update openTEPES.py

IIT-EnergySystemModels · Apr 21, 2021 · 005edd6 · 005edd6
1 parent e535917
commit 005edd6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/openTEPES/openTEPES.py b/openTEPES/openTEPES.py
@@ -8,7 +8,7 @@
 
 from pyomo.environ import ConcreteModel, Set
 
-from openTEPES.openTEPES_InputData        import InputData
+from openTEPES.openTEPES_InputData        import InputData, SettingUpVariables
 from openTEPES.openTEPES_ModelFormulation import InvestmentModelFormulation, GenerationOperationModelFormulation, NetworkSwitchingModelFormulation, NetworkOperationModelFormulation
 from openTEPES.openTEPES_ProblemSolving   import ProblemSolving
 from openTEPES.openTEPES_OutputResults    import InvestmentResults, GenerationOperationResults, ESSOperationResults, FlexibilityResults, NetworkOperationResults, MarginalResults, EconomicResults, NetworkMapResults
@@ -24,8 +24,12 @@ def openTEPES_run(DirName, CaseName, SolverName):
 
     pIndLogConsole = 1
 
+    # Define sets and parameters
     InputData(DirName, CaseName, mTEPES)
 
+    # Define variables
+    SettingUpVariables(mTEPES, mTEPES)
+
     # investment model objective function
     InvestmentModelFormulation(mTEPES, mTEPES, pIndLogConsole)