Correct name bugs

GenXProject · Dec 3, 2023 · 91c10d7 · 91c10d7
1 parent 2b7bce7
commit 91c10d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/model/resources/fusion/fusion_capacity_reserve_margin.jl b/src/model/resources/fusion/fusion_capacity_reserve_margin.jl
@@ -61,7 +61,8 @@ end
 
 
 # alias for better parallelism in effective_capacity.jl
-thermal_fusion_capacity_reserve_margin_adjustment(a,b,c,d,e,f) = fusion_capacity_reserve_margin_adjustment(a,b,c,d,e,f)
+thermal_fusion_capacity_reserve_margin_adjustment = fusion_capacity_reserve_margin_adjustment
+
 #################################
 # Where the math actually happens
 #################################

diff --git a/src/model/resources/fusion/fusion_maintenance.jl b/src/model/resources/fusion/fusion_maintenance.jl
@@ -8,11 +8,11 @@ function fusion_maintenance_adjust_parasitic_power!(EP, df::DataFrame)
     MAINTENANCE = resources_with_maintenance(df)
 
     for y in intersect(FUSION, MAINTENANCE)
-        resource_component(y) = df[y, :Resource]
-        reactor = FusionReactorData(parasitic_passive_fraction = by_rid(y, :Recirc_Pass),
+        resource_component = df[y, :Resource]
+        reactor = FusionReactorData(parasitic_passive_fraction = by_rid(y, :Parasitic_Passive),
                                     eff_down = 1.0,
                                     component_size = by_rid(y, :Cap_Size),
-                                    maintenance_remaining_parasitic_power_fraction = by_rid(y, :Recirc_Pass_Maintenance_Remaining))
+									maintenance_remaining_parasitic_power_fraction = float(by_rid(y, :Parasitic_Passive_Maintenance_Remaining)))
 
         _fusion_maintenance_parasitic_power_adjustment!(EP, resource_component, reactor)
     end