From 361ee17cadebe27bdb6ddd60bc25f4a73cb48494 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Mon, 6 Jul 2026 16:38:38 +0200 Subject: [PATCH 1/2] Fix capitalization of 'BOF' in parameters --- docs/steel/definitions/parameters.csv | 2 +- remind_mfa/steel/steel_definition.py | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/steel/definitions/parameters.csv b/docs/steel/definitions/parameters.csv index c7d0fa26..61914e34 100644 --- a/docs/steel/definitions/parameters.csv +++ b/docs/steel/definitions/parameters.csv @@ -11,7 +11,7 @@ g,sector_split_medium,Final good category shares in consumption for medium gdp p g,sector_split_high,Final good category shares in consumption for high gdp per capita ,secsplit_gdppc_low,Upper GDP per capita threshold for sector_split_low ,secsplit_gdppc_high,Lower GDP per capita threshold for sector_split_high -,scrap_in_bof_rate,Share of scrap-based steel from BF-BOF production +,scrap_in_BOF_rate,Share of scrap-based steel from BF-BOF production ,forming_loss_rate,"Loss rate in forming process. Contrary to (1-forming_yield), this material is completely lost and not recycled as home scrap" ,fabrication_losses,"Loss rate during fabrication of final goods. Contrary to (1-fabrication_yield), this material is completely lost and not recycled as new scrap" ,production_loss_rate,Loss rate of raw steel production in BF-BOF and (DRI-)EAF processes diff --git a/remind_mfa/steel/steel_definition.py b/remind_mfa/steel/steel_definition.py index 006e1b68..6d4916d8 100644 --- a/remind_mfa/steel/steel_definition.py +++ b/remind_mfa/steel/steel_definition.py @@ -1,9 +1,11 @@ import flodym as fd -from remind_mfa.common.common_definition import RemindMFADefinition -from remind_mfa.steel.steel_config import SteelCfg -from remind_mfa.common.common_definition import RemindMFAParameterDefinition +from remind_mfa.common.common_definition import ( + RemindMFADefinition, + RemindMFAParameterDefinition, +) from remind_mfa.common.trade import TradeDefinition +from remind_mfa.steel.steel_config import SteelCfg def get_steel_definition(cfg: SteelCfg, historic: bool) -> RemindMFADefinition: @@ -182,7 +184,7 @@ def get_steel_definition(cfg: SteelCfg, historic: bool) -> RemindMFADefinition: description="Lower GDP per capita threshold for sector_split_high", ), RemindMFAParameterDefinition( - name="scrap_in_bof_rate", dim_letters=(), + name="scrap_in_BOF_rate", dim_letters=(), description="Share of scrap-based steel from BF-BOF production" ), RemindMFAParameterDefinition( From 120d81b9f8df8f3f57e548cb8d435643fb401555 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Mon, 6 Jul 2026 16:42:21 +0200 Subject: [PATCH 2/2] More replacements --- docs/steel/definitions/parameters.md | 2 +- remind_mfa/steel/steel_mfa_system_future.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/steel/definitions/parameters.md b/docs/steel/definitions/parameters.md index fbed2280..5b0e2b8b 100644 --- a/docs/steel/definitions/parameters.md +++ b/docs/steel/definitions/parameters.md @@ -12,7 +12,7 @@ | g | sector_split_high | Final good category shares in consumption for high gdp per capita | [@pauliuk_steel_2013] | | nan | secsplit_gdppc_low | Upper GDP per capita threshold for sector_split_low | | | nan | secsplit_gdppc_high | Lower GDP per capita threshold for sector_split_high | | -| nan | scrap_in_bof_rate | Share of scrap-based steel from BF-BOF production | | +| nan | scrap_in_BOF_rate | Share of scrap-based steel from BF-BOF production | | | nan | forming_loss_rate | Loss rate in forming process. Contrary to (1-forming_yield), this material is completely lost and not recycled as home scrap | [@cullen_mapping_2012] | | nan | fabrication_losses | Loss rate during fabrication of final goods. Contrary to (1-fabrication_yield), this material is completely lost and not recycled as new scrap | | | nan | production_loss_rate | Loss rate of raw steel production in BF-BOF and (DRI-)EAF processes | [@cullen_mapping_2012] | diff --git a/remind_mfa/steel/steel_mfa_system_future.py b/remind_mfa/steel/steel_mfa_system_future.py index 0d0182d5..f48c13b5 100644 --- a/remind_mfa/steel/steel_mfa_system_future.py +++ b/remind_mfa/steel/steel_mfa_system_future.py @@ -1,9 +1,9 @@ import flodym as fd +from remind_mfa.common.common_mfa_system import CommonMFASystem +from remind_mfa.common.price_driven_trade import PriceDrivenTrade from remind_mfa.common.trade import TradeSet from remind_mfa.common.trade_extrapolation import TradeExtrapolator -from remind_mfa.common.price_driven_trade import PriceDrivenTrade -from remind_mfa.common.common_mfa_system import CommonMFASystem from remind_mfa.steel.steel_config import SteelCfg @@ -152,9 +152,9 @@ def compute_flows(self, historic_trade: TradeSet): aux["scrap_share_production"][...] = aux["scrap_in_production"] / aux["production_inflow"].maximum(1e-6) aux["eaf_share_production"][...] = ( aux["scrap_share_production"] - - prm["scrap_in_bof_rate"].cast_to(aux["scrap_share_production"].dims) + - prm["scrap_in_BOF_rate"].cast_to(aux["scrap_share_production"].dims) ) - aux["eaf_share_production"][...] = aux["eaf_share_production"] / (1 - prm["scrap_in_bof_rate"]) + aux["eaf_share_production"][...] = aux["eaf_share_production"] / (1 - prm["scrap_in_BOF_rate"]) aux["eaf_share_production"][...] = aux["eaf_share_production"].minimum(1).maximum(0) flw["scrap_market => eaf_production"][...] = aux["production_inflow"] * aux["eaf_share_production"] flw["scrap_market => bof_production"][...] = aux["scrap_in_production"] - flw["scrap_market => eaf_production"]