Merge remote-tracking branch 'remotes/origin/develop' into removeAirT…

…ermSDUncontrolled
NREL · Feb 7, 2020 · ef87136 · ef87136 · nrel-bot-2c · Feb 8, 2020
2 parents 649fa6f + ce80ec5
commit ef87136
Show file tree

Hide file tree

Showing 13 changed files with 2,782 additions and 844 deletions.
diff --git a/src/EnergyPlus/InternalHeatGains.cc b/src/EnergyPlus/InternalHeatGains.cc
diff --git a/src/EnergyPlus/InternalHeatGains.hh b/src/EnergyPlus/InternalHeatGains.hh
@@ -57,6 +57,7 @@
 #include <EnergyPlus/EnergyPlus.hh>
 
 namespace EnergyPlus {
+  class OutputFiles;
 
 namespace InternalHeatGains {
 
@@ -80,7 +81,7 @@ namespace InternalHeatGains {
 
     void ManageInternalHeatGains(Optional_bool_const InitOnly = _); // when true, just calls the get input, if appropriate and returns.
 
-    void GetInternalHeatGainsInput();
+    void GetInternalHeatGainsInput(OutputFiles &outputFiles);
 
     void InitInternalHeatGains();
 

diff --git a/src/EnergyPlus/OutputFiles.cc b/src/EnergyPlus/OutputFiles.cc
@@ -84,7 +84,7 @@ class custom_arg_formatter : public arg_formatter
 
     static constexpr bool should_be_fixed_output(const Real64 value)
     {
-        return (value >= 0.1 || value <= -0.1) || (value == 0.0);
+        return (value >= 0.099999999999999995 || value <= -0.099999999999999995) || (value == 0.0) || (value == -0.0);
     }
 
     static bool fixed_will_fit(const Real64 value, const int places)

diff --git a/src/EnergyPlus/PlantLoopHeatPumpEIR.cc b/src/EnergyPlus/PlantLoopHeatPumpEIR.cc
@@ -1057,18 +1057,18 @@ namespace EIRPlantLoopHeatPumps {
                                         "; entered curve name: " + capFtName.get<std::string>());
                         errorsFound = true;
                     }
-                    auto &capEIRtName = fields.at("electric_input_to_output_ratio_modifier_function_of_temperature_curve_name");
-                    thisPLHP.powerRatioFuncTempCurveIndex = CurveManager::GetCurveIndex(UtilityRoutines::MakeUPPERCase(capEIRtName));
+                    auto &eirFtName = fields.at("electric_input_to_output_ratio_modifier_function_of_temperature_curve_name");
+                    thisPLHP.powerRatioFuncTempCurveIndex = CurveManager::GetCurveIndex(UtilityRoutines::MakeUPPERCase(eirFtName));
                     if (thisPLHP.capFuncTempCurveIndex == 0) {
                         ShowSevereError("Invalid curve name for EIR PLHP (name=" + thisPLHP.name +
-                                        "; entered curve name: " + capEIRtName.get<std::string>());
+                                        "; entered curve name: " + eirFtName.get<std::string>());
                         errorsFound = true;
                     }
-                    auto &capEIRplrName = fields.at("electric_input_to_output_ratio_modifier_function_of_temperature_curve_name");
-                    thisPLHP.powerRatioFuncPLRCurveIndex = CurveManager::GetCurveIndex(UtilityRoutines::MakeUPPERCase(capEIRplrName));
+                    auto &eirFplrName = fields.at("electric_input_to_output_ratio_modifier_function_of_part_load_ratio_curve_name");
+                    thisPLHP.powerRatioFuncPLRCurveIndex = CurveManager::GetCurveIndex(UtilityRoutines::MakeUPPERCase(eirFplrName));
                     if (thisPLHP.capFuncTempCurveIndex == 0) {
                         ShowSevereError("Invalid curve name for EIR PLHP (name=" + thisPLHP.name +
-                                        "; entered curve name: " + capEIRplrName.get<std::string>());
+                                        "; entered curve name: " + eirFplrName.get<std::string>());
                         errorsFound = true;
                     }
 

diff --git a/src/EnergyPlus/SimulationManager.cc b/src/EnergyPlus/SimulationManager.cc
@@ -1166,12 +1166,19 @@ namespace SimulationManager {
             DoWeathSim = true;
         }
 
-        auto const instances = inputProcessor->epJSON.find("PerformancePrecisionTradeoffs");
+        CurrentModuleObject = "PerformancePrecisionTradeoffs";
+        auto const instances = inputProcessor->epJSON.find(CurrentModuleObject);
+        Num = inputProcessor->getNumObjectsFound(CurrentModuleObject);
+        if (Num > 1) {
+            ErrorsFound = true;
+            ShowFatalError("GetProjectData: Only one (\"1\") " + CurrentModuleObject + " object per simulation is allowed.");
+        }
         if (instances != inputProcessor->epJSON.end()) {
             auto &instancesValue = instances.value();
             for (auto instance = instancesValue.begin(); instance != instancesValue.end(); ++instance) {
                 auto const &fields = instance.value();
-                inputProcessor->markObjectAsUsed("PerformancePrecisionTradeoffs", instance.key());
+                auto const &thisObjectName = instance.key();
+                inputProcessor->markObjectAsUsed(CurrentModuleObject, thisObjectName);
                 if (fields.find("use_coil_direct_solutions") != fields.end()) {
                     DoCoilDirectSolutions =
                         UtilityRoutines::MakeUPPERCase(fields.at("use_coil_direct_solutions"))=="YES";

diff --git a/testfiles/CMakeLists.txt b/testfiles/CMakeLists.txt
@@ -358,6 +358,7 @@ ADD_SIMULATION_TEST(IDF_FILE MultiSpeedACFurnace.idf EPW_FILE USA_IL_Chicago-OHa
 ADD_SIMULATION_TEST(IDF_FILE MultiSpeedHP_StagedThermostat.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw)
 ADD_SIMULATION_TEST(IDF_FILE MultiStory.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw)
 ADD_SIMULATION_TEST(IDF_FILE MultispeedHeatPump.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw)
+ADD_SIMULATION_TEST(IDF_FILE MultispeedHeatPump_DirectSolution.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw)
 ADD_SIMULATION_TEST(IDF_FILE MultiSpeedHeatPump_MultiSolvers.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw)
 ADD_SIMULATION_TEST(IDF_FILE Mundt_System_Always_On.idf EPW_FILE USA_FL_Tampa.Intl.AP.722110_TMY3.epw)
 ADD_SIMULATION_TEST(IDF_FILE Mundt_System_On_During_the_Day.idf EPW_FILE USA_FL_Tampa.Intl.AP.722110_TMY3.epw)