Remove computed from Clock

docs/2_2_common_mechanisms.adoc

@@ -555,41 +555,32 @@ The importer calls <<fmi3GetClock>> to inquire the Clock's activation state.
 h|<<causality>>
 h|<<intervalVariability>>
 
-.7+|<<time-based-clock,time-based>>
-.5+|[[periodic-clock]]periodic
-.5+|<<input>>
+.5+|<<time-based-clock,time-based>>
+.3+|[[periodic-clock]]periodic
+.3+|<<input>>
 |`constant`
 |[[constant-clock]]<<fmi3SetClock>> in <<EventMode>>,
 <<fmi3ActivateModelPartition>> in <<ClockActivationMode>>,
 <<fmi3GetInterval>> and <<fmi3GetShift>> in <<InitializationMode>>
 |clocked PI-controller with a defined constant interval
 
 |`fixed`
-|[[fixed-clock]]<<fmi3SetClock>> in <<EventMode>>,
+a|[[fixed-clock]]<<fmi3SetClock>> in <<EventMode>>,
 <<fmi3ActivateModelPartition>> in <<ClockActivationMode>>,
-<<fmi3SetInterval>> in <<InitializationMode>>
-|clocked PI-controller with an adaptable interval
+
+* if <<intervalDecimal>> is defined, <<fmi3SetInterval>> in <<InitializationMode>>,
+* if <<intervalDecimal>> is not defined, <<fmi3GetInterval>> and <<fmi3GetShift>> in <<InitializationMode>>
+
+|clocked PI-controller with directly or indirectly adaptable interval
 
 |`tunable`
-|[[tunable-clock]]<<fmi3SetClock>> in <<EventMode>>,
+a|[[tunable-clock]]<<fmi3SetClock>> in <<EventMode>>,
 <<fmi3ActivateModelPartition>> in <<ClockActivationMode>>,
-<<fmi3SetInterval>> in <<InitializationMode>>, <<EventMode>> and in <<ClockActivationMode>>
-|clocked PI-controller with an adaptable interval
 
-|`fixed` and +
-`computed = true`
-|[[fixed-computed-clock]]<<fmi3SetClock>> in <<EventMode>>,
-<<fmi3ActivateModelPartition>> in <<ClockActivationMode>>,
-<<fmi3GetInterval>> and <<fmi3GetShift>> in <<InitializationMode>>
-|clocked PI-controller with interval defined by fixed parameter(s) of the FMU
+* if <<intervalDecimal>> is defined, <<fmi3SetInterval>> in <<InitializationMode>>, <<EventMode>> and in <<ClockActivationMode>>
+* if <<intervalDecimal>> is not defined, <<fmi3GetShift>> in <<InitializationMode>>, <<fmi3GetInterval>> in <<InitializationMode>>, <<EventMode>> and in <<ClockActivationMode>>
 
-|`tunable` and +
-`computed = true`
-|[[tunable-computed-clock]]<<fmi3SetClock>> in <<EventMode>>,
-<<fmi3ActivateModelPartition>> in <<ClockActivationMode>>,
-<<fmi3GetShift>> in <<InitializationMode>>,
-<<fmi3GetInterval>> in <<InitializationMode>>, <<EventMode>> and in <<ClockActivationMode>>
-|clocked PI-controller with interval defined by tunable parameter(s) of the FMU
+|clocked PI-controller with directly or indirectly tunable interval
 
 .2+|[[aperiodic-clock]]aperiodic
 .2+|<<input>>
@@ -677,25 +668,31 @@ is a time-based periodic clock that defines its <<intervalDecimal>> and optional
 
 Fixed periodic Clock::
 is a time-based periodic Clock which ticks with an arbitrary, but fixed interval latexmath:[\mathbf{T}_{\mathit{interval}}] starting after an arbitrary latexmath:[\mathbf{T}_{\mathit{shift}}], both interval and shift can be changed by the importer.
-The importer informs the FMU about the Clock's `fixed` interval using <<fmi3SetInterval>> in <<InitializationMode>>.
-If the function is not called the value given in <<intervalDecimal,`intervalDecimal`>> and <<intervalCounter,`intervalCounter`>> is used. +
-_[This information enables the FMU to adapt internal computations to the `fixed` Clock interval determined by the importer.]_
+
++
+If <<intervalDecimal,`intervalDecimal`>> is specified, the importer sets the Clock's `fixed` interval using <<fmi3SetInterval>> in <<InitializationMode>>.
+If the function is not called the value given in <<intervalDecimal,`intervalDecimal`>> and <<intervalCounter,`intervalCounter`>> is used.
+
++
+_[Calling <<fmi3SetInterval>> informs the FMU about the interval determined by the importer to enable the FMU to adapt internal computations to this `fixed` interval.]_
+
++
+If <<intervalDecimal,`intervalDecimal`>> is not specified, then the importer must use <<fmi3GetInterval>> and <<fmi3GetShift>> to retrieve the Clock interval and shift in <<InitializationMode>> because they depend on <<fixed>> <<parameter, parameters>>.
 
 Tunable periodic Clock::
-is a time-based periodic Clock which ticks with an arbitrary and changeble interval latexmath:[\mathbf{T}_{\mathit{interval}}] starting after an arbitrary latexmath:[\mathbf{T}_{\mathit{shift}}], both interval and shift can be changed by the importer.
-The importer informs the FMU about the Clock's `tunable` interval using <<fmi3SetInterval>> in <<InitializationMode>>.
+is a time-based periodic Clock which ticks with an arbitrary and changeable interval latexmath:[\mathbf{T}_{\mathit{interval}}] starting after an arbitrary latexmath:[\mathbf{T}_{\mathit{shift}}], both interval and shift can be changed by the importer.
+
++
+If <<intervalDecimal,`intervalDecimal`>> is specified, the importer sets the Clock's `tunable` interval using <<fmi3SetInterval>> in <<InitializationMode>>.
 It can later change this interval in <<EventMode>> or <<ClockActivationMode>>.
-If the function is not called the value given in <<intervalDecimal,`intervalDecimal`>> and <<intervalCounter,`intervalCounter`>> is used. +
-_[This information enables the FMU to adapt internal computations to the `tunable` Clock interval determined by the importer.]_
+If the function is not called, the value given in <<intervalDecimal,`intervalDecimal`>> and <<intervalCounter,`intervalCounter`>> is used by the importer.
 
-Fixed computed periodic Clock::
-is a time-based periodic Clock whose interval and shift depend on <<fixed>> <<parameter, parameters>>.
-The importer must use <<fmi3GetInterval>> and <<fmi3GetShift>> to retrieve the Clock interval and shift in <<InitializationMode>>.
++
+_[Calling <<fmi3SetInterval>> informs the FMU about the interval determined by the importer to enable the FMU to adapt internal computations to this `tunable` interval.]_
 
-Tunable computed periodic Clock::
-is a time-based periodic Clock whose interval depends on <<tunable>> <<parameter, parameters>>.
++
+If <<intervalDecimal,`intervalDecimal`>> is not specified, then the importer must use <<fmi3GetInterval>> to retrieve the Clock interval in <<InitializationMode>>, and later in <<EventMode>> or <<ClockActivationMode>>, if any of the <<tunable>> <<parameter, parameters>> the Clock's interval depends on was changed.
 The shift may only depend on <<fixed>> <<parameter, parameters>>.
-The importer must use <<fmi3GetInterval>> to retrieve the Clock interval in <<InitializationMode>>, and later in <<EventMode>> or <<ClockActivationMode>>, if any of the <<tunable>> <<parameter, parameters>> it depends on was changed.
 The importer must use <<fmi3GetShift>> to retrieve the Clock shift in <<InitializationMode>>.
 
 Aperiodic Clock::

docs/2_4_common_schema.adoc

@@ -671,12 +671,6 @@ For multiple <<Clock,`Clocks`>> with the same priority the order is undefined.
 [[intervalVariability,`intervalVariability`]]
 The attribute `intervalVariability` declares the Clock type, see <<table-overview-clocks>>.
 
-|`computed`
-|
-[[computed,`computed`]]
-The attribute `computed` may only be used if <<intervalVariability>> is <<fixed-computed-clock,`fixed`>> or <<tunable-computed-clock,`tunable`>> and indicates that interval and shift of the Clock is defined by fixed or tunable parameters of the FMU.
-The values of interval and shift must be retrieved by <<fmi3GetInterval>> and <<fmi3GetShift>>, see <<table-overview-clocks>>.
-
 2+|The values of the following float and integer attributes refer to the unit of the <<independent>> variable.
 
 |`intervalDecimal`

docs/5_1_scheduled_execution_math.adoc

@@ -5,7 +5,7 @@
 In Scheduled Execution the importer has to ensure that model partitions are scheduled according to their activation time and priorities.
 This is realized in <<ClockActivationMode>> by calling <<fmi3ActivateModelPartition>> triggering their respective Clocks.
 
-After <<fmi3ActivateModelPartition>> has been called for a <<fixed-computed-clock,`fixed`>>, <<tunable-computed-clock,`tunable`>> or <<changing-aperiodic-clock,aperiodic>> Clock the FMU provides the information on when the Clock will tick again, i.e. when the corresponding model partition must be scheduled the next time.
+After <<fmi3ActivateModelPartition>> has been called for a <<fixed-clock,`fixed`>>, <<tunable-clock,`tunable`>> or <<changing-aperiodic-clock,aperiodic>> Clock the FMU provides the information on when the Clock will tick again, i.e. when the corresponding model partition must be scheduled the next time.
 To retrieve this information the importer calls <<fmi3GetInterval>> on the Clock.
 
 The FMU may request to schedule another model partition even while currently a model partition is being executed.

schema/fmi3AttributeGroups.xsd

@@ -109,7 +109,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute name="computed" type="xs:boolean" default="false"/>
         <xs:attribute name="intervalDecimal" type="xs:float" use="optional"/>
         <xs:attribute name="shiftDecimal" type="xs:float" default="0"/>
         <xs:attribute name="supportsFraction" type="xs:boolean" default="false"/>