post release io changes

NREL · Oct 4, 2021 · 1f16ee7 · 1f16ee7 · nrel-bot · Oct 4, 2021
1 parent 2ad6731
commit 1f16ee7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 22 deletions.
diff --git a/idd/Energy+.idd.in b/idd/Energy+.idd.in
@@ -5129,10 +5129,8 @@ WindowMaterial:SimpleGlazingSystem,
   N1 , \field U-Factor
        \required-field
        \note Enter U-Factor including film coefficients
-       \note Note that the effective upper limit for U-factor is 5.8 W/m2-K
        \units W/m2-K
        \minimum> 0
-       \maximum  7
   N2 , \field Solar Heat Gain Coefficient
        \required-field
        \note SHGC at Normal Incidence

diff --git a/src/EnergyPlus/WindowManager.cc b/src/EnergyPlus/WindowManager.cc
@@ -7365,14 +7365,9 @@ namespace WindowManager {
             //                                      Write Descriptions
             print(state.files.eio,
                   "{}\n",
-                  "! <WindowConstruction>,Construction Name,Index,#Layers,Roughness,Conductance {W/m2-K},SHGC,"
+                  "! <WindowConstruction>,Construction Name,Index,#Layers,Roughness,Conductance {W/m2-K},Conductance (Before Adjusted) {W/m2-K},"
+                  "Convection Coefficient Adjustment Ratio,SHGC,"
                   "Solar Transmittance at Normal Incidence,Visible Transmittance at Normal Incidence");
-            // todo - hold off for bug fix release
-            //            print(state.files.eio,
-            //                  "{}\n",
-            //                  "! <WindowConstruction>,Construction Name,Index,#Layers,Roughness,Conductance {W/m2-K},Conductance (Before Adjusted)
-            //                  {W/m2-K}," "Convection Coefficient Adjustment Ratio,SHGC," "Solar Transmittance at Normal Incidence,Visible
-            //                  Transmittance at Normal Incidence");
             if ((state.dataHeatBal->TotSimpleWindow > 0) || (state.dataHeatBal->W5GlsMat > 0) || (state.dataHeatBal->W5GlsMatAlt > 0))
                 print(state.files.eio,
                       "{}\n",
@@ -7539,22 +7534,11 @@ namespace WindowManager {
                               state.dataConstruction->Construct(ThisNum).TotLayers,
                               Roughness(static_cast<int>(state.dataConstruction->Construct(ThisNum).OutsideRoughness)),
                               NominalConductanceWinter,
+                              state.dataHeatBal->NominalUBeforeAdjusted(ThisNum),
+                              state.dataHeatBal->CoeffAdjRatio(ThisNum),
                               SHGCSummer,
                               TransSolNorm,
                               TransVisNorm);
-                        // todo
-                        //                        print(state.files.eio,
-                        //                              Format_700,
-                        //                              state.dataConstruction->Construct(ThisNum).Name,
-                        //                              ThisNum,
-                        //                              state.dataConstruction->Construct(ThisNum).TotLayers,
-                        //                              Roughness(static_cast<int>(state.dataConstruction->Construct(ThisNum).OutsideRoughness)),
-                        //                              NominalConductanceWinter,
-                        //                              state.dataHeatBal->NominalUBeforeAdjusted(ThisNum),
-                        //                              state.dataHeatBal->CoeffAdjRatio(ThisNum),
-                        //                              SHGCSummer,
-                        //                              TransSolNorm,
-                        //                              TransVisNorm);
                     }
                     //    Write(OutputFileConstrainParams, 705)  TRIM(Construct(ThisNum)%Name), SHGCSummer ,TransVisNorm