Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/steel/definitions/parameters.csv
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/steel/definitions/parameters.md
Original file line number Diff line number Diff line change
Expand Up @@ -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] |
Expand Down
10 changes: 6 additions & 4 deletions remind_mfa/steel/steel_definition.py
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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(
Expand Down
8 changes: 4 additions & 4 deletions remind_mfa/steel/steel_mfa_system_future.py
Original file line number Diff line number Diff line change
@@ -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


Expand Down Expand Up @@ -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"]
Expand Down