Merge branch 'develop_0.1.8' into splitting_networks

UU-ER · Feb 7, 2025 · 357825f · 357825f
2 parents 30d7695 + 0786681
commit 357825f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/adopt_net0/data/technology_data/CCSTechnologies/MEA_large.json b/adopt_net0/data/technology_data/CCSTechnologies/MEA_large.json
@@ -6,7 +6,7 @@
   "size_is_int": 0,
   "decommission": 0,
   "Economics": {
-    "comment": "CAPEX in EUR/t/hCO2_in, OPEX_variable in EUR/t/h_CO2_captured, OPEX_fixed in % of CAPEX_annual",
+    "comment": "CAPEX in EUR/(t/hCO2_in), OPEX_variable in EUR/(t/h_CO2_captured), OPEX_fixed in % of CAPEX_annual",
     "CAPEX_model": 3,
     "unit_CAPEX": 1.1084E+06,
     "CAPEX_kappa": 3.11E+06,

diff --git a/adopt_net0/data/technology_data/CCSTechnologies/MEA_medium.json b/adopt_net0/data/technology_data/CCSTechnologies/MEA_medium.json
@@ -6,7 +6,7 @@
   "size_is_int": 0,
   "decommission": 0,
   "Economics": {
-    "comment": "CAPEX in EUR/t/hCO2_in, OPEX_variable in EUR/t/h_CO2_captured, OPEX_fixed in % of CAPEX_annual",
+    "comment": "CAPEX in EUR/(t/hCO2_in), OPEX_variable in EUR/(t/h_CO2_captured), OPEX_fixed in % of CAPEX_annual",
     "CAPEX_model": 3,
     "unit_CAPEX": 1.1084E+06,
     "CAPEX_kappa": 2.83E+06,

diff --git a/adopt_net0/data/technology_data/CCSTechnologies/MEA_small.json b/adopt_net0/data/technology_data/CCSTechnologies/MEA_small.json
@@ -6,7 +6,7 @@
   "size_is_int": 0,
   "decommission": 0,
   "Economics": {
-    "comment": "CAPEX in EUR/t/hCO2_in, OPEX_variable in EUR/t/h_CO2_captured, OPEX_fixed in % of CAPEX_annual",
+    "comment": "CAPEX in EUR/(t/hCO2_in), OPEX_variable in EUR/(t/h_CO2_captured), OPEX_fixed in % of CAPEX_annual",
     "CAPEX_model": 3,
     "unit_CAPEX": 1.104E+06,
     "CAPEX_kappa": 3.44E+06,

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -5,7 +5,7 @@
 
 Welcome to AdOpT-NET0 documentation!
 =====================================
-Energyhub is a Python Library for bottom-up multi energy system modelling. It can model conversion technologies and
+AdOpT-NET0 is a Python Library for bottom-up multi energy system modelling. It can model conversion technologies and
 networks for any carrier and optimize the design and operation of your energy system.
 We recommend to start with the :ref:`installation<installation>`, the
 :ref:`workflow for (first-time) users<workflow>`, and the