Homogeneous diffuse shade fix

Author: vidanovic

src/create_wce_objects.cpp

@@ -38,13 +38,9 @@ namespace wincalc
 
     SpectralAveraging::MeasuredRow convert(OpticsParser::WLData const & data)
     {
-        if(!data.directComponent.has_value())
+        // clang-format off
+        SpectralAveraging::MeasuredRow converted
         {
-            throw std::runtime_error("Missing wavelength direct component");
-        }
-
-        // TODO: Check this with Stephen (Simon)
-        SpectralAveraging::MeasuredRow converted(
             data.wavelength,
             {
                 data.directComponent.has_value() ? data.directComponent.value().tf : 0.0,
@@ -58,7 +54,8 @@ namespace wincalc
                 data.diffuseComponent.has_value() ? data.diffuseComponent.value().rf : 0.0,
                 data.diffuseComponent.has_value() ? data.diffuseComponent.value().rb : 0.0
             }
-            );
+        };
+        // clang-format on
         return converted;
     }
 

test/expected_results/2_layers/nfrc_102_air_homogeneous_diffusing_shade_single_band/0.15_permeability_factor/quarter_basis/condensed_spectrum/theta=0_phi=0/photopic.json

@@ -1,6 +1,6 @@
 {
-    "emissivity_back_hemispheric": 0.8993011215640143,
-    "emissivity_front_hemispheric": 0.8993011215640143,
+    "emissivity_back_hemispheric": 0.8993011215640266,
+    "emissivity_front_hemispheric": 0.8993011215640266,
     "transmittance_back_diffuse_diffuse": 0.0,
     "transmittance_front_diffuse_diffuse": 0.0
 }

test/expected_results/2_layers/nfrc_102_air_homogeneous_diffusing_shade_single_band/0.15_permeability_factor/quarter_basis/condensed_spectrum/theta=0_phi=0/solar.json

@@ -1,53 +1,53 @@
 {
-    "H_shgc_indoor": 8.547542421795644,
-    "H_shgc_outdoor": 20.555016158076093,
-    "H_u_indoor": 7.360456878395626,
-    "H_u_outdoor": 20.3795779960104,
-    "SHGC": 0.2356283030956789,
-    "U": 3.210328777259255,
+    "H_shgc_indoor": 8.547899698477563,
+    "H_shgc_outdoor": 20.555047663708265,
+    "H_u_indoor": 7.36045687773547,
+    "H_u_outdoor": 20.379577995785684,
+    "SHGC": 0.23568592394297253,
+    "U": 3.2103287768776694,
     "gap_layer_effective_conductivities_shgc": [
-        0.09494977788825505
+        0.09495202436379602
     ],
     "gap_layer_effective_conductivities_u": [
-        0.08812800026225633
+        0.08812800028151506
     ],
-    "heat_flow_shgc_indoor": -121.72326041943802,
-    "heat_flow_shgc_outdoor": 108.43890170265723,
-    "heat_flow_u_indoor": -23.13854247798127,
-    "heat_flow_u_outdoor": -25.682630213967457,
+    "heat_flow_shgc_indoor": -121.76788153111434,
+    "heat_flow_shgc_outdoor": 108.46285429405384,
+    "heat_flow_u_indoor": -23.138542480346686,
+    "heat_flow_u_outdoor": -25.68263021113006,
     "layer_temperatures_shgc": [
-        310.4255444639804,
-        310.59062840851544,
-        311.39097378989425,
-        311.3907319445789
+        310.4267016677637,
+        310.59185810890096,
+        311.3955987331915,
+        311.39535684996696
     ],
     "layer_temperatures_u": [
-        303.88978596530126,
-        303.81150530591816,
-        300.2937306415426,
-        300.29362856268466
+        303.8897859651772,
+        303.81150530578714,
+        300.29373064118147,
+        300.29362856232353
     ],
     "radiosities_shgc": [
-        520.9076621133645,
-        528.408947673831,
-        532.6005447472062,
-        523.9019476911009
+        520.9142566464593,
+        528.4207130972352,
+        532.6302107863619,
+        523.9304286655001
     ],
     "radiosities_u": [
-        484.8225076817637,
-        479.81779644900826,
-        462.9371415139953,
-        459.13254441522554
+        484.8225076811996,
+        479.8177964480847,
+        462.9371415119426,
+        459.13254441326643
     ],
-    "relative_heat_gain": 195.84750319768392,
+    "relative_heat_gain": 195.8892882445536,
     "solid_layer_effective_conductivities_shgc": [
         1.0,
-        136.0040555845274
+        136.0040556383615
     ],
     "solid_layer_effective_conductivities_u": [
         1.0,
-        136.00392641343055
+        136.00392641343058
     ],
-    "system_effective_conductivity_shgc": 2.0617050182990297,
-    "system_effective_conductivity_u": 0.10518696831407572
+    "system_effective_conductivity_shgc": 2.055077362939655,
+    "system_effective_conductivity_u": 0.10518696832201335
 }

test/expected_results/2_layers/nfrc_102_air_homogeneous_diffusing_shade_single_band/0.15_permeability_factor/quarter_basis/condensed_spectrum/theta=0_phi=0/tdw.json

@@ -1,53 +1,53 @@
 {
-    "H_shgc_indoor": 7.628439051173036,
-    "H_shgc_outdoor": 29.250034404560086,
-    "H_u_indoor": 7.628439051290824,
-    "H_u_outdoor": 29.250034404546952,
+    "H_shgc_indoor": 7.628439051228499,
+    "H_shgc_outdoor": 29.250034404531924,
+    "H_u_indoor": 7.6284390515787255,
+    "H_u_outdoor": 29.25003440451446,
     "SHGC": 0.0,
-    "U": 3.413250280949299,
+    "U": 3.4132502808063596,
     "gap_layer_effective_conductivities_shgc": [
-        0.07210170414136552
+        0.07210170413740608
     ],
     "gap_layer_effective_conductivities_u": [
-        0.07210170413763992
+        0.07210170413743631
     ],
-    "heat_flow_shgc_indoor": 101.84054734591152,
-    "heat_flow_shgc_outdoor": 133.11676095893802,
-    "heat_flow_u_indoor": 101.84054734878592,
-    "heat_flow_u_outdoor": 133.11676095908828,
+    "heat_flow_shgc_indoor": 101.84054735644698,
+    "heat_flow_shgc_outdoor": 133.11676096124327,
+    "heat_flow_u_indoor": 101.84054735874865,
+    "heat_flow_u_outdoor": 133.11676096115576,
     "layer_temperatures_shgc": [
-        259.70099502172536,
-        260.10673492208167,
-        280.7994345695537,
-        280.79988385386457
+        259.70099502175333,
+        260.1067349221123,
+        280.79943456968675,
+        280.79988385399764
     ],
     "layer_temperatures_u": [
-        259.700995021715,
-        260.10673492207,
-        280.7994345697349,
-        280.79988385404585
+        259.7009950217064,
+        260.1067349220598,
+        280.79943457040275,
+        280.7998838547137
     ],
     "radiosities_shgc": [
-        255.08458251480351,
-        273.1139081225944,
-        344.4955989244612,
-        359.7378835311662
+        255.0845825147184,
+        273.11390812243906,
+        344.4955989240773,
+        359.73788353079595
     ],
     "radiosities_u": [
-        255.0845825148288,
-        273.1139081228101,
-        344.49559892564537,
-        359.7378835323286
+        255.0845825148517,
+        273.1139081230307,
+        344.49559892687626,
+        359.73788353353535
     ],
-    "relative_heat_gain": 26.555087186149386,
+    "relative_heat_gain": 26.555087184999227,
     "solid_layer_effective_conductivities_shgc": [
-        1.0000000000000002,
+        1.0,
         136.00369950303323
     ],
     "solid_layer_effective_conductivities_u": [
         0.9999999999999999,
-        136.0036995030332
+        136.00369950303323
     ],
-    "system_effective_conductivity_shgc": 0.0789088606208096,
-    "system_effective_conductivity_u": 0.07890886062371766
+    "system_effective_conductivity_shgc": 0.07890886061327952,
+    "system_effective_conductivity_u": 0.07890886061416642
 }