reference external resources according to Modelica standard

rfranke · rfranke · commit a73c206d81e7 · 2014-08-15T08:46:09.000+02:00
diff --git a/PowerSystems/Examples/PowerWorld/package.mo b/PowerSystems/Examples/PowerWorld/package.mo
@@ -1,9 +1,9 @@
 within PowerSystems.Examples;
 package PowerWorld "Demonstrate stabilization of wind power in Eurosyslib work package 5.3"
 
-
     extends Modelica.Icons.ExamplesPackage;
 
+    constant string PowerWorldResources = Modelica.Utilities.Files.loadResource("modelica://PowerSystems.Examples.PowerWorld/Resources/");
 
     model PowerWorld "Interoperation of wind power and thermal power"
       extends Modelica.Icons.Example;
@@ -618,7 +618,7 @@ The following switches/features are provided:
 
       Modelica.Blocks.Sources.CombiTimeTable wind(
         tableName="tab",
-        fileName="Examples/PowerWorld/Resources/LoadData.txt",
+        fileName=PowerWorldResources + "LoadData.txt",
         tableOnFile=true,
         table=fill(
                 0.0,
@@ -706,7 +706,7 @@ The following switches/features are provided:
 
       Modelica.Blocks.Sources.CombiTimeTable data(
         tableName="tab",
-        fileName="Examples/PowerWorld/Resources/LoadData.txt",
+        fileName=PowerWorldResources + "LoadData.txt",
         tableOnFile=true,
         table=fill(
             0.0,
@@ -877,7 +877,7 @@ The following switches/features are provided:
       extends PowerSystems.Generic.Ports.PartialLoad;
       Modelica.Blocks.Sources.CombiTimeTable data(
         tableName="tab",
-        fileName="Examples/PowerWorld/Resources/LoadData.txt",
+        fileName=PowerWorldResources + "LoadData.txt",
         tableOnFile=true,
         table=fill(
                 0.0,
@@ -1351,6 +1351,6 @@ The following switches/features are provided:
 annotation (preferredView="info",Documentation(info="<html>
 <p>The example demonstrates power/frequency control exploiting a thermal power plant and a pump store for the stabilization of fluctuating wind power.
 The demonstrator developed for Eurosyslib WP5.3 complements the model with a 3D animation using DLR&apos;s SimVis software.</p>
-<p><img src=\"modelica://PowerSystems/Examples/PowerWorld/Resources/PowerWorld.png\"/></p>
+<p><img src=\"modelica://PowerSystems.Examples.PowerWorld/Resources/PowerWorld.png\"/></p>
 </html>"));
 end PowerWorld;
diff --git a/PowerSystems/package.mo b/PowerSystems/package.mo
@@ -73,6 +73,14 @@ The following table summerizes the PhaseSystems that are predefined in the Power
 </html>",
   revisions="<html>
 <ul>
+<li><i>15 Aug 2014</i>
+    by <a href=\"mailto:Ruediger.Franke@de.abb.com\">Ruediger Franke</a>:<br>
+     Version 0.2.1
+  <ul>
+  <li>use Modelica.Utilities.Files.loadResource() instead of deprecated classDirectory()</li>
+  <li>fix references to Connections package</li>
+  </ul>
+</li>
 <li><i>18 Apr 2013</i>
     by <a href=\"mailto:Ruediger.Franke@de.abb.com\">Ruediger Franke</a>:<br>
      Version 0.2
@@ -119,25 +127,12 @@ The following table summerizes the PhaseSystems that are predefined in the Power
       PhaseSystems.ThreePhase_dq "Default phase system"
     annotation (choicesAllMatching=true);
 
-
-
-
-
-
-
-
-
-
-
-
-
-  constant String TableDir=classDirectory() + "Resources/Tables/"
+  constant String TableDir=Modelica.Utilities.Files.loadResource("modelica://PowerSystems/Resources/Tables/")
   "Directory of example tables";
 
-
   annotation (preferedView="info",
-  version="0.2",
-  versionDate="2013-04-18",
+  version="0.2.1",
+  versionDate="2014-08-15",
   Documentation(info="<html>
 <h3><font color=\"#000080\" size=5>Modelica PowerSystems library</font></h3>
 <p>The library is intended to model electrical <b>power systems</b> at different <b>levels of detail</b> both in <b>transient</b> and <b>steady-state</b> mode.</p>
@@ -154,7 +149,7 @@ by funding of the IST Programme, Contract No. IST-1999-11979. </i></p>
 <p/>
 </html>
 "),
-  uses(Modelica(version="3.2")),
+  uses(Modelica(version="3.2.1")),
   Icon(graphics={
       Line(
         points={{-60,-16},{38,-16}},
