From d295fec5f73c8c5280cb08f74f6a9865fbbe1c16 Mon Sep 17 00:00:00 2001
From: Elmir Nahodovic <210350926+elmir-nahodovic@users.noreply.github.com>
Date: Thu, 27 Aug 2026 12:16:17 +0200
Subject: [PATCH 1/3] Update fmi-ls-dae.xml

To match PR https://github.com/modelica/fmi-ls-dae/pull/64
---
 Roberts/fmi-ls-dae.xml | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/Roberts/fmi-ls-dae.xml b/Roberts/fmi-ls-dae.xml
index d07c6409..cc12da70 100644
--- a/Roberts/fmi-ls-dae.xml
+++ b/Roberts/fmi-ls-dae.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fmiLayeredStandardManifest
+<fmiDAEManifest
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns="http://fmi-standard.org/fmi-ls-manifest"
   xmlns:fmi-ls="http://fmi-standard.org/fmi-ls-manifest"
   fmi-ls:fmi-ls-name="fmi-ls-dae"
-  fmi-ls:fmi-ls-version=""
+  fmi-ls:fmi-ls-version="1.0.0-alpha.1"
   fmi-ls:fmi-ls-description="Layered standard for DAE support in FMI">
   <EnableDAE valueReference="1"/>
-  <AlgebraicVariables>
-    <AlgebraicVariable
-      valueReference="6"
-      nominal="7"/>
-  </AlgebraicVariables>
+  <AlgebraicVariable
+    valueReference="6"
+    nominal="7"/>
   <ModelStructure>
     <ContinuousStateDerivative
       valueReference="3"
@@ -41,12 +39,9 @@
       valueReference="10"
       dependencies="6"
       dependenciesKind="constant"/>
-    <Residual>
-      <Formulation
-        index="1"
-        valueReference="8"
-        dependencies="2 4 6"
-        dependenciesKind="constant constant constant"/>
-    </Residual>
+    <Residual
+      valueReference="8"
+      dependencies="2 4 6"
+      dependenciesKind="constant constant constant"/>
   </ModelStructure>
-</fmiLayeredStandardManifest>
+</fmiDAEManifest>

From f5ce0a8ec6027dd4bb8ec3ca90954c421a323454 Mon Sep 17 00:00:00 2001
From: Torsten Sommer <torsten.sommer@3ds.com>
Date: Mon, 31 Aug 2026 09:02:33 +0200
Subject: [PATCH 2/3] Refactor AlgebraicVariable to use container element

---
 Roberts/fmi-ls-dae.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Roberts/fmi-ls-dae.xml b/Roberts/fmi-ls-dae.xml
index cc12da70..33c8fa3e 100644
--- a/Roberts/fmi-ls-dae.xml
+++ b/Roberts/fmi-ls-dae.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiDAEManifest
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="http://fmi-standard.org/fmi-ls-manifest"
   xmlns:fmi-ls="http://fmi-standard.org/fmi-ls-manifest"
   fmi-ls:fmi-ls-name="fmi-ls-dae"
   fmi-ls:fmi-ls-version="1.0.0-alpha.1"
   fmi-ls:fmi-ls-description="Layered standard for DAE support in FMI">
   <EnableDAE valueReference="1"/>
-  <AlgebraicVariable
-    valueReference="6"
-    nominal="7"/>
+  <AlgebraicVariables>
+    <AlgebraicVariable valueReference="6"/>
+  </AlgebraicVariables>
   <ModelStructure>
     <ContinuousStateDerivative
       valueReference="3"

From 28a98fdf284323215f39cddc36e8a61925188cbb Mon Sep 17 00:00:00 2001
From: Torsten Sommer <torsten.sommer@3ds.com>
Date: Wed, 2 Sep 2026 14:43:13 +0200
Subject: [PATCH 3/3] Update manifest and model

---
 Roberts/FMI3.xml       | 11 +++++------
 Roberts/config.h       |  1 -
 Roberts/fmi-ls-dae.xml |  9 ++++-----
 Roberts/model.c        |  4 ----
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/Roberts/FMI3.xml b/Roberts/FMI3.xml
index ef5db34d..076ff4d1 100644
--- a/Roberts/FMI3.xml
+++ b/Roberts/FMI3.xml
@@ -39,10 +39,9 @@
       <Float64 name="y2" valueReference="4" causality="output" initial="exact" start="0" nominal="1e-2"/>
       <Float64 name="der(y2)" valueReference="5" derivative="4"/>
       <Float64 name="y3" valueReference="6" causality="output" initial="approx" start="0" nominal="1e-2"/>
-      <Float64 name="y3_nominal" valueReference="7" variability="constant" start="1e-2"/>
-      <Float64 name="r" valueReference="8"/>
-      <Float64 name="g1" valueReference="9"/>
-      <Float64 name="g2" valueReference="10"/>
+      <Float64 name="r" valueReference="7"/>
+      <Float64 name="g1" valueReference="8"/>
+      <Float64 name="g2" valueReference="9"/>
   </ModelVariables>
 
   <ModelStructure>
@@ -54,8 +53,8 @@
     <InitialUnknown valueReference="3" dependencies="2 4" dependenciesKind="dependent dependent"/>
     <InitialUnknown valueReference="5" dependencies="2 4" dependenciesKind="dependent dependent"/>
     <InitialUnknown valueReference="6" dependencies="2 4" dependenciesKind="constant constant"/>
-    <EventIndicator valueReference="9" dependencies="2" dependenciesKind="constant"/>
-    <EventIndicator valueReference="10" dependencies="6" dependenciesKind="constant"/>
+    <EventIndicator valueReference="8" dependencies="2" dependenciesKind="constant"/>
+    <EventIndicator valueReference="9" dependencies="6" dependenciesKind="constant"/>
   </ModelStructure>
 
 </fmiModelDescription>
diff --git a/Roberts/config.h b/Roberts/config.h
index 8f71150b..1f40d415 100644
--- a/Roberts/config.h
+++ b/Roberts/config.h
@@ -29,7 +29,6 @@ typedef enum {
     vr_y2,
     vr_der_y2,
     vr_y3,
-    vr_y3_nominal,
     vr_r,
     vr_g1,
     vr_g2,
diff --git a/Roberts/fmi-ls-dae.xml b/Roberts/fmi-ls-dae.xml
index 33c8fa3e..70f8b19e 100644
--- a/Roberts/fmi-ls-dae.xml
+++ b/Roberts/fmi-ls-dae.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiDAEManifest
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:fmi-ls="http://fmi-standard.org/fmi-ls-manifest"
-  fmi-ls:fmi-ls-name="fmi-ls-dae"
+  fmi-ls:fmi-ls-name="org.fmi-standard.fmi-ls-dae"
   fmi-ls:fmi-ls-version="1.0.0-alpha.1"
-  fmi-ls:fmi-ls-description="Layered standard for DAE support in FMI">
-  <EnableDAE valueReference="1"/>
+  fmi-ls:fmi-ls-description="Layered standard for DAE support in FMI 3">
+  <EnableDAEParameter valueReference="1"/>
   <AlgebraicVariables>
     <AlgebraicVariable valueReference="6"/>
   </AlgebraicVariables>
@@ -39,7 +38,7 @@
       dependencies="6"
       dependenciesKind="constant"/>
     <Residual
-      valueReference="8"
+      valueReference="7"
       dependencies="2 4 6"
       dependenciesKind="constant constant constant"/>
   </ModelStructure>
diff --git a/Roberts/model.c b/Roberts/model.c
index acba2119..38500c1c 100644
--- a/Roberts/model.c
+++ b/Roberts/model.c
@@ -67,10 +67,6 @@ Status getFloat64(ModelInstance* comp, ValueReference vr, double values[], size_
             ASSERT_NVALUES(1);
             values[(*index)++] = M(y3);
             return OK;
-        case vr_y3_nominal:
-            ASSERT_NVALUES(1);
-            values[(*index)++] = Y3_NOMINAL;
-            return OK;
         case vr_r:
             ASSERT_NVALUES(1);
             values[(*index)++] = M(r);