#10596 - Remove fmt fortran workarounds - Z & N (and S)#11109
#10596 - Remove fmt fortran workarounds - Z & N (and S)#11109Myoldmopar merged 9 commits intodevelopfrom
Conversation
|
|
At 6163163 which removed the Z-format Table Small Diffs: 7 They are all like this - <td align="right">0.312471E+02</td>
+ <td align="right">3.124709E+01</td>I think that's acceptable 5ZoneAutoDXVAVClick to expand diff--- eplustbl.htm
+++ eplustbl.htm
@@ -6377,7 +6377,7 @@
<td align="right">Pass</td>
<td align="right">Pass</td>
<td align="right"> 3.579994412</td>
- <td align="right">0.312471E+02</td>
+ <td align="right">3.124709E+01</td>
<td align="right">Pass</td>
<td align="right">Pass</td>
</tr>
@@ -11022,7 +11022,7 @@
<td align="right"> 86.20</td>
<td align="right"> 0.01461378</td>
<td align="right"> 72.74</td>
- <td align="right">0.101896E+04</td>
+ <td align="right">1.018959E+03</td>
<td align="right"> 21.1412</td>
<td align="right"> 76.00</td>
<td align="right"> 0.00936238</td>
@@ -11111,7 +11111,7 @@
<td align="right"> 0.86</td>
<td align="right"> 0.00083893</td>
<td align="right"> 0.86</td>
- <td align="right">0.101896E+04</td>
+ <td align="right">1.018959E+03</td>
<td align="right"> 70.4705</td>
<td align="right"> 70.42</td>
<td align="right"> 0.00375825</td>5Zone_Unitary_HXAssistedCoilClick to expand diff--- eplustbl.htm
+++ eplustbl.htm
@@ -6145,7 +6145,7 @@
<td align="right">AirLoopHVAC:UnitarySystem</td>
<td align="right">GASHEAT DXAC FURNACE 1</td>
<td align="right">Design Size Nominal Heating Capacity [Btu/h]</td>
- <td align="right">0.100908E+06</td>
+ <td align="right">1.009077E+05</td>
</tr>
<tr>
<td align="right">58</td>
@@ -6166,14 +6166,14 @@
<td align="right">AirLoopHVAC:UnitarySystem</td>
<td align="right">GASHEAT DXAC FURNACE 1</td>
<td align="right">Design Size Supplemental Heating Coil Nominal Capacity [Btu/h]</td>
- <td align="right">0.193637E+06</td>
+ <td align="right">1.936368E+05</td>
</tr>
<tr>
<td align="right">61</td>
<td align="right">AirLoopHVAC:UnitarySystem</td>
<td align="right">GASHEAT DXAC FURNACE 1</td>
<td align="right">User-Specified Supplemental Heating Coil Nominal Capacity [Btu/h]</td>
- <td align="right">0.109184E+06</td>
+ <td align="right">1.091840E+05</td>
</tr>
<tr>
<td align="right">62</td>
@@ -6222,21 +6222,21 @@
<td align="right">Coil:Heating:Fuel</td>
<td align="right">MAIN HEATING COIL 1</td>
<td align="right">Design Size Nominal Capacity [Btu/h]</td>
- <td align="right">0.100908E+06</td>
+ <td align="right">1.009077E+05</td>
</tr>
<tr>
<td align="right">69</td>
<td align="right">Coil:Heating:Fuel</td>
<td align="right">HUMIDISTAT REHEAT COIL 1</td>
<td align="right">Design Size Nominal Capacity [Btu/h]</td>
- <td align="right">0.193637E+06</td>
+ <td align="right">1.936368E+05</td>
</tr>
<tr>
<td align="right">70</td>
<td align="right">Coil:Heating:Fuel</td>
<td align="right">HUMIDISTAT REHEAT COIL 1</td>
<td align="right">User-Specified Nominal Capacity [Btu/h]</td>
- <td align="right">0.109184E+06</td>
+ <td align="right">1.091840E+05</td>
</tr>
</table>
<br><br>
@@ -10561,7 +10561,7 @@
<td align="right">VAV SYS 1</td>
<td align="right"> 183854.897</td>
<td align="right"> 140476.552</td>
- <td align="right">0.116535E+05</td>
+ <td align="right">1.165346E+04</td>
<td align="right"> -99999.</td>
<td align="right"> -999.00</td>
<td align="right">CHICAGO ANN CLG .4% CONDNS WB=>MDB</td>
@@ -10570,7 +10570,7 @@
<td align="right">7/21 16:00:00</td>
<td align="right"> 193636.75</td>
<td align="right"> 128146.91</td>
- <td align="right">0.116535E+05</td>
+ <td align="right">1.165346E+04</td>
<td align="right"> 79.89</td>
<td align="right"> 67.58</td>
<td align="right"> 0.01197140</td>
@@ -10827,7 +10827,7 @@
<td align="right"> 0.86</td>
<td align="right"> 0.00083893</td>
<td align="right"> 0.86</td>
- <td align="right">0.150220E+04</td>
+ <td align="right">1.502203E+03</td>
<td align="right"> 27.0536</td>
<td align="right"> 70.42</td>
<td align="right"> 0.00375757</td>
@@ -11309,7 +11309,7 @@
<td align="right">No</td>
<td align="right"> 183854.897</td>
<td align="right"> 140476.552</td>
- <td align="right">0.116535E+05</td>
+ <td align="right">1.165346E+04</td>
<td align="right"> -99999.</td>
<td align="right"> -999.00</td>
<td align="right"> -999.0000</td>
@@ -11343,7 +11343,7 @@
<td align="right"> 128146.91</td>
<td align="right"> 1.0532</td>
<td align="right"> 14.25907779</td>
- <td align="right">0.116535E+05</td>
+ <td align="right">1.165346E+04</td>
<td align="right"> 79.89</td>
<td align="right"> 67.58</td>
<td align="right"> 0.01197140</td>
@@ -11361,7 +11361,7 @@
<td align="right"> 85.68</td>
<td align="right"> 0.01879512</td>
<td align="right"> 77.28</td>
- <td align="right">0.150220E+04</td>
+ <td align="right">1.502203E+03</td>
<td align="right"> 12.8906</td>
<td align="right"> 76.00</td>
<td align="right"> 0.00944068</td>
@@ -11450,7 +11450,7 @@
<td align="right"> 0.86</td>
<td align="right"> 0.00083893</td>
<td align="right"> 0.86</td>
- <td align="right">0.150220E+04</td>
+ <td align="right">1.502203E+03</td>
<td align="right"> 27.0536</td>
<td align="right"> 70.42</td>
<td align="right"> 0.00375757</td>5Zone_Unitary_VSDesuperheatWaterHeaterClick to expand diff--- eplustbl.htm
+++ eplustbl.htm
@@ -6247,7 +6247,7 @@
<td align="right">AirLoopHVAC:UnitarySystem</td>
<td align="right">GASHEAT DXAC FURNACE 1</td>
<td align="right">Design Size Nominal Heating Capacity [Btu/h]</td>
- <td align="right">0.100908E+06</td>
+ <td align="right">1.009077E+05</td>
</tr>
<tr>
<td align="right">61</td>
@@ -6268,14 +6268,14 @@
<td align="right">AirLoopHVAC:UnitarySystem</td>
<td align="right">GASHEAT DXAC FURNACE 1</td>
<td align="right">Design Size Supplemental Heating Coil Nominal Capacity [Btu/h]</td>
- <td align="right">0.184234E+06</td>
+ <td align="right">1.842337E+05</td>
</tr>
<tr>
<td align="right">64</td>
<td align="right">AirLoopHVAC:UnitarySystem</td>
<td align="right">GASHEAT DXAC FURNACE 1</td>
<td align="right">User-Specified Supplemental Heating Coil Nominal Capacity [Btu/h]</td>
- <td align="right">0.109184E+06</td>
+ <td align="right">1.091840E+05</td>
</tr>
<tr>
<td align="right">65</td>
@@ -6296,21 +6296,21 @@
<td align="right">Coil:Heating:Fuel</td>
<td align="right">MAIN HEATING COIL 1</td>
<td align="right">Design Size Nominal Capacity [Btu/h]</td>
- <td align="right">0.100908E+06</td>
+ <td align="right">1.009077E+05</td>
</tr>
<tr>
<td align="right">68</td>
<td align="right">Coil:Heating:Fuel</td>
<td align="right">HUMIDISTAT REHEAT COIL 1</td>
<td align="right">Design Size Nominal Capacity [Btu/h]</td>
- <td align="right">0.184234E+06</td>
+ <td align="right">1.842337E+05</td>
</tr>
<tr>
<td align="right">69</td>
<td align="right">Coil:Heating:Fuel</td>
<td align="right">HUMIDISTAT REHEAT COIL 1</td>
<td align="right">User-Specified Nominal Capacity [Btu/h]</td>
- <td align="right">0.109184E+06</td>
+ <td align="right">1.091840E+05</td>
</tr>
</table>
<br><br>
@@ -10635,7 +10635,7 @@
<td align="right">VAV SYS 1</td>
<td align="right"> 184233.739</td>
<td align="right"> 140766.011</td>
- <td align="right">0.116775E+05</td>
+ <td align="right">1.167747E+04</td>
<td align="right"> -99999.</td>
<td align="right"> -999.00</td>
<td align="right">CHICAGO ANN CLG .4% CONDNS WB=>MDB</td>
@@ -10644,7 +10644,7 @@
<td align="right">7/21 16:00:00</td>
<td align="right"> 193981.25</td>
<td align="right"> 128501.28</td>
- <td align="right">0.116775E+05</td>
+ <td align="right">1.167747E+04</td>
<td align="right"> 79.88</td>
<td align="right"> 67.56</td>
<td align="right"> 0.01196166</td>
@@ -10866,7 +10866,7 @@
<td align="right"> 0.86</td>
<td align="right"> 0.00083893</td>
<td align="right"> 0.86</td>
- <td align="right">0.150220E+04</td>
+ <td align="right">1.502203E+03</td>
<td align="right"> 26.9610</td>
<td align="right"> 70.43</td>
<td align="right"> 0.00375217</td>
@@ -11348,7 +11348,7 @@
<td align="right">No</td>
<td align="right"> 184233.739</td>
<td align="right"> 140766.011</td>
- <td align="right">0.116775E+05</td>
+ <td align="right">1.167747E+04</td>
<td align="right"> -99999.</td>
<td align="right"> -999.00</td>
<td align="right"> -999.0000</td>
@@ -11382,7 +11382,7 @@
<td align="right"> 128501.28</td>
<td align="right"> 1.0529</td>
<td align="right"> 14.28845932</td>
- <td align="right">0.116775E+05</td>
+ <td align="right">1.167747E+04</td>
<td align="right"> 79.88</td>
<td align="right"> 67.56</td>
<td align="right"> 0.01196166</td>
@@ -11400,7 +11400,7 @@
<td align="right"> 85.69</td>
<td align="right"> 0.01879513</td>
<td align="right"> 77.28</td>
- <td align="right">0.150220E+04</td>
+ <td align="right">1.502203E+03</td>
<td align="right"> 12.8641</td>
<td align="right"> 75.99</td>
<td align="right"> 0.00943921</td>
@@ -11489,7 +11489,7 @@
<td align="right"> 0.86</td>
<td align="right"> 0.00083893</td>
<td align="right"> 0.86</td>
- <td align="right">0.150220E+04</td>
+ <td align="right">1.502203E+03</td>
<td align="right"> 26.9610</td>
<td align="right"> 70.43</td>
<td align="right"> 0.00375217</td>5Zone_Unitary_VSDesuperheaterClick to expand diff--- eplustbl.htm
+++ eplustbl.htm
@@ -6177,7 +6177,7 @@
<td align="right">AirLoopHVAC:UnitarySystem</td>
<td align="right">GASHEAT DXAC FURNACE 1</td>
<td align="right">Design Size Nominal Heating Capacity [Btu/h]</td>
- <td align="right">0.100908E+06</td>
+ <td align="right">1.009077E+05</td>
</tr>
<tr>
<td align="right">64</td>
@@ -6219,7 +6219,7 @@
<td align="right">Coil:Heating:Fuel</td>
<td align="right">MAIN HEATING COIL 1</td>
<td align="right">Design Size Nominal Capacity [Btu/h]</td>
- <td align="right">0.100908E+06</td>
+ <td align="right">1.009077E+05</td>
</tr>
</table>
<br><br>
@@ -10846,7 +10846,7 @@
<td align="right"> 0.86</td>
<td align="right"> 0.00083893</td>
<td align="right"> 0.86</td>
- <td align="right">0.150220E+04</td>
+ <td align="right">1.502203E+03</td>
<td align="right"> 27.0536</td>
<td align="right"> 70.42</td>
<td align="right"> 0.00375757</td>
@@ -11558,7 +11558,7 @@
<td align="right"> 85.68</td>
<td align="right"> 0.01879512</td>
<td align="right"> 77.28</td>
- <td align="right">0.150220E+04</td>
+ <td align="right">1.502203E+03</td>
<td align="right"> 27.0536</td>
<td align="right"> 76.00</td>
<td align="right"> 0.00944068</td>EMSSetpointBasedMultiSpeedDXCoilOverrideControlClick to expand diff--- eplustbl.htm
+++ eplustbl.htm
@@ -8098,7 +8098,7 @@
<td align="right"> 0.86</td>
<td align="right"> 0.00083893</td>
<td align="right"> 0.86</td>
- <td align="right">0.150220E+04</td>
+ <td align="right">1.502203E+03</td>
<td align="right"> 27.0536</td>
<td align="right"> 70.42</td>
<td align="right"> 0.00375757</td>
@@ -8632,7 +8632,7 @@
<td align="right"> 85.68</td>
<td align="right"> 0.01879512</td>
<td align="right"> 77.28</td>
- <td align="right">0.150220E+04</td>
+ <td align="right">1.502203E+03</td>
<td align="right"> 27.0536</td>
<td align="right"> 76.00</td>
<td align="right"> 0.00944068</td>
@@ -8721,7 +8721,7 @@
<td align="right"> 0.86</td>
<td align="right"> 0.00083893</td>
<td align="right"> 0.86</td>
- <td align="right">0.150220E+04</td>
+ <td align="right">1.502203E+03</td>
<td align="right"> 27.0536</td>
<td align="right"> 70.42</td>
<td align="right"> 0.00375757</td>
@@ -8899,7 +8899,7 @@
<td align="right"> 85.68</td>
<td align="right"> 0.01879512</td>
<td align="right"> 77.28</td>
- <td align="right">0.150220E+04</td>
+ <td align="right">1.502203E+03</td>
<td align="right"> 54.1072</td>
<td align="right"> 76.00</td>
<td align="right"> 0.00944068</td>
@@ -8988,7 +8988,7 @@
<td align="right"> 85.68</td>
<td align="right"> 0.01879512</td>
<td align="right"> 77.28</td>
- <td align="right">0.150220E+04</td>
+ <td align="right">1.502203E+03</td>
<td align="right"> 27.0536</td>
<td align="right"> 76.00</td>
<td align="right"> 0.00944068</td>WaterSideEconomizer_PreCoolCoilClick to expand diff--- eplustbl.htm
+++ eplustbl.htm
@@ -6167,7 +6167,7 @@
<td align="right">Coil:Cooling:Water</td>
<td align="right">FREE COOLING COIL</td>
<td align="right">Design Size Design Coil Load [Btu/h]</td>
- <td align="right">0.193357E+06</td>
+ <td align="right">1.933571E+05</td>
</tr>
<tr>
<td align="right">50</td>
@@ -6363,7 +6363,7 @@
<td align="right">PlantLoop</td>
<td align="right">CONDENSERPLANTLOOP</td>
<td align="right">Design Capacity [Btu/h]</td>
- <td align="right">0.193357E+06</td>
+ <td align="right">1.933571E+05</td>
</tr>
<tr>
<td align="right">78</td>
@@ -11115,7 +11115,7 @@
<td align="right"> 0.86</td>
<td align="right"> 0.00083893</td>
<td align="right"> 0.86</td>
- <td align="right">0.150220E+04</td>
+ <td align="right">1.502203E+03</td>
<td align="right"> 27.0536</td>
<td align="right"> 70.42</td>
<td align="right"> 0.00375757</td>
@@ -11649,7 +11649,7 @@
<td align="right"> 85.68</td>
<td align="right"> 0.01879512</td>
<td align="right"> 77.28</td>
- <td align="right">0.150220E+04</td>
+ <td align="right">1.502203E+03</td>
<td align="right"> 27.0536</td>
<td align="right"> 76.00</td>
<td align="right"> 0.00944068</td>
@@ -11738,7 +11738,7 @@
<td align="right"> 0.86</td>
<td align="right"> 0.00083893</td>
<td align="right"> 0.86</td>
- <td align="right">0.150220E+04</td>
+ <td align="right">1.502203E+03</td>
<td align="right"> 27.0536</td>
<td align="right"> 70.42</td>
<td align="right"> 0.00375757</td>
@@ -11916,7 +11916,7 @@
<td align="right"> 85.68</td>
<td align="right"> 0.01879512</td>
<td align="right"> 77.28</td>
- <td align="right">0.150220E+04</td>
+ <td align="right">1.502203E+03</td>
<td align="right"> 27.0536</td>
<td align="right"> 76.00</td>
<td align="right"> 0.00944068</td>_SmallOffice_DullesClick to expand diff--- eplustbl.htm
+++ eplustbl.htm
@@ -7013,7 +7013,7 @@
<td align="right">Coil:Heating:Fuel</td>
<td align="right">REHEATCOIL_SOUTHZONE_1STFLOOR</td>
<td align="right">User-Specified Nominal Capacity [Btu/h]</td>
- <td align="right">0.341200E+06</td>
+ <td align="right">3.412000E+05</td>
</tr>
<tr>
<td align="right">57</td>
@@ -7125,7 +7125,7 @@
<td align="right">Coil:Heating:Fuel</td>
<td align="right">REHEATCOIL_NORTHZONE_1STFLOOR</td>
<td align="right">User-Specified Nominal Capacity [Btu/h]</td>
- <td align="right">0.341200E+06</td>
+ <td align="right">3.412000E+05</td>
</tr>
<tr>
<td align="right">73</td>
@@ -7237,7 +7237,7 @@
<td align="right">Coil:Heating:Fuel</td>
<td align="right">REHEATCOIL_SOUTHZONE_2NDFLOOR</td>
<td align="right">User-Specified Nominal Capacity [Btu/h]</td>
- <td align="right">0.341200E+06</td>
+ <td align="right">3.412000E+05</td>
</tr>
<tr>
<td align="right">89</td>
@@ -7349,7 +7349,7 @@
<td align="right">Coil:Heating:Fuel</td>
<td align="right">REHEATCOIL_NORTHZONE_2NDFLOOR</td>
<td align="right">User-Specified Nominal Capacity [Btu/h]</td>
- <td align="right">0.341200E+06</td>
+ <td align="right">3.412000E+05</td>
</tr>
</table>
<br><br>
@@ -10335,7 +10335,7 @@
<td align="right">Pass</td>
<td align="right">Pass</td>
<td align="right"> 1.050040921</td>
- <td align="right">0.102423E+02</td>
+ <td align="right">1.024235E+01</td>
<td align="right">Pass</td>
<td align="right">Pass</td>
</tr>
@@ -10348,7 +10348,7 @@
<td align="right">Pass</td>
<td align="right">Pass</td>
<td align="right"> 3.186750994</td>
- <td align="right">0.323712E+02</td>
+ <td align="right">3.237124E+01</td>
<td align="right">Pass</td>
<td align="right">Pass</td>
</tr>
@@ -10478,7 +10478,7 @@
<td align="right">Pass</td>
<td align="right">Pass</td>
<td align="right"> 1.588301378</td>
- <td align="right">0.145832E+02</td>
+ <td align="right">1.458317E+01</td>
<td align="right">Pass</td>
<td align="right">Pass</td>
</tr>
@@ -10608,7 +10608,7 @@
<td align="right">Pass</td>
<td align="right">Pass</td>
<td align="right"> 2.574393012</td>
- <td align="right">0.164763E+02</td>
+ <td align="right">1.647630E+01</td>
<td align="right">Pass</td>
<td align="right">Pass</td>
</tr>
@@ -10738,7 +10738,7 @@
<td align="right">Pass</td>
<td align="right">Pass</td>
<td align="right"> 1.825416937</td>
- <td align="right">0.142969E+02</td>
+ <td align="right">1.429690E+01</td>
<td align="right">Pass</td>
<td align="right">Pass</td>
</tr>
@@ -10764,7 +10764,7 @@
<td align="right">Pass</td>
<td align="right">Pass</td>
<td align="right"> 2.403229175</td>
- <td align="right">0.111442E+02</td>
+ <td align="right">1.114418E+01</td>
<td align="right">Pass</td>
<td align="right">Pass</td>
</tr>
@@ -10829,7 +10829,7 @@
<td align="right">Pass</td>
<td align="right">Pass</td>
<td align="right"> 2.607823973</td>
- <td align="right">0.927127E+01</td>
+ <td align="right">9.271266E+00</td>
<td align="right">Pass</td>
<td align="right">Pass</td>
</tr>
@@ -10868,7 +10868,7 @@
<td align="right">Pass</td>
<td align="right">Pass</td>
<td align="right"> 2.384205668</td>
- <td align="right">0.924518E+01</td>
+ <td align="right">9.245183E+00</td>
<td align="right">Pass</td>
<td align="right">Pass</td>
</tr>
@@ -10894,7 +10894,7 @@
<td align="right">Pass</td>
<td align="right">Pass</td>
<td align="right"> 3.040824559</td>
- <td align="right">0.137171E+02</td>
+ <td align="right">1.371709E+01</td>
<td align="right">Pass</td>
<td align="right">Pass</td>
</tr>
@@ -10920,7 +10920,7 @@
<td align="right">Fail</td>
<td align="right">Pass</td>
<td align="right"> 3.250103289</td>
- <td align="right">0.133043E+02</td>
+ <td align="right">1.330425E+01</td>
<td align="right">Fail</td>
<td align="right">Pass</td>
</tr>
@@ -10932,8 +10932,8 @@
<td align="right"> 0.918573750</td>
<td align="right">Fail</td>
<td align="right">Pass</td>
- <td align="right">0.627905E+02</td>
- <td align="right">0.728155E+03</td>
+ <td align="right">6.279051E+01</td>
+ <td align="right">7.281547E+02</td>
<td align="right">Fail</td>
<td align="right">Pass</td>
</tr>
@@ -10946,7 +10946,7 @@
<td align="right">Pass</td>
<td align="right">Pass</td>
<td align="right"> 3.879656597</td>
- <td align="right">0.180543E+02</td>
+ <td align="right">1.805427E+01</td>
<td align="right">Fail</td>
<td align="right">Pass</td>
</tr>
@@ -10972,7 +10972,7 @@
<td align="right">Pass</td>
<td align="right">Pass</td>
<td align="right"> 5.031508179</td>
- <td align="right">0.279209E+02</td>
+ <td align="right">2.792095E+01</td>
<td align="right">Pass</td>
<td align="right">Pass</td>
</tr>
@@ -10985,7 +10985,7 @@
<td align="right">Fail</td>
<td align="right">Pass</td>
<td align="right"> 3.141076316</td>
- <td align="right">0.175128E+02</td>
+ <td align="right">1.751279E+01</td>
<td align="right">Fail</td>
<td align="right">Pass</td>
</tr>
@@ -10998,7 +10998,7 @@
<td align="right">Pass</td>
<td align="right">Pass</td>
<td align="right"> 2.450511019</td>
- <td align="right">0.942971E+01</td>
+ <td align="right">9.429708E+00</td>
<td align="right">Pass</td>
<td align="right">Pass</td>
</tr>
@@ -11024,7 +11024,7 @@
<td align="right">Pass</td>
<td align="right">Pass</td>
<td align="right"> 8.402452195</td>
- <td align="right">0.584392E+02</td>
+ <td align="right">5.843915E+01</td>
<td align="right">Pass</td>
<td align="right">Pass</td>
</tr>
@@ -11037,7 +11037,7 @@
<td align="right">Pass</td>
<td align="right">Pass</td>
<td align="right"> 2.233290365</td>
- <td align="right">0.963129E+01</td>
+ <td align="right">9.631290E+00</td>
<td align="right">Pass</td>
<td align="right">Pass</td>
</tr>
@@ -11050,7 +11050,7 @@
<td align="right">Pass</td>
<td align="right">Pass</td>
<td align="right"> 3.251856941</td>
- <td align="right">0.111815E+02</td>
+ <td align="right">1.118146E+01</td>
<td align="right">Pass</td>
<td align="right">Pass</td>
</tr>
@@ -11076,7 +11076,7 @@
<td align="right">Pass</td>
<td align="right">Pass</td>
<td align="right"> 2.887852220</td>
- <td align="right">0.122896E+02</td>
+ <td align="right">1.228957E+01</td>
<td align="right">Pass</td>
<td align="right">Pass</td>
</tr>
@@ -11115,7 +11115,7 @@
<td align="right">Pass</td>
<td align="right">Pass</td>
<td align="right"> 2.887033315</td>
- <td align="right">0.235945E+02</td>
+ <td align="right">2.359451E+01</td>
<td align="right">Pass</td>
<td align="right">Pass</td>
</tr>
@@ -11180,7 +11180,7 @@
<td align="right">Pass</td>
<td align="right">Pass</td>
<td align="right"> 2.453435830</td>
- <td align="right">0.906978E+01</td>
+ <td align="right">9.069776E+00</td>
<td align="right">Pass</td>
<td align="right">Pass</td>
</tr>
@@ -11193,7 +11193,7 @@
<td align="right">Pass</td>
<td align="right">Pass</td>
<td align="right"> 2.935234283</td>
- <td align="right">0.124067E+02</td>
+ <td align="right">1.240671E+01</td>
<td align="right">Pass</td>
<td align="right">Pass</td>
</tr>
@@ -11206,7 +11206,7 @@
<td align="right">Pass</td>
<td align="right">Pass</td>
<td align="right"> 3.045309577</td>
- <td align="right">0.142484E+02</td>
+ <td align="right">1.424837E+01</td>
<td align="right">Pass</td>
<td align="right">Pass</td>
</tr>
@@ -15651,7 +15651,7 @@
<td align="right"> 93.38</td>
<td align="right"> 0.01469484</td>
<td align="right"> 74.77</td>
- <td align="right">0.120000E+03</td>
+ <td align="right">1.200000E+02</td>
<td align="right"> 8.0203</td>
<td align="right"> 75.02</td>
<td align="right"> 0.00922156</td>
@@ -15740,7 +15740,7 @@
<td align="right"> 10.76</td>
<td align="right"> 0.00137459</td>
<td align="right"> 10.69</td>
- <td align="right">0.120000E+03</td>
+ <td align="right">1.200000E+02</td>
<td align="right"> 26.7342</td>
<td align="right"> 70.91</td>
<td align="right"> 0.00448645</td>
@@ -15829,7 +15829,7 @@
<td align="right"> 10.76</td>
<td align="right"> 0.00137459</td>
<td align="right"> 10.69</td>
- <td align="right">0.120000E+03</td>
+ <td align="right">1.200000E+02</td>
<td align="right"> 26.7342</td>
<td align="right"> 70.91</td>
<td align="right"> 0.00448645</td>
@@ -15918,7 +15918,7 @@
<td align="right"> 92.76</td>
<td align="right"> 0.01469422</td>
<td align="right"> 74.60</td>
- <td align="right">0.120000E+03</td>
+ <td align="right">1.200000E+02</td>
<td align="right"> 11.1922</td>
<td align="right"> 75.02</td>
<td align="right"> 0.00931176</td>
@@ -16007,7 +16007,7 @@
<td align="right"> 10.76</td>
<td align="right"> 0.00137459</td>
<td align="right"> 10.69</td>
- <td align="right">0.120000E+03</td>
+ <td align="right">1.200000E+02</td>
<td align="right"> 37.3072</td>
<td align="right"> 70.91</td>
<td align="right"> 0.00448641</td>
@@ -16096,7 +16096,7 @@
<td align="right"> 10.76</td>
<td align="right"> 0.00137459</td>
<td align="right"> 10.69</td>
- <td align="right">0.120000E+03</td>
+ <td align="right">1.200000E+02</td>
<td align="right"> 37.3072</td>
<td align="right"> 70.91</td>
<td align="right"> 0.00448641</td>
@@ -16185,7 +16185,7 @@
<td align="right"> 93.38</td>
<td align="right"> 0.01469484</td>
<td align="right"> 74.77</td>
- <td align="right">0.120000E+03</td>
+ <td align="right">1.200000E+02</td>
<td align="right"> 4.9162</td>
<td align="right"> 75.02</td>
<td align="right"> 0.00913706</td>
@@ -16274,7 +16274,7 @@
<td align="right"> 10.76</td>
<td align="right"> 0.00137459</td>
<td align="right"> 10.69</td>
- <td align="right">0.120000E+03</td>
+ <td align="right">1.200000E+02</td>
<td align="right"> 16.3874</td>
<td align="right"> 70.84</td>
<td align="right"> 0.00413574</td>
@@ -16363,7 +16363,7 @@
<td align="right"> 10.76</td>
<td align="right"> 0.00137459</td>
<td align="right"> 10.69</td>
- <td align="right">0.120000E+03</td>
+ <td align="right">1.200000E+02</td>
<td align="right"> 16.3874</td>
<td align="right"> 70.84</td>
<td align="right"> 0.00413574</td>
@@ -16452,7 +16452,7 @@
<td align="right"> 83.26</td>
<td align="right"> 0.01468459</td>
<td align="right"> 72.00</td>
- <td align="right">0.120000E+03</td>
+ <td align="right">1.200000E+02</td>
<td align="right"> 5.7489</td>
<td align="right"> 75.02</td>
<td align="right"> 0.00920531</td>
@@ -16541,7 +16541,7 @@
<td align="right"> 10.76</td>
<td align="right"> 0.00137459</td>
<td align="right"> 10.69</td>
- <td align="right">0.120000E+03</td>
+ <td align="right">1.200000E+02</td>
<td align="right"> 19.1629</td>
<td align="right"> 70.84</td>
<td align="right"> 0.00413553</td>
@@ -16630,7 +16630,7 @@
<td align="right"> 10.76</td>
<td align="right"> 0.00137459</td>
<td align="right"> 10.69</td>
- <td align="right">0.120000E+03</td>
+ <td align="right">1.200000E+02</td>
<td align="right"> 19.1629</td>
<td align="right"> 70.84</td>
<td align="right"> 0.00413553</td> |
|
|
src/EnergyPlus/Construction.cc
Outdated
| { | ||
|
|
||
| static constexpr std::string_view Format_700{" Construction CTF,{},{:4},{:4},{:4},{:8.3F},{:15.4G},{:8.3F},{:8.3F},{:8.3F},{:8.3F},{}\n"}; | ||
| static constexpr std::string_view Format_700{" Construction CTF,{},{:4},{:4},{:4},{:8.3F},{:15.4F},{:8.3F},{:8.3F},{:8.3F},{:8.3F},{}\n"}; |
There was a problem hiding this comment.
Note about 9af23f3 which I'm going to revert
I wrote in the commit message:
Adjust former N replacement: for U-value/R-value, we expect NOT needing an exponent. The '{:15.4G}' format will format '0.8' as '0.8' while {:15.4F} will format at 0.8000
#include <fmt/format.h>
int main() {
fmt::print("{{:15.4G}}='{:15.4G}'\n", 0.8);
fmt::print("{{:15.4F}}='{:15.4F}'\n", 0.8);
}
Output:
{:15.4G}=' 0.8'
{:15.4F}=' 0.8000'
This creates more problems that it solves actually. We do have very low values
| double | {:15.4G} | {:15.4F} |
|---|---|---|
| 1.5461211121e-05 | 1.546E-05 | 0.0000 |
| 0.0008155511551215415 | 0.0008156 | 0.0008 |
| 0.8155511551215415 | 0.8156 | 0.8156 |
| 0.8 | 0.8 | 0.8000 |
| 1.011212 | 1.011 | 1.0112 |
| 176.9231 | 176.9 | 176.9231 |
| 29980.012323 | 2.998E+04 | 29980.0123 |
…OT needing an exponent. The '{:15.4G}' format will format '0.8' as '0.8' while {:15.4F} will format at 0.8000"
This reverts commit 9af23f3.
cf #11109 (comment) for why this is worse
|
Ok, so now comparing only the N-format changes, from 6163163 to either d74b29f or f7dd5e7 which are completely equivalent I wrote a complete EIO parser that will parse the tables, in two formats: text, and str. (I realized in the process how broken the EIO is, I had to do all kinds of workarounds...) TL;DR I have only TWO actual diffs, which are minimal The vast majority of changes are exponents, eg A fair number due to the fact that the G format will not display trailing zeros: for a value of 0.8, '{:15.4G}' will format as '0.8', and {:15.4N} would format as '0.8000'. Here is a filterable HTML page for all diffs found (I removed duplicated values): And here is a CSV (careful to treat "base" and "mod" as TEXT when importing it) and an ODS for the same Here is a random sample of 50
|
|
Found in #11109: I wrote an EIO parser and realized that some formats were broken
…OT needing an exponent. The '{:15.4G}' format will format '0.8' as '0.8' while {:15.4F} will format at 0.8000"
This reverts commit 9af23f3.
cf #11109 (comment) for why this is worse
f7dd5e7 to
830b770
Compare
|
| } | ||
| state.dataOutRptPredefined->tableEntry(state.dataOutRptPredefined->numTableEntry).charEntry = | ||
| format("{:12.{}Z}", tableEntryReal, sigDigitCount); | ||
| format("{:12.{}E}", tableEntryReal, sigDigitCount); |
There was a problem hiding this comment.
@Myoldmopar so, the difference with the Z and E format right now is basically this (see the OutputReportTabular.unit.cc changes for more info https://github.com/NREL/EnergyPlus/pull/11109/files#diff-d541504a0ee106c6fbf7df90a2b6c096cbaf55db3f0f6be70ccd6dc5664950bdR9892 )
print("{:.3Z}", 123456789.1) => 0.123E+09
print("{:.3E}", 123456789.1) => 1.235E+08
So Z would have a leading zero, and 3 numbers. The E format doesn't use a leading zero, and adds 3 decimals after the floating point separator (unlike the G format which would use 3 significant numbers, period)
So to limit the changes here, I could do sigDigitCount - 1 in that format call... But I think I'd rather not, as this takes the same amount of space in the HTML table and provides more accuracy. What do you think?
print("{:.2E}", 123456789.1) => 1.23E+08
|
Actual diffs (rounding):
|
|
@jmarrec @Myoldmopar it has been 36 days since this pull request was last updated. |
…ng an exponent. The '{:15.4G}' format will format '0.8' as '0.8' while {:15.4F} will format at 0.8000
```
#include <fmt/format.h>
int main() {
fmt::print("{{:15.4G}}='{:15.4G}'\n", 0.8);
fmt::print("{{:15.4F}}='{:15.4F}'\n", 0.8);
}
```
Output:
```
{:15.4G}=' 0.8'
{:15.4F}=' 0.8000'
```
…OT needing an exponent. The '{:15.4G}' format will format '0.8' as '0.8' while {:15.4F} will format at 0.8000"
This reverts commit 9af23f3.
cf #11109 (comment) for why this is worse
…version with sigDigitsCounts - 1, but chose not to
a3ee8ab to
9516dbb
Compare
|
|
@Myoldmopar I rebased onto develop. I updated my eio_differ.py Gist https://gist.github.com/jmarrec/583a4b2dc5a38ce106afe609590f816c to include the EIO fix PR I made already. Same results. python eio_differ.py --base-testfiles-dir testfiles-25.2.0-58430fc53b --mod-testfiles-dir testfiles-25.2.0-9516dbbe69 --output-html --out-dir eio_diffs_pr11109
|
|
Awesome. Thanks for all this @jmarrec. Let's merge this one in. I'm super excited about getting rid of these format workarounds. |












Pull request overview
Description of the purpose of this PR
The goal of this PR:
Pull Request Author
Reviewer