Merge branch 'patch' of https://github.com/NREL/ssc into patch_to_develop_2_19_25

Author: Brian Mirletz

shared/lib_battery_capacity.cpp

@@ -162,8 +162,11 @@ void capacity_t::check_SOC() {
 
             // do not switch to discharging
             state->cell_current = fmin(0, state->cell_current);
+
+            // Correct state given current change
+            state->q0 = q_upper;
         }
-        state->q0 = q_upper;
+        
     }
     else if (state->q0 < q_lower - tolerance) {
         // if undercharged then reduce discharhing
@@ -172,8 +175,10 @@ void capacity_t::check_SOC() {
 
             // do not switch to charging
             state->cell_current = fmax(0, state->cell_current);
+
+            // Correct state given current change
+            state->q0 = q_lower;
         }
-        state->q0 = q_lower;
     }
 }
 

shared/lib_windfile.cpp

@@ -115,7 +115,7 @@ static float col_or_nan(const std::string& s)
         }
     }
     else
-        return std::numeric_limits<float>::quiet_NaN();;
+        return std::numeric_limits<float>::quiet_NaN();
 }
 
 static int locate2(std::string buf, std::vector<std::string> &vstring, char delim)
@@ -479,7 +479,12 @@ bool windfile::open( const std::string &file )
         std::vector<std::string> hdr;
         int ncols = locate2(m_buf, hdr, ',');
 
-        for (size_t i = 0; (int)i < ncols; i++)
+        lat = std::numeric_limits<float>::quiet_NaN();
+        lon = std::numeric_limits<float>::quiet_NaN();
+        elev = std::numeric_limits<float>::quiet_NaN();
+
+//        for (size_t i = 0; (int)i < ncols; i++) SAM issue 1990
+        for (size_t i = 0; (int)i < ncols && (i+1) < hdr.size(); i++)
         {
             hdr_item = util::lower_case(trimboth(hdr[i]));
 
@@ -509,13 +514,18 @@ bool windfile::open( const std::string &file )
             }
 
         }
-
-        // time stamps expected to be in local time
-        // wind data files provide both site timezone and data timezone in header
-        // if the values are different, we can't determine the time zone of the time stamps
-        if (tz_data != tz_site)
+        // elevation required for hub-height power curve adjustment
+        if (isnan(elev)) {
+            m_errorMsg = "Elevation must be specified in header. Please check resource data.";
+            return false;
+        }
+ 
+        // time stamps expected to be in local time. wind data files provide both site timezone and data timezone in header
+        // if the values are different, we can't determine the time zone of the time stamps for financial model time-dependent features (TOU, TOD, etc.)
+        if (tz_data != tz_site) {
             m_errorMsg = util::format("data must be in local time: data time zone %s and site time zone %s are not the same", tz_data.c_str(), tz_site.c_str());
-
+            return false;
+        }
         // line 2 data column headings
         getline(m_ifs, m_buf);
         nhdrs++;

ssc/cmod_mhk_tidal.cpp

@@ -114,6 +114,9 @@ class cm_mhk_tidal : public compute_module
 
 		//Store the number of rows- this will have to change if resource and power curve can have different stream speeds
 		int number_rows = (int)tidal_resource_matrix.nrows();
+        // malloc issue for calculated power curve
+        if (tidal_power_curve.nrows() > tidal_resource_matrix.nrows())
+            number_rows = (int)tidal_power_curve.nrows();
 
 		//Check that the power matrix only has two columns
 		if (tidal_power_curve.ncols() != (size_t)2)
@@ -261,6 +264,7 @@ class cm_mhk_tidal : public compute_module
 
                     }
                 }
+
                 p_gen[i] = tidal_power_curve.at(power_bin, 1) * (1 - total_loss/100.0) * number_devices * haf(i); //kW
                 //p_annual_energy_dist[i] = p_gen[i] * 8760.0 / number_records;
                 annual_energy += p_gen[i] * 8760.0 / number_records;

test/shared_test/lib_battery_dispatch_automatic_btm_test.cpp

@@ -867,7 +867,7 @@ TEST_F(AutoBTMTest_lib_battery_dispatch, DispatchAutoBTMGridOutagePeakShavingDai
     // Battery will discharge as much as possible for the outage, charge when PV is available, then discharge when load increases at 7 pm
     std::vector<double> expectedPower = { 52.1, 52.1, 52.1, 52.1, 39.4, 3.7, // 0 - 5
                                            0, -48, -48, -48, -48, -48, // Able to charge when SOC at 0, 6- 11
-                                        -48, -48, -48, -48.0, -11, 0, // 12 - 17
+                                        -48, -48, -48, -48.0, -48, -38.57, // 12 - 17
                                         0, 52.1, 52.1, 52.1, 52.1, 52.1, // 18 - 23
                                         52.1, 52.1, 52.1, 52.1 };
 
@@ -938,7 +938,7 @@ TEST_F(AutoBTMTest_lib_battery_dispatch, DispatchAutoBTMGridOutageWithAvailabili
     std::vector<double> expectedPower = { 52.1, 52.1, 52.1, 52.1, 39.4, 3.7,
                                             0, 0, 0, 0, 0, 0,
                                         0, -48, -48, -48.0, -48.0, -48.0,
-                                        0, 52.1, 52.1, 52.28, 52.48, 27.6 };
+                                        0, 52.22, 52.34, 52.28, 4.47, 0 };
 
     std::vector<double> expectedCritLoadUnmet = { 0, 0, 0, 0, 12.19, 46.46,
                                                 50, 50, 50, 50, 50, 50, // Losses below prevent any crit load from being met in hrs 6 - 12 while battery is discharged
@@ -1085,7 +1085,7 @@ TEST_F(AutoBTMTest_lib_battery_dispatch, DispatchAutoBTMGridOutageWithInverterLo
     // Battery will discharge as much as possible for the outage, charge when PV is available, then discharge when load increases at 7 pm
     std::vector<double> expectedPower = { 52.1, 52.1, 52.1, 52.1, 39.4, 3.7,
                                             0, -48, -48, -48, -48, -48,
-                                        -48, -48, -48, -48.0, -11, 0,
+                                        -48, -48, -48, -48.0, -48, -38.57,
                                         0, 52.16, 52.16, 52.16, 52.16, 52.16, 52.16, };
 
     std::vector<double> expectedCritLoadUnmet = { 50, 50, 50, 50, 50, 50, // Losses below prevent any crit load from being met in first hours
@@ -1206,20 +1206,20 @@ TEST_F(AutoBTMTest_lib_battery_dispatch, DispatchAutoBTMGridOutagePeakShavingEmp
         SOC = batteryModel->SOC();
     }
 
-    EXPECT_NEAR(batteryModel->SOC(), 100, 0.01);
-    EXPECT_EQ(h, 17);
+    EXPECT_NEAR(batteryModel->SOC(), 96.67, 0.01);
+    EXPECT_EQ(h, 18);
 
     // Show that the battery can discharge above max SOC after outage
-    batteryPower->powerLoad = 680;
+    batteryPower->powerLoad = 670;
     batteryPower->powerSystem = 0;
     batteryPower->isOutageStep = false;
     batteryPower->powerCritLoad = 14;
-    dispatchAutoBTM->dispatch(0, h, 0);
+    dispatchAutoBTM->dispatch(0, h-1, 0);
     h++;
 
-    EXPECT_NEAR(batteryPower->powerBatteryDC, 12.84, 0.5) << " error in expected at hour " << h;
+    EXPECT_NEAR(batteryPower->powerBatteryDC, 2.08, 0.5) << " error in expected at hour " << h;
 
-    EXPECT_NEAR(batteryModel->SOC(), 95, 0.01);
+    EXPECT_NEAR(batteryModel->SOC(), 96.31, 0.01);
 
     // Battery cannot charge above max SOC
     batteryPower->powerLoad = 700;
@@ -1327,7 +1327,7 @@ TEST_F(AutoBTMTest_lib_battery_dispatch, DispatchAutoBTMGridOutageRetailRAteEmpt
         SOC = batteryModel->SOC();
     }
 
-    EXPECT_NEAR(batteryModel->SOC(), 100, 0.01);
+    EXPECT_NEAR(batteryModel->SOC(), 96.67, 0.01);
     EXPECT_EQ(h, 18);
 
     // Show that the battery can discharge above max SOC after outage
@@ -1338,9 +1338,9 @@ TEST_F(AutoBTMTest_lib_battery_dispatch, DispatchAutoBTMGridOutageRetailRAteEmpt
     dispatchAutoBTM->dispatch(0, h, 0);
     h++;
 
-    EXPECT_NEAR(batteryPower->powerBatteryDC, 14.6, 0.5) << " error in expected at hour " << h;
+    EXPECT_NEAR(batteryPower->powerBatteryDC, 9.80, 0.5) << " error in expected at hour " << h;
 
-    EXPECT_NEAR(batteryModel->SOC(), 95, 0.01);
+    EXPECT_NEAR(batteryModel->SOC(), 94.93, 0.01);
 
     // Battery cannot charge above max SOC
     batteryPower->powerLoad = 700;
@@ -1450,20 +1450,20 @@ TEST_F(AutoBTMTest_lib_battery_dispatch, DispatchAutoBTMGridOutageCustomEmptyAnd
         SOC = batteryModel->SOC();
     }
 
-    EXPECT_NEAR(batteryModel->SOC(), 100, 0.01);
+    EXPECT_NEAR(batteryModel->SOC(), 96.67, 0.01);
     EXPECT_EQ(h, 17);
 
     // Show that the battery can discharge above max SOC after outage
-    batteryPower->powerLoad = 700;
+    batteryPower->powerLoad = 8;
     batteryPower->powerSystem = 0;
     batteryPower->isOutageStep = false;
-    batteryPower->powerCritLoad = 50;
+    batteryPower->powerCritLoad = 8;
     dispatchAutoBTM->dispatch(0, h, 0);
     h++;
 
-    EXPECT_NEAR(batteryPower->powerBatteryDC, 14.8, 0.5) << " error in expected at hour " << h;
+    EXPECT_NEAR(batteryPower->powerBatteryDC, 9.45, 0.5) << " error in expected at hour " << h;
 
-    EXPECT_NEAR(batteryModel->SOC(), 95, 0.01);
+    EXPECT_NEAR(batteryModel->SOC(), 95.01, 0.01);
 
     // Battery cannot charge above max SOC
     batteryPower->powerLoad = 700;
@@ -1716,7 +1716,7 @@ TEST_F(AutoBTMTest_lib_battery_dispatch, DispatchAutoBTMGridOutageWithBatteryAva
     std::vector<double> expectedPower = { 0, 0, 0, 0, 0, 0,
                                             52.1, 52.1, 52.1, 52.1, 39.4, 3.7,
                                         0, -48, -48, -48.0, -48.0, -48.0,
-                                        0, 52.1, 52.1, 52.28, 52.48, 27.6 };
+                                        0, 52.22, 52.34, 52.28, 4.46, 0 };
 
     std::vector<double> expectedCritLoadUnmet = { 50, 50, 50, 50, 50, 50, // Losses below prevent any crit load from being met in hrs 0 - 5 while battery is unavailable
                                                 0, 0, 0, 0, 12.2, 46.5, // Battery meets losses until it runs out of SOC

test/shared_test/lib_battery_dispatch_manual_test.cpp

@@ -680,7 +680,7 @@ TEST_F(ManualTest_lib_battery_dispatch, OutageWithManualDispatch) {
     batteryPower->powerLoad = 50;
     dispatchManual->dispatch(year, hour_of_year, step_of_hour);
     hour_of_year += 1;
-    EXPECT_NEAR(batteryPower->powerBatteryDC, -50.0, 0.1);
+    EXPECT_NEAR(batteryPower->powerBatteryDC, -47.7, 0.1);
 
     // Turn outage back on, should charge to 100%
     batteryPower->powerSystem = 700; batteryPower->voltageSystem = 600; batteryPower->powerLoad = 50;
@@ -691,7 +691,7 @@ TEST_F(ManualTest_lib_battery_dispatch, OutageWithManualDispatch) {
         soc = dispatchManual->battery_soc();
     }
     EXPECT_NEAR(100, dispatchManual->battery_soc(), 0.1);
-    EXPECT_NEAR(17, hour_of_year, 0.1);
+    EXPECT_NEAR(19, hour_of_year, 0.1);
 
     // With outage off, can discharge above max SOC
     batteryPower->powerSystem = 0; batteryPower->voltageSystem = 600; batteryPower->powerLoad = 14;
@@ -701,7 +701,7 @@ TEST_F(ManualTest_lib_battery_dispatch, OutageWithManualDispatch) {
     EXPECT_NEAR(batteryPower->powerBatteryDC, 14.6, 0.1);
 
     // With outage off, cannot charge above max soc
-    EXPECT_NEAR(95, dispatchManual->battery_soc(), 0.1);
+    EXPECT_NEAR(97.42, dispatchManual->battery_soc(), 0.1);
     batteryPower->powerSystem = 700; batteryPower->voltageSystem = 600; batteryPower->powerLoad = 14;
     batteryPower->powerCritLoad = 14; batteryPower->isOutageStep = false;
     dispatchManual->dispatch(year, hour_of_year, step_of_hour);

test/ssc_test/cmod_battery_pvsamv1_test.cpp

@@ -124,7 +124,7 @@ TEST_F(CMPvsamv1BatteryIntegration_cmod_pvsamv1, ResidentialACBatteryModelIntegr
     ssc_number_t peakKwCharge[4] = { -2.91, -2.66, -2.25, -3.30 };
     ssc_number_t peakKwDischarge[4] = { 1.39, 1.73, 0.97, 1.96 };
     ssc_number_t peakCycles[4] = { 1, 1, 1, 3 };
-    ssc_number_t avgCycles[4] = { 1, 1, 0.4904, 1.0110 };
+    ssc_number_t avgCycles[4] = { 1, 1, 0.4822, 1.0110 };
 
     // Test peak shaving look ahead, peak shaving look behind, and automated grid power target, and self-consumption. Others require additional input data
     for (int i = 0; i < 4; i++) {

test/ssc_test/cmod_hybrid_test.cpp

@@ -101,8 +101,8 @@ TEST_F(CmodHybridTest, PVWattsv8WindBatterySingleOwner) {
         ssc_data_get_number(hybrid_outputs, "project_return_aftertax_npv", &npv);
 
         EXPECT_NEAR(om_expenses[1], 10425847, 1);
-        EXPECT_NEAR(revenue[1], 33062516, 1);
-        EXPECT_NEAR(ebitda[1], 22636669, 1);
+        EXPECT_NEAR(revenue[1], 33062517, 1);
+        EXPECT_NEAR(ebitda[1], 22636670, 1);
         EXPECT_NEAR(npv, -227222606, 227222606 * 0.001);
 
         EXPECT_NEAR(total_energy, battannualenergy, total_energy * 0.001);