Let <EventIndicator> inherit from fmi3Unknown

docs/2_2_common_mechanisms.adoc

@@ -1043,10 +1043,13 @@ where
 ** <<StepMode>> (Co-Simulation): The variables listed as elements <<Output>> of `<ModelStructure>` with a floating point type and <<variability>> = <<continuous>> or <<discrete>>.
 Each continuous state derivative variable listed as elements <<ContinuousStateDerivative>> in `<ModelStructure>`, if present.
 
-* latexmath:[\mathbf{v}_{\mathit{known}}] is the vector of <<input>> variables of function *f* which can be changed by the importer in the current state.
+* latexmath:[\mathbf{v}_{\mathit{known}}] is the vector of <<input>> variables of function latexmath:[\mathbf{f}] which can be changed by the importer in the current state.
 Details about which variables are in latexmath:[\mathbf{v}_{\mathit{known}}] are given in the description of element <<dependencies>> in <<ModelStructure>>.
 
-* latexmath:[{\mathbf{v}_{\mathit{rest}}}] is the set of <<input>> variables and discrete-time states of function *f* which cannot be set by the importer in the current state, but in other states _[for example, discrete-time <<input,`inputs`>> in <<ContinuousTimeMode>>]_.
+* latexmath:[{\mathbf{v}_{\mathit{rest}}}] is the set of <<input>> variables and discrete-time states of function latexmath:[\mathbf{f}] which cannot be set by the importer in the current state, but in other states _[for example, discrete-time <<input,`inputs`>> in <<ContinuousTimeMode>>]_.
+
+* <<EventIndicator,`EventIndicators`>> must not be included among latexmath:[\mathbf{v}_{\mathit{unknonwn}}].
+_[This is intentional as their dependencies listed in `<ModelStructure>` are intended for debugging purposes and not for partial derivatives.]_
 
 _[The variable relationships are different in different states._
 _For example, during <<ContinuousTimeMode>>, the partial derivate of a continuous-time output *y* with respect to discrete-time <<input,`inputs`>> is undefined, because discrete-time <<input,`inputs`>> cannot be set between events.]_

docs/2_3_common_states.adoc

@@ -270,6 +270,7 @@ This function can only be called in Model Exchange.
 * Argument `nEventIndicators` points to the `size_t` variable that will receive the number of event indicators.
 
 +
+The initial value of `nEventIndicators` is the sum of the sizes of the variables referenced by the <<EventIndicator>> elements.
 The number of <<state-event,event indicators>> might change if a variable related to <<state-event,event indicators>> has a `<Dimension>` that references a <<structuralParameter,`structural parameter`>>  (see <<ConfigurationMode>> and <<ReconfigurationMode>>).
 <<fmi3GetNumberOfEventIndicators>> must be called after such <<structuralParameter,`structural parameters`>> changed.
 As long as no <<structuralParameter,`structural parameters`>> changed, the number of event indicators is given in the <<modelDescription.xml>>, alleviating the need to call this function.

docs/2_4_common_schema.adoc

@@ -1728,6 +1728,8 @@ latexmath:[{\mathbf{v}_{\mathit{initialUnknowns}} := \mathbf{f}_{\mathit{init}}(
 
 Since, <<output,`outputs`>>, continuous-time <<state,`states`>> and state derivatives are either present as knowns (if <<initial>> = <<exact>>) or as unknowns (if <<initial>> = <<approx>> or <<calculated>>), they can be inquired with <<get-and-set-variable-values,`fmi3Get{VariableType}`>> in <<InitializationMode>>.
 
+<<EventIndicator,`EventIndicators`>> are available during <<InitializationMode>>, however their dependencies are intended for debugging purposes only (and not for connection with other FMU's), and therefore they must not be listed as <<InitialUnknown>>.
+
 _[Example: Assume an FMU is defined in the following way:_
 
 latexmath:[{(\mathbf{y}_{c+d}, \dot{\mathbf{x}}_c) := \mathbf{f}_{\mathit{init}}(\mathbf{x}_c, \mathbf{u}_{c+d}, t_0, \mathbf{p})}] +
@@ -1740,12 +1742,15 @@ _The environment can still initialize this FMU in steady-state, by using latexma
 |`EventIndicator`
 |
 [[EventIndicator,`<EventIndicator>`]]
-Ordered list of all event indicators, in other words, a list of value references where every corresponding variable must be an event indicator.
-_[Note that only <<continuous>> floating point variables are listed here._
-_If an event indicator shall not be exposed from the FMU, or if event indicators are not statically associated with a variable (due to dynamic event indicator selection), then dummy variables have to be introduced, for example, `eventIndicator[4]`._
+An ordered list of all event indicators, in other words, a list of value references where every referenced variable must be an event indicator.
+The serialized and concatenated values of the variables referenced by the attribute `valueReference` form the array that can be retrieved with <<fmi3GetEventIndicators>>.
+Only <<continuous>> variables of type `Float32` and `Float64` can be referenced by <<EventIndicator>>.
+
+_[If an event indicator shall not be exposed from the FMU, or if event indicators are not statically associated with a variable (due to dynamic event indicator selection), then dummy variables have to be introduced, for example, `eventIndicator[4]`._
 _The ordering of the variables in this list is defined by the exporting tool.]_
 
 For Co-Simulation, elements <<EventIndicator>> are ignored.
+
 _[If an FMU supports both Model Exchange and Co-Simulation, then the <<EventIndicator>> elements might be present, since it is needed for Model Exchange.]_
 |====
 

schema/fmi3ModelDescription.xsd

@@ -96,14 +96,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 							<xs:element name="ContinuousStateDerivative" type="fmi3Unknown" minOccurs="0" maxOccurs="unbounded"/>
 							<xs:element name="ClockedState" type="fmi3Unknown" minOccurs="0" maxOccurs="unbounded"/>
 							<xs:element name="InitialUnknown" type="fmi3Unknown" minOccurs="0" maxOccurs="unbounded"/>
-							<xs:element name="EventIndicator" minOccurs="0" maxOccurs="unbounded">
-								<xs:complexType>
-									<xs:sequence>
-										<xs:element ref="Annotations" minOccurs="0"/>
-									</xs:sequence>
-									<xs:attribute name="valueReference" type="xs:unsignedInt" use="required"/>
-								</xs:complexType>
-							</xs:element>
+							<xs:element name="EventIndicator" type="fmi3Unknown" minOccurs="0" maxOccurs="unbounded"/>
 						</xs:sequence>
 					</xs:complexType>
 				</xs:element>