Added support for initializing and terminating ME FMUs

.github/workflows/build.yml

@@ -47,8 +47,8 @@ jobs:
     - name: Install fmilib
       run: |
         cd /tmp
-        curl -fSsL https://github.com/modelon-community/fmi-library/archive/3.0a4.tar.gz | tar xz
-        cd fmi-library-3.0a4
+        curl -fSsL https://github.com/modelon-community/fmi-library/archive/3.0a5.tar.gz | tar xz
+        cd fmi-library-3.0a5
         sed -i "/CMAKE_INSTALL_PREFIX/d" CMakeLists.txt
         mkdir -p build && cd build
         cmake -DCMAKE_INSTALL_PREFIX=/usr ..

src/pyfmi/fmi2.pxd

@@ -169,12 +169,12 @@ cdef class WorkerClass2:
     cpdef verify_dimensions(self, int dim)
 
 cdef object _load_fmi2_fmu(
-    fmu, 
-    object log_file_name, 
-    str kind, 
-    int log_level, 
+    fmu,
+    object log_file_name,
+    str kind,
+    int log_level,
     int allow_unzipped_fmu,
-    FMIL.fmi_import_context_t* context, 
+    FMIL.fmi_import_context_t* context,
     bytes fmu_temp_dir,
     FMIL.jm_callbacks callbacks,
     list log_data

src/pyfmi/fmi2.pyx

@@ -40,7 +40,7 @@ from pyfmi.fmi_base import (
 from pyfmi.exceptions import (
     FMUException,
     InvalidBinaryException,
-    InvalidXMLException, 
+    InvalidXMLException,
     InvalidVersionException
 )
 from pyfmi.common.core import create_temp_dir
@@ -1185,7 +1185,6 @@ cdef class FMUModelBase2(FMI_BASE.ModelBase):
 
         self._t = start_time
         self._last_accepted_time = start_time
-        self._relative_tolerance = tolerance
 
         self._log_handler.capi_start_callback(self._max_log_size_msg_sent, self._current_log_size)
         status = FMIL2.fmi2_import_setup_experiment(self._fmu,
@@ -1206,7 +1205,7 @@ cdef class FMUModelBase2(FMI_BASE.ModelBase):
         status = FMIL2.fmi2_import_reset(self._fmu)
         self._log_handler.capi_end_callback(self._max_log_size_msg_sent, self._current_log_size)
         if status != 0:
-            raise FMUException('An error occured when reseting the model, see the log for possible more information')
+            raise FMUException('An error occured when resetting the model, see the log for possible more information')
 
         #Default values
         self._t = None
@@ -5172,12 +5171,12 @@ cdef class WorkerClass2:
         return ret
 
 cdef object _load_fmi2_fmu(
-    fmu, 
-    object log_file_name, 
-    str kind, 
-    int log_level, 
+    fmu,
+    object log_file_name,
+    str kind,
+    int log_level,
     int allow_unzipped_fmu,
-    FMIL.fmi_import_context_t* context, 
+    FMIL.fmi_import_context_t* context,
     bytes fmu_temp_dir,
     FMIL.jm_callbacks callbacks,
     list log_data

src/pyfmi/fmi3.pxd

@@ -27,14 +27,23 @@ cdef class FMUModelBase3(FMI_BASE.ModelBase):
     cdef FMIL3.fmi3_import_t*       _fmu
     cdef FMIL3.fmi3_fmu_kind_enu_t  _fmu_kind
     cdef FMIL.fmi_version_enu_t     _version
+
+
     # Internal values
-    cdef object _fmu_full_path
+    cdef public float  _last_accepted_time
     cdef public object _enable_logging
+    cdef object     _fmu_full_path
+    cdef object     _modelName
+    cdef object     _t
     cdef int _allow_unzipped_fmu
-    cdef int _allocated_context, _allocated_xml
+    cdef int _allocated_context, _allocated_dll, _allocated_fmu, _allocated_xml
+
+    cdef int _initialized_fmu
+    cdef object  _has_entered_init_mode # this is public in FMI2 but I don't see why
 
 cdef class FMUModelME3(FMUModelBase3):
-    pass
+    cdef FMIL.size_t                _nEventIndicators
+    cdef FMIL.size_t                _nContinuousStates
 
 cdef void _cleanup_on_load_error(
     FMIL3.fmi3_import_t* fmu_3,
@@ -46,12 +55,12 @@ cdef void _cleanup_on_load_error(
 )
 
 cdef object _load_fmi3_fmu(
-    fmu, 
-    object log_file_name, 
-    str kind, 
-    int log_level, 
+    fmu,
+    object log_file_name,
+    str kind,
+    int log_level,
     int allow_unzipped_fmu,
-    FMIL.fmi_import_context_t* context, 
+    FMIL.fmi_import_context_t* context,
     bytes fmu_temp_dir,
     FMIL.jm_callbacks callbacks,
     list log_data