Merge branch 'master' of https://github.com/IIT-EnergySystemModels/op…

…enTEPES
IIT-EnergySystemModels · Jul 20, 2021 · d82d7e1 · d82d7e1
2 parents e6fa5b2 + 4d0fc7b
commit d82d7e1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/openTEPES/__init__.py b/openTEPES/__init__.py
@@ -14,6 +14,7 @@
         >>> import openTEPES as oT
         >>> oT.routine("9n", "C:\\Users\\UserName\\Documents\\GitHub\\openTEPES", "glpk")
 """
+__version__ = "3.1.2"
 
 from .openTEPES_Main             import main
 from .openTEPES                  import *

diff --git a/openTEPES/openTEPES.py b/openTEPES/openTEPES.py
@@ -8,10 +8,10 @@
 
 from pyomo.environ import ConcreteModel, Set
 
-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
+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
 
 
 def openTEPES_run(DirName, CaseName, SolverName):

diff --git a/openTEPES/openTEPES_Main.py b/openTEPES/openTEPES_Main.py
@@ -87,15 +87,14 @@
 import argparse
 import os
 # import pkg_resources
-from openTEPES.openTEPES import openTEPES_run
-import openTEPES
+from .openTEPES import openTEPES_run
 
 parser = argparse.ArgumentParser(description='Introducing main parameters...')
 parser.add_argument('--case',   type=str, default=None)
 parser.add_argument('--dir',    type=str, default=None)
 parser.add_argument('--solver', type=str, default=None)
 
-DIR    = os.path.dirname(openTEPES.__file__)
+DIR    = os.path.dirname(__file__)
 CASE   = '9n'
 SOLVER = 'glpk'