Merge branch 'develop' into RAFN-CheckEquipName-Issue

Author: lgu1234

doc/ems-application-guide/src/ems-actuators/internal-gains-and-exterior-lights.tex

@@ -30,7 +30,7 @@ \subsection{Other Equipment}\label{other-equipment}
 
 \subsection{Indoor Living Wall}\label{indoor-living-wall}
 
-An actuator called ``IndoorLivingWall'' is available with a control type called ``Evapotranspiration Rate'' (in \unit{\kilo\gram\per\square\meter\per\second}). This allows you to set the evapotranspiration rates for each IndoorLivingWall object directly using EMS, Python PlugIns, or Python API. The unique identifier is the name of the IndoorLivingWall input object.
+An actuator called ``IndoorLivingWall'' is available with a control type called ``Evapotranspiration Rate'' (in \si{\evapotranspirationRate}). This allows you to set the evapotranspiration rates for each IndoorLivingWall input object. The unique identifier is the name of the IndoorLivingWall input object.
 
 \subsection{Baseboard}\label{baseboard}
 

doc/engineering-reference/src/simulation-models-encyclopedic-reference-003/indoor-living-wall.tex

@@ -109,6 +109,8 @@
 \DeclareSIUnit\wattperVolumeFlowRate{\watt\s\per\m\cubed} % Displays "W s/m^3"
 \DeclareSIUnit\volumeFlowRateperArea{\volumeFlowRate\per\area} % Unused
 \DeclareSIUnit\volumeFlowRateperWatt{\volumeFlowRate\per\watt} % Displays "m^3/(s W)"
+\DeclareSIUnit\umolperAreaperSecond{\umol\per\area\per\s} % Displays "µmol/(m^2 s)"
+\DeclareSIUnit\evapotranspirationRate{\kg\per\area\per\s} % Displays "kg / (m^2 s)"
 
 % Make alias, so its clear these are IP units
 \let\DeclareIPUnit\DeclareSIUnit

doc/header.tex

@@ -22671,8 +22671,8 @@ OtherEquipment,
        \default General
 
 IndoorLivingWall,
-   \memo Indoor greenery systems such as indoor living walls are panels of plants, which grow hydroponically or from substrates. 
-   \memo The living wall structures can be either free-standing or attached to walls. 
+   \memo Indoor greenery systems such as indoor living walls are panels of plants, which grow hydroponically or from substrates.
+   \memo The living wall structures can be either free-standing or attached to walls.
    \memo The IndoorLivingWall module directly connects with inside surface heat balance, zone air heat balance, and zone air moisture balance.
   A1 , \field Name
        \required-field
@@ -22700,42 +22700,42 @@ IndoorLivingWall,
        \key LED
        \key Daylight
        \key LED-Daylight
-  A6 , \field LED Intensity Schedule Name 
+  A6 , \field LED Intensity Schedule Name
        \type object-list
        \object-list ScheduleNames
   A7 , \field Daylighting Control Name
-       \note If daylighting is used in the selected lighting methods (Daylight or LED-Daylight), 
-       \note users should define an object of Daylighting:Control to obtain the daylighting illumance level 
-       \note and an object for Daylighing:ReferencePoint for the daylighting sensor location in the thermal zone. 
-       \note The name of the object of Daylighting:Controls should be specified in this field. 
-       \type alpha 
+       \note If daylighting is used in the selected lighting methods (Daylight or LED-Daylight),
+       \note users should define an object of Daylighting:Control to obtain the daylighting illumance level
+       \note and an object for Daylighing:ReferencePoint for the daylighting sensor location in the thermal zone.
+       \note The name of the object of Daylighting:Controls should be specified in this field.
+       \type alpha
   A8 , \field LED-Daylight Targeted Lighting Intensity Schedule Name
-       \note This field defines targeted LED intensity level for indoor living wall systems. 
-       \note The schedule values can be any positive number representing targeted photosynthetic photon flux density (PPFD). 
-       \note Based on the available daylighting, the required LED lighting level and power will be automatically adjusted to meet the targeted LED intensity level. 
+       \note This field defines targeted LED intensity level for indoor living wall systems.
+       \note The schedule values can be any positive number representing targeted photosynthetic photon flux density (PPFD).
+       \note Based on the available daylighting, the required LED lighting level and power will be automatically adjusted to meet the targeted LED intensity level.
        \type object-list
        \object-list ScheduleNames
   N1 , \field Total Leaf Area
-       \note The value is the one-sided leaf area of an indoor living wall. 
-       \note Based on the users’ input, LAI is calculated as the ratio of the total leaf area and the partition wall area. 
-       \note Typical LAIs are 1.0 for grass and 3.0 for bushes and shrubs. The maximum LAI is 2.0 for the IndoorLivingWall module in EnergyPlus. 
-       \note If the calculated LAI is greater than 2.0, the maximum value of 2.0 is used for LAI in the simulation. 
+       \note The value is the one-sided leaf area of an indoor living wall.
+       \note Based on the users’ input, LAI is calculated as the ratio of the total leaf area and the partition wall area.
+       \note Typical LAIs are 1.0 for grass and 3.0 for bushes and shrubs. The maximum LAI is 2.0 for the IndoorLivingWall module in EnergyPlus.
+       \note If the calculated LAI is greater than 2.0, the maximum value of 2.0 is used for LAI in the simulation.
        \units m2
        \type real
        \ip-units ft2
-  N2 , \field LED Nominal Intensity 
-       \note The value represents photosynthetic photon flux density (PPFD) of LED grow light. 
-       \note PPFD is measured in micro-mole per m2 per second (umol_m2s) which establishes exactly how many photosynthetically active radiation (PAR) photons are landing on a specific area.
+  N2 , \field LED Nominal Intensity
+       \note The value represents photosynthetic photon flux density (PPFD) of LED grow light.
+       \note PPFD is measured in micro-mole per m2 per second (umol/m2-s) which establishes exactly how many photosynthetically active radiation (PAR) photons are landing on a specific area.
        \units umol/m2-s
        \type real
        \ip-units umol/ft2-s
   N3 , \field LED Nominal Power
-       \note This field defines nominal total LED power for an indoor living wall system. 
+       \note This field defines nominal total LED power for an indoor living wall system.
        \units W
        \type real
        \ip-units W
   N4 ; \field Radiant Fraction of LED Lights
-       \note This field defines the fraction of radiation from LED lights 
+       \note This field defines the fraction of radiation from LED lights
        \type real
        \minimum 0.0
        \maximum 1.0
@@ -63493,7 +63493,7 @@ AirLoopHVAC:UnitarySystem,
        \key Yes
        \key No
        \default Yes
-       \note This field is not used when Design Specification Multispeed Object Type input is present 
+       \note This field is not used when Design Specification Multispeed Object Type input is present
        \note When Yes is selected the minimum air flow rate is used.
        \note When No is selected the maximum air flow rate is used.
   N17, \field Maximum Supply Air Temperature

doc/input-output-reference/src/overview/group-internal-gains-people-lights-other.tex

@@ -167,7 +167,7 @@ def process_enum_str(input_str: str, file_name: str, line_no: int, print_errors:
             error_str += "\tenum keys must begin with upper case letter\n"
 
     if difflib.get_close_matches(name, keys, cutoff=0.7):
-        exceptions = ["DataGlobalConstants.hh:HeatOrCool"]
+        exceptions = ["DataGlobalConstants.hh:HeatOrCool", "DataHVACGlobals.hh:UnitarySysType"]
         if f"{file_name}:{name}" not in exceptions:
             error_str += "\tenum keys are too similar to enum name\n"
 

idd/Energy+.idd.in

@@ -632,7 +632,7 @@ namespace AirLoopHVACDOAS {
                         if (thisOutsideAirSys.compPointer[CompNum] == nullptr) {
                             UnitarySystems::UnitarySys thisSys;
                             thisOutsideAirSys.compPointer[CompNum] =
-                                UnitarySystems::UnitarySys::factory(state, HVAC::UnitarySys_AnyCoilType, CompName, false, 0);
+                                UnitarySystems::UnitarySys::factory(state, HVAC::UnitarySysType::Unitary_AnyCoilType, CompName, false, 0);
                         }
                         thisOutsideAirSys.InletNodeNum(CompNum) =
                             thisOutsideAirSys.compPointer[CompNum]->getAirInNode(state, CompName, 0, InletNodeErrFlag);

scripts/dev/check_for_malformed_enums.py

@@ -64,6 +64,7 @@
 #include <EnergyPlus/Data/BaseData.hh>
 #include <EnergyPlus/EPVector.hh>
 #include <EnergyPlus/EnergyPlus.hh>
+#include <EnergyPlus/SystemAvailabilityManager.hh>
 
 namespace EnergyPlus {
 
@@ -324,8 +325,8 @@ namespace AirflowNetwork {
         Array1D<Real64> MA;
         Array1D<Real64> MV;
         Array1D_int IVEC;
-        int VentilationCtrl = 0;  // Hybrid ventilation control type
-        int NumOfExhaustFans = 0; // Number of exhaust fans
+        Avail::VentCtrlStatus ventCtrlStatus = Avail::VentCtrlStatus::NoAction; // Hybrid ventilation control type
+        int NumOfExhaustFans = 0;                                               // Number of exhaust fans
         int NumAirflowNetwork = 0;
         int AirflowNetworkNumOfDetOpenings = 0;
         int AirflowNetworkNumOfSimOpenings = 0;
@@ -548,7 +549,7 @@ namespace AirflowNetwork {
             MA.deallocate();
             MV.deallocate();
             IVEC.deallocate();
-            VentilationCtrl = 0;
+            ventCtrlStatus = Avail::VentCtrlStatus::NoAction;
             NumOfExhaustFans = 0;
             NumAirflowNetwork = 0;
             AirflowNetworkNumOfDetOpenings = 0;

src/EnergyPlus/AirLoopHVACDOAS.cc

@@ -715,10 +715,10 @@ namespace AirflowNetwork {
         int AirLoopNum = state.afn->AirflowNetworkLinkageData(i).AirLoopNum;
 
         if (fanType == HVAC::FanType::OnOff) {
-            if (state.dataAirLoop->AirLoopAFNInfo(AirLoopNum).LoopFanOperationMode == CycFanCycComp &&
+            if (state.dataAirLoop->AirLoopAFNInfo(AirLoopNum).LoopFanOperationMode == HVAC::FanOp::Cycling &&
                 state.dataLoopNodes->Node(InletNode).MassFlowRate == 0.0) {
                 NF = GenericDuct(0.1, 0.001, LFLAG, PDROP, propN, propM, F, DF);
-            } else if (state.dataAirLoop->AirLoopAFNInfo(AirLoopNum).LoopFanOperationMode == CycFanCycComp &&
+            } else if (state.dataAirLoop->AirLoopAFNInfo(AirLoopNum).LoopFanOperationMode == HVAC::FanOp::Cycling &&
                        state.dataAirLoop->AirLoopAFNInfo(AirLoopNum).LoopSystemOnMassFlowrate > 0.0) {
                 F[0] = state.dataAirLoop->AirLoopAFNInfo(AirLoopNum).LoopSystemOnMassFlowrate;
             } else {
@@ -3293,7 +3293,7 @@ namespace AirflowNetwork {
             // Treat the component as an exhaust fan
             F[0] = state.dataLoopNodes->Node(InletNode).MassFlowRate;
             DF[0] = 0.0;
-            if (state.dataAirLoop->AirLoopAFNInfo(AirLoopNum).LoopFanOperationMode == CycFanCycComp &&
+            if (state.dataAirLoop->AirLoopAFNInfo(AirLoopNum).LoopFanOperationMode == HVAC::FanOp::Cycling &&
                 state.dataAirLoop->AirLoopAFNInfo(AirLoopNum).LoopOnOffFanPartLoadRatio > 0.0) {
                 F[0] = F[0] / state.dataAirLoop->AirLoopAFNInfo(AirLoopNum).LoopOnOffFanPartLoadRatio;
             }
@@ -3413,7 +3413,7 @@ namespace AirflowNetwork {
                 F[0] = state.afn->ReliefMassFlowRate;
             } else {
                 F[0] = state.dataLoopNodes->Node(OutletNode).MassFlowRate;
-                if (state.dataAirLoop->AirLoopAFNInfo(AirLoopNum).LoopFanOperationMode == CycFanCycComp &&
+                if (state.dataAirLoop->AirLoopAFNInfo(AirLoopNum).LoopFanOperationMode == HVAC::FanOp::Cycling &&
                     state.dataAirLoop->AirLoopAFNInfo(AirLoopNum).LoopOnOffFanPartLoadRatio > 0.0) {
                     F[0] = F[0] / state.dataAirLoop->AirLoopAFNInfo(AirLoopNum).LoopOnOffFanPartLoadRatio;
                 }