Merge branch 'develop' into integration

os-climate · Jun 26, 2024 · 8b9a186 · 8b9a186
2 parents 87a8dba + 6422197
commit 8b9a186
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/energy_models/core/stream_type/stream_disc.py b/energy_models/core/stream_type/stream_disc.py
@@ -1,6 +1,6 @@
 '''
 Copyright 2022 Airbus SAS
-Modifications on 2023/03/27-2024/06/24 Copyright 2023 Capgemini
+Modifications on 2023/03/27-2024/06/26 Copyright 2023 Capgemini
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -30,9 +30,6 @@
     InstanciatedPieChart,
 )
 
-from energy_models.core.stream_type.resources_models.resource_glossary import (
-    ResourceGlossary,
-)
 from energy_models.glossaryenergy import GlossaryEnergy
 
 

diff --git a/energy_models/models/gaseous_hydrogen/plasma_cracking/plasma_cracking.py b/energy_models/models/gaseous_hydrogen/plasma_cracking/plasma_cracking.py
@@ -1,6 +1,6 @@
 '''
 Copyright 2022 Airbus SAS
-Modifications on 2023/11/07-2024/06/2024 Copyright 2023 Capgemini
+Modifications on 2023/11/07-2024/06/26 Copyright 2023 Capgemini
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -185,8 +185,7 @@ def grad_percentage_resource_vs_energy_prices(self, CO2_credits, carbon_market_d
             energy)
 
         # if carbon_production < carbon_demand
-        quantity.loc[quantity['is_prod_inf_demand'] == True,
-                     'A_value'] = quantity['carbon_sales_revenues']
+        quantity.loc[quantity['is_prod_inf_demand'], 'A_value'] = quantity['carbon_sales_revenues']
         # if carbon_production > carbon_demand
         # carbon_storage
         quantity.loc[~quantity['is_prod_inf_demand'], 'A_value'] = quantity['carbon_demand_sales_revenues']