Merge branch '1277852-CommandLineInterface' of https://github.com/NRE…

…L/EnergyPlusTeam into 1277852-CommandLineInterface
NREL · Jan 26, 2015 · 6ed1975 · 6ed1975 · nrel-bot · Jan 27, 2015
2 parents dfca351 + beef9e8
commit 6ed1975
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/EnergyPlus/InputProcessor.cc b/src/EnergyPlus/InputProcessor.cc
@@ -273,7 +273,7 @@ namespace InputProcessor {
 		NumLines = 0;
 
 		DoingInputProcessing = true;
-		gio::write( EchoInputFile, fmtLD ) << " Processing Data Dictionary ("+inputIddFileName+") File -- Start";
+		gio::write( EchoInputFile, fmtLD ) << " Processing Data Dictionary (" + inputIddFileName + ") File -- Start";
 		DisplayString( "Processing Data Dictionary" );
 		ProcessingIDD = true;
 		ProcessDataDicFile( idd_stream, ErrorsInIDD );

diff --git a/testfiles/CMakeLists.txt b/testfiles/CMakeLists.txt
@@ -508,7 +508,7 @@ IF (BUILD_FORTRAN)
     ADD_SIMULATION_TEST(IDF_FILE LBuilding-G180.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw ENERGYPLUS_FLAGS -x COST 2)
     ADD_SIMULATION_TEST(IDF_FILE LBuilding-G270.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw ENERGYPLUS_FLAGS -x COST 2)
     # Parametric preprocessor dependent files
-    ADD_SIMULATION_TEST(IDF_FILE LBuildingAppGRotPar.idf EPW_FILE USA_FL_Miami.Intl.AP.722020_TMY3.epw COST 5)
+    ADD_SIMULATION_TEST(IDF_FILE LBuildingAppGRotPar.idf EPW_FILE USA_FL_Miami.Intl.AP.722020_TMY3.epw ENERGYPLUS_FLAGS -x COST 5)
     ADD_SIMULATION_TEST(IDF_FILE 1ZoneParameterAspect.idf EPW_FILE USA_CO_Golden-NREL.724666_TMY3.epw COST 5)
     ADD_SIMULATION_TEST(IDF_FILE ParametricInsulation-5ZoneAirCooled.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw COST 5)
     # Basement/slab dependent files