Skip to content

Commit d26f522

Browse files
sjanzousjanzou
authored
Merge pull request #1327 from NREL/speedy_gonzales
ssc test speed up Note that all 693 tests run locally on Windows in release mode in about 14m20s (about 1/3 of the debug build run on the Ubutntu coverage VM)
2 parents e3949fc + ac90663 commit d26f522

26 files changed

+114
-918
lines changed

‎test/input_cases/battwatts_cases.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ int v1 = sprintf(ac_power_path, "%s/test/input_cases/battwatts_data/ac_power.csv
5151
void pvwatts_pv_defaults(ssc_data_t& data) {
5252
ssc_data_set_string(data, "solar_resource_file", solar_resource_path);
5353
ssc_data_set_number(data, "system_use_lifetime_output", 0);
54-
ssc_data_set_number(data, "analysis_period", 25);
55-
ssc_data_set_number(data, "system_capacity", 4.6928700000000001);
54+
ssc_data_set_number(data, "analysis_period", 2);
55+
ssc_data_set_number(data, "system_capacity", 4.6928700000000001);
5656
ssc_data_set_number(data, "module_type", 0);
5757
ssc_data_set_number(data, "dc_ac_ratio", 1.2);
5858
ssc_data_set_number(data, "array_type", 0);

‎test/input_cases/biomass_common.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@ void biomass_commondata(ssc_data_t &data) {
149149

150150
ssc_data_set_number(data, "adjust_constant", 0.0);
151151

152-
ssc_data_set_number(data, "analysis_period", 25);
152+
ssc_data_set_number(data, "analysis_period", 2);
153+
153154
ssc_number_t p_federal_tax_rate[1] = { 21 };
154155
ssc_data_set_array(data, "federal_tax_rate", p_federal_tax_rate, 1);
155156
ssc_number_t p_state_tax_rate[1] = { 7 };

‎test/input_cases/csp_financial_defaults.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ ssc_data_t singleowner_defaults()
77
{
88
ssc_data_t data = ssc_data_create();
99

10-
ssc_data_set_number(data, "analysis_period", 25);
10+
ssc_data_set_number(data, "analysis_period", 2);
11+
1112
ssc_number_t p_federal_tax_rate[1] = { 21 };
1213
ssc_data_set_array(data, "federal_tax_rate", p_federal_tax_rate, 1);
1314
ssc_number_t p_state_tax_rate[1] = { 7 };

‎test/input_cases/custom_generation_common_data.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,8 @@ void custom_generation_commerical_battery_60min(ssc_data_t &data)
442442
ssc_data_set_number(data, "conv_eff", 34.118049621582031);
443443
set_array(data, "energy_output_array", customgenerationtest::gen_path_60min, 8760);
444444
ssc_data_set_number(data, "system_use_lifetime_output", 0);
445-
ssc_data_set_number(data, "analysis_period", 25);
445+
ssc_data_set_number(data, "analysis_period", 2);
446+
446447
ssc_number_t p_generic_degradation[1] = { 0 };
447448
ssc_data_set_array(data, "generic_degradation", p_generic_degradation, 1);
448449

‎test/input_cases/geothermal_common_data.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ static void geothermal_singleowner_default(ssc_data_t &data)
5858
ssc_data_set_number(data, "resource_temp", 200);
5959
ssc_data_set_number(data, "resource_depth", 2000);
6060
ssc_data_set_number(data, "geotherm.cost.inj_prod_well_ratio", 50);
61-
ssc_data_set_number(data, "geothermal_analysis_period", 25);
61+
ssc_data_set_number(data, "geothermal_analysis_period", 2);
6262
ssc_data_set_number(data, "model_choice", 0);
6363
ssc_data_set_number(data, "specified_pump_work_amount", 0);
6464
ssc_data_set_number(data, "nameplate", 30000);
@@ -145,7 +145,8 @@ static void geothermal_singleowner_default(ssc_data_t &data)
145145
set_array(data, "grid_curtailment", geothermal_curtailment_path, 8760);
146146
ssc_data_set_number(data, "grid_interconnection_limit_kwac", 100000);
147147

148-
ssc_data_set_number(data, "analysis_period", 25);
148+
ssc_data_set_number(data, "analysis_period", 2);
149+
149150
ssc_number_t p_federal_tax_rate[1] = { 21 };
150151
ssc_data_set_array(data, "federal_tax_rate", p_federal_tax_rate, 1);
151152
ssc_number_t p_state_tax_rate[1] = { 7 };

‎test/input_cases/pvsamv1_battery_common_data.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ void pvsamv1_pv_defaults(ssc_data_t& data) {
7979
ssc_data_set_number(data, "transformer_load_loss", 0);
8080
ssc_data_set_number(data, "system_use_lifetime_output", 1);
8181
ssc_data_set_number(data, "save_full_lifetime_variables", 1);
82-
ssc_data_set_number(data, "analysis_period", 25);
83-
ssc_number_t p_dc_degradation[1] = { 0.5 };
82+
ssc_data_set_number(data, "analysis_period", 2);
83+
ssc_number_t p_dc_degradation[1] = { 0.5 };
8484
ssc_data_set_array(data, "dc_degradation", p_dc_degradation, 1);
8585
ssc_data_set_number(data, "en_dc_lifetime_losses", 0);
8686
ssc_number_t p_dc_lifetime_losses[1] = { 0 };
@@ -825,7 +825,8 @@ void commercial_multiarray_default(ssc_data_t& data) {
825825
ssc_data_set_number(data, "transformer_load_loss", 0);
826826
ssc_data_set_number(data, "system_use_lifetime_output", 1);
827827
ssc_data_set_number(data, "save_full_lifetime_variables", 1);
828-
ssc_data_set_number(data, "analysis_period", 25);
828+
ssc_data_set_number(data, "analysis_period", 2);
829+
829830
ssc_number_t p_federal_tax_rate[1] = { 21 };
830831
ssc_data_set_array(data, "federal_tax_rate", p_federal_tax_rate, 1);
831832
ssc_number_t p_state_tax_rate[1] = { 7 };

‎test/input_cases/pvsamv1_common_data.cpp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,8 @@ void pvsamv1_with_residential_default(ssc_data_t& data)
553553
ssc_data_set_number(data, "transformer_no_load_loss", 0);
554554
ssc_data_set_number(data, "transformer_load_loss", 0);
555555
ssc_data_set_number(data, "system_use_lifetime_output", 0);
556-
ssc_data_set_number(data, "analysis_period", 25);
556+
ssc_data_set_number(data, "analysis_period", 2);
557+
557558
ssc_number_t p_dc_degradation[1] = { 0.5 };
558559
ssc_data_set_array(data, "dc_degradation", p_dc_degradation, 1);
559560
ssc_data_set_number(data, "en_dc_lifetime_losses", 0);
@@ -942,8 +943,10 @@ void cashloan_default(ssc_data_t& data)
942943
ssc_data_set_array(data, "om_fuel_cost", p_om_fuel_cost, 1);
943944
ssc_data_set_number(data, "om_fuel_cost_escal", 0);
944945
ssc_number_t itc_amount[1] = { 0 };
945-
ssc_number_t itc_fed_percent[1] = { 30 };
946-
ssc_number_t itc_sta_percent[1] = { 25 };
946+
// ssc_number_t itc_fed_percent[1] = { 30 };
947+
// ssc_number_t itc_sta_percent[1] = { 25 };
948+
ssc_number_t itc_fed_percent[1] = { 0 };
949+
ssc_number_t itc_sta_percent[1] = { 0 };
947950
ssc_number_t itc_amount_max[1] = { 1e+38 };
948951
ssc_data_set_array(data, "itc_fed_amount", itc_amount, 1);
949952
ssc_data_set_array(data, "itc_sta_amount", itc_amount, 1);

‎test/input_cases/pvwatts_cases.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ static int pvwatts_nofinancial_testfile(ssc_data_t &data)
6565

6666
//set the variables for the PVWatts default case
6767
ssc_data_set_number(data, "system_use_lifetime_output", 0);
68-
ssc_data_set_number(data, "analysis_period", 25);
68+
ssc_data_set_number(data, "analysis_period", 2);
69+
6970
ssc_data_set_string(data, "solar_resource_file", hourly); //file set above
7071
ssc_data_set_number(data, "system_capacity", 4);
7172
ssc_data_set_number(data, "module_type", 0);

‎test/main.cpp‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,17 @@ GTEST_API_ int main(int argc, char **argv) {
5656
// ::testing::GTEST_FLAG(filter) = "CmodPVWatts*:CMPvwatts*";
5757
//::testing::GTEST_FLAG(filter) = "CmodHybridTest*";
5858
//::testing::GTEST_FLAG(filter) = "CMPvsamv1BatteryIntegration_cmod_pvsamv1.ResidentialDCBatteryModelPriceSignalDispatchGridExport";
59-
59+
//::testing::GTEST_FLAG(filter) = "CMPvsamv1BatteryIntegration_cmod_pvsamv1.*";
60+
//::testing::GTEST_FLAG(filter) = "CMPvsamv1PowerIntegration_cmod_pvsamv1.*";
61+
//::testing::GTEST_FLAG(filter) = "CMGeothermal.*";
62+
//::testing::GTEST_FLAG(filter) = "save_as_JSON_test_run.*";
6063
//::testing::GTEST_FLAG(filter) = "csp_tower.PowerTowerCmod.Default_NoFinancial";
61-
64+
//::testing::GTEST_FLAG(filter) = "CMPvsamv1PowerIntegration_cmod_pvsamv1.NoFinancialModelSystemDesign";
6265
//::testing::GTEST_FLAG(filter) = "CmodCashLoanTest*:CmodSingleOwnerTest*";
66+
//::testing::GTEST_FLAG(filter) = "CmodSaleLeasebackTest*:CmodThirdPartyOwnershipTest*:CmodHostDeveloperTest*:CmodMerchantPlantTest*:CmodLCOEFCRTest*";
67+
//::testing::GTEST_FLAG(filter) = "CmodLeveragedPartnershipFlipTest*:CmodAllEquityPartnershipFlipTest*";
6368
//::testing::GTEST_FLAG(filter) = "Solesca*";
64-
69+
//::testing::GTEST_FLAG(filter) = "etes_ptes_test*";
6570
//::testing::GTEST_FLAG(filter) = "csp_tower.PowerTowerCmod*";
6671
//::testing::GTEST_FLAG(filter) = "CmodFresnelPhysicalTest.MSLFDefault";
6772

‎test/shared_test/lib_battery_dispatch_pvsmoothing_fom_test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ TEST_F(PVSmoothing_lib_battery_dispatch, Generic_w_PV_input_all_on) {
123123
ssc_data_free(dat);
124124
dat = nullptr;
125125
}
126-
126+
/*
127127
TEST_F(PVSmoothing_lib_battery_dispatch, FuelCell_PV_Phoenix_all_on) {
128128
129129
char file_path[256];
@@ -167,4 +167,4 @@ TEST_F(PVSmoothing_lib_battery_dispatch, FuelCell_PV_Phoenix_all_on) {
167167
ssc_data_free(dat);
168168
dat = nullptr;
169169
}
170-
170+
*/

0 commit comments

Comments
 (0)