From f222fa7601f6c13ce7953fa0a4e8e6379ed78227 Mon Sep 17 00:00:00 2001 From: Steven Janzou Date: Mon, 10 Apr 2023 23:27:26 -0600 Subject: [PATCH] Fix GitHub Actions failing tests --- test/input_cases/trough_physical_defaults.h | 4 +--- test/main.cpp | 2 +- test/ssc_test/cmod_trough_physical_test.cpp | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/test/input_cases/trough_physical_defaults.h b/test/input_cases/trough_physical_defaults.h index 468492ebc..397ddd252 100644 --- a/test/input_cases/trough_physical_defaults.h +++ b/test/input_cases/trough_physical_defaults.h @@ -323,6 +323,7 @@ ssc_data_t trough_physical_defaults() ssc_number_t p_tes_lengths[11] = { 0, 90, 100, 120, 0, 0, 0, 0, 80, 120, 80 }; ssc_data_set_matrix(data, "tes_lengths", p_tes_lengths, 1, 11); ssc_data_set_number(data, "DP_SGS", 0); + ssc_data_set_number(data, "adjust_constant", 4); ssc_data_set_number(data, "use_solar_mult_or_aperture_area", 0); ssc_data_set_number(data, "specified_solar_multiple", 2); ssc_data_set_number(data, "specified_total_aperture", 877000); @@ -332,9 +333,6 @@ ssc_data_t trough_physical_defaults() ssc_number_t p_trough_loop_control[25] = { 8, 1, 1, 8, 1, 1, 7, 1, 1, 6, 1, 1, 5, 1, 1, 4, 1, 1, 3, 1, 1, 2, 1, 1, 1 }; ssc_data_set_array(data, "trough_loop_control", p_trough_loop_control, 25); ssc_data_set_number(data, "ppa_soln_mode", 0); - - ssc_data_set_number(data, "adjust_constant", 4.0); - return data; } diff --git a/test/main.cpp b/test/main.cpp index 6dc0679d9..8f502b006 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -59,7 +59,7 @@ GTEST_API_ int main(int argc, char **argv) { // ::testing::GTEST_FLAG(filter) = "CmodCashLoanTest*"; // .DiscountedPayback * "; // ::testing::GTEST_FLAG(filter) = "CMPvwattsv8Integration_cmod_pvwattsv8.DefaultNoFinancialModel_cmod_pvwattsv8*"; // "CMPvsamv1PowerIntegration_cmod_pvsamv1*"; - ::testing::GTEST_FLAG(filter) = "csp_trough.PowerTroughCmod*"; + // ::testing::GTEST_FLAG(filter) = "csp_trough.PowerTroughCmod*"; // ::testing::GTEST_FLAG(filter) = "csp_common.Tes*"; // filter to exclude diff --git a/test/ssc_test/cmod_trough_physical_test.cpp b/test/ssc_test/cmod_trough_physical_test.cpp index 90f4addb9..3c9cc095f 100644 --- a/test/ssc_test/cmod_trough_physical_test.cpp +++ b/test/ssc_test/cmod_trough_physical_test.cpp @@ -48,8 +48,8 @@ NAMESPACE_TEST(csp_trough, PowerTroughCmod, Default_NoFinancial) EXPECT_FALSE(errors); if (!errors) { EXPECT_NEAR_FRAC(power_trough.GetOutput("annual_energy"), 376824118, kErrorToleranceHi); - EXPECT_NEAR_FRAC(power_trough.GetOutput("annual_thermal_consumption"), 649308, kErrorToleranceHi); - EXPECT_NEAR_FRAC(power_trough.GetOutput("annual_tes_freeze_protection"), 611312, kErrorToleranceHi); + EXPECT_NEAR_FRAC(power_trough.GetOutput("annual_thermal_consumption"), 628313, kErrorToleranceHi); + EXPECT_NEAR_FRAC(power_trough.GetOutput("annual_tes_freeze_protection"), 590320, kErrorToleranceHi); EXPECT_NEAR_FRAC(power_trough.GetOutput("annual_field_freeze_protection"), 38042, kErrorToleranceHi); EXPECT_NEAR_FRAC(power_trough.GetOutput("capacity_factor"), 43.05, kErrorToleranceHi); EXPECT_NEAR_FRAC(power_trough.GetOutput("annual_W_cycle_gross"), 429613242, kErrorToleranceHi);