Merge branch 'adjust_pvwatts' into pysam_5.1

NREL · Mar 13, 2024 · deb48ce · deb48ce
2 parents 3acb25c + 4ef3bf4
commit deb48ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ssc/cmod_pvwattsv7.cpp b/ssc/cmod_pvwattsv7.cpp
@@ -1261,7 +1261,7 @@ class cm_pvwattsv7 : public compute_module
                 p_tpoa[idx] = (ssc_number_t)tpoa;  // W/m2
                 p_tmod[idx] = (ssc_number_t)tmod;
                 p_dc[idx] = (ssc_number_t)dc; // power, Watts
-                p_ac[idx] = (ssc_number_t)(ac * haf(hour_of_year)); // power, Watts
+                p_ac[idx] = (ssc_number_t)(ac * haf(wdprov->annualSimulation() ? hour_of_year : idx)); // power, Watts
 
                 // accumulate hourly energy (kWh) (was initialized to zero when allocated)
                 p_gen[idx_life] = (ssc_number_t)(p_ac[idx]* util::watt_to_kilowatt);

diff --git a/ssc/cmod_pvwattsv8.cpp b/ssc/cmod_pvwattsv8.cpp
@@ -1359,7 +1359,7 @@ class cm_pvwattsv8 : public compute_module
                 p_tmod[idx] = (ssc_number_t)tmod;
                 p_dc[idx] = (ssc_number_t)dc; // power, Watts
                 p_ac_pre_adjust[idx] = (ssc_number_t)ac; //power, Watts
-                p_ac[idx] = (ssc_number_t)(ac * haf(hour_of_year)); // power, Watts
+                p_ac[idx] = (ssc_number_t)(ac * haf(wdprov->annualSimulation() ? hour_of_year : idx)); // power, Watts
 
                 // accumulate hourly energy (kWh) (was initialized to zero when allocated)
                 p_gen[idx_life] = (ssc_number_t)(p_ac[idx] * util::watt_to_kilowatt);