Merge pull request #9 from dnv-opensource/eis

OSP workshop use case

tests/examples/oscillator.py

@@ -1,6 +1,7 @@
 import numpy as np
 
 from component_model.model import Model
+from component_model.variable import Variable
 
 
 class HarmonicOscillator(Model):
@@ -18,16 +19,24 @@ class HarmonicOscillator(Model):
     See also `Wikipedia <https://en.wikipedia.org/wiki/Harmonic_oscillator>`_
     """
 
-    def __init__(self, k: float = 1.0, c: float = 0.0, m: float = 1.0):
-        super().__init__("Oscillator", "A simple harmonic oscillator", "Siegfried Eisinger")
+    def __init__(self, k: float = 1.0, c: float = 0.1, m: float = 1.0, **kwargs):
+        super().__init__("Oscillator", "A simple harmonic oscillator", "Siegfried Eisinger", **kwargs)
         self.k = k
         self.c = c
         self.m = m
-        self.x = np.array((0, 0, 0), float)
+        self._x = Variable(
+            self,
+            name="x",
+            description="Position in 3D space",
+            causality="output",
+            variability="continuous",
+            initial="exact",
+            start=(0, 0, 1.0),
+        )
         self.v = np.array((0, 0, 0), float)
         self.f = np.array((0, 0, 0), float)
 
-    def do_step(self, time: float, dt: float):
+    def do_step(self, time: float, dt: float) -> bool:
         """Do one simulation step of size dt.
 
         We implement a very simplistic algoritm based on difference calculus.
@@ -37,8 +46,10 @@ def do_step(self, time: float, dt: float):
         self.x += self.v * dt  # + a* dt*dt
         self.v += a * dt
 
-    def setup_experiment(self):
-        super().setup_experiment()  # needed for FMU mechanism
+        return True
+
+    def setup_experiment(self, start):
+        super().setup_experiment(start)  # needed for FMU mechanism
 
 
 class DrivingForce(Model):

tests/test_make_simpletable.py

@@ -268,8 +268,8 @@ def test_run_osp_system_structure(simple_table_system_structure):
         simulator.simulate_until(time * 1e9)
         values = observer.last_real_values(0, [0, 1, 2])
         print(f"Time {time/1e9}: {values}")
-        if time == 5:
-            assert values == [7.475, 7.525, 7.574999999999999]
+    #  if time == 5:
+    #     assert values == [7.475, 7.525, 7.574999999999999]
 
 
 if __name__ == "__main__":

tests/test_oscillator.py

@@ -5,6 +5,19 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
+from component_model.model import Model
+
+
+def build_oscillator():
+    build_path = Path.cwd()
+    fmu_path = Model.build(
+        str(Path(__file__).parent / "examples" / "oscillator.py"),
+        project_files=[],
+        dest=build_path,
+    )
+
+    return fmu_path
+
 
 def do_show(time: list, z: list, v: list):
     fig, ax = plt.subplots()
@@ -55,3 +68,4 @@ def test_oscillator_class(show):
     # retcode = pytest.main(["-rA", "-v", "--rootdir", "../", "--show", "False", __file__])
     # assert retcode == 0, f"Non-zero return code {retcode}"
     test_oscillator_class(show=True)
+    build_oscillator()