Bump version to 3.0-beta.2 (#1483)

and use Reference FMUs v0.0.9
modelica · Jul 22, 2021 · 6371478 · 6371478
1 parent 9807f19
commit 6371478
Show file tree

Hide file tree

Showing 21 changed files with 22 additions and 22 deletions.
diff --git a/docs/3_3_model_exchange_example.adoc b/docs/3_3_model_exchange_example.adoc
@@ -6,7 +6,7 @@ If the FMU would be used inside another model, additional code is needed, especi
 
 [source, c]
 ----
-include::Reference-FMUs/examples/model_exchange.c[tags=ModelExchange]
+include::Reference-FMUs/examples/simulate_me.c[tags=ModelExchange]
 ----
 
 In the code above errors are handled by the following definition:

diff --git a/docs/Reference-FMUs b/docs/Reference-FMUs
diff --git a/docs/examples/alias_example.xml b/docs/examples/alias_example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-beta.1"
+  fmiVersion="3.0-beta.2"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/build_description_complex.xml b/docs/examples/build_description_complex.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fmiBuildDescription fmiVersion="3.0-beta.1">
+<fmiBuildDescription fmiVersion="3.0-beta.2">
 
   <BuildConfiguration modelIdentifier="PlantModel" description="Build configuration for desktop platforms">
     <SourceFileSet language="C99">

diff --git a/docs/examples/build_description_simple.xml b/docs/examples/build_description_simple.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fmiBuildDescription fmiVersion="3.0-beta.1">
+<fmiBuildDescription fmiVersion="3.0-beta.2">
 
   <BuildConfiguration modelIdentifier="PIDContoller">
     <SourceFileSet>

diff --git a/docs/examples/co_simulation.xml b/docs/examples/co_simulation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-beta.1"
+  fmiVersion="3.0-beta.2"
   modelName="MyLibrary.SpringMassDamper"
   instantiationToken="{8c4e810f-3df3-4a00-8276-176fa3c9f9e0}"
   description="Rotational Spring Mass Damper System"

diff --git a/docs/examples/co_simulation_early_return.xml b/docs/examples/co_simulation_early_return.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-beta.1"
+  fmiVersion="3.0-beta.2"
   modelName="MyLibrary.SpringMassDamper_Early_Return_example"
   instantiationToken="{8c4e810f-3df3-4a00-8276-176fa3c9f9e0}"
   description="Rotational Spring Mass Damper System"

diff --git a/docs/examples/model_exchange.xml b/docs/examples/model_exchange.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-beta.1"
+  fmiVersion="3.0-beta.2"
   modelName="MyLibrary.SpringMassDamper"
   instantiationToken="{8c4e810f-3df3-4a00-8276-176fa3c9f9e0}"
   description="Rotational Spring Mass Damper System"

diff --git a/docs/examples/model_structure_example1.xml b/docs/examples/model_structure_example1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-beta.1"
+  fmiVersion="3.0-beta.2"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/model_structure_example2.xml b/docs/examples/model_structure_example2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-beta.1"
+  fmiVersion="3.0-beta.2"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/model_structure_example3.xml b/docs/examples/model_structure_example3.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-beta.1"
+  fmiVersion="3.0-beta.2"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/model_structure_example4.xml b/docs/examples/model_structure_example4.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-beta.1"
+  fmiVersion="3.0-beta.2"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/scheduled_execution.xml b/docs/examples/scheduled_execution.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fmiModelDescription fmiVersion="3.0-beta.1" modelName="ThreeInputClocks" instantiationToken="ThreeInputClocks">
+<fmiModelDescription fmiVersion="3.0-beta.2" modelName="ThreeInputClocks" instantiationToken="ThreeInputClocks">
 	<ScheduledExecution modelIdentifier="ThreeInputClocks"/>
 	<LogCategories>
 		<Category name="logStatusError" description="Log error messages"/>

diff --git a/docs/examples/string_vector_example.xml b/docs/examples/string_vector_example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-beta.1"
+  fmiVersion="3.0-beta.2"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/structural_parameter_example.xml b/docs/examples/structural_parameter_example.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-beta.1"
+  fmiVersion="3.0-beta.2"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/unit_definition.xml b/docs/examples/unit_definition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
-  fmiVersion="3.0-beta.1"
+  fmiVersion="3.0-beta.2"
   modelName=""
   instantiationToken=""
   description=""

diff --git a/docs/examples/variable_types.xml b/docs/examples/variable_types.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<fmiModelDescription fmiVersion="3.0-beta.1" modelName="VariableTypes" instantiationToken="">
+<fmiModelDescription fmiVersion="3.0-beta.2" modelName="VariableTypes" instantiationToken="">
 
   <CoSimulation modelIdentifier="VariableTypes"/>
 

diff --git a/headers/fmi3FunctionTypes.h b/headers/fmi3FunctionTypes.h
@@ -4,7 +4,7 @@
 #include "fmi3PlatformTypes.h"
 
 /*
-This header file defines the data and function types of FMI 3.0-beta.1.
+This header file defines the data and function types of FMI 3.0-beta.2.
 It must be used when compiling an FMU or an FMI importer.
 
 Copyright (C) 2011 MODELISAR consortium,

diff --git a/headers/fmi3Functions.h b/headers/fmi3Functions.h
@@ -2,7 +2,7 @@
 #define fmi3Functions_h
 
 /*
-This header file declares the functions of FMI 3.0-beta.1.
+This header file declares the functions of FMI 3.0-beta.2.
 It must be used when compiling an FMU.
 
 In order to have unique function names even if several FMUs
@@ -93,7 +93,7 @@ it may be set to __declspec(dllimport).
 #endif
 
 /* FMI version */
-#define fmi3Version "3.0-beta.1"
+#define fmi3Version "3.0-beta.2"
 
 /***************************************************
 Common Functions

diff --git a/headers/fmi3PlatformTypes.h b/headers/fmi3PlatformTypes.h
@@ -2,7 +2,7 @@
 #define fmi3PlatformTypes_h
 
 /*
-This header file defines the data types of FMI 3.0-beta.1.
+This header file defines the data types of FMI 3.0-beta.2.
 It must be used by both FMU and FMI master.
 
 Copyright (C) 2008-2011 MODELISAR consortium,

diff --git a/schema/fmi3ModelDescription.xsd b/schema/fmi3ModelDescription.xsd
@@ -102,7 +102,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                 </xs:element>
                 <xs:element ref="Annotations" minOccurs="0"/>
             </xs:sequence>
-            <xs:attribute name="fmiVersion" fixed="3.0-beta.1" use="required"/>
+            <xs:attribute name="fmiVersion" fixed="3.0-beta.2" use="required"/>
             <xs:attribute name="modelName" type="xs:string" use="required"/>
             <xs:attribute name="instantiationToken" type="xs:normalizedString" use="required"/>
             <xs:attribute name="description" type="xs:string"/>
+1 −0		.gitignore
+3 −0		BouncingBall/FMI1CS.xml
+3 −0		BouncingBall/FMI1ME.xml
+20 −8		BouncingBall/FMI2.xml
+15 −7		BouncingBall/FMI3.xml
+2 −2		BouncingBall/config.h
+6 −2		BouncingBall/model.c
+0 −0		Clocks/Clocks_ref.csv
+0 −0		Clocks/Clocks_ref.opt
+36 −46		Clocks/FMI3.xml
+8 −4		Clocks/config.h
+87 −59		Clocks/model.c
+6 −3		Dahlquist/FMI1CS.xml
+6 −3		Dahlquist/FMI1ME.xml
+20 −8		Dahlquist/FMI2.xml
+20 −9		Dahlquist/FMI3.xml
+2 −2		Dahlquist/config.h
+5 −0		Dahlquist/model.c
+14 −11		Feedthrough/FMI1CS.xml
+14 −11		Feedthrough/FMI1ME.xml
+33 −21		Feedthrough/FMI2.xml
+37 −22		Feedthrough/FMI3.xml
+6 −5		Feedthrough/config.h
+30 −7		Feedthrough/model.c
+1 −1		LICENSE.txt
+18 −6		LinearTransform/FMI3.xml
+2 −2		LinearTransform/config.h
+7 −0		LinearTransform/model.c
+4 −0		README.md
+4 −1		Resource/FMI1CS.xml
+0 −19		Resource/FMI1ME.xml
+17 −5		Resource/FMI2.xml
+17 −6		Resource/FMI3.xml
+2 −1		Resource/config.h
+51 −18		Resource/model.c
+4 −1		Stair/FMI1CS.xml
+4 −1		Stair/FMI1ME.xml
+16 −4		Stair/FMI2.xml
+16 −5		Stair/FMI3.xml
+2 −1		Stair/config.h
+12 −0		Stair/model.c
+8 −5		VanDerPol/FMI1CS.xml
+8 −5		VanDerPol/FMI1ME.xml
+25 −13		VanDerPol/FMI2.xml
+25 −14		VanDerPol/FMI3.xml
+2 −2		VanDerPol/config.h
+5 −0		VanDerPol/model.c
+1 −1		azure-pipelines.yml
+24 −0		examples/BouncingBall.c
+95 −88		examples/Examples.cmake
+175 −0		examples/FMU.c
+137 −0		examples/FMU.h
+26 −0		examples/Feedthrough.c
+24 −0		examples/Stair.c
+0 −147		examples/bcs_early_return.c
+23 −8		examples/co_simulation.c
+181 −0		examples/connected_cs.c
+117 −0		examples/cs_early_return.c
+34 −60		examples/cs_event_mode.c
+32 −36		examples/cs_intermediate_update.c
+3 −3		examples/import_shared_library.c
+24 −21		examples/jacobian.c
+0 −232		examples/model_exchange.c
+69 −53		examples/scs_synchronous.c
+149 −100		examples/scs_threaded.c
+103 −0		examples/simulate_cs.c
+250 −0		examples/simulate_me.c
+8 −0		examples/util.h
+112 −78		include/fmi3FunctionTypes.h
+26 −20		include/fmi3Functions.h
+15 −14		include/fmi3PlatformTypes.h
+12 −10		include/model.h
+1 −1		lint_files.py
+3 −3		merge_platform_binaries.py
+22 −24		src/cosimulation.c
+81 −28		src/fmi3Functions.c
+28 −10		test_build.py