cf naming

NREL · Feb 28, 2024 · 435205a · 435205a
1 parent 130aa39
commit 435205a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/greenheart/simulation/technologies/ammonia/ammonia.py b/greenheart/simulation/technologies/ammonia/ammonia.py
@@ -167,11 +167,11 @@ class AmmoniaCapcityModelConfig:
             per year to make ammonia.
         desired_ammonia_kgpy Optional (float): The amount of desired ammonia production in
             kilograms per year.
-        plant_capcity_factor (float): The ammonia plant capacity factor.
+        input_capacity_factor_estimate (float): The estimated ammonia plant capacity factor.
         feedstocks (Feedstocks): An instance of the `Feedstocks` class detailing the
             costs and consumption rates of resources used in production.
     """
-    plant_capacity_factor: float
+    input_capacity_factor_estimate: float
     feedstocks: Feedstocks
     hydrogen_amount_kgpy: Optional[float] = field(default=None)
     desired_ammonia_kgpy: Optional[float] = field(default=None)
@@ -203,17 +203,17 @@ def run_size_ammonia_plant_capacity(config: AmmoniaCapcityModelConfig) -> Ammoni
     if config.hydrogen_amount_kgpy:
         ammonia_plant_capacity_kgpy = (config.hydrogen_amount_kgpy 
             / config.feedstocks.hydrogen_consumption 
-            * config.plant_capacity_factor
+            * config.input_capacity_factor_estimate
         )
         hydrogen_amount_kgpy = config.hydrogen_amount_kgpy
 
     if config.desired_ammonia_kgpy:
         hydrogen_amount_kgpy = (config.desired_ammonia_kgpy
             * config.feedstocks.hydrogen_consumption
-            / config.plant_capacity_factor
+            / config.input_capacity_factor_estimate
         )
         ammonia_plant_capacity_kgpy = (config.desired_ammonia_kgpy 
-            / config.plant_capacity_factor
+            / config.input_capacity_factor_estimate
         )
 
     return AmmoniaCapacityModelOutputs(

diff --git a/greenheart/simulation/technologies/steel/steel.py b/greenheart/simulation/technologies/steel/steel.py
@@ -202,11 +202,11 @@ class SteelCapacityModelConfig:
             per year to make steel.
         desired_steel_mtpy Optional (float): The amount of desired steel production in
             metric tonnes per year.
-        plant_capcity_factor (float): The steel plant capacity factor.
+        input_capacity_factor_estimate (float): The estimated steel plant capacity factor.
         feedstocks (Feedstocks): An instance of the `Feedstocks` class detailing the
             costs and consumption rates of resources used in production.
     """
-    plant_capacity_factor: float
+    input_capacity_factor_estimate: float
     feedstocks: Feedstocks
     hydrogen_amount_kgpy: Optional[float] = field(default=None)
     desired_steel_mtpy: Optional[float] = field(default=None)
@@ -239,18 +239,18 @@ def run_size_steel_plant_capcity(config: SteelCapacityModelConfig) -> SteelCapac
         steel_plant_capacity_mtpy = (config.hydrogen_amount_kgpy 
             / 1000
             / config.feedstocks.hydrogen_consumption 
-            * config.plant_capacity_factor
+            * config.input_capacity_factor_estimate
         )
         hydrogen_amount_kgpy = config.hydrogen_amount_kgpy
 
     if config.desired_steel_mtpy:
         hydrogen_amount_kgpy = (config.desired_steel_mtpy 
             * 1000
             * config.feedstocks.hydrogen_consumption
-            / config.plant_capacity_factor
+            / config.input_capacity_factor_estimate
         )
         steel_plant_capacity_mtpy = (config.desired_steel_mtpy 
-            / config.plant_capacity_factor
+            / config.input_capacity_factor_estimate
         )
 
     return SteelCapacityModelOutputs(

diff --git a/tests/greenheart/test_ammonia.py b/tests/greenheart/test_ammonia.py
@@ -114,7 +114,7 @@ def test_ammonia_finance_model():
 def test_ammonia_size_h2_input(subtests):
     config = ammonia.AmmoniaCapcityModelConfig(
         hydrogen_amount_kgpy=73288888.8888889,
-        plant_capacity_factor=0.9,
+        input_capacity_factor_estimate=0.9,
         feedstocks=ammonia.Feedstocks(
             electricity_cost=89.42320514456621,
             hydrogen_cost=4.2986685034417045,
@@ -134,7 +134,7 @@ def test_ammonia_size_h2_input(subtests):
 def test_ammonia_size_NH3_input(subtests):
     config = ammonia.AmmoniaCapcityModelConfig(
         desired_ammonia_kgpy=334339658.8730839,
-        plant_capacity_factor=0.9,
+        input_capacity_factor_estimate=0.9,
         feedstocks=ammonia.Feedstocks(
             electricity_cost=89.42320514456621,
             hydrogen_cost=4.2986685034417045,

diff --git a/tests/greenheart/test_steel.py b/tests/greenheart/test_steel.py
@@ -141,7 +141,7 @@ def test_steel_finance_model(cost_config):
 def test_steel_size_h2_input(subtests):
     config = steel.SteelCapacityModelConfig(
         hydrogen_amount_kgpy=73288888.8888889,
-        plant_capacity_factor=0.9,
+        input_capacity_factor_estimate=0.9,
         feedstocks=steel.Feedstocks(
             natural_gas_prices=ng_prices_dict, oxygen_market_price=0
         ),
@@ -157,7 +157,7 @@ def test_steel_size_h2_input(subtests):
 def test_steel_size_NH3_input(subtests):
     config = steel.SteelCapacityModelConfig(
         desired_steel_mtpy=1000000,
-        plant_capacity_factor=0.9,
+        input_capacity_factor_estimate=0.9,
         feedstocks=steel.Feedstocks(
             natural_gas_prices=ng_prices_dict, oxygen_market_price=0
         ),