From e6ba5e3a2566742dea665b2171d12251ee8286b3 Mon Sep 17 00:00:00 2001
From: Dietmar Winkler
Date: Wed, 30 Oct 2024 12:37:09 +0100
Subject: [PATCH] Correct false friend "Aggregate" --> "unit"
---
OpenHPL/ElectroMech/BaseClasses/Power2Torque.mo | 6 +++---
OpenHPL/ElectroMech/Generators/SimpleGen.mo | 2 +-
OpenHPL/Resources/Documents/UsersGuide_src/UsersGuide.tex | 2 +-
OpenHPL/Resources/Images/simplegen.svg | 2 +-
OpenHPL/Tests/HPElasticKPPenstock.mo | 6 +++---
OpenHPL/Tests/HPElasticKPPenstockCompres.mo | 6 +++---
OpenHPL/Tests/HPElasticKPPenstockHalfSurgeD.mo | 6 +++---
OpenHPL/Tests/HPElasticKPPenstockWithoutSurge.mo | 6 +++---
OpenHPL/Tests/HPSimpleElasticPenstock.mo | 6 +++---
OpenHPL/Tests/HPSimpleElasticPenstockWithoutSurge.mo | 6 +++---
OpenHPL/Tests/HPSimplePenstockAutoRefGate.mo | 8 ++++----
OpenHPL/Tests/HPSimplePenstockFrancis.mo | 8 ++++----
OpenHPL/Tests/HPSimplePenstockFrancisGener.mo | 6 +++---
OpenHPL/Tests/HPSimplePenstockPelton.mo | 6 +++---
OpenHPL/Tests/HPSimplePenstockResKP.mo | 6 +++---
OpenHPL/Tests/TestFitingSimpleHP.mo | 6 +++---
16 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/OpenHPL/ElectroMech/BaseClasses/Power2Torque.mo b/OpenHPL/ElectroMech/BaseClasses/Power2Torque.mo
index d99dedb..12c413f 100644
--- a/OpenHPL/ElectroMech/BaseClasses/Power2Torque.mo
+++ b/OpenHPL/ElectroMech/BaseClasses/Power2Torque.mo
@@ -62,11 +62,11 @@ partial model Power2Torque "Converts a power signal to a torque in the rotationa
rotation=180,
origin={-50,0})));
Modelica.Blocks.Interfaces.RealOutput f(unit="Hz")
- if enable_f "Frequency output of the aggregate"
+ if enable_f "Frequency output of the unit"
annotation (Placement(transformation(extent={{100,-50},{120,-30}}),
iconTransformation(extent={{100,-50},{120,-30}})));
Modelica.Blocks.Interfaces.RealOutput w(unit="rad/s")
- if enable_w "Angular velocity output of the aggregate"
+ if enable_w "Angular velocity output of the unit"
annotation (Placement(transformation(extent={{100,30},{120,50}}),
iconTransformation(extent={{100,30},{120,50}})));
@@ -80,7 +80,7 @@ partial model Power2Torque "Converts a power signal to a torque in the rotationa
Modelica.Mechanics.Rotational.Components.IdealGear toSysSpeed(ratio=2/p) "Converts to system speed based on p = 2" annotation (Placement(transformation(extent={{24,-6},{36,6}})));
Modelica.Blocks.Sources.RealExpression nominalSpeed(y=w_0*p/2) if enable_nomSpeed annotation (Placement(transformation(extent={{-12,-70},{8,-50}})));
Modelica.Blocks.Interfaces.RealInput w_in if enable_w_in and not enable_nomSpeed
- "Angular velocity input of the aggregate [pu]" annotation (Placement(transformation(
+ "Angular velocity input of the unit [pu]" annotation (Placement(transformation(
extent={{-20,-20},{20,20}},
rotation=90,
origin={-80,-120})));
diff --git a/OpenHPL/ElectroMech/Generators/SimpleGen.mo b/OpenHPL/ElectroMech/Generators/SimpleGen.mo
index 5e09c2f..71fbb70 100644
--- a/OpenHPL/ElectroMech/Generators/SimpleGen.mo
+++ b/OpenHPL/ElectroMech/Generators/SimpleGen.mo
@@ -18,7 +18,7 @@ model SimpleGen "Model of a simple generator with mechanical connectors"
Simple model of an ideal generator with friction.
This model based on the angular momentum balance, which depends on the turbine shaft power,
- the friction loss in the aggregate rotation and the power taken up by the generator.
+ the friction loss in the unit rotation and the power taken up by the generator.
The generator can be loaded either:
diff --git a/OpenHPL/Resources/Documents/UsersGuide_src/UsersGuide.tex b/OpenHPL/Resources/Documents/UsersGuide_src/UsersGuide.tex
index be92e73..4dbcd1f 100644
--- a/OpenHPL/Resources/Documents/UsersGuide_src/UsersGuide.tex
+++ b/OpenHPL/Resources/Documents/UsersGuide_src/UsersGuide.tex
@@ -917,7 +917,7 @@ \subsection{Pelton}
\subsection{Simple Generator}
-Here, a simple model of an ideal generator with friction is considered. This model has inputs as electric power available on the grid and the turbine shaft power. This model is based on the angular momentum balance which depends on the turbine shaft power, the friction loss in the aggregate rotation, and the power taken up by the generator. The rotor angular velocity mainly depends on its inertia, internal friction and available power. The kinetic energy stored in the rotating generator is $ K_a=\frac{1}{2}J_a\omega_a^2$, where $\omega_a$ is the angular velocity of the rotor and $J_a$ is its moment of inertia. The kinetic energy $K_a$ is changed by the power terms operating on the generator axis, e.g., the turbine shaft power $\dot{W}_s$ produced by the turbine, friction power $\dot{W}_{f,a}$, and the power taken up by the generator, $\dot{W}_g$, \cite{LieL:18}, and from energy the balance can be expressed as follows:
+Here, a simple model of an ideal generator with friction is considered. This model has inputs as electric power available on the grid and the turbine shaft power. This model is based on the angular momentum balance which depends on the turbine shaft power, the friction loss in the unit rotation, and the power taken up by the generator. The rotor angular velocity mainly depends on its inertia, internal friction and available power. The kinetic energy stored in the rotating generator is $ K_a=\frac{1}{2}J_a\omega_a^2$, where $\omega_a$ is the angular velocity of the rotor and $J_a$ is its moment of inertia. The kinetic energy $K_a$ is changed by the power terms operating on the generator axis, e.g., the turbine shaft power $\dot{W}_s$ produced by the turbine, friction power $\dot{W}_{f,a}$, and the power taken up by the generator, $\dot{W}_g$, \cite{LieL:18}, and from energy the balance can be expressed as follows:
\begin{equation}
\frac{dK_a}{dt}=\dot{W}_s-\dot{W}_{f,a}-\dot{W}_g
\end{equation}
diff --git a/OpenHPL/Resources/Images/simplegen.svg b/OpenHPL/Resources/Images/simplegen.svg
index bc9b714..02b2d4a 100644
--- a/OpenHPL/Resources/Images/simplegen.svg
+++ b/OpenHPL/Resources/Images/simplegen.svg
@@ -531,7 +531,7 @@
scale-x="0.9" />