Skip to content

Commit 2aea97d

Browse files
author
ljamt
committed
Merge remote-tracking branch 'origin/master' into 62-osp-validator-and-ospis
# Conflicts: # cosim-cli.md # downloads.md # kopl.md
2 parents 710b07d + 514cd58 commit 2aea97d

23 files changed

+56
-58
lines changed

assets/img/HouseFig3.png

106 KB
Loading

assets/img/QuarterTruckFig6.png

25.3 KB
Loading

assets/img/UserguideFig11.png

21 KB
Loading

assets/img/UserguideFig2.png

3.19 KB
Loading

assets/img/UserguideFig3.png

-1.56 MB
Loading

assets/img/UserguideFig4.png

-1.81 MB
Loading

assets/img/UserguideFig5.png

-1.63 MB
Loading

assets/img/UserguideFig6.png

-2.03 MB
Loading

assets/img/UserguideFig9.png

-2.26 MB
Loading

cosim-cli.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
layout: default
3-
title: "cosim"
3+
title: "Command line interface"
44
permalink: /cosim
55
has_toc: false
66
nav_order: 2
@@ -13,8 +13,8 @@ nav_order: 2
1313
</b>
1414
</div>
1515

16-
# cosim
17-
`cosim` is a command-line interface (CLI) to libcosim for the cases where a graphical user interface is not available or needed. It facilitates for running co-simulations of systems configured with SSP or [OSP system structure configuration](./libcosim/configuration).
16+
# Command line interface
17+
`cosim` is a command line interface (CLI) to libcosim for the cases where a graphical user interface is not available or needed. It facilitates for running co-simulations of systems configured with SSP or [OSP system structure configuration](./libcosim/configuration).
1818
It has three primary use cases:
1919

2020
- Running simulations from other programs or scripts

cosim-demo-app/House.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ This demo case simulates the temperature deviations of a house which consists of
1414
## Model Description
1515
A simplified model represents the heat exchange dynamics of a house as shown in Figure 1.
1616

17-
![foo](/assets/img/HouseFig1.png "Fig.1 A simplified house model")
17+
[![foo](/assets/img/HouseFig1.png "Fig.1 A simplified house model")](/assets/img/HouseFig1.png)
1818

1919
**Table 1:** *List of FMUs of the house configuration and their input/output variables for connection.*
2020

@@ -42,6 +42,6 @@ A simplified model represents the heat exchange dynamics of a house as shown in
4242

4343
Figure 2 shows the simulation results of the temperature of each room over time.
4444

45-
[![A diagram that ...](/assets/img/HouseFig3.png " Fig.2 Simulation results of Room1 and Room2 temperature")](/assets/img/HouseFig3.png)
45+
[![foo](/assets/img/HouseFig3.png " Fig.2 Simulation results of Room1 and Room2 temperature")](/assets/img/HouseFig3.png)
4646

4747
More information on how to use the _cosim demo app_ is available in the [user guide](./user-guide), where the [DP-Ship](./DPShip) demo test case was used as an example.

cosim-demo-app/Quarter-Truck.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ permalink: /cosim-demo-app/Quarter-Truck
1414
This example describes a low-level test case for the performance of libcosim in terms of accuracy and efficiency [1].
1515
Figure 1 shows a simplified model of a quarter truck with two masses mWheel and mChassis representing the mass of wheel and chassis respectively. Both masses have a single vertical degree of freedom coupled by a linear spring-damper system representing the suspension force and tire force. The ground profile is given as external input.
1616

17-
![foo](/assets/img/QuarterTruckFig1.png "Fig.1 A simplified quarter truck model.")
17+
[![foo](/assets/img/QuarterTruckFig1.png "Fig.1 A simplified quarter truck model.")](/assets/img/QuarterTruckFig1.png)
1818

1919
## Model Description
2020

@@ -46,7 +46,7 @@ The local default parameters used in the model are listed in Table 2.
4646
The following scenario is performed as example: The system starts from equilibrium state where `zWheel = zChassis = 0`. The ground profile is defined as a step function excited by a jump of 0.1m in vertical direction at 1s.
4747
Figure 2 below shows the simulation results using the *cosim demo app*. In the plot the vertical displacements of the wheel and the chassis are displayed.
4848

49-
[![A diagram that ...](/assets/img/QuarterTruckFig6.png "Fig.2 Displacement of the wheel and chassis.")](/assets/img/QuarterTruckFig6.png)
49+
[![foo](/assets/img/QuarterTruckFig6.png "Fig.2 Displacement of the wheel and chassis.")](/assets/img/QuarterTruckFig6.png)
5050

5151
More information on how to use the _cosim demo app_ is available in the [user guide](./user-guide), where the [DP-Ship](./DPShip) demo test case was used as an example.
5252

cosim-demo-app/cosim-demo-app.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
layout: default
3-
title: "cosim demo app"
3+
title: "Demo application"
44
has_children: true
55
permalink: /cosim-demo-app/cosim-demo-app
66
has_toc: false
@@ -14,9 +14,9 @@ nav_order: 3
1414
</b>
1515
</div>
1616

17-
# cosim demo app
17+
# Demo application
1818

19-
Load a configuration, control the simulation or explore in a easy way some of the features included in libcosim. The demo application was developed to showcase how the library can be used in an application and to provide a graphical user interface to manage co-simulations.
19+
Load a configuration, control the simulation or explore in a easy way some of the features included in `libcosim`. The `cosim demo app` was developed to showcase how the library can be used in an application and to provide a graphical user interface to manage co-simulations.
2020

2121
There are options for real time execution or simulation in free mode (as fast as the hardware allows). During simulation, the user can observe simulation variables, manipulate these and visualise the results in charts.
2222
A scenario management feature allows change of the simulation variables automatically based on a scenario file. It is also possible to log to file the simulation variable values of all models.

cosim-demo-app/user-guide.md

+23-21
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ layout: default
33
title: "User guide"
44
permalink: /cosim-demo-app/user-guide
55
has_toc: false
6-
parent: "cosim demo app"
6+
parent: "Demo application"
77
---
88

99
# User guide
@@ -29,17 +29,17 @@ Features covered in this user guide:
2929

3030
1. [Download](https://github.com/open-simulation-platform/cosim-demo-app/releases) the _cosim demo app_.
3131
2. Extract the files and you will have a root folder looking like the figure below
32-
3. [Download](https://github.com/open-simulation-platform/cse-demos/releases) the _dp-ship_ demo case.
32+
3. [Download](https://github.com/open-simulation-platform/demo-cases/releases) the _dp-ship_ demo case.
3333
4. Extract the demo configuration
3434
5. Run the startup script: run-windows.cmd
3535
6. The application should open in your web browser at url http://localhost:8000.
36-
![foo](/assets/img/UserguideFig1.png "Root folder and extracted files")
36+
[![foo](/assets/img/UserguideFig1.png "Root folder and extracted files")](/assets/img/UserguideFig1.png)
3737

3838
**Linux:**
3939

4040
1. [Download](https://github.com/open-simulation-platform/cosim-demo-app/releases) the _cosim demo app_.
4141
2. Extract archive: tar -xzvf cosim-demo-app-vX.Y.Z.tar.gz
42-
3. [Download](https://github.com/open-simulation-platform/cse-demos/releases) the _dp-ship_ demo case.
42+
3. [Download](https://github.com/open-simulation-platform/demo-cases/releases) the _dp-ship_ demo case.
4343
4. Extract the demo configuration
4444
5. Run startup script: run-linux
4545
6. The application should open in your web browser at url http://localhost:8000.
@@ -54,12 +54,12 @@ Features covered in this user guide:
5454
4. Previously used configurations are available below.
5555
5. Click "Load simulation" to load the configuration.
5656

57-
![foo](/assets/img/UserguideFig2.png "Load a configuration")
57+
[![foo](/assets/img/UserguideFig2.png "Load a configuration")](/assets/img/UserguideFig2.png)
5858

5959
A typical configuration folder will contain simulation models (FMUs) and configuration files.
60-
Connections between models and initialization values are configured through the files "OspSystemStructure.xml" or "SystemStructure.ssd".
61-
If your configuration directory contains both ("OspSystemStructure.xml" and a "SystemStructure.ssd"), the .xml file will be prioritized.
62-
If you would like to load your simulation with the connections as defined on the "SystemStructure.ssd" file, include it in the path (Example: C:\cosim-demos\dp-ship\SystemStructure.ssd)
60+
Connections between models and initialization values are configured through the files `OspSystemStructure.xml` or `SystemStructure.ssd`.
61+
If your configuration directory contains both (`OspSystemStructure.xml` and a `SystemStructure.ssd`), the .xml file will be prioritized.
62+
If you would like to load your simulation with the connections as defined on the `SystemStructure.ssd` file, include it in the path (Example: C:\cosim-demos\dp-ship\SystemStructure.ssd)
6363

6464
[back to top](./user-guide#user-guide)
6565

@@ -68,7 +68,7 @@ If you would like to load your simulation with the connections as defined on the
6868
1. After loading the configuration, the simulation models are shown on the left hand side.
6969
2. Browse the model variables by clicking the names. Their variables are organized in tabs based on causality.
7070

71-
![foo](/assets/img/UserguideFig3.png "Navigating through simulation models and variables")
71+
[![foo](/assets/img/UserguideFig3.png "Navigating through simulation models and variables")](/assets/img/UserguideFig3.png)
7272

7373
[back to top](./user-guide#user-guide)
7474

@@ -80,21 +80,23 @@ as the hardware allows).
8080
3. At the navigation bar, the RTF (Real Time Factor) indicates the current simulation speed related to real time. For instance, a RTF = 2 means that simulation runs at twice the speed of real time.
8181
4. Real time factor target value can be altered to set a specific RTF.
8282
5. At the navigation bar, click on "Play/Pause" to start or pause the simulation.
83-
6. To close the current simulation and to load another configuration, click the "Tear down" button. Note that the current simulation needs to be paused in order to enable this button.
83+
6. At the navigation bar, click on "Reset" to stop a simulation and initialize it again.
84+
7. To close the current simulation and to load another configuration, click the "Tear down" button. Note that the current simulation needs to be paused in order to enable this button.
8485

85-
![foo](/assets/img/UserguideFig4.png "Control the simulation")
86+
[![foo](/assets/img/UserguideFig4.png "Control the simulation")](/assets/img/UserguideFig4.png)
8687

8788
[back to top](./user-guide#user-guide)
8889

8990
## Plot variables
9091
*Note: Each item below is highlighted in the figures below with its corresponding number.*
91-
1. Click "Create new time series" or "Create new XY plot" to obtain a time series plot or an XY plot that variables can be added to.
92-
2. Any variable can be added to a plot by clicking "Add to plot" in the variable overview.
93-
3. Select where to plot the variable from the list of available plots.
94-
4. Click the plot name to see the chart.
92+
1. Click "+ XY plot" or "+ Time series" to create a new XY plot or a new time series plot, respectively. The plots are initially empty. Navigate to a simulation model and add variables to a plot.
93+
2. Click "Save plot config" to save to file the current plot configuration. Next time the configuration is loaded the saved plots will be automatically loaded.
94+
3. Any variable can be added to a plot by clicking "Add to plot" in the variable overview.
95+
4. Select where to plot the variable from the list of available plots.
96+
5. Click the plot name to see the chart.
9597

96-
![foo](/assets/img/UserguideFig5.png "Adding variables to a plot")
97-
![foo](/assets/img/UserguideFig6.png "Plot view")
98+
[![foo](/assets/img/UserguideFig5.png "Adding variables to a plot")](/assets/img/UserguideFig5.png)
99+
[![foo](/assets/img/UserguideFig6.png "Plot view")](/assets/img/UserguideFig6.png)
98100

99101
### Configurable Plot
100102
Two types of plot are supported by the _cosim demo app_: **trend** and **scatter**. The type trend (above defined as "time series") shows the curve of a variable over time, while the type scatter (above defined as "XY plot") shows the relation between two variables, of one versus the other.
@@ -145,7 +147,7 @@ It is possible to override any variable value.
145147
2. Type in the value and click the check icon to confirm the new value.
146148
3. Click the eraser symbol to remove the override.
147149

148-
![foo](/assets/img/UserguideFig7.png "Override variable values")
150+
[![foo](/assets/img/UserguideFig7.png "Override variable values")](/assets/img/UserguideFig7.png)
149151

150152
[back to top](./user-guide#user-guide)
151153

@@ -159,7 +161,7 @@ The scenario management allows to automatically change the value of variables at
159161
3. To execute a scenario click on "Load scenario". The scenario will run and the variable values will be modified according the event list.
160162

161163
See more details on [libcosim](../libcosim/scenario)
162-
![foo](/assets/img/UserguideFig9.png "Scenario view")
164+
[![foo](/assets/img/UserguideFig9.png "Scenario view")](/assets/img/UserguideFig9.png)
163165

164166
[back to top](./user-guide#user-guide)
165167

@@ -235,7 +237,7 @@ There are three different ways to specify the FMU source to be loaded by the fmu
235237
Replace localhost and 9090 with the actual host name and port of the server you want to connect to.
236238

237239
The _cosim demo app_ distribution comes with a bundled startup script (*run-fmuproxy.cmd*), as seen in the image below.
238-
![foo](/assets/img/UserguideFig1.png "Root folder files")
240+
[![foo](/assets/img/UserguideFig1.png "Root folder files")](/assets/img/UserguideFig1.png)
239241

240242
Use the bundled startup script or start the server executable fmu-proxy.jar from a command line:
241243
```bash
@@ -254,6 +256,6 @@ Steps to run the _cosim demo app_ with fmu-proxy:
254256

255257
The image below shows the models loaded in the _cosim demo app_ after they were loaded by the fmu-proxy server.
256258

257-
![foo](/assets/img/UserguideFig11.png "Simulation models loaded through fmu-proxy")
259+
[![foo](/assets/img/UserguideFig11.png "Simulation models loaded through fmu-proxy")](/assets/img/UserguideFig11.png)
258260

259261
[back to top](./user-guide#user-guide)

cosim4j.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
layout: default
3-
title: "java wrapper"
3+
title: "Java wrapper"
44
permalink: /cosim4j
55
has_toc: false
66
nav_order: 4
@@ -12,12 +12,12 @@ nav_order: 4
1212
</b>
1313
</div>
1414

15-
# Java Wrapper
16-
The Java wrapper - _cosim4j_ - enables Java applications to make use of _libcosim_.
17-
It uses the Java Native Interface (JNI) to efficiently interact with _libcosim_.
15+
# Java wrapper
16+
The Java wrapper `cosim4j` enables Java applications to make use of `libcosim`.
17+
It uses the Java Native Interface (JNI) to efficiently interact with `libcosim`.
1818
To make it accessible, all native dependencies for Linux and Windows have been pre-built and are bundled with the library.
1919

20-
A highly convenient and powerful feature found in _cosim4j_
20+
A highly convenient and powerful feature found in `cosim4j`
2121
is the ability to write inline FMI 2.0 compatible models
2222
using Java, i.e., models can be written as regular Java
2323
code that can be added directly to the simulation without first

demo-cases.md

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
layout: default
3-
title: "Demo Cases"
3+
title: "Example configurations"
44
has_children: true
55
permalink: /demo-cases
66
nav_order: 5
@@ -13,12 +13,8 @@ has_toc: false
1313
</b>
1414
</div>
1515

16-
# Demo Cases
17-
16+
# Example configurations
17+
Demonstration cases including simulation models and configuration with OSP-IS and SSP:
1818
- [DPShip](./cosim-demo-app/DPShip)
1919
- [Quarter-Truck](./cosim-demo-app/Quarter-Truck)
20-
- [House](./cosim-demo-app/House)
21-
22-
23-
## Demo simulation models
24-
The above demo models can be downloaded from [here](https://github.com/open-simulation-platform/cse-demos).
20+
- [House](./cosim-demo-app/House)

downloads.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ You can use this page to download:
1414
- [cosim (command line interface)](https://github.com/open-simulation-platform/cse-cli/releases)
1515
- [cosim demo app](https://github.com/open-simulation-platform/cosim-demo-app/releases)
1616
- [cosim4j (java wrapper)](https://github.com/open-simulation-platform/cosim4j/releases)
17-
- [demo simulation models](https://github.com/open-simulation-platform/cse-demos/releases)
17+
- [demo simulation models](https://github.com/open-simulation-platform/demo-cases/releases)
1818
- [OSP validator](https://github.com/open-simulation-platform/osp-validator/releases)
1919
- [kopl - windows](https://mooropt2.marintek.sintef.no/nexus/content/repositories/thirdparty/no/sintef/ocean/kopl/kopl/1.0.0/kopl-1.0.0-win32.x86_64.zip)
2020
- [kopl - linux (experimental)](https://mooropt2.marintek.sintef.no/nexus/content/repositories/thirdparty/no/sintef/ocean/kopl/kopl/1.0.0/kopl-1.0.0-linux.gtk.x86_64.zip)

kopl.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
22
layout: default
3-
title: "Kopl configurator"
3+
title: "Configuration tool"
44
permalink: /kopl
55
has_toc: false
66
nav_order: 7
77
---
88

9-
# Kopl configurator
10-
Kopl is a configurator to help set up and run a simulation. It can also be used to validate the model using the [OSP validator](./osp-validator).
11-
Kopl is not an open source software but can be freely used without any restrictions.
9+
# Configuration tool
10+
`Kopl` is a configurator to help set up and run a simulation. It can also be used to validate the model using the [OSP validator](./osp-validator).
11+
`Kopl` is not an open source software but can be freely used without any restrictions.
1212

1313
<figure>
1414
<img src="/assets/img/Kopl.png">
@@ -22,8 +22,8 @@ Kopl is not an open source software but can be freely used without any restricti
2222

2323
# How to get started
2424

25-
* Get the appropriate version of Kopl [here](./downloads).
26-
* Unzip somewhere on disk and double click the kopl executable
25+
* Get the appropriate version of `Kopl` [here](./downloads).
26+
* Unzip somewhere on disk and double click the `Kopl` executable
2727
* Choose a location for the workspace (working folder) or just hit OK to use the default workspace
2828
* Right click the navigator area to create a new CoSimulation Task. Give it a name or leave the default
2929
* Create a new configuration which represents a simulation. Right click -> New configuration.
@@ -49,7 +49,7 @@ Just start dragging from an output or input slot and drop when hovering over the
4949

5050
<figure>
5151
<img src="/assets/img/Kopl-variablegroups.png">
52-
<figcaption>Definition of nested variable groups </figcaption>
52+
<figcaption class="caption" >Definition of nested variable groups</figcaption>
5353
</figure>
5454

5555
# OSP-IS validation

libcosim/configuration.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ layout: default
33
title: "Simulation configuration"
44
permalink: /libcosim/configuration
55
has_toc: false
6-
parent: "libcosim"
6+
parent: "Co-simulation C/C++ libraries"
77
nav_order: 1
88
---
99
# Simulation configuration

libcosim/fmuproxy.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ layout: default
33
title: "Distributed co-simulation"
44
permalink: /libcosim/fmuproxy
55
has_toc: false
6-
parent: "libcosim"
6+
parent: "Co-simulation C/C++ libraries"
77
nav_order: 4
88
---
99
# Distributed co-simulation

libcosim/libcosim.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
layout: default
3-
title: "libcosim"
3+
title: "Co-simulation C/C++ libraries"
44
permalink: /libcosim
55
has_children: true
66
has_toc: false
@@ -16,7 +16,7 @@ nav_order: 1
1616
</b>
1717
</div>
1818

19-
# libcosim
19+
# OSP co-simulation C/C++ libraries
2020
The OSP co-simulation C/C++ libraries that orchestrates the co-simulation of models that conform to the Functional Mock-up Interface (FMI).
2121
`libcosim` is the C++ API and `libcosimc` is a C wrapper for a subset of `libcosim`.
2222

libcosim/logging.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ layout: default
33
title: "Results logging"
44
permalink: /libcosim/logging
55
has_toc: false
6-
parent: "libcosim"
6+
parent: "Co-simulation C/C++ libraries"
77
nav_order: 3
88
---
99
# Results logging

libcosim/scenario.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ layout: default
33
title: "Scenario"
44
permalink: /libcosim/scenario
55
has_toc: false
6-
parent: "libcosim"
6+
parent: "Co-simulation C/C++ libraries"
77
nav_order: 2
88
---
99
# Scenario

0 commit comments

Comments
 (0)