Skip to content

unit symbols to DIN 1301-1 for PowerSystemUnits #279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 28, 2022
Merged

unit symbols to DIN 1301-1 for PowerSystemUnits #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ee11ae6
unit symbols to DIN 1301-1 for PowerSystemUnits
danielfeismann Jul 21, 2022
e46872b
Merge branch 'main' into df/#278_units_symbols_to_DIN
danielfeismann Jul 21, 2022
018f4e0
harmonize per unit symbol
danielfeismann Jul 22, 2022
11e3c9e
Merge branch 'main' into df/#278_units_symbols_to_DIN
danielfeismann Jul 22, 2022
54511b8
Merge branch 'main' into df/#278_units_symbols_to_DIN
sebastian-peter Jul 27, 2022
f5b34d8
Changelog
danielfeismann Jul 28, 2022
9727ace
Merge branch 'main' into df/#278_units_symbols_to_DIN
danielfeismann Jul 28, 2022
960a603
Merge remote-tracking branch 'origin/df/#278_units_symbols_to_DIN' in…
danielfeismann Jul 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed
- 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)
- Changed unit symbols according to DIN 1301-1 for apparent and reactive power [#278] (https://github.com/ie3-institute/PowerSystemUtils/issues/278)

### Fixed
- Fix tests in CI [#206](https://github.com/ie3-institute/PowerSystemUtils/issues/206)
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/edu/ie3/util/quantities/PowerSystemUnits.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public class PowerSystemUnits extends Units {
new TransformedUnit<>("Wh", JOULE, MultiplyConverter.of(3600));

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

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

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

/** Megavar */
public static final Unit<Power> MEGAVAR = MetricPrefix.MEGA(VAR);
Expand Down Expand Up @@ -204,10 +204,10 @@ public class PowerSystemUnits extends Units {
addUnit(WATT_PER_SQUAREMETRE, "W/m²");
addUnit(PERCENT_PER_HOUR, "%/h");
addUnit(PU_PER_HOUR, "p.u./h");
addUnit(VAR, "VAr");
addUnit(KILOVAR, "kVAr");
addUnit(MEGAVAR, "MVAr");
addUnit(PU, "PU");
addUnit(VAR, "var");
addUnit(KILOVAR, "kvar");
addUnit(MEGAVAR, "Mvar");
addUnit(PU, "p.u.");
addUnit(EURO, "EUR");
addUnit(EURO_PER_KILOMETRE, "EUR/km");
addUnit(EURO_PER_WATTHOUR, "EUR/Wh");
Expand Down