Move function

GenXProject · Dec 5, 2023 · 1c4eb68 · 1c4eb68
1 parent 3826972
commit 1c4eb68
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/src/model/resources/fusion/fusion.jl b/src/model/resources/fusion/fusion.jl
@@ -486,3 +486,14 @@ function fusion_annual_parasitic_power(EP, inputs, resource_component::AbstractS
 	annual_parasitic = weight' * eTotalParasitic
 	return annual_parasitic
 end
+
+function thermal_fusion_annual_parasitic_power(EP::Model, inputs::Dict, setup::Dict)::Vector{Float64}
+	dfGen = inputs["dfGen"]
+	scale_factor = setup["ParameterScale"] == 1 ? ModelScalingFactor : 1
+	FUSION = resources_with_fusion(dfGen)
+
+	resource_component = dfGen[FUSION, :Resource]
+
+	expr = fusion_annual_parasitic_power.(Ref(EP), Ref(inputs), resource_component)
+	return scale_factor * value.(expr)
+end
diff --git a/src/model/resources/fusion/fusion_policy_adjustments.jl b/src/model/resources/fusion/fusion_policy_adjustments.jl
@@ -119,19 +119,3 @@ function fusion_parasitic_power_adjust_energy_share_requirement!(EP, inputs)
 	end
 end
 
-#################################
-#
-#    For various outputs
-#
-#################################
-
-function thermal_fusion_annual_parasitic_power(EP::Model, inputs::Dict, setup::Dict)::Vector{Float64}
-	dfGen = inputs["dfGen"]
-	scale_factor = setup["ParameterScale"] == 1 ? ModelScalingFactor : 1
-	FUSION = resources_with_fusion(dfGen)
-
-	resource_component = dfGen[FUSION, :Resource]
-
-	expr = fusion_annual_parasitic_power.(Ref(EP), Ref(inputs), resource_component)
-	return scale_factor * value.(expr)
-end