make nameplate units consistent in mslf

NREL · Sep 29, 2023 · 44c88d7 · 44c88d7
1 parent 95a0ae5
commit 44c88d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ssc/cmod_fresnel_physical.cpp b/ssc/cmod_fresnel_physical.cpp
@@ -1566,7 +1566,7 @@ class cm_fresnel_physical : public compute_module
             csp_solver.get_design_parameters(W_dot_bop_design, W_dot_fixed_parasitic_design);
 
             double gross_net_conversion_des = as_number("gross_net_conversion_factor");
-            nameplate = W_dot_cycle_des * gross_net_conversion_des;
+            nameplate = W_dot_cycle_des * gross_net_conversion_des;     //[MWe]
 
             // Assign
             {
@@ -1974,7 +1974,7 @@ class cm_fresnel_physical : public compute_module
 
         double kWh_per_kW = 0.0;
         if (nameplate > 0.0)
-            kWh_per_kW = ae / nameplate;
+            kWh_per_kW = ae / (nameplate*1.E3);     // convert nameplate to kW
 
         assign("capacity_factor", (ssc_number_t)(kWh_per_kW / ((double)n_steps_fixed / (double)steps_per_hour) * 100.));
         assign("kwh_per_kw", (ssc_number_t)kWh_per_kW);

diff --git a/ssc/cmod_fresnel_physical_iph.cpp b/ssc/cmod_fresnel_physical_iph.cpp
@@ -1231,7 +1231,7 @@ class cm_fresnel_physical_iph : public compute_module
             double W_dot_bop_design, W_dot_fixed_parasitic_design;    //[MWe]
             csp_solver.get_design_parameters(W_dot_bop_design, W_dot_fixed_parasitic_design);
 
-            nameplate = q_dot_pc_des * 1.E3;    // [kWt]
+            nameplate = q_dot_pc_des;    // [MWt]
 
             // Assign
             {
@@ -1510,7 +1510,7 @@ class cm_fresnel_physical_iph : public compute_module
 
 
         ssc_number_t ae = as_number("annual_energy");			//[kWt-hr]
-        double kWh_per_kW = ae / nameplate;
+        double kWh_per_kW = ae / (nameplate*1.E3);              // convert nameplate to kW
         assign("capacity_factor", (ssc_number_t)(kWh_per_kW / 8760. * 100.));
         assign("kwh_per_kw", (ssc_number_t)kWh_per_kW);