Merge pull request #7724 from NREL/7640-Remove-a-wrong-error-message

7640 remove a wrong error message
NREL · Feb 3, 2020 · ce80ec5 · ce80ec5 · nrel-bot-2 · Feb 3, 2020
2 parents d230951 + 7e9c54b
commit ce80ec5
Show file tree

Hide file tree

Showing 4 changed files with 2,275 additions and 2 deletions.
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)