Skip to content

Commit ef395ec

Browse files
#28 more logging changes
1 parent c4be0e0 commit ef395ec

File tree

1 file changed

+23
-6
lines changed

1 file changed

+23
-6
lines changed

test/util.cpp

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -441,35 +441,47 @@ void test_thermal_results(std::string const &results_name,
441441
double phi = 0) {
442442
logMsg("start test_thermal_results: " + results_name);
443443
auto expected = parse_expected_results(results_name);
444+
logMsg("before u: " + results_name);
444445
auto u = glazing_system->u(theta, phi);
446+
logMsg("before shgc: " + results_name);
445447
auto shgc = glazing_system->shgc(theta, phi);
448+
logMsg("before system_effective_conductivity_u: " + results_name);
446449
auto system_effective_conductivity_u =
447450
glazing_system->system_effective_conductivity(Tarcog::ISO15099::System::Uvalue, theta, phi);
451+
logMsg("before system_effective_conductivity_shgc: " + results_name);
448452
auto system_effective_conductivity_shgc =
449453
glazing_system->system_effective_conductivity(Tarcog::ISO15099::System::SHGC, theta, phi);
454+
logMsg("before relative_heat_gain: " + results_name);
450455
auto relative_heat_gain = glazing_system->relative_heat_gain(theta, phi);
451-
456+
logMsg("before heat_flow_u_indoor: " + results_name);
452457
auto heat_flow_u_indoor = glazing_system->heat_flow(
453458
Tarcog::ISO15099::System::Uvalue, Tarcog::ISO15099::Environment::Indoor, theta, phi);
459+
logMsg("before heat_flow_u_outdoor: " + results_name);
454460
auto heat_flow_u_outdoor = glazing_system->heat_flow(
455461
Tarcog::ISO15099::System::Uvalue, Tarcog::ISO15099::Environment::Outdoor, theta, phi);
462+
logMsg("before heat_flow_shgc_indoor: " + results_name);
456463
auto heat_flow_shgc_indoor = glazing_system->heat_flow(
457464
Tarcog::ISO15099::System::SHGC, Tarcog::ISO15099::Environment::Indoor, theta, phi);
465+
logMsg("before heat_flow_shgc_outdoor: " + results_name);
458466
auto heat_flow_shgc_outdoor = glazing_system->heat_flow(
459467
Tarcog::ISO15099::System::SHGC, Tarcog::ISO15099::Environment::Outdoor, theta, phi);
460-
468+
logMsg("before H_u_indoor: " + results_name);
461469
auto H_u_indoor = glazing_system->h(
462470
Tarcog::ISO15099::System::Uvalue, Tarcog::ISO15099::Environment::Indoor, theta, phi);
471+
logMsg("before H_u_outdoor: " + results_name);
463472
auto H_u_outdoor = glazing_system->h(
464473
Tarcog::ISO15099::System::Uvalue, Tarcog::ISO15099::Environment::Outdoor, theta, phi);
474+
logMsg("before H_shgc_indoor: " + results_name);
465475
auto H_shgc_indoor = glazing_system->h(
466476
Tarcog::ISO15099::System::SHGC, Tarcog::ISO15099::Environment::Indoor, theta, phi);
477+
logMsg("before H_shgc_outdoor: " + results_name);
467478
auto H_shgc_outdoor = glazing_system->h(
468479
Tarcog::ISO15099::System::SHGC, Tarcog::ISO15099::Environment::Outdoor, theta, phi);
469-
480+
logMsg("before radiosities_u: " + results_name);
470481
auto radiosities_u = glazing_system->radiosities(Tarcog::ISO15099::System::Uvalue);
482+
logMsg("before radiosities_shgc: " + results_name);
471483
auto radiosities_shgc = glazing_system->radiosities(Tarcog::ISO15099::System::SHGC);
472-
484+
logMsg("after radiosities_shgc: " + results_name);
473485
auto expected_u = expected.value("U", -1.0);
474486
EXPECT_NEAR(u, expected_u, TEST_TOLARANCE);
475487

@@ -572,6 +584,7 @@ void test_thermal_results(std::string const &results_name,
572584
glazing_system->solid_layers_effective_conductivities(
573585
Tarcog::ISO15099::System::SHGC, theta, phi);
574586

587+
logMsg("before expected_solid_layer_effective_conductivities_u: " + results_name);
575588
std::vector<double> expected_solid_layer_effective_conductivities_u =
576589
expected.value("solid_layer_effective_conductivities_u", std::vector<double>());
577590
std::vector<double> expected_solid_layer_effective_conductivities_shgc =
@@ -581,8 +594,10 @@ void test_thermal_results(std::string const &results_name,
581594
compare_vectors(solid_layer_effective_conductivities_shgc,
582595
expected_solid_layer_effective_conductivities_shgc);
583596

597+
logMsg("before gap_layer_effective_conductivities_u: " + results_name);
584598
auto gap_layer_effective_conductivities_u = glazing_system->gap_layers_effective_conductivities(
585599
Tarcog::ISO15099::System::Uvalue, theta, phi);
600+
logMsg("before gap_layer_effective_conductivities_shgc: " + results_name);
586601
auto gap_layer_effective_conductivities_shgc =
587602
glazing_system->gap_layers_effective_conductivities(
588603
Tarcog::ISO15099::System::SHGC, theta, phi);
@@ -596,18 +611,20 @@ void test_thermal_results(std::string const &results_name,
596611
compare_vectors(gap_layer_effective_conductivities_shgc,
597612
expected_gap_layer_effective_conductivities_shgc);
598613

614+
logMsg("before layer_temperatures_u: " + results_name);
599615
auto layer_temperatures_u =
600616
glazing_system->layer_temperatures(Tarcog::ISO15099::System::Uvalue, theta, phi);
617+
logMsg("before layer_temperatures_shgc: " + results_name);
601618
auto layer_temperatures_shgc =
602619
glazing_system->layer_temperatures(Tarcog::ISO15099::System::SHGC, theta, phi);
603-
620+
logMsg("after layer_temperatures_shgc: " + results_name);
604621
std::vector<double> expected_layer_temperatures_u =
605622
expected.value("layer_temperatures_u", std::vector<double>());
606623
std::vector<double> expected_layer_temperatures_shgc =
607624
expected.value("layer_temperatures_shgc", std::vector<double>());
608625
compare_vectors(layer_temperatures_u, expected_layer_temperatures_u);
609626
compare_vectors(layer_temperatures_shgc, expected_layer_temperatures_shgc);
610-
627+
logMsg("before if(update): " + results_name);
611628

612629
if (update) {
613630
expected["U"] = u;

0 commit comments

Comments
 (0)