diff --git a/docs/5___ssd.adoc b/docs/5___ssd.adoc
index e5a85b1..4cb3402 100644
--- a/docs/5___ssd.adoc
+++ b/docs/5___ssd.adoc
@@ -27,7 +27,7 @@ The following XML child elements are specified for the SystemStructureDescriptio
|System |This required element specifies the root system of the model, see section 5.3.
|Enumerations |This optional element *MUST* contain definitions for all enumerations referenced in the system description file. See section 4.4.1 for its definition.
|Units |This optional element *MUST* contain definitions for all units referenced in the system description file. See section 4.4.2 for its definition.
-|DefaultExperiment |This optional element *MAY* contain information of a default simulation setup that is supplied with the system definition for informational purposes, see description below.
+|DefaultExperiment |This optional repeatable element *MAY* provide information of one or more default simulation setups that are supplied with the system definition for informational purposes, see description below.
|===
The root system of the model is specified through the required System element, see section 5.3.
@@ -40,8 +40,9 @@ image:images/image24.png[image,width=449,height=248]
This element contains information of a default simulation setup that is supplied with the system definition for informational purposes.
-{empty}[ _Note that in contrast to FMI 2.0 only start and stop time are specified here, since values like step size or tolerance depend on the specific solver or master algorithms employed and are hence not specified in this global element.
-Additional solver or master algorithm specific information can be supplied through the annotation mechanism, or using a future layered standard._ ]
+Besides the setup information itself, the element can also specify stimuli and reference time-series data bindings, that can be used to provide reference results for basic validity checking.
+
+Note that the simulation setup only provides for very basic simulation settings and does not support specifying advanced solver or co-simulation setups.
{empty}[ _The handling of systems comprising components with differing units for the independent variable depends on the implementation.
It should be noted that since FMI 2.0 the unit of the independent variable for FMUs is clearly specified: It defaults to seconds, however other units can be specified by explicitly defining the independent variable.
@@ -52,6 +53,8 @@ This standard does not specify additional measures to deal with differing indepe
|Attribute |Description
|startTime |This optional attribute gives the start time of the simulation.
|stopTime |This optional attribute gives the stop time of the simulation.
+|stepSize |This optional attribute gives a suggested fixed step size for the simulation.
+|tolerance |This optional attribute gives a suggested tolerance for the simulation.
|===
=== Common Model Element Type
diff --git a/schema/SystemStructureDescription.xsd b/schema/SystemStructureDescription.xsd
index 2e257c3..faedd0b 100644
--- a/schema/SystemStructureDescription.xsd
+++ b/schema/SystemStructureDescription.xsd
@@ -50,7 +50,7 @@
-
+
@@ -941,8 +941,11 @@
+
+
+
Default start time of simulation
@@ -951,7 +954,146 @@
Default stop time of simulation
-
+
+
+
+ Default tolerance of simulation
+
+
+
+
+ Default step size of simulation
+
+
+
+
+
+
+
+
+
+ This provides time series data for the overall system, either as a source of
+ stimuli, or as a source of reference outputs.
+
+
+
+
+
+
+
+ This optional element can be used to provide time series values inline
+ to the time series binding, in which case the source attribute of the
+ binding element must be empty.
+
+ The contents must be CSV according to the rules set out in XXX, if the
+ type attribute of the binding element is text/csv, or any other valid
+ mixed XML content if the type attribute references another MIME type
+ (in that case there should be a layered specification that defines how
+ embedding the content works for that MIME type).
+
+
+
+
+
+
+
+
+
+
+
+ This element provides an optional time series mapping, which specifies how
+ the variable names and values provided in the time series source are to be
+ mapped to the input/output connectors of the system in question. If no
+ mapping is supplied, the variables names of the time series source are used
+ as is for name matching against the names of connectors in the system and
+ the values of the time series source are not transformed further before
+ being applied.
+
+ The contents of the element can be used to provide a time series mapping
+ inline, in which case the source attribute of the TimeSeriesMapping element
+ must be empty.
+
+ The contents must be an ssm:ParameterMapping element, if the type attribute
+ of this element is application/x-ssp-parameter-mapping, or any other valid
+ XML content if the type attribute references another MIME type (in that case
+ there should be a layered specification that defines how embedding the content
+ works for that MIME type).
+
+
+
+
+
+
+
+
+
+
+
+
+ This attribute indicates the source of the time series mapping as a URI
+ (cf. RFC 3986). For purposes of the resolution of relative URIs
+ the base URI is the URI of the SSD.
+
+ If the source attribute is missing, the time series mapping is provided
+ inline as contents of the TimeSeriesMapping element, which must be
+ empty otherwise.
+
+
+
+
+
+
+
+
+
+
+
+ This attribute specifies the MIME type of the time series data source, which
+ defaults to text/csv to indicate the CSV file format as specified in XXX.
+ No further types are currently defined, but can of course be added at a later
+ date, e.g. for pre-existing time series file formats, like HDF5, MDF, etc.
+
+
+
+
+
+
+ This attribute indicates the source of the time series data as a URI
+ (cf. RFC 3986). For purposes of the resolution of relative URIs
+ the base URI is the URI of the SSD.
+
+ If the source attribute is missing, the time series data is provided
+ inline as contents of a TimeSeriesValues element, which must not be
+ present otherwise.
+
+
+
+
+
+
+ Defines the optional prefix for name resolution and mapping purposes
+ for this binding. If this attribute is empty or not supplied no
+ prefix is used for name resolution and mapping, otherwise the specified
+ prefix is prepended to all names in the time series source prior to
+ processing the normal name resolution or name mapping rules.
+
+
+
+
+
+
diff --git a/schema/SystemStructureDescription11.xsd b/schema/SystemStructureDescription11.xsd
index 11ab537..b21b0be 100644
--- a/schema/SystemStructureDescription11.xsd
+++ b/schema/SystemStructureDescription11.xsd
@@ -59,7 +59,7 @@
-
+
@@ -914,8 +914,11 @@
+
+
+
Default start time of simulation
@@ -924,7 +927,134 @@
Default stop time of simulation
-
+
+
+
+
+ Default tolerance of simulation
+
+
+
+ Default step size of simulation
+
+
+
+
+
+
+
+
+
+ This provides time series data for the overall system, either as a source of
+ stimuli, or as a source of reference outputs.
+
+
+
+
+
+
+
+ This optional element can be used to provide time series values inline
+ to the time series binding, in which case the source attribute of the
+ binding element must be empty.
+
+ The contents must be CSV according to the rules set out in XXX, if the
+ type attribute of the binding element is text/csv, or any other valid
+ mixed XML content if the type attribute references another MIME type
+ (in that case there should be a layered specification that defines how
+ embedding the content works for that MIME type).
+
+
+
+
+
+
+
+
+
+
+
+ This element provides an optional time series mapping, which specifies how
+ the variable names and values provided in the time series source are to be
+ mapped to the input/output connectors of the system in question. If no
+ mapping is supplied, the variables names of the time series source are used
+ as is for name matching against the names of connectors in the system and
+ the values of the time series source are not transformed further before
+ being applied.
+
+ The contents of the element can be used to provide a time series mapping
+ inline, in which case the source attribute of the TimeSeriesMapping element
+ must be empty.
+
+ The contents must be an ssm:ParameterMapping element, if the type attribute
+ of this element is application/x-ssp-parameter-mapping, or any other valid
+ XML content if the type attribute references another MIME type (in that case
+ there should be a layered specification that defines how embedding the content
+ works for that MIME type).
+
+
+
+
+
+
+
+
+
+
+
+
+ This attribute indicates the source of the time series mapping as a URI
+ (cf. RFC 3986). For purposes of the resolution of relative URIs
+ the base URI is the URI of the SSD.
+
+ If the source attribute is missing, the time series mapping is provided
+ inline as contents of the TimeSeriesMapping element, which must be
+ empty otherwise.
+
+
+
+
+
+
+
+
+
+
+
+ This attribute specifies the MIME type of the time series data source, which
+ defaults to text/csv to indicate the CSV file format as specified in XXX.
+ No further types are currently defined, but can of course be added at a later
+ date, e.g. for pre-existing time series file formats, like HDF5, MDF, etc.
+
+
+
+
+
+
+ This attribute indicates the source of the time series data as a URI
+ (cf. RFC 3986). For purposes of the resolution of relative URIs
+ the base URI is the URI of the SSD.
+
+ If the source attribute is missing, the time series data is provided
+ inline as contents of a TimeSeriesValues element, which must not be
+ present otherwise.
+
+
+
+
+
+
+ Defines the optional prefix for name resolution and mapping purposes
+ for this binding. If this attribute is empty or not supplied no
+ prefix is used for name resolution and mapping, otherwise the specified
+ prefix is prepended to all names in the time series source prior to
+ processing the normal name resolution or name mapping rules.
+
+
+
+
+
+