Merge branch 'dev' into main

Virtual-FCS · Feb 10, 2022 · f408f29 · f408f29
2 parents b03020f + e520e88
commit f408f29
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/VirtualFCS/Electrical/package.order b/VirtualFCS/Electrical/package.order
@@ -1,6 +1,6 @@
 UsersGuide
 DC_converter
+DC_DC_Converter
 DCConverterSwitch
 DCConverter
 SpeedControlledDCMotor
-DC_DC_Converter
diff --git a/VirtualFCS/UsersGuide/Acknowledgements.mo b/VirtualFCS/UsersGuide/Acknowledgements.mo
@@ -4,8 +4,8 @@ model Acknowledgements
   extends Modelica.Icons.Information;
 equation
 
-annotation(
+  annotation(
     Documentation(info = "<html><head></head><body><div><span style=\"font-size: 12px;\">The following people have directly contributed to the implementation of the Virtual-FCS library.</span></div><div><span style=\"font-size: 12px;\"><br></span></div><div>•<span class=\"Apple-tab-span\" style=\"white-space: pre;\">	</span><a href=\"https://scholar.google.no/citations?user=YyXXh8UAAAAJ&amp;hl=en\">Dr. Simon Clark</a>, SINTEF Industry, Norway</div><div>•<span class=\"Apple-tab-span\" style=\"white-space: pre;\">	</span><a href=\"https://scholar.google.no/citations?user=mlhoJ9wAAAAJ&amp;hl=en&amp;oi=ao\">Dr. Yash Raka</a>, SINTEF Industry, Norway</div><div>•<span class=\"Apple-tab-span\" style=\"white-space: pre;\">	</span><a href=\"https://scholar.google.no/citations?user=Lb7P3pwAAAAJ&amp;hl=en&amp;oi=ao\">Dr. Michael R. Gerhardt</a>, SINTEF Industry, Norway</div><div>•<span class=\"Apple-tab-span\" style=\"white-space: pre;\">	</span><a href=\"https://scholar.google.no/citations?user=VtrKOXUAAAAJ&amp;hl=en&amp;oi=ao\">Dr. Loic Vichard</a>, UBFC, France</div><div>•<span class=\"Apple-tab-span\" style=\"white-space: pre;\">	</span>Amelie Pinard, France</div><div><br></div><div><span style=\"font-size: 12px;\">Many others have contributed by other means than model implementation. Specifically, w</span><span style=\"font-size: 12px;\">e thank <a href=\"https://scholar.google.com/citations?user=96ato0cAAAAJ&amp;hl=it\">Dr. Federico Zenith</a> (SINTEF Digital), <a href=\"https://scholar.google.com/citations?user=usI_z3IAAAAJ&amp;hl=it&amp;oi=ao\">Dr. Alejandro Oyarce Barnett</a> (SINTEF Industry), <a href=\"https://scholar.google.com/citations?user=I83c1BcAAAAJ&amp;hl=it&amp;oi=ao\">Dr. Nadia Steiner</a> (UBFC) and <a href=\"https://scholar.google.com/citations?user=C0YhMpsAAAAJ&amp;hl=it&amp;oi=ao\">Dr. Daniel Hissel</a> (UBFC) for the helpful discussions.&nbsp;</span></div><div><span style=\"font-size: 12px;\"><br></span></div><div>This project has received funding from the Fuel Cells and Hydrogen 2 Joint Undertaking under grant agreement No 875087. This Joint Undertaking receives support from the European Union’s Horizon 2020 research and innovation programme, Hydrogen Europe and Hydrogen Europe research.</div><div><br></div><div><br></div><div><span style=\"font-size: 12px;\"><br></span></div>
-<img src=\"file:///C:\Users\simonc\Documents\GitHub\VirtualFCS\docs\imgEuropeFlag.jpg\" style=\"width:3cm\">
+<img src=\"modelica://VirtualFCS/../docs/imgEuropeFlag.jpg\" style=\"width:3cm\">
 </body></html>"));
 end Acknowledgements;
diff --git a/VirtualFCS/UsersGuide/ReleaseNotes/Version_0_1_0.mo b/VirtualFCS/UsersGuide/ReleaseNotes/Version_0_1_0.mo
@@ -1377,7 +1377,7 @@ computer<o:p></o:p></span></p>
 <p class=\"MsoListParagraphCxSpMiddle\" style=\"text-indent:-18.0pt;mso-list:l0 level1 lfo1\"><!--[if !supportLists]--><span lang=\"EN-GB\">3.<span style=\"font-size: 7pt; font-family: 'Times New Roman';\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></span><!--[endif]--><span lang=\"EN-GB\">Open the OpenModelica Connection
 Editor<o:p></o:p></span></p>
 
-<p class=\"MsoListParagraphCxSpMiddle\" style=\"text-indent:-18.0pt;mso-list:l0 level1 lfo1\"><!--[if !supportLists]--><span lang=\"EN-GB\">4.<span style=\"font-size: 7pt; font-family: 'Times New Roman';\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></span><!--[endif]--><span lang=\"EN-GB\">Open the file VirtualFCS\package.mo<o:p></o:p></span></p>
+<p class=\"MsoListParagraphCxSpMiddle\" style=\"text-indent:-18.0pt;mso-list:l0 level1 lfo1\"><!--[if !supportLists]--><span lang=\"EN-GB\">4.<span style=\"font-size: 7pt; font-family: 'Times New Roman';\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></span><!--[endif]--><span lang=\"EN-GB\">Open the file VirtualFCS/package.mo<o:p></o:p></span></p>
 
 <p class=\"MsoListParagraphCxSpLast\" style=\"text-indent:-18.0pt;mso-list:l0 level1 lfo1\"><!--[if !supportLists]--><span lang=\"EN-GB\">5.<span style=\"font-size: 7pt; font-family: 'Times New Roman';\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></span><!--[endif]--><span lang=\"EN-GB\">The VirtualFCS library will load in
 the library browser on the left of the Connection Editor</span></p></div><div><div id=\"ftn2\">

diff --git a/VirtualFCS/package.mo b/VirtualFCS/package.mo