Skip to content

Commit 5427d62

Browse files
Merge pull request #279 from ie3-institute/df/#278_units_symbols_to_DIN
unit symbols to DIN 1301-1 for PowerSystemUnits
2 parents e1913b5 + 960a603 commit 5427d62

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1212

1313
### Changed
1414
- Refactored `GeoUtils`, moved them to the scala package and tailored them toward the `loactiontec.jts` Geometries used in the `OsmContainer` [#163] (https://github.com/ie3-institute/PowerSystemUtils/issues/163)
15+
- Changed unit symbols according to DIN 1301-1 for apparent and reactive power [#278] (https://github.com/ie3-institute/PowerSystemUtils/issues/278)
1516

1617
### Fixed
1718
- Fix tests in CI [#206](https://github.com/ie3-institute/PowerSystemUtils/issues/206)

src/main/java/edu/ie3/util/quantities/PowerSystemUnits.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public class PowerSystemUnits extends Units {
7878
new TransformedUnit<>("Wh", JOULE, MultiplyConverter.of(3600));
7979

8080
public static final Unit<Energy> VARHOUR =
81-
new TransformedUnit<>("VArh", JOULE, MultiplyConverter.of(3600));
81+
new TransformedUnit<>("varh", JOULE, MultiplyConverter.of(3600));
8282

8383
/** Kilowatthour */
8484
public static final Unit<Energy> KILOWATTHOUR = MetricPrefix.KILO(WATTHOUR);
@@ -112,8 +112,8 @@ public class PowerSystemUnits extends Units {
112112
/** Megavoltampere */
113113
public static final Unit<Power> MEGAVOLTAMPERE = MetricPrefix.MEGA(VOLTAMPERE);
114114

115-
/** Volt ampere reactive */
116-
public static final Unit<Power> VAR = new AlternateUnit<>(WATT, "VAr");
115+
/** Voltampere reactive */
116+
public static final Unit<Power> VAR = new AlternateUnit<>(WATT, "var");
117117

118118
/** Megavar */
119119
public static final Unit<Power> MEGAVAR = MetricPrefix.MEGA(VAR);
@@ -204,10 +204,10 @@ public class PowerSystemUnits extends Units {
204204
addUnit(WATT_PER_SQUAREMETRE, "W/m²");
205205
addUnit(PERCENT_PER_HOUR, "%/h");
206206
addUnit(PU_PER_HOUR, "p.u./h");
207-
addUnit(VAR, "VAr");
208-
addUnit(KILOVAR, "kVAr");
209-
addUnit(MEGAVAR, "MVAr");
210-
addUnit(PU, "PU");
207+
addUnit(VAR, "var");
208+
addUnit(KILOVAR, "kvar");
209+
addUnit(MEGAVAR, "Mvar");
210+
addUnit(PU, "p.u.");
211211
addUnit(EURO, "EUR");
212212
addUnit(EURO_PER_KILOMETRE, "EUR/km");
213213
addUnit(EURO_PER_WATTHOUR, "EUR/Wh");

0 commit comments

Comments
 (0)