Skip to content

Commit 84ba6d0

Browse files
committed
[ModelicaSystem] split file
1 parent a32f7a0 commit 84ba6d0

9 files changed

Lines changed: 2603 additions & 2447 deletions

OMPython/ModelicaSystem.py

Lines changed: 16 additions & 2429 deletions
Large diffs are not rendered by default.

OMPython/__init__.py

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,32 @@
3535
OMPathRunnerLocal,
3636
OMSessionRunner,
3737
)
38-
39-
from OMPython.ModelicaSystem import (
38+
from OMPython.modelica_system_abc import (
4039
LinearizationResult,
41-
ModelicaSystem,
42-
ModelicaSystemOMC,
43-
ModelicaSystemDoE,
44-
ModelicaDoEOMC,
40+
ModelicaSystemABC,
4541
ModelicaSystemError,
42+
)
43+
from OMPython.modelica_system_omc import (
44+
ModelicaSystemOMC,
45+
)
46+
from OMPython.modelica_system_runner import (
4647
ModelicaSystemRunner,
47-
ModelicaDoERunner,
48-
48+
)
49+
from OMPython.modelica_doe_abc import (
50+
ModelicaDoEABC,
51+
)
52+
from OMPython.modelica_doe_omc import (
4953
doe_get_solutions,
5054

55+
ModelicaDoEOMC,
56+
)
57+
from OMPython.modelica_doe_runner import (
58+
ModelicaDoERunner,
59+
)
60+
61+
from OMPython.ModelicaSystem import (
62+
ModelicaSystem,
63+
ModelicaSystemDoE,
5164
ModelicaSystemCmd,
5265
)
5366
from OMPython.OMCSession import (
@@ -63,12 +76,23 @@
6376

6477
# global names imported if import 'from OMPython import *' is used
6578
__all__ = [
79+
'doe_get_solutions',
80+
6681
'LinearizationResult',
6782

6883
'ModelExecutionCmd',
6984
'ModelExecutionData',
7085
'ModelExecutionException',
7186

87+
'ModelicaDoEABC',
88+
'ModelicaDoEOMC',
89+
'ModelicaDoERunner',
90+
'ModelicaSystemABC',
91+
'ModelicaSystemDoE',
92+
'ModelicaSystemError',
93+
'ModelicaSystemOMC',
94+
'ModelicaSystemRunner',
95+
7296
'OMPathABC',
7397
'OMSessionABC',
7498
'OMSessionException',
@@ -85,17 +109,8 @@
85109
'OMPathRunnerLocal',
86110
'OMSessionRunner',
87111

88-
'ModelicaSystem',
89-
'ModelicaSystemOMC',
90112
'ModelicaSystemCmd',
91-
'ModelicaSystemDoE',
92-
'ModelicaDoEOMC',
93-
'ModelicaSystemError',
94-
95-
'ModelicaSystemRunner',
96-
'ModelicaDoERunner',
97-
98-
'doe_get_solutions',
113+
'ModelicaSystem',
99114

100115
'OMCSessionABC',
101116
'OMCSessionCmd',

OMPython/model_execution.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
# define logger using the current module name as ID
1818
logger = logging.getLogger(__name__)
1919

20+
MODEL_EXECUTION_TIMEOUT: float = 300.0
21+
2022

2123
class ModelExecutionException(Exception):
2224
"""

0 commit comments

Comments
 (0)