From 9569269ea5e493ce3a7becea62096b5df8380b98 Mon Sep 17 00:00:00 2001 From: lucabert01 Date: Wed, 5 Feb 2025 13:54:01 +0100 Subject: [PATCH 1/4] Changed Energyhub to AdOpT-NET0 in Welcome to AdOpT-NET0 page in docs --- docs/source/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 9aa3a876c..c89797d66 100644 --- 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`, the :ref:`workflow for (first-time) users`, and the From fc943f42316b7b32d0fc604741156c8ec16f3ca2 Mon Sep 17 00:00:00 2001 From: lucabert01 Date: Fri, 7 Feb 2025 10:24:05 +0100 Subject: [PATCH 2/4] Added parenthesis in units in MEA json files --- adopt_net0/data/technology_data/CCSTechnologies/MEA_large.json | 2 +- adopt_net0/data/technology_data/CCSTechnologies/MEA_small.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/adopt_net0/data/technology_data/CCSTechnologies/MEA_large.json b/adopt_net0/data/technology_data/CCSTechnologies/MEA_large.json index bf0000392..5b9497af8 100644 --- 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_small.json b/adopt_net0/data/technology_data/CCSTechnologies/MEA_small.json index a7bde4318..6a0918397 100644 --- 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, From 6b09e2c9bffa9d8e743c69ed75c877a3ab99e2f7 Mon Sep 17 00:00:00 2001 From: lucabert01 Date: Fri, 7 Feb 2025 10:24:42 +0100 Subject: [PATCH 3/4] Added parenthesis in units in MEA json files (also for MEA_medium.json --- adopt_net0/data/technology_data/CCSTechnologies/MEA_medium.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adopt_net0/data/technology_data/CCSTechnologies/MEA_medium.json b/adopt_net0/data/technology_data/CCSTechnologies/MEA_medium.json index 9a08e9eab..dc1b09b39 100644 --- 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, From b96c54f71e18f51ebe836e7171bef1050a56c0dd Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 7 Feb 2025 09:25:59 +0000 Subject: [PATCH 4/4] Update requirements.txt generated by Poetry --- requirements.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index 614a03e7c..6438a25d4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,15 +1,15 @@ -certifi==2024.12.14 ; python_version >= "3.12" and python_version < "4.0" +certifi==2025.1.31 ; python_version >= "3.12" and python_version < "4.0" cffi==1.17.1 ; python_version >= "3.12" and python_version < "4.0" charset-normalizer==3.4.1 ; python_version >= "3.12" and python_version < "4.0" colorama==0.4.6 ; python_version >= "3.12" and python_version < "4.0" and platform_system == "Windows" et-xmlfile==2.0.0 ; python_version >= "3.12" and python_version < "4.0" -h3==4.1.2 ; python_version >= "3.12" and python_version < "4.0" +h3==4.2.1 ; python_version >= "3.12" and python_version < "4.0" h5py==3.12.1 ; python_version >= "3.12" and python_version < "4.0" highspy==1.9.0 ; python_version >= "3.12" and python_version < "4.0" idna==3.10 ; python_version >= "3.12" and python_version < "4.0" joblib==1.4.2 ; python_version >= "3.12" and python_version < "4.0" networkx==3.4.2 ; python_version >= "3.12" and python_version < "4.0" -numpy==2.2.1 ; python_version >= "3.12" and python_version < "4.0" +numpy==2.2.2 ; python_version >= "3.12" and python_version < "4.0" openpyxl==3.1.5 ; python_version >= "3.12" and python_version < "4.0" packaging==24.2 ; python_version >= "3.12" and python_version < "4.0" pandas==2.2.3 ; python_version >= "3.12" and python_version < "4.0" @@ -21,7 +21,7 @@ pycparser==2.22 ; python_version >= "3.12" and python_version < "4.0" pydoe==0.3.8 ; python_version >= "3.12" and python_version < "4.0" pyomo==6.8.2 ; python_version >= "3.12" and python_version < "4.0" python-dateutil==2.9.0.post0 ; python_version >= "3.12" and python_version < "4.0" -pytz==2024.2 ; python_version >= "3.12" and python_version < "4.0" +pytz==2025.1 ; python_version >= "3.12" and python_version < "4.0" requests==2.32.3 ; python_version >= "3.12" and python_version < "4.0" scandir==1.10.0 ; python_version >= "3.12" and python_version < "4.0" scikit-learn==1.6.1 ; python_version >= "3.12" and python_version < "4.0" @@ -29,8 +29,8 @@ scipy==1.15.1 ; python_version >= "3.12" and python_version < "4.0" six==1.17.0 ; python_version >= "3.12" and python_version < "4.0" statsmodels==0.14.4 ; python_version >= "3.12" and python_version < "4.0" threadpoolctl==3.5.0 ; python_version >= "3.12" and python_version < "4.0" -timezonefinder==6.5.7 ; python_version >= "3.12" and python_version < "4.0" +timezonefinder==6.5.8 ; python_version >= "3.12" and python_version < "4.0" tqdm==4.67.1 ; python_version >= "3.12" and python_version < "4.0" tsam==2.3.5 ; python_version >= "3.12" and python_version < "4.0" -tzdata==2024.2 ; python_version >= "3.12" and python_version < "4.0" +tzdata==2025.1 ; python_version >= "3.12" and python_version < "4.0" urllib3==2.3.0 ; python_version >= "3.12" and python_version < "4.0"