Merge pull request #106 from rwijtvliet/develop

new version
rwijtvliet · Sep 18, 2024 · da218c7 · da218c7
2 parents bc3c8a2 + 36e50ac
commit da218c7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/portfolyo/tools/unitdefinitions.txt b/portfolyo/tools/unitdefinitions.txt
@@ -1,6 +1,6 @@
 # prefixes
 centi- = 1e-2 = c-
-kilo- = 1e3 = k- = K-
+kilo- = 1e3 = k-= K-
 mega- = 1e6 = M-
 giga- = 1e9 = G-
 terra- = 1e12 = T-
@@ -18,6 +18,11 @@ second = minute / 60 = s = sec
 # Energy
 watthour = [energy] = Wh
 joule = watt * second = J
+tonne_oil_equiv = 11.63 * MWh = toe
+tonne_coal_equiv = 6.978 * MWh = tce
+
+# Emissions
+tonne_co2 = [emisisons] = tCO2
 
 # Revenue (Currency)
 euro = [currency] = Eur = €
@@ -45,4 +50,4 @@ cent_per_kWh = (euro / 100) / (1000 * watthour)
 
 @system powerbase
     megawatt:watthour
-@end
+@end
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "portfolyo"
-version = "0.6.1"
+version = "0.6.2"
 description = "Analyse and manipulate timeseries related to power and gas offtake portfolios"
 authors = [
     "Ruud Wijtvliet <rwijtvliet@gmail.com>",