rn examples

ibpsa · Apr 3, 2024 · 0b18dd8 · 0b18dd8
1 parent 59b9079
commit 0b18dd8
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 30 deletions.
diff --git a/IBPSA/Fluid/Chillers/ModularReversible/Examples/CarnotWithLosses.mo b/IBPSA/Fluid/Chillers/ModularReversible/Examples/CarnotWithLosses.mo
@@ -1,5 +1,5 @@
 within IBPSA.Fluid.Chillers.ModularReversible.Examples;
-model ReversibleCarnotWithLosses
+model CarnotWithLosses
   "Example for reversible Carnot chiller model"
   extends Modelica.Icons.Example;
   package MediumCon = IBPSA.Media.Water "Medium model for condenser";
@@ -109,7 +109,7 @@ equation
   connect(chiCoo.y, chi.coo) annotation (Line(points={{-39,-50},{-22,-50},{-22,7.9},
           {-1.1,7.9}},           color={255,0,255}));
   annotation (experiment(Tolerance=1e-6, StopTime=3600),
-__Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/ReversibleCarnotWithLosses.mos"
+__Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/CarnotWithLosses.mos"
         "Simulate and plot"),
     Documentation(revisions="<html>
 <ul>
@@ -136,4 +136,4 @@ __Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/Fluid/Chillers
   the safety control.
 </p>
 </html>"));
-end ReversibleCarnotWithLosses;
+end CarnotWithLosses;
diff --git a/IBPSA/Fluid/Chillers/ModularReversible/Examples/Modular.mo b/IBPSA/Fluid/Chillers/ModularReversible/Examples/Modular.mo
@@ -1,5 +1,5 @@
 within IBPSA.Fluid.Chillers.ModularReversible.Examples;
-model ModularReversible
+model Modular
   "Example for modular reversible chiller"
   extends Modelica.Icons.Example;
   package MediumCon = IBPSA.Media.Air "Medium model for condenser";
@@ -117,7 +117,7 @@ equation
   connect(chiCoo.y, chi.coo) annotation (Line(points={{-39,-50},{-22,-50},{-22,
           7.9},{-1.1,7.9}}, color={255,0,255}));
   annotation (experiment(Tolerance=1e-6, StopTime=3600),
-__Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/ModularReversible.mos"
+__Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/Modular.mos"
         "Simulate and plot"),
     Documentation(revisions="<html>
 <ul>
@@ -146,4 +146,4 @@ __Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/Fluid/Chillers
   IBPSA.Fluid.Chillers.ModularReversible.ModularReversible</a>.
 </p>
 </html>"));
-end ModularReversible;
+end Modular;
diff --git a/IBPSA/Fluid/Chillers/ModularReversible/Examples/package.order b/IBPSA/Fluid/Chillers/ModularReversible/Examples/package.order
@@ -1,3 +1,3 @@
+CarnotWithLosses
 LargeScaleWaterToWater
-ModularReversible
-ReversibleCarnotWithLosses
+Modular
diff --git a/...ReversibleAirToWater2D_OneRoomRadiator.mo → .../Examples/AirToWater2D_OneRoomRadiator.mo b/...ReversibleAirToWater2D_OneRoomRadiator.mo → .../Examples/AirToWater2D_OneRoomRadiator.mo
@@ -1,5 +1,5 @@
 within IBPSA.Fluid.HeatPumps.ModularReversible.Examples;
-model ReversibleAirToWater2D_OneRoomRadiator
+model AirToWater2D_OneRoomRadiator
   "Reversible heat pump with EN 2D data connected to a simple room model with radiator"
   extends
     IBPSA.Fluid.HeatPumps.ModularReversible.Examples.BaseClasses.PartialOneRoomRadiator(
@@ -71,7 +71,7 @@ equation
           {-94,-196},{-82,-196}}, color={0,0,127}));
   annotation (
    __Dymola_Commands(file=
-     "modelica://IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/ReversibleAirToWater2D_OneRoomRadiator.mos"
+     "modelica://IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mos"
         "Simulate and plot"),
   experiment(
       StartTime=0,
@@ -100,4 +100,4 @@ equation
 </li>
 </ul>
 </html>"));
-end ReversibleAirToWater2D_OneRoomRadiator;
+end AirToWater2D_OneRoomRadiator;
diff --git a/...rsibleCarnotWithLosses_OneRoomRadiator.mo → ...mples/CarnotWithLosses_OneRoomRadiator.mo b/...rsibleCarnotWithLosses_OneRoomRadiator.mo → ...mples/CarnotWithLosses_OneRoomRadiator.mo
@@ -1,5 +1,5 @@
 within IBPSA.Fluid.HeatPumps.ModularReversible.Examples;
-model ReversibleCarnotWithLosses_OneRoomRadiator
+model CarnotWithLosses_OneRoomRadiator
   "Reversible heat pump with Carnot approach connected to a simple room model with radiator"
   extends Examples.BaseClasses.PartialOneRoomRadiator(
     mEva_flow_nominal=heaPum.mEva_flow_nominal,
@@ -65,7 +65,7 @@ equation
                                                             color={0,0,127}));
   annotation (
    __Dymola_Commands(file=
-     "modelica://IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/ReversibleCarnotWithLosses_OneRoomRadiator.mos"
+     "modelica://IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mos"
         "Simulate and plot"),
   experiment(
       StartTime=0,
@@ -94,4 +94,4 @@ equation
 </li>
 </ul>
 </html>"));
-end ReversibleCarnotWithLosses_OneRoomRadiator;
+end CarnotWithLosses_OneRoomRadiator;
diff --git a/...ples/ModularReversible_OneRoomRadiator.mo → ...sible/Examples/Modular_OneRoomRadiator.mo b/...ples/ModularReversible_OneRoomRadiator.mo → ...sible/Examples/Modular_OneRoomRadiator.mo
@@ -1,5 +1,5 @@
 within IBPSA.Fluid.HeatPumps.ModularReversible.Examples;
-model ModularReversible_OneRoomRadiator
+model Modular_OneRoomRadiator
   "Modular reversible heat pump connected to a simple room model with radiator"
   extends
     IBPSA.Fluid.HeatPumps.ModularReversible.Examples.BaseClasses.PartialOneRoomRadiator(
@@ -110,10 +110,10 @@ equation
 </ul>
 </html>"),
    __Dymola_Commands(file=
-     "modelica://IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/ModularReversible_OneRoomRadiator.mos"
+     "modelica://IBPSA/Resources/Scripts/Dymola/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mos"
         "Simulate and plot"),
   experiment(
       StartTime=0,
       StopTime=86400,
       Tolerance=1e-08));
-end ModularReversible_OneRoomRadiator;
+end Modular_OneRoomRadiator;
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/package.order b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/package.order
@@ -1,5 +1,5 @@
+AirToWater2D_OneRoomRadiator
+CarnotWithLosses_OneRoomRadiator
 LargeScaleWaterToWater_OneRoomRadiator
-ModularReversible_OneRoomRadiator
-ReversibleAirToWater2D_OneRoomRadiator
-ReversibleCarnotWithLosses_OneRoomRadiator
+Modular_OneRoomRadiator
 BaseClasses
diff --git a/...eversibleAirToWater2D_OneRoomRadiator.txt → ...Examples_AirToWater2D_OneRoomRadiator.txt b/...eversibleAirToWater2D_OneRoomRadiator.txt → ...Examples_AirToWater2D_OneRoomRadiator.txt
diff --git a/...sibleCarnotWithLosses_OneRoomRadiator.txt → ...ples_CarnotWithLosses_OneRoomRadiator.txt b/...sibleCarnotWithLosses_OneRoomRadiator.txt → ...ples_CarnotWithLosses_OneRoomRadiator.txt
diff --git a/...les_ModularReversible_OneRoomRadiator.txt → ...ible_Examples_Modular_OneRoomRadiator.txt b/...les_ModularReversible_OneRoomRadiator.txt → ...ible_Examples_Modular_OneRoomRadiator.txt
diff --git a/...A/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/CarnotWithLosses.mos b/...A/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/CarnotWithLosses.mos
@@ -1,4 +1,4 @@
-simulateModel("IBPSA.Fluid.Chillers.ModularReversible.Examples.ReversibleCarnotWithLosses", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="ReversibleCarnotWithLosses");
-createPlot(id=2, position={39, 13, 913, 546}, y={"chi.refCyc.sigBus.TConInMea", "chi.refCyc.sigBus.TConOutMea", "chi.refCyc.sigBus.TEvaOutMea", "chi.refCyc.sigBus.TEvaInMea"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="ReversibleCarnotWithLosses.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
+simulateModel("IBPSA.Fluid.Chillers.ModularReversible.Examples.CarnotWithLosses", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="CarnotWithLosses");
+createPlot(id=2, position={39, 13, 913, 546}, y={"chi.refCyc.sigBus.TConInMea", "chi.refCyc.sigBus.TConOutMea", "chi.refCyc.sigBus.TEvaOutMea", "chi.refCyc.sigBus.TEvaInMea"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="CarnotWithLosses.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
 createPlot(id=2, position={39, 13, 913, 546}, y={"chi.QCon_flow", "chi.QEva_flow", "chi.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=2, position={39, 13, 913, 546}, y={"chi.refCyc.sigBus.ySet", "chi.refCyc.sigBus.yMea"}, range={0.0, 3600.0, 0.0, 1.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/Modular.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/Chillers/ModularReversible/Examples/Modular.mos
@@ -1,4 +1,4 @@
-simulateModel("IBPSA.Fluid.Chillers.ModularReversible.Examples.ModularReversible", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="ModularReversible");
-createPlot(id=2, position={39, 13, 913, 546}, y={"chi.refCyc.sigBus.TConInMea", "chi.refCyc.sigBus.TConOutMea", "chi.refCyc.sigBus.TEvaOutMea", "chi.refCyc.sigBus.TEvaInMea"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="ModularReversible.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
+simulateModel("IBPSA.Fluid.Chillers.Modular.Examples.Modular", tolerance=1e-6, stopTime=3600, method="CVode", resultFile="Modular");
+createPlot(id=2, position={39, 13, 913, 546}, y={"chi.refCyc.sigBus.TConInMea", "chi.refCyc.sigBus.TConOutMea", "chi.refCyc.sigBus.TEvaOutMea", "chi.refCyc.sigBus.TEvaInMea"}, range={0.0, 3600.0, 5.0, 40.0}, grid=true, filename="Modular.mat", colors={{28,108,200}, {238,46,47}, {0,140,72}, {180,56,148}});
 createPlot(id=2, position={39, 13, 913, 546}, y={"chi.QCon_flow", "chi.QEva_flow", "chi.P"}, range={0.0, 3600.0, -200000.0, 300000.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}});
 createPlot(id=2, position={39, 13, 913, 546}, y={"chi.refCyc.sigBus.ySet", "chi.refCyc.sigBus.yMea"}, range={0.0, 3600.0, 0.0, 1.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/...eversibleAirToWater2D_OneRoomRadiator.mos → ...Examples/AirToWater2D_OneRoomRadiator.mos b/...eversibleAirToWater2D_OneRoomRadiator.mos → ...Examples/AirToWater2D_OneRoomRadiator.mos
@@ -1,4 +1,4 @@
-simulateModel("IBPSA.Fluid.HeatPumps.ModularReversible.Examples.ReversibleAirToWater2D_OneRoomRadiator", stopTime=86400, method="CVode", tolerance=1e-08, resultFile="ReversibleAirToWater2D_OneRoomRadiator");
+simulateModel("IBPSA.Fluid.HeatPumps.ModularReversible.Examples.AirToWater2D_OneRoomRadiator", stopTime=86400, method="CVode", tolerance=1e-08, resultFile="AirToWater2D_OneRoomRadiator");
 createPlot(id = 1,
  position = {19, 32, 809, 500},
  y = {"vol.T_start", "vol.T"},
@@ -10,7 +10,7 @@ createPlot(id = 1,
  grid = true,
  color = true,
  online = false,
- filename = "ReversibleAirToWater2D_OneRoomRadiator.mat",
+ filename = "AirToWater2D_OneRoomRadiator.mat",
  leftTitleType = 1,
  bottomTitleType = 1,
  colors = {{0, 0, 255}, {255, 0, 0}});

diff --git a/...les/ModularReversible_OneRoomRadiator.mos → ...ples/CarnotWithLosses_OneRoomRadiator.mos b/...les/ModularReversible_OneRoomRadiator.mos → ...ples/CarnotWithLosses_OneRoomRadiator.mos
@@ -1,4 +1,4 @@
-simulateModel("IBPSA.Fluid.HeatPumps.ModularReversible.Examples.ModularReversible_OneRoomRadiator", stopTime=86400, method="CVode", tolerance=1e-08, resultFile="ModularReversible_OneRoomRadiator");
+simulateModel("IBPSA.Fluid.HeatPumps.ModularReversible.Examples.CarnotWithLosses_OneRoomRadiator", stopTime=86400, method="CVode", tolerance=1e-08, resultFile="CarnotWithLosses_OneRoomRadiator");
 createPlot(id = 1,
  position = {19, 32, 798, 500},
  y = {"vol.T_start", "vol.T"},
@@ -10,7 +10,7 @@ createPlot(id = 1,
  grid = true,
  color = true,
  online = false,
- filename = "ModularReversible_OneRoomRadiator.mat",
+ filename = "CarnotWithLosses_OneRoomRadiator.mat",
  leftTitleType = 1,
  bottomTitleType = 1,
  colors = {{0, 0, 255}, {255, 0, 0}});

diff --git a/...sibleCarnotWithLosses_OneRoomRadiator.mos → ...ible/Examples/Modular_OneRoomRadiator.mos b/...sibleCarnotWithLosses_OneRoomRadiator.mos → ...ible/Examples/Modular_OneRoomRadiator.mos
@@ -1,4 +1,4 @@
-simulateModel("IBPSA.Fluid.HeatPumps.ModularReversible.Examples.ReversibleCarnotWithLosses_OneRoomRadiator", stopTime=86400, method="CVode", tolerance=1e-08, resultFile="ReversibleCarnotWithLosses_OneRoomRadiator");
+simulateModel("IBPSA.Fluid.HeatPumps.ModularReversible.Examples.Modular_OneRoomRadiator", stopTime=86400, method="CVode", tolerance=1e-08, resultFile="Modular_OneRoomRadiator");
 createPlot(id = 1,
  position = {19, 32, 798, 500},
  y = {"vol.T_start", "vol.T"},
@@ -10,7 +10,7 @@ createPlot(id = 1,
  grid = true,
  color = true,
  online = false,
- filename = "ReversibleCarnotWithLosses_OneRoomRadiator.mat",
+ filename = "Modular_OneRoomRadiator.mat",
  leftTitleType = 1,
  bottomTitleType = 1,
  colors = {{0, 0, 255}, {255, 0, 0}});