Update ptes and etes tests to run all is_dispatch and update pvsamv1 integration tests

Author: sjanzou

test/main.cpp

@@ -63,7 +63,7 @@ GTEST_API_ int main(int argc, char **argv) {
     //::testing::GTEST_FLAG(filter) = "CMPvsamv1PowerIntegration_cmod_pvsamv1.NoFinancialModelSystemDesign";
     //::testing::GTEST_FLAG(filter) = "CmodCashLoanTest*:CmodSingleOwnerTest*";
     //::testing::GTEST_FLAG(filter) = "Solesca*";
-
+    //::testing::GTEST_FLAG(filter) = "etes_ptes_test*";
     //::testing::GTEST_FLAG(filter) = "csp_tower.PowerTowerCmod*";
     //::testing::GTEST_FLAG(filter) = "CmodFresnelPhysicalTest.MSLFDefault";
 

test/ssc_test/cmod_etes_etes_test.cpp

@@ -44,18 +44,18 @@ NAMESPACE_TEST(etes_etes_test, EtesEtesCmod, Default_NoFinancial)
 {
     ssc_data_t defaults = etes_etes_defaults();
     CmodUnderTest etes_system = CmodUnderTest("etes_electric_resistance", defaults);
-    /*
+
     etes_system.SetInput("is_dispatch", 0);
     int errors = etes_system.RunModule();
     double ann_energy = etes_system.GetOutput("annual_energy");
     EXPECT_FALSE(errors);
     if (!errors) {
         EXPECT_NEAR_FRAC(std::abs(etes_system.GetOutput("annual_energy")), std::abs(-739728801.), kErrorToleranceHi);
     }
-    */
+
     etes_system.SetInput("is_dispatch", 1);
-    int errors = etes_system.RunModule();
-    double ann_energy = etes_system.GetOutput("annual_energy");
+    errors = etes_system.RunModule();
+    ann_energy = etes_system.GetOutput("annual_energy");
     EXPECT_FALSE(errors);
     if (!errors) {
         EXPECT_NEAR_FRAC(std::abs(etes_system.GetOutput("annual_energy")), std::abs(-497554825), kErrorToleranceHi);

test/ssc_test/cmod_etes_ptes_test.cpp

@@ -44,21 +44,19 @@ NAMESPACE_TEST(etes_ptes_test, EtesPtesCmod, Default_NoFinancial)
 {
     ssc_data_t defaults = etes_ptes_defaults();
     CmodUnderTest ptes_system = CmodUnderTest("etes_ptes", defaults);
-    /*
+    
     ptes_system.SetInput("is_dispatch", 0);
     int errors = ptes_system.RunModule();
     double ann_energy = ptes_system.GetOutput("annual_energy");
     EXPECT_FALSE(errors);
     if (!errors) {
         EXPECT_NEAR_FRAC(std::abs(ptes_system.GetOutput("annual_energy")), std::abs(264339255.), kErrorToleranceHi);
     }
-    */
     ptes_system.SetInput("is_dispatch", 1);
-    int errors = ptes_system.RunModule();
-    double ann_energy = ptes_system.GetOutput("annual_energy");
+    errors = ptes_system.RunModule();
+    ann_energy = ptes_system.GetOutput("annual_energy");
     EXPECT_FALSE(errors);
     if (!errors) {
         EXPECT_NEAR_FRAC(std::abs(ptes_system.GetOutput("annual_energy")), std::abs(202929176.), kErrorToleranceHi);
     }
-
 }

test/ssc_test/cmod_pvsamv1_test.cpp

@@ -670,7 +670,7 @@ TEST_F(CMPvsamv1PowerIntegration_cmod_pvsamv1, NoFinancialModelSystemDesign)
                                 192329, 187710, 185732, 197565, 201021, 192329, 187710
     };
 
-    for (size_t i = 0; i < annual_energy_expected.size(); i+=15)
+    for (size_t i = 57; i < annual_energy_expected.size(); i++)
     {
         pairs["enable_mismatch_vmax_calc"] = enable_mismatch[i];
         pairs["subarray1_azimuth"] = subarray1_azimuth[i];