]> gerrit.simantics Code Review - simantics/fmil.git/log
simantics/fmil.git
4 years agoEnsure unloadFMU is called only if FMU instance (pointer) exists 78/3778/1 release/1.42.0
Miro Richard Eklund [Tue, 14 Jan 2020 10:50:50 +0000 (12:50 +0200)]
Ensure unloadFMU is called only if FMU instance (pointer) exists

Previous assumptions of unloadFMU was that there was a valid C-level
pointer to cleanup and pass to the FMU model's cleanup functions.
However, if only loadFMU is called prior to unloadFMU, then JVM would
crash with an access violation exception. I introduced a boolean for
instantiated to keep track of this to ensure we avoid future crashes if
unloadFMU is called directly after loadFMU.

gitlab #13

Change-Id: Idef742d6805e856617c3c95c0bb751d8a48caa0d

5 years agoUpdate license, copyright and description for FMIL Library 44/3344/1 release/1.41.0
Miro Richard Eklund [Wed, 16 Oct 2019 10:43:21 +0000 (13:43 +0300)]
Update license, copyright and description for FMIL Library

Need to update the statements found in the feature.xml files when
publishing plugins and products that use FMI Studio. Otherwise the
placeholder [Enter license here] are listed to end-user installing the
software.

Change-Id: I03de308a666dbb497b070c0c7b4436671c6f2f49
(cherry picked from commit ca655e8717e857d01e0c18e7b0737a58b97851b1)

5 years agoAdd gitignore that ignores vaadin preferences 00/2600/1 release/1.37.0 release/1.38.0 release/1.39.0 release/1.40.0
Miro Richard Eklund [Fri, 18 Jan 2019 10:59:25 +0000 (12:59 +0200)]
Add gitignore that ignores vaadin preferences

closes #14
gitlab #14

Change-Id: I77a40e1241af666fee8aa390390bc4e94aedbc25

6 years agoUpdated binaries 83/2483/1 private/psaas
Reino Ruusu [Wed, 21 Nov 2018 12:23:34 +0000 (14:23 +0200)]
Updated binaries

gitlab #12

Change-Id: I64eec7ad2fd7e2e01bb14c745b2c3af53dbbf275

6 years agoAdd calls to fmi termination functions to implementation of unloadFMU() 39/2439/3
Reino Ruusu [Thu, 8 Nov 2018 14:46:44 +0000 (16:46 +0200)]
Add calls to fmi termination functions to implementation of unloadFMU()

gitlab #12

Linux build in a later commit.

Change-Id: I731328a8088119059a3bf3775aec65e389f6f381

6 years agoLinux .so build to gerrit for doStep 94/2294/1 release/1.36.0
meklund [Wed, 10 Oct 2018 12:48:32 +0000 (15:48 +0300)]
Linux .so build to gerrit for doStep

Commit to gerrit the .so linux build changes that add pending status check to doStep

gitlab #10

Change-Id: Ie9fce072d4254ebae8ed6267fbcf5d6bcaf6e5ee

6 years agoPending status can be returns from FMU to Native C to Java 93/2293/3
Miro Richard Eklund [Wed, 10 Oct 2018 11:49:08 +0000 (14:49 +0300)]
Pending status can be returns from FMU to Native C to Java

Previous doStep only returned status OK or ERROR. Now pending status is
possible for asyncronous FMUs.

gitlab #10

Change-Id: I5d2ff07e98fe0137fcc9ed3500b3b0986bf1dbe0

6 years agoFixed newly created errors in FMIL native interfaces. 37/2237/1
Reino Ruusu [Tue, 25 Sep 2018 14:46:23 +0000 (17:46 +0300)]
Fixed newly created errors in FMIL native interfaces.

gitlab #7

* Missing method declarations from header file. Resulted in methods
exposed with C++ decorations by the DLL.
* Copy-paste errors in setStringValue_().

Change-Id: I54a3957b61e9ec3a152b36596d70440cb5d2947a

6 years agoMerge "Added getters and setters for all FMI data types."
Tuukka Lehtonen [Fri, 21 Sep 2018 09:34:10 +0000 (09:34 +0000)]
Merge "Added getters and setters for all FMI data types."

6 years agoAdded getters and setters for all FMI data types. 15/2215/1
Reino Ruusu [Thu, 20 Sep 2018 13:14:27 +0000 (16:14 +0300)]
Added getters and setters for all FMI data types.

gitlab #7

Also includes some refactoring of fmi_util.c.
* No repetition of data types in fmi1_cs.h
* Elimination of compiler warnings by explicit casting

Change-Id: I936e5dda068552f020e81956601ba9c9c3782807

6 years agoMissing changes to windows build scripts. 14/2214/1
Reino Ruusu [Thu, 20 Sep 2018 13:10:03 +0000 (16:10 +0300)]
Missing changes to windows build scripts.

gitlab #8

Change-Id: Ie4011e34017656db307bdc3edecb64ac763c9b9e

6 years agoAdd FMILibrary-2.0.3 to org.simantics.fmil.core\native. 04/2204/2
Reino Ruusu [Tue, 18 Sep 2018 13:24:47 +0000 (16:24 +0300)]
Add FMILibrary-2.0.3 to org.simantics.fmil.core\native.

gitlab #8

Refactored code added to FMILibrary during build process into a static
source in FMUSimulator.

Revised Windows and Linux build processes to use local sources for
FMILibrary.

Dockerfile and shell scripts for Linux build refactored to display
compilation messages and fail early.

Change-Id: Ie722eb5ed63e493b596f81c0085517cd87e7c16a

6 years agoUpdates to FMILibrary and its build process 88/2188/5
Reino Ruusu [Fri, 14 Sep 2018 11:24:53 +0000 (14:24 +0300)]
Updates to FMILibrary and its build process

* Windows batch file for building FMILibrary.
* New build instrcutions in README.txt.
* Newly built FMILibrary binaries.

gitlab #6

Change-Id: Id88e9c3d254fab85c3d25f4a8c581ad9071fa6a3

6 years agoFixed some issues in native code and build configs. 79/2179/2
Reino Ruusu [Thu, 13 Sep 2018 15:53:32 +0000 (18:53 +0300)]
Fixed some issues in native code and build configs.

gitlab #6

Update to VC++ v141 (2017).

Change-Id: I3e16a10fba1a4298a486206810ebbf1497cb3af0

6 years agoAdd atomic counter for instanceName and update README, fix loadFMU 64/2164/9
Miro Richard Eklund [Wed, 12 Sep 2018 12:50:08 +0000 (15:50 +0300)]
Add atomic counter for instanceName and update README, fix loadFMU

Readme has been updated to have a more detailed build instruction on
Windows.

gitlab #6
gitlab #5

Change-Id: I86462b0a15e4adac0f4b8546811f6d2c3c18087a

6 years agoFixed unsafe handling of temporary directory deletion. 63/2163/2
Reino Ruusu [Wed, 12 Sep 2018 11:33:36 +0000 (14:33 +0300)]
Fixed unsafe handling of temporary directory deletion.

gitlab #4

Change-Id: Iaa886932b71bc6bdb09b1f262135640a4c6458b4

6 years agoReduced logging level in FMIL to warning 61/2061/1
Marko Luukkainen [Thu, 30 Aug 2018 12:41:41 +0000 (15:41 +0300)]
Reduced logging level in FMIL to warning

Fixed compilation issues with VS2017

gitlab #2
gitlab #3

Change-Id: I1caf4a7ed7fe3443a3180b857a87ae0d487b84b2

6 years agoDefault values for FMI values is NaN in FMIL.java 41/1941/1
Miro Richard Eklund [Fri, 20 Jul 2018 14:46:29 +0000 (17:46 +0300)]
Default values for FMI values is NaN in FMIL.java

Previously the default values were 0.0. Now, we can clearly see if the
values are fetched internally correctly by starting out with NaN. If an
actual value is found, it replaces it. If it fails, then NaN is still
present.

Change-Id: I019950cdf1559598d216cddbac28b8f2c1da95d5

6 years agoAdded LICENSE release/1.34.1
Tuukka Lehtonen [Thu, 14 Jun 2018 11:44:18 +0000 (14:44 +0300)]
Added LICENSE

6 years agoLinux 64 support for FMU 00/1700/1 release/1.34.0 release/1.34.2
meklund [Tue, 10 Apr 2018 14:00:47 +0000 (17:00 +0300)]
Linux 64 support for FMU

Refactored a lot of c and cpp code to allow both Windows and Linux
builds.

Added a Dockerfile and shellscripts that automatically builds the FMI
base library and FMUSimulator for us in .so format, as well as updates
them with "patchelf" program to properly find each-other.

Removed the previous Dockerfile, which only built the FMI library
without taking our code into account.

Updated all .so files to reflect changes made here.

Updated README

refs #7862

Change-Id: Ibfab64c67030825cbed763762354bacbe8884ad3

6 years agoAdded Dockerfile for Linux64 FMILibrary build and README for it 86/1686/2
meklund [Tue, 3 Apr 2018 13:25:16 +0000 (16:25 +0300)]
Added Dockerfile for Linux64 FMILibrary build and README for it

A Dockerfile for building FMILibrary on Linux has been added. Usage
guide in the README.

Change-Id: Id44ed8f260c175a2ef460dd5081345e1abd00fee

6 years agoRemove unnecessary Require-Capability specifications 82/1682/1
Miro Richard Eklund [Tue, 3 Apr 2018 11:34:59 +0000 (14:34 +0300)]
Remove unnecessary Require-Capability specifications

Related to changes made in: https://www.simantics.org:8088/r/#/c/1664/

Change-Id: I0d9953f40ab2406dadb67b08a9d22a809779fae7

6 years agoChanged FMIL core and fragments logic to properly find files 64/1664/5
meklund [Thu, 29 Mar 2018 10:53:16 +0000 (13:53 +0300)]
Changed FMIL core and fragments logic to properly find files

Required .dll and .so files on window and linux are found in fragments
.win32, .win64 and .linux64. Added a "Requires-Capability" and
"Provides-Capability" tag to the project's MANIFEST.MF files, which now
correctly resolves the fragments on Linux and Windows.

Also added first build of linux FMI shared object files (still missing
FMUSimulator.so!)

Amend 1: Updated to tycho 1.1.0 build

Amend 2: Added README.md to linux64 FMI Library with build from source
instructions

Change-Id: I5cfd24d1890c73eb4f39effbb7e26a67ef920df9

6 years agoAdded placeholder for FMIL linux64 fragment
Tuukka Lehtonen [Tue, 27 Mar 2018 12:45:16 +0000 (15:45 +0300)]
Added placeholder for FMIL linux64 fragment

It is still missing all the shared libraries.

refs #7832

6 years agoRemoved Simantics DB requirement from FMIL 80/1580/1
Miro Richard Eklund [Thu, 15 Mar 2018 11:29:42 +0000 (13:29 +0200)]
Removed Simantics DB requirement from FMIL

Change-Id: Icc124d075cbc1fcd9d0f16202b695dc2cbb00016

7 years agoFix reference-bug in FMUSimulator simulateStep to update currentTime 16/1316/1 release/1.32.0 release/1.32.0.1 release/1.32.0.2 release/1.32.1 release/1.33.0
jsimomaa [Mon, 11 Dec 2017 14:20:41 +0000 (16:20 +0200)]
Fix reference-bug in FMUSimulator simulateStep to update currentTime

refs #7649

Change-Id: Id1c98fd334a9a633e5ccf676f99bf19b7ba3af75

7 years agoUnpack fmil-plugins to access DLL's at runtime in product 68/1268/1 release/1.31.0 v1.31.0
jsimomaa [Wed, 29 Nov 2017 07:50:13 +0000 (09:50 +0200)]
Unpack fmil-plugins to access DLL's at runtime in product

refs #7649

Change-Id: I8d81baa26b128391d806f2740989823fbb537d5a

7 years agoFixed project name for org.simantics.fmil.repository
Tuukka Lehtonen [Wed, 27 Sep 2017 06:19:10 +0000 (09:19 +0300)]
Fixed project name for org.simantics.fmil.repository

refs #7396

7 years agoUpdate to Tycho 1.0.0 38/1038/1
Tuukka Lehtonen [Tue, 26 Sep 2017 11:37:09 +0000 (14:37 +0300)]
Update to Tycho 1.0.0

refs #7396

Change-Id: Iee1cbafcdf6ab649cde3c98c89c92632dab7f6fe

7 years agoImprovements to FMI-support to support 2.0 FMU's 69/869/2
jsimomaa [Mon, 21 Aug 2017 06:07:34 +0000 (09:07 +0300)]
Improvements to FMI-support to support 2.0 FMU's

refs #7440

Change-Id: I53dc3fc59308d00c3ab6285d33e1bc2d664c0413

7 years agoFix errors from classpaths of FMIL fragments. 06/606/1 release/1.30.0
Tuukka Lehtonen [Tue, 6 Jun 2017 10:01:14 +0000 (13:01 +0300)]
Fix errors from classpaths of FMIL fragments.

Change-Id: I9e0b53116cb429f30632bfce69bca088d9974e1b

7 years agoParametrized build with branch-spec. release/1.26.0 release/1.27.0 release/1.28.0 v1.26.0 v1.27.0 v1.28.0
Tuukka Lehtonen [Tue, 31 Jan 2017 06:40:10 +0000 (08:40 +0200)]
Parametrized build with branch-spec.

-Dbranch-spec=master or release/1.26.0, etc. can
now be used to run the build based on different
versions of the Simantics SDK.

refs #6879

7 years agoAdded project for p2 repository generation from FMIL feature.
Tuukka Lehtonen [Mon, 30 Jan 2017 13:50:48 +0000 (15:50 +0200)]
Added project for p2 repository generation from FMIL feature.

refs #6879

7 years agoRemoved excess source/binary definitions from build.properties.
Tuukka Lehtonen [Mon, 30 Jan 2017 10:59:53 +0000 (12:59 +0200)]
Removed excess source/binary definitions from build.properties.

refs #6879

8 years agoUpgrade to Tycho 0.25.0 in FMI Studio.
lehtonen [Wed, 7 Sep 2016 21:32:32 +0000 (21:32 +0000)]
Upgrade to Tycho 0.25.0 in FMI Studio.

refs #6621

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@33180 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agorefs #6283
jsimomaa [Tue, 5 Apr 2016 08:13:33 +0000 (08:13 +0000)]
refs #6283

Updating FMUSimulator.dll's to point to right package name as org.simantics.fmil was renamed to org.simantics.fmil.core

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@32641 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agorefs #6283
jsimomaa [Tue, 5 Apr 2016 07:44:43 +0000 (07:44 +0000)]
refs #6283

Updating FMUSimulator.dll's to point to right package name as org.simantics.fmil was renamed to org.simantics.fmil.core

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@32640 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoRenamed org.simantics.fmil to org.simantics.fmil.core to prevent having bundles and...
lehtonen [Fri, 1 Apr 2016 07:25:11 +0000 (07:25 +0000)]
Renamed org.simantics.fmil to org.simantics.fmil.core to prevent having bundles and features with same ID.

refs #6283

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@32635 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoMavenized FMIL projects.
lehtonen [Fri, 1 Apr 2016 07:24:20 +0000 (07:24 +0000)]
Mavenized FMIL projects.
Renamed org.simantics.fmil to org.simantics.fmil.core to not have a bundle and a feature with the same ID.

refs #6283

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@32634 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoShare project "org.simantics.fmil.parent" into "https://www.simantics.org/svn/simantics"
lehtonen [Fri, 1 Apr 2016 07:17:35 +0000 (07:17 +0000)]
Share project "org.simantics.fmil.parent" into "https://www.simantics.org/svn/simantics"

refs #6283

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@32633 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoShare project "org.simantics.fmil.parent" into "https://www.simantics.org/svn/simantics"
lehtonen [Fri, 1 Apr 2016 07:17:08 +0000 (07:17 +0000)]
Share project "org.simantics.fmil.parent" into "https://www.simantics.org/svn/simantics"

refs #6283

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@32632 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agorefs #6290 Fixed some build stuff for update site deployment
villberg [Wed, 30 Mar 2016 10:35:27 +0000 (10:35 +0000)]
refs #6290 Fixed some build stuff for update site deployment

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@32619 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agorefs #6290
jsimomaa [Thu, 24 Mar 2016 09:23:47 +0000 (09:23 +0000)]
refs #6290

Compiled 64-bit FMI Library and necessary changes

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@32613 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agorefs #6290
jsimomaa [Thu, 24 Mar 2016 09:17:00 +0000 (09:17 +0000)]
refs #6290

Compiled 64-bit FMI Library

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@32612 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agorefs #6290
jsimomaa [Thu, 24 Mar 2016 09:16:37 +0000 (09:16 +0000)]
refs #6290

Share project "org.simantics.fmil.win64" into "https://www.simantics.org/svn/simantics"

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@32611 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years ago(refs #6290) Release DLLs
villberg [Mon, 1 Feb 2016 03:20:31 +0000 (03:20 +0000)]
(refs #6290) Release DLLs
The native fragment needs to be unpacked

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@32340 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years ago(refs #6290) Added functions
villberg [Sun, 31 Jan 2016 20:59:10 +0000 (20:59 +0000)]
(refs #6290) Added functions

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@32339 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years ago(refs #6290) Import initial FMI Studio codebase
villberg [Thu, 28 Jan 2016 06:36:15 +0000 (06:36 +0000)]
(refs #6290) Import initial FMI Studio codebase
More ontology for variables. Type, description, variability, causality

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@32331 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoFixed required environment to JavaSE-1.8 because compilation settings already require it.
lehtonen [Wed, 27 Jan 2016 16:07:19 +0000 (16:07 +0000)]
Fixed required environment to JavaSE-1.8 because compilation settings already require it.

refs #6283

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@32325 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoMoved org.simantics.fmil.feature to its right place.
lehtonen [Wed, 27 Jan 2016 15:11:49 +0000 (15:11 +0000)]
Moved org.simantics.fmil.feature to its right place.

refs #6283

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@32324 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years ago(refs #6290) Release DLLs
villberg [Tue, 26 Jan 2016 13:28:57 +0000 (13:28 +0000)]
(refs #6290) Release DLLs

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@32313 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years ago(refs #6283) Introduce FMI interface library
villberg [Tue, 26 Jan 2016 08:51:16 +0000 (08:51 +0000)]
(refs #6283) Introduce FMI interface library
Initial version

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@32306 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years ago(refs #6283) Introduce FMI interface library
villberg [Tue, 26 Jan 2016 08:51:07 +0000 (08:51 +0000)]
(refs #6283) Introduce FMI interface library
Initial version

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@32305 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years ago(refs #6283) Introduce FMI interface library
villberg [Tue, 26 Jan 2016 08:48:43 +0000 (08:48 +0000)]
(refs #6283) Introduce FMI interface library
Initial version

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@32304 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years ago(refs #6283) Introduce FMI interface library
villberg [Tue, 26 Jan 2016 08:48:20 +0000 (08:48 +0000)]
(refs #6283) Introduce FMI interface library
Share project "org.simantics.fmil" into "https://www.simantics.org/svn/simantics"

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@32303 ac1ea38d-2e2b-0410-8846-a27921b304fc

8 years agoProject location for FMI interface library.
lehtonen [Tue, 26 Jan 2016 08:26:44 +0000 (08:26 +0000)]
Project location for FMI interface library.

refs #6283

git-svn-id: https://www.simantics.org/svn/simantics/fmi/trunk@32302 ac1ea38d-2e2b-0410-8846-a27921b304fc