fix docs, idd and format

lymereJ · Nov 9, 2018 · 224cba7 · 224cba7
1 parent 1024534
commit 224cba7
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 39 deletions.
diff --git a/design/FY2017/NFP_Enhancements to Improve Modeling of Data Centers.md b/design/FY2017/NFP_Enhancements to Improve Modeling of Data Centers.md
@@ -22,7 +22,7 @@ Based on discussions with data center experts and manufacturers, data centers ar
 
 $$\Delta T_{supply}=\Delta T_{in}-\Delta T_{supply}$$
 
-$$\Delta T_{return}=\Delta T_{return}-\Delta T_{return-mixed</sub}$$
+$$\Delta T_{return}=\Delta T_{return}-\Delta T_{out}$$
 
 Where, 
 
@@ -32,7 +32,7 @@ T<sub>supply</sub> : AHU supply air temperature
 
 T<sub>return</sub> : The actual AHU return air temperature
 
-T<sub>airzone</sub> : The calculated zone air temperature (or return air temperature) if the room is well-mixed
+T<sub>out</sub> : The IT equipment outlet temperature
 
 The two approach temperatures can be calculated by CFD tools for typical IT load levels and air flow management of data centers, or provided by measurement data or lookup tables. 
 
@@ -81,13 +81,13 @@ We propose a calculation logic as shown in Figure 2. Detailed calculation steps
 + **Step 3**:
 	Calculate AHU return air temperature (Treturn) and AHU air flow rate (V\_AHU).
 
-	$$T_{return}=\Delta T_{return}+T_{return-mixed}$$
+	$$T_{return}=\Delta T_{return}+T_{out}$$
 
 	$$Q_{AHU}=Q_{IT}+Q_{ITfan}+Q_{UPS}$$
 
 	$$V_{AHU}=Q_{AHU}/(T_{return}-T_{supply})$$
 	- Input:
-		- T<sub>return-mixed</sub>: The calculated AHU return air temperature if air is well-mixed. This is the simulated result from the last time step based on the zone setpoint in EnergyPlus
+		- T<sub>out</sub>: IT equipment outlet temperature
 		- ∆T<sub>return</sub>: Return approach temperature
 		- Q<sub>UPS</sub>*: UPS load
 	- Output:

diff --git a/...eering-reference/src/simulation-models-encyclopedic-reference-003/zone-internal-gains.tex b/...eering-reference/src/simulation-models-encyclopedic-reference-003/zone-internal-gains.tex
@@ -268,7 +268,7 @@ \subsubsection{Calculations}\label{calculations}
 \end{equation}
 
 \begin{equation}
-\delta T_{return}=T_{return}-T_{return,mixed}
+\delta T_{return}=T_{return}-T_{out}
 \end{equation}
 
 where:
@@ -279,7 +279,7 @@ \subsubsection{Calculations}\label{calculations}
 
 $T_{return}$ is the actual AHU return air temperature
 
-$T_{airzone}$ is the calculated zone air temperature (or return air temperature) if the room is well-mixed.
+$T_{out}$ is the IT equipment outlet temperature.
 
 The two approach temperatures can be calculated by CFD tools for typical IT load levels and air flow management of data centers, or provided by measurement data or lookup tables. 
 

diff --git a/doc/input-output-reference/src/overview/group-internal-gains-people-lights-other.tex b/doc/input-output-reference/src/overview/group-internal-gains-people-lights-other.tex
@@ -2344,11 +2344,11 @@ \subsubsection{Inputs}\label{inputs-9-009}
 
 \paragraph{Field: Return Temperature Difference}\label{field-return-temperature-difference}
 
-The difference of the return outlet temperature from the well mixed zone temperature. Either Return Temperature Difference or Return Temperature Difference Schedule is required if Air Flow Calculation Method is set to \textbf{FlowControlWithApproachTemperatures}. This field is ignored when Air Flow Calculation Method is \textbf{FlowFromSystem}.
+The difference of the actual AHU return air temperature to the IT equipment outlet temperature. Either Return Temperature Difference or Return Temperature Difference Schedule is required if Air Flow Calculation Method is set to \textbf{FlowControlWithApproachTemperatures}. This field is ignored when Air Flow Calculation Method is \textbf{FlowFromSystem}.
 
 \paragraph{Field: Return Temperature Difference Schedule}\label{field-return-temperature-difference-schedule}
 
-The difference schedule of the return outlet temperature from the well mixed zone temperature. Either Return Temperature Difference or Return Temperature Difference Schedule is required if Air Flow Calculation Method is set to \textbf{FlowControlWithApproachTemperatures}. This field is ignored when Air Flow Calculation Method is \textbf{FlowFromSystem}.
+The difference schedule of the actual AHU return air temperature to the IT equipment outlet temperature. Either Return Temperature Difference or Return Temperature Difference Schedule is required if Air Flow Calculation Method is set to \textbf{FlowControlWithApproachTemperatures}. This field is ignored when Air Flow Calculation Method is \textbf{FlowFromSystem}.
 
 An IDF example:
 

diff --git a/idd/Energy+.idd.in b/idd/Energy+.idd.in
@@ -21401,13 +21401,13 @@ ElectricEquipment:ITE:AirCooled,
        \type object-list
        \object-list ScheduleNames
   N11, \field Return Temperature Difference
-       \note The difference of the return outlet temperature from the well mixed zone temperature.
+       \note The difference of the the actual AHU return air temperature to the IT equipment outlet temperature.
        \note Either Return Temperature Difference or Return Temperature Difference Schedule is required if Air Flow Calculation Method is set to FlowControlWithApproachTemperatures.
        \note This field is ignored when Air Flow Calculation Method is FlowFromSystem.
        \type real
        \units deltaC
   A21; \field Return Temperature Difference Schedule
-       \note The difference schedule of the return outlet temperature from the well mixed zone temperature.
+       \note The difference schedule of the actual AHU return air temperature to the IT equipment outlet temperature.
        \note Either Return Temperature Difference or Return Temperature Difference Schedule is required if Air Flow Calculation Method is set to FlowControlWithApproachTemperatures.
        \note This field is ignored when Air Flow Calculation Method is FlowFromSystem.
        \type object-list

diff --git a/src/EnergyPlus/InternalHeatGains.cc b/src/EnergyPlus/InternalHeatGains.cc
@@ -3775,29 +3775,27 @@ namespace InternalHeatGains {
                     ErrorsFound = true;
                 }
 
-				if (!lAlphaFieldBlanks(15)) {
-					ZoneITEq(Loop).RecircFLTCurve = GetCurveIndex(AlphaName(15));
-					if (ZoneITEq(Loop).RecircFLTCurve == 0) {
-						ShowSevereError(RoutineName + CurrentModuleObject + " \"" + AlphaName(1) + "\"");
-						ShowContinueError("Invalid " + cAlphaFieldNames(15) + '=' + AlphaName(15));
-						ErrorsFound = true;
-					}
-				}
-				else {
-					ZoneITEq(Loop).RecircFLTCurve = 0;
-				}
-
-				if (!lAlphaFieldBlanks(16)) {
-					ZoneITEq(Loop).UPSEfficFPLRCurve = GetCurveIndex(AlphaName(16));
-					if (ZoneITEq(Loop).UPSEfficFPLRCurve == 0) {
-						ShowSevereError(RoutineName + CurrentModuleObject + " \"" + AlphaName(1) + "\"");
-						ShowContinueError("Invalid " + cAlphaFieldNames(16) + '=' + AlphaName(16));
-						ErrorsFound = true;
-					}
-				}
-				else {
-					ZoneITEq(Loop).UPSEfficFPLRCurve = 0;
-				}
+                if (!lAlphaFieldBlanks(15)) {
+                    ZoneITEq(Loop).RecircFLTCurve = GetCurveIndex(AlphaName(15));
+                    if (ZoneITEq(Loop).RecircFLTCurve == 0) {
+                        ShowSevereError(RoutineName + CurrentModuleObject + " \"" + AlphaName(1) + "\"");
+                        ShowContinueError("Invalid " + cAlphaFieldNames(15) + '=' + AlphaName(15));
+                        ErrorsFound = true;
+                    }
+                } else {
+                    ZoneITEq(Loop).RecircFLTCurve = 0;
+                }
+
+                if (!lAlphaFieldBlanks(16)) {
+                    ZoneITEq(Loop).UPSEfficFPLRCurve = GetCurveIndex(AlphaName(16));
+                    if (ZoneITEq(Loop).UPSEfficFPLRCurve == 0) {
+                        ShowSevereError(RoutineName + CurrentModuleObject + " \"" + AlphaName(1) + "\"");
+                        ShowContinueError("Invalid " + cAlphaFieldNames(16) + '=' + AlphaName(16));
+                        ErrorsFound = true;
+                    }
+                } else {
+                    ZoneITEq(Loop).UPSEfficFPLRCurve = 0;
+                }
                 // Environmental class
                 if (UtilityRoutines::SameString(AlphaName(10), "None")) {
                     ZoneITEq(Loop).Class = ITEClassNone;
@@ -6309,12 +6307,12 @@ namespace InternalHeatGains {
             } else {
                 UPSPartLoadRatio = 0.0;
             }
-			if (ZoneITEq(Loop).UPSEfficFPLRCurve != 0) {
-				UPSPower = (CPUPower + FanPower) *
-					max((1.0 - ZoneITEq(Loop).DesignUPSEfficiency * CurveValue(ZoneITEq(Loop).UPSEfficFPLRCurve, UPSPartLoadRatio)), 0.0);
-			} else {
-				UPSPower = (CPUPower + FanPower) * max((1.0 - ZoneITEq(Loop).DesignUPSEfficiency), 0.0);
-			}
+            if (ZoneITEq(Loop).UPSEfficFPLRCurve != 0) {
+                UPSPower = (CPUPower + FanPower) *
+                    max((1.0 - ZoneITEq(Loop).DesignUPSEfficiency * CurveValue(ZoneITEq(Loop).UPSEfficFPLRCurve, UPSPartLoadRatio)), 0.0);
+            } else {
+                UPSPower = (CPUPower + FanPower) * max((1.0 - ZoneITEq(Loop).DesignUPSEfficiency), 0.0);
+            }
             UPSHeatGain = UPSPower * ZoneITEq(Loop).UPSLossToZoneFrac;
 
             // Calculate air outlet conditions and convective heat gain to zone