From b01fc9552833a2348ca0312ef823bc832dbc7748 Mon Sep 17 00:00:00 2001 From: Monika Sharma Date: Thu, 25 Sep 2014 11:23:58 -0600 Subject: [PATCH] All output files are a string now + replaced error messages in CommandLineInterface with ShowFatalError --- src/EnergyPlus/AirflowNetworkSolver.cc | 6 +- src/EnergyPlus/CommandLineInterface.cc | 168 +++++++++++++------- src/EnergyPlus/CommandLineInterface.hh | 63 +++++--- src/EnergyPlus/DataStringGlobals.cc | 2 +- src/EnergyPlus/DataStringGlobals.hh | 2 +- src/EnergyPlus/DataSystemVariables.cc | 2 +- src/EnergyPlus/DaylightingManager.cc | 36 +++-- src/EnergyPlus/EMSManager.cc | 6 +- src/EnergyPlus/HeatBalanceSurfaceManager.cc | 6 +- src/EnergyPlus/InputProcessor.cc | 46 +++--- src/EnergyPlus/OutputProcessor.cc | 40 ++--- src/EnergyPlus/OutputReportTabular.cc | 28 ++-- src/EnergyPlus/OutputReports.cc | 24 +-- src/EnergyPlus/ScheduleManager.cc | 2 +- src/EnergyPlus/SimulationManager.cc | 20 +-- src/EnergyPlus/SizingManager.cc | 26 +-- src/EnergyPlus/SolarShading.cc | 4 +- src/EnergyPlus/TARCOGOutput.cc | 6 +- src/EnergyPlus/ThermalComfort.cc | 18 +-- src/EnergyPlus/UtilityRoutines.cc | 22 +-- src/EnergyPlus/WeatherManager.cc | 8 +- src/EnergyPlus/WindTurbine.cc | 14 +- src/EnergyPlus/WindowManager.cc | 4 +- src/EnergyPlus/main.cc | 20 +-- 24 files changed, 329 insertions(+), 244 deletions(-) diff --git a/src/EnergyPlus/AirflowNetworkSolver.cc b/src/EnergyPlus/AirflowNetworkSolver.cc index a4ff5aaac2d..b70be9a08cf 100644 --- a/src/EnergyPlus/AirflowNetworkSolver.cc +++ b/src/EnergyPlus/AirflowNetworkSolver.cc @@ -9,6 +9,7 @@ // EnergyPlus Headers #include +#include #include #include #include @@ -54,6 +55,7 @@ namespace AirflowNetworkSolver { // USE STATEMENTS: // Using/Aliasing + using namespace CommandLineInterface; using namespace DataPrecisionGlobals; using DataGlobals::Pi; using DataGlobals::DegToRadians; @@ -217,7 +219,7 @@ namespace AirflowNetworkSolver { LIST = 0; if ( LIST >= 1 ) { Unit21 = GetNewUnitNumber(); - gio::open( Unit21, "eplusADS.out" ); + gio::open( Unit21, outputAdsFileName ); } for ( n = 1; n <= NetworkNumOfNodes; ++n ) { @@ -242,7 +244,7 @@ namespace AirflowNetworkSolver { // Write an ouput file used for AIRNET input if ( LIST >= 5 ) { Unit11 = GetNewUnitNumber(); - gio::open( Unit11, "eplusADS.inp" ); + gio::open( Unit11, eplusADSFileName ); for ( i = 1; i <= NetworkNumOfNodes; ++i ) { gio::write( Unit11, Format_901 ) << i << AirflowNetworkNodeData( i ).NodeTypeNum << AirflowNetworkNodeData( i ).NodeHeight << TZ( i ) << PZ( i ); } diff --git a/src/EnergyPlus/CommandLineInterface.cc b/src/EnergyPlus/CommandLineInterface.cc index 555216d2c64..e0f721aab8e 100644 --- a/src/EnergyPlus/CommandLineInterface.cc +++ b/src/EnergyPlus/CommandLineInterface.cc @@ -31,26 +31,49 @@ namespace CommandLineInterface{ using namespace SolarShading; using namespace ez; - std::string outputAuditFile; - std::string outputBndFile; - std::string outputDxfFile; - std::string outputEioFile; - std::string outputEndFile; - std::string outputErrFile; - std::string outputEsoFile; - std::string outputMtdFile; - std::string outputMddFile; - std::string outputMtrFile; - std::string outputRddFile; - std::string outputShdFile; - std::string outputCsvFile; - std::string outputHtmFile; - std::string outputTabFile; - std::string outputTxtFile; - std::string outputXmlFile; - std::string inputFileName; - std::string inputEnergyFile; - std::string inputWeatherFile; + std::string outputAuditFileName; + std::string outputBndFileName; + std::string outputDxfFileName; + std::string outputEioFileName; + std::string outputEndFileName; + std::string outputErrFileName; + std::string outputEsoFileName; + std::string outputMtdFileName; + std::string outputMddFileName; + std::string outputMtrFileName; + std::string outputRddFileName; + std::string outputShdFileName; + std::string outputTblCsvFileName; + std::string outputTblHtmFileName; + std::string outputTblTabFileName; + std::string outputTblTxtFileName; + std::string outputTblXmlFileName; + std::string inputIdfFileName; + std::string inputIddFileName; + std::string inputWeatherFileName; + std::string outputAdsFileName; + std::string outputDfsFileName; + std::string outputDelightFileName; + std::string outputMapTabFileName; + std::string outputMapCsvFileName; + std::string outputMapTxtFileName; + std::string outputEddFileName; + std::string outputIperrFileName; + std::string outputDbgFileName; + std::string outputSlnFileName; + std::string outputSciFileName; + std::string outputWrlFileName; + std::string outputZszCsvFileName; + std::string outputZszTabFileName; + std::string outputZszTxtFileName; + std::string outputSszCsvFileName; + std::string outputSszTabFileName; + std::string outputSszTxtFileName; + std::string outputScreenCsvFileName; + std::string EnergyPlusIniFileName; + std::string inStatFileName; + std::string TarcogIterationsFileName; + std::string eplusADSFileName; int ProcessArgs(int argc, const char * argv[]) @@ -89,12 +112,70 @@ namespace CommandLineInterface{ std::string usage; opt.getUsage(usage); + opt.get("-i")->getString(inputIdfFileName); + + opt.get("-w")->getString(inputWeatherFileName); + + opt.get("-e")->getString(inputIddFileName); + + std::string outputFilePrefix; + + if (opt.isSet("-o")) { + outputFilePrefix = inputIdfFileName.substr(0, inputIdfFileName.size()-4) + "_" + + inputWeatherFileName.substr(0, inputWeatherFileName.size()-4) + "_"; + } + else { + outputFilePrefix = "eplus"; + } + + outputAuditFileName = outputFilePrefix + "out.audit"; + outputBndFileName = outputFilePrefix + "out.bnd"; + outputDxfFileName = outputFilePrefix + "out.dxf"; + outputEioFileName = outputFilePrefix + "out.eio"; + outputEndFileName = outputFilePrefix + "out.end"; + outputErrFileName = outputFilePrefix + "out.err"; + outputEsoFileName = outputFilePrefix + "out.eso"; + outputMtdFileName = outputFilePrefix + "out.mtd"; + outputMddFileName = outputFilePrefix + "out.mdd"; + outputMtrFileName = outputFilePrefix + "out.mtr"; + outputRddFileName = outputFilePrefix + "out.rdd"; + outputShdFileName = outputFilePrefix + "out.shd"; + outputTblCsvFileName = outputFilePrefix + "tbl.csv"; + outputTblHtmFileName = outputFilePrefix + "tbl.htm"; + outputTblTabFileName = outputFilePrefix + "tbl.tab"; + outputTblTxtFileName = outputFilePrefix + "tbl.txt"; + outputTblXmlFileName = outputFilePrefix + "tbl.xml"; + outputAdsFileName = outputFilePrefix + "ADS.out"; + outputDfsFileName = outputFilePrefix + "out.dfs"; + outputDelightFileName = outputFilePrefix + "out.delightdfdmp"; + outputMapTabFileName = outputFilePrefix + "map.tab"; + outputMapCsvFileName = outputFilePrefix + "map.csv"; + outputMapTxtFileName = outputFilePrefix + "map.txt"; + outputEddFileName = outputFilePrefix + "out.edd"; + outputIperrFileName = outputFilePrefix + "out.iperr"; + outputDbgFileName = outputFilePrefix + "out.dbg"; + outputSlnFileName = outputFilePrefix + "out.sln"; + outputSciFileName = outputFilePrefix + "out.sci"; + outputWrlFileName = outputFilePrefix + "out.wrl"; + outputZszCsvFileName = outputFilePrefix + "zsz.csv"; + outputZszTabFileName = outputFilePrefix + "zsz.tab"; + outputZszTxtFileName = outputFilePrefix + "zsz.txt"; + outputSszCsvFileName = outputFilePrefix + "ssz.csv"; + outputSszTabFileName = outputFilePrefix + "ssz.tab"; + outputSszTxtFileName = outputFilePrefix + "ssz.txt"; + outputScreenCsvFileName = outputFilePrefix + "screen.csv"; + EnergyPlusIniFileName = "Energy+.ini"; + inStatFileName = "in.stat"; + TarcogIterationsFileName = "TarcogIterations.dbg"; + eplusADSFileName = "eplusADS.inp"; + + // Handle bad options std::vector badOptions; if(!opt.gotExpected(badOptions)) { for(int i=0; i < badOptions.size(); ++i) { - DisplayString("ERROR: Unexpected number of arguments for option " + badOptions[i] + "\n"); + ShowFatalError("ERROR: Unexpected number of arguments for option " + badOptions[i] + "\n"); } DisplayString(usage); exit(EXIT_FAILURE); @@ -103,15 +184,15 @@ namespace CommandLineInterface{ if(opt.firstArgs.size() > 1 || opt.unknownArgs.size() > 0 || opt.lastArgs.size() > 0){ for(int i=1; i < opt.firstArgs.size(); ++i) { std::string arg(opt.firstArgs[i]->c_str()); - DisplayString("ERROR: Invalid option: " + arg + "\n"); + ShowFatalError("ERROR: Invalid option first arg: " + arg + "\n"); } for(int i=0; i < opt.unknownArgs.size(); ++i) { std::string arg(opt.unknownArgs[i]->c_str()); - DisplayString("ERROR: Invalid option: " + arg + "\n"); + ShowFatalError("ERROR: Invalid option unknown arg: " + arg + "\n"); } for(int i=0; i < opt.lastArgs.size(); ++i) { std::string arg(opt.lastArgs[i]->c_str()); - DisplayString("ERROR: Invalid option: " + arg + "\n"); + ShowFatalError("ERROR: Invalid option last arg: " + arg + "\n"); } DisplayString(usage); exit(EXIT_FAILURE); @@ -119,13 +200,13 @@ namespace CommandLineInterface{ if(!opt.gotRequired(badOptions)) { for(int i=0; i < badOptions.size(); ++i) { - DisplayString("ERROR: Missing required option " + badOptions[i] + "\n"); + ShowFatalError("ERROR: Missing required option " + badOptions[i] + "\n"); } DisplayString(usage); exit(EXIT_FAILURE); } - // Process arguments + // Process standard arguments if (opt.isSet("-h")) { DisplayString(usage); exit(EXIT_SUCCESS); @@ -136,41 +217,6 @@ namespace CommandLineInterface{ exit(EXIT_SUCCESS); } - opt.get("-i")->getString(inputFileName); - - opt.get("-w")->getString(inputWeatherFile); - - opt.get("-e")->getString(inputEnergyFile); - - std::string outputFilePrefix; - - if (opt.isSet("-o")) { - outputFilePrefix = - inputFileName.substr(0, inputFileName.size()-4) + "_" + - inputWeatherFile.substr(0, inputWeatherFile.size()-4) + "_"; - } - else { - outputFilePrefix = "eplus"; - } - - outputAuditFile = outputFilePrefix + "out.audit"; - outputBndFile = outputFilePrefix + "out.bnd"; - outputDxfFile = outputFilePrefix + "out.dxf"; - outputEioFile = outputFilePrefix + "out.eio"; - outputEndFile = outputFilePrefix + "out.end"; - outputErrFile = outputFilePrefix + "out.err"; - outputEsoFile = outputFilePrefix + "out.eso"; - outputMtdFile = outputFilePrefix + "out.mtd"; - outputMddFile = outputFilePrefix + "out.mdd"; - outputMtrFile = outputFilePrefix + "out.mtr"; - outputRddFile = outputFilePrefix + "out.rdd"; - outputShdFile = outputFilePrefix + "out.shd"; - outputCsvFile = outputFilePrefix + "tbl.csv"; - outputHtmFile = outputFilePrefix + "tbl.htm"; - outputTabFile = outputFilePrefix + "tbl.tab"; - outputTxtFile = outputFilePrefix + "tbl.txt"; - outputXmlFile = outputFilePrefix + "tbl.xml"; - return 0; } } //namespace options diff --git a/src/EnergyPlus/CommandLineInterface.hh b/src/EnergyPlus/CommandLineInterface.hh index 40012bb235d..91d905b9035 100644 --- a/src/EnergyPlus/CommandLineInterface.hh +++ b/src/EnergyPlus/CommandLineInterface.hh @@ -6,26 +6,49 @@ namespace EnergyPlus{ namespace CommandLineInterface { - extern std::string outputAuditFile; - extern std::string outputBndFile; - extern std::string outputDxfFile; - extern std::string outputEioFile; - extern std::string outputEndFile; - extern std::string outputErrFile; - extern std::string outputEsoFile; - extern std::string outputMtdFile; - extern std::string outputMddFile; - extern std::string outputMtrFile; - extern std::string outputRddFile; - extern std::string outputShdFile; - extern std::string outputCsvFile; - extern std::string outputHtmFile; - extern std::string outputTabFile; - extern std::string outputTxtFile; - extern std::string outputXmlFile; - extern std::string inputFileName; - extern std::string inputEnergyFile; - extern std::string inputWeatherFile; + extern std::string outputAuditFileName; + extern std::string outputBndFileName; + extern std::string outputDxfFileName; + extern std::string outputEioFileName; + extern std::string outputEndFileName; + extern std::string outputErrFileName; + extern std::string outputEsoFileName; + extern std::string outputMtdFileName; + extern std::string outputMddFileName; + extern std::string outputMtrFileName; + extern std::string outputRddFileName; + extern std::string outputShdFileName; + extern std::string outputTblCsvFileName; + extern std::string outputTblHtmFileName; + extern std::string outputTblTabFileName; + extern std::string outputTblTxtFileName; + extern std::string outputTblXmlFileName; + extern std::string inputIdfFileName; + extern std::string inputIddFileName; + extern std::string inputWeatherFileName; + extern std::string outputAdsFileName; + extern std::string outputDfsFileName; + extern std::string outputDelightFileName; + extern std::string outputMapTabFileName; + extern std::string outputMapCsvFileName; + extern std::string outputMapTxtFileName; + extern std::string outputEddFileName; + extern std::string outputIperrFileName; + extern std::string outputDbgFileName; + extern std::string outputSlnFileName; + extern std::string outputSciFileName; + extern std::string outputWrlFileName; + extern std::string outputZszCsvFileName; + extern std::string outputZszTabFileName; + extern std::string outputZszTxtFileName; + extern std::string outputSszCsvFileName; + extern std::string outputSszTabFileName; + extern std::string outputSszTxtFileName; + extern std::string outputScreenCsvFileName; + extern std::string EnergyPlusIniFileName; + extern std::string inStatFileName; + extern std::string TarcogIterationsFileName; + extern std::string eplusADSFileName; // Process command line arguments int diff --git a/src/EnergyPlus/DataStringGlobals.cc b/src/EnergyPlus/DataStringGlobals.cc index 8cc9f5d04a3..9e90ab221f3 100644 --- a/src/EnergyPlus/DataStringGlobals.cc +++ b/src/EnergyPlus/DataStringGlobals.cc @@ -67,7 +67,7 @@ namespace DataStringGlobals { // na // MODULE VARIABLE DECLARATIONS: - std::string ProgramPath; // Path for Program from Energy+.ini + std::string ProgramPath; // Path for Program from EnergyPlusIniFileName std::string CurrentWorkingFolder; // Current working directory for run std::string FullName; // Full name of file to open, including path std::string IDDVerString; // Version information from the IDD (line 1) diff --git a/src/EnergyPlus/DataStringGlobals.hh b/src/EnergyPlus/DataStringGlobals.hh index 59d61e49f08..58fbef6d49d 100644 --- a/src/EnergyPlus/DataStringGlobals.hh +++ b/src/EnergyPlus/DataStringGlobals.hh @@ -35,7 +35,7 @@ namespace DataStringGlobals { // na // MODULE VARIABLE DECLARATIONS: - extern std::string ProgramPath; // Path for Program from Energy+.ini + extern std::string ProgramPath; // Path for Program from EnergyPlusIniFileName extern std::string CurrentWorkingFolder; // Current working directory for run extern std::string FullName; // Full name of file to open, including path extern std::string IDDVerString; // Version information from the IDD (line 1) diff --git a/src/EnergyPlus/DataSystemVariables.cc b/src/EnergyPlus/DataSystemVariables.cc index 632e67e01ee..e641c1a5b74 100644 --- a/src/EnergyPlus/DataSystemVariables.cc +++ b/src/EnergyPlus/DataSystemVariables.cc @@ -187,7 +187,7 @@ namespace DataSystemVariables { std::string::size_type pos; if ( firstTime ) { - EchoInputFile = FindUnitNumber( outputAuditFile ); + EchoInputFile = FindUnitNumber( outputAuditFileName ); get_environment_variable( cInputPath1, envinputpath1 ); if ( envinputpath1 != blank ) { pos = index( envinputpath1, pathChar, true ); // look backwards for pathChar diff --git a/src/EnergyPlus/DaylightingManager.cc b/src/EnergyPlus/DaylightingManager.cc index f8ffb92fc7c..81a1a73ce5f 100644 --- a/src/EnergyPlus/DaylightingManager.cc +++ b/src/EnergyPlus/DaylightingManager.cc @@ -12,6 +12,7 @@ #include // EnergyPlus Headers +#include #include #include #include @@ -91,6 +92,7 @@ namespace DaylightingManager { // DLUMEF DayltgLuminousEfficacy WeatherManager WeatherManager // Using/Aliasing + using namespace CommandLineInterface; using namespace DataPrecisionGlobals; using namespace DataGlobals; using namespace DataHeatBalance; @@ -684,9 +686,9 @@ namespace DaylightingManager { // open a new file eplusout.dfs for saving the daylight factors if ( CreateDFSReportFile ) { OutputFileDFS = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileDFS, "eplusout.dfs", flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileDFS, outputDfsFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "CalcDayltgCoefficients: Could not open file \"eplusout.dfs\" for output (write)." ); + ShowFatalError( "CalcDayltgCoefficients: Could not open file "+outputDfsFileName+" for output (write)." ); } else { gio::write( OutputFileDFS, fmtA ) << "This file contains daylight factors for all exterior windows of daylight zones."; gio::write( OutputFileDFS, fmtA ) << "If only one reference point the last 4 columns in the data will be zero."; @@ -4048,7 +4050,7 @@ namespace DaylightingManager { int TotDaylightingDElight; // Total Daylighting:DElight inputs Real64 dLatitude; // double for argument passing int iErrorFlag; // Error Flag for warning/errors returned from DElight - int iDElightErrorFile; // Unit number for reading DElight Error File (eplusout.delightdfdmp) + int iDElightErrorFile; // Unit number for reading DElight Error File (eplusout.delightdfdmp or outputDelightFile) int iReadStatus; // Error File Read Status std::string cErrorLine; // Each DElight Error line can be up to 210 characters long std::string cErrorMsg; // Each DElight Error Message can be up to 200 characters long @@ -4190,7 +4192,7 @@ namespace DaylightingManager { if ( iErrorFlag != 0 ) { // Open DElight Daylight Factors Error File for reading iDElightErrorFile = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "READWRITE" ); gio::open( iDElightErrorFile, "eplusout.delightdfdmp", flags ); } + { IOFlags flags; flags.ACTION( "READWRITE" ); gio::open( iDElightErrorFile, outputDelightFileName, flags ); } // Sequentially read lines in DElight Daylight Factors Error File // and process them using standard EPlus warning/error handling calls @@ -4231,7 +4233,7 @@ namespace DaylightingManager { } else { // Open, Close, and Delete DElight Daylight Factors Error File for reading iDElightErrorFile = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "READWRITE" ); gio::open( iDElightErrorFile, "eplusout.delightdfdmp", flags ); } + { IOFlags flags; flags.ACTION( "READWRITE" ); gio::open( iDElightErrorFile, outputDelightFileName, flags ); } { IOFlags flags; flags.DISPOSE( "DELETE" ); gio::close( iDElightErrorFile, flags ); } } SetupDElightOutput4EPlus(); @@ -9324,13 +9326,13 @@ namespace DaylightingManager { IllumMap( MapNum ).UnitNo = GetNewUnitNumber(); MapNoString = RoundSigDigits( MapNum ); if ( MapColSep == CharTab ) { - { IOFlags flags; flags.ACTION( "readwrite" ); flags.STATUS( "UNKNOWN" ); gio::open( IllumMap( MapNum ).UnitNo, "eplusmap.tab" + MapNoString, flags ); if ( flags.err() ) goto Label901; } + { IOFlags flags; flags.ACTION( "readwrite" ); flags.STATUS( "UNKNOWN" ); gio::open( IllumMap( MapNum ).UnitNo, outputMapTabFileName + MapNoString, flags ); if ( flags.err() ) goto Label901; } CommaDelimited = false; } else if ( MapColSep == CharComma ) { - { IOFlags flags; flags.ACTION( "readwrite" ); flags.STATUS( "UNKNOWN" ); gio::open( IllumMap( MapNum ).UnitNo, "eplusmap.csv" + MapNoString, flags ); if ( flags.err() ) goto Label902; } + { IOFlags flags; flags.ACTION( "readwrite" ); flags.STATUS( "UNKNOWN" ); gio::open( IllumMap( MapNum ).UnitNo, outputMapCsvFileName + MapNoString, flags ); if ( flags.err() ) goto Label902; } CommaDelimited = true; } else { - { IOFlags flags; flags.ACTION( "readwrite" ); flags.STATUS( "UNKNOWN" ); gio::open( IllumMap( MapNum ).UnitNo, "eplusmap.txt" + MapNoString, flags ); if ( flags.err() ) goto Label903; } + { IOFlags flags; flags.ACTION( "readwrite" ); flags.STATUS( "UNKNOWN" ); gio::open( IllumMap( MapNum ).UnitNo, outputMapTxtFileName + MapNoString, flags ); if ( flags.err() ) goto Label903; } CommaDelimited = false; } @@ -9436,15 +9438,15 @@ namespace DaylightingManager { return; Label901: ; - ShowFatalError( "ReportIllumMap: Could not open file \"eplusmap.tab" + MapNoString + "\" for output (write)." ); + ShowFatalError( "ReportIllumMap: Could not open file "+ outputMapTabFileName + MapNoString + "\" for output (write)." ); return; Label902: ; - ShowFatalError( "ReportIllumMap: Could not open file \"eplusmap.csv" + MapNoString + "\" for output (write)." ); + ShowFatalError( "ReportIllumMap: Could not open file "+ outputMapCsvFileName + MapNoString + "\" for output (write)." ); return; Label903: ; - ShowFatalError( "ReportIllumMap: Could not open file \"eplusmap.txt" + MapNoString + "\" for output (write)." ); + ShowFatalError( "ReportIllumMap: Could not open file "+ outputMapTxtFileName + MapNoString + "\" for output (write)." ); } @@ -9500,11 +9502,11 @@ Label903: ; // Write map header if ( MapColSep == CharTab ) { - { IOFlags flags; flags.ACTION( "write" ); flags.STATUS( "UNKNOWN" ); gio::open( MapOutputFile, "eplusmap.tab", flags ); if ( flags.err() ) goto Label901; } + { IOFlags flags; flags.ACTION( "write" ); flags.STATUS( "UNKNOWN" ); gio::open( MapOutputFile, outputMapTabFileName, flags ); if ( flags.err() ) goto Label901; } } else if ( MapColSep == CharComma ) { - { IOFlags flags; flags.ACTION( "write" ); flags.STATUS( "UNKNOWN" ); gio::open( MapOutputFile, "eplusmap.csv", flags ); if ( flags.err() ) goto Label902; } + { IOFlags flags; flags.ACTION( "write" ); flags.STATUS( "UNKNOWN" ); gio::open( MapOutputFile, outputMapCsvFileName, flags ); if ( flags.err() ) goto Label902; } } else { - { IOFlags flags; flags.ACTION( "write" ); flags.STATUS( "UNKNOWN" ); gio::open( MapOutputFile, "eplusmap.txt", flags ); if ( flags.err() ) goto Label903; } + { IOFlags flags; flags.ACTION( "write" ); flags.STATUS( "UNKNOWN" ); gio::open( MapOutputFile, outputMapTxtFileName, flags ); if ( flags.err() ) goto Label903; } } for ( MapNum = 1; MapNum <= TotIllumMaps; ++MapNum ) { @@ -9540,15 +9542,15 @@ Label903: ; return; Label901: ; - ShowFatalError( "CloseReportIllumMaps: Could not open file \"eplusmap.tab\" for output (write)." ); + ShowFatalError( "CloseReportIllumMaps: Could not open file "+outputMapTabFileName+" for output (write)." ); return; Label902: ; - ShowFatalError( "CloseReportIllumMaps: Could not open file \"eplusmap.csv\" for output (write)." ); + ShowFatalError( "CloseReportIllumMaps: Could not open file "+outputMapCsvFileName+" for output (write)." ); return; Label903: ; - ShowFatalError( "CloseReportIllumMaps: Could not open file \"eplusmap.txt\" for output (write)." ); + ShowFatalError( "CloseReportIllumMaps: Could not open file "+outputMapTxtFileName+" for output (write)." ); } diff --git a/src/EnergyPlus/EMSManager.cc b/src/EnergyPlus/EMSManager.cc index 993aad2b499..e96e78e0200 100644 --- a/src/EnergyPlus/EMSManager.cc +++ b/src/EnergyPlus/EMSManager.cc @@ -9,6 +9,7 @@ // EnergyPlus Headers #include +#include #include #include #include @@ -46,6 +47,7 @@ namespace EMSManager { // METHODOLOGY EMPLOYED: // Using/Aliasing + using namespace CommandLineInterface; using namespace DataPrecisionGlobals; using namespace DataRuntimeLanguage; @@ -189,9 +191,9 @@ namespace EMSManager { if ( OutputEDDFile ) { // open up output file for EMS EDD file EMS Data and Debug OutputEMSFileUnitNum = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputEMSFileUnitNum, "eplusout.edd", flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputEMSFileUnitNum, outputEddFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "CheckIFAnyEMS: Could not open file \"eplusout.edd\" for output (write)." ); + ShowFatalError( "CheckIFAnyEMS: Could not open file "+ outputEddFileName +" for output (write)." ); } } } else { diff --git a/src/EnergyPlus/HeatBalanceSurfaceManager.cc b/src/EnergyPlus/HeatBalanceSurfaceManager.cc index ba8580ba5ea..04eb777b8c8 100644 --- a/src/EnergyPlus/HeatBalanceSurfaceManager.cc +++ b/src/EnergyPlus/HeatBalanceSurfaceManager.cc @@ -13,6 +13,7 @@ // EnergyPlus Headers #include +#include #include #include #include @@ -96,6 +97,7 @@ namespace HeatBalanceSurfaceManager { // USE STATEMENTS: // Use statements for data only modules // Using/Aliasing + using namespace CommandLineInterface; using namespace DataPrecisionGlobals; using namespace DataGlobals; using namespace DataEnvironment; @@ -492,7 +494,7 @@ namespace HeatBalanceSurfaceManager { // Open DElight Electric Lighting Error File for reading iDElightErrorFile = GetNewUnitNumber(); // RJH 2008-03-07: open file with READWRITE - { IOFlags flags; flags.ACTION( "READWRITE" ); gio::open( iDElightErrorFile, "eplusout.delighteldmp", flags ); iwriteStatus = flags.ios(); } + { IOFlags flags; flags.ACTION( "READWRITE" ); gio::open( iDElightErrorFile, outputDelightFileName, flags ); iwriteStatus = flags.ios(); } if ( iwriteStatus == 0 ) { elOpened = true; } else { @@ -536,7 +538,7 @@ namespace HeatBalanceSurfaceManager { // extract reference point illuminance values from DElight Electric Lighting dump file for reporting // Open DElight Electric Lighting Dump File for reading iDElightErrorFile = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "READWRITE" ); gio::open( iDElightErrorFile, "eplusout.delighteldmp", flags ); iwriteStatus = flags.ios(); } + { IOFlags flags; flags.ACTION( "READWRITE" ); gio::open( iDElightErrorFile, outputDelightFileName, flags ); iwriteStatus = flags.ios(); } // IF (iwriteStatus /= 0) THEN // CALL ShowFatalError('InitSurfaceHeatBalance: Could not open file "eplusout.delighteldmp" for output (readwrite).') // ENDIF diff --git a/src/EnergyPlus/InputProcessor.cc b/src/EnergyPlus/InputProcessor.cc index cbbb3dbe94a..2d7c2c081ec 100644 --- a/src/EnergyPlus/InputProcessor.cc +++ b/src/EnergyPlus/InputProcessor.cc @@ -231,50 +231,50 @@ namespace InputProcessor { InitSecretObjects(); EchoInputFile = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); gio::open( EchoInputFile, outputAuditFile, flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( EchoInputFile, outputAuditFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - DisplayString( "Could not open (write) "+ outputAuditFile + " ." ); - ShowFatalError( "ProcessInput: Could not open file " + outputAuditFile + " for output (write)." ); + DisplayString( "Could not open (write) "+ outputAuditFileName + " ." ); + ShowFatalError( "ProcessInput: Could not open file " + outputAuditFileName + " for output (write)." ); } { IOFlags flags; gio::inquire( "eplusout.iperr", flags ); FileExists = flags.exists(); } if ( FileExists ) { CacheIPErrorFile = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "read" ); gio::open( CacheIPErrorFile, "eplusout.iperr", flags ); read_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "read" ); gio::open( CacheIPErrorFile, outputIperrFileName, flags ); read_stat = flags.ios(); } if ( read_stat != 0 ) { - ShowFatalError( "EnergyPlus: Could not open file \"eplusout.iperr\" for input (read)." ); + ShowFatalError( "EnergyPlus: Could not open file "+outputIperrFileName+" for input (read)." ); } { IOFlags flags; flags.DISPOSE( "delete" ); gio::close( CacheIPErrorFile, flags ); } } CacheIPErrorFile = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); gio::open( CacheIPErrorFile, "eplusout.iperr", flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( CacheIPErrorFile, outputIperrFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - DisplayString( "Could not open (write) eplusout.iperr." ); - ShowFatalError( "ProcessInput: Could not open file " + outputAuditFile + " for output (write)." ); + DisplayString( "Could not open (write) "+outputIperrFileName ); + ShowFatalError( "ProcessInput: Could not open file " + outputAuditFileName + " for output (write)." ); } // FullName from StringGlobals is used to build file name with Path if ( len( ProgramPath ) == 0 ) { - FullName = inputEnergyFile; + FullName = inputIddFileName; } else { - FullName = ProgramPath + inputEnergyFile; + FullName = ProgramPath + inputIddFileName; } { IOFlags flags; gio::inquire( FullName, flags ); FileExists = flags.exists(); } if ( ! FileExists ) { DisplayString( "Missing " + FullName ); - ShowFatalError( "ProcessInput: " + inputEnergyFile + " missing. Program terminates. Fullname = " + FullName ); + ShowFatalError( "ProcessInput: " + inputIddFileName + " missing. Program terminates. Fullname = " + FullName ); } IDDFile = GetNewUnitNumber(); { IOFlags flags; flags.ACTION( "read" ); gio::open( IDDFile, FullName, flags ); read_stat = flags.ios(); } if ( read_stat != 0 ) { - DisplayString( "Could not open (read) " + inputEnergyFile ); - ShowFatalError( "ProcessInput: Could not open file " + inputEnergyFile + " for input (read)." ); + DisplayString( "Could not open (read) " + inputIddFileName ); + ShowFatalError( "ProcessInput: Could not open file " + inputIddFileName + " for input (read)." ); } gio::read( IDDFile, fmtA ) >> InputLine; endcol = len( InputLine ); if ( endcol > 0 ) { if ( int( InputLine[ endcol - 1 ] ) == iUnicode_end ) { - ShowSevereError( "ProcessInput: " + inputEnergyFile + " appears to be a Unicode or binary file." ); + ShowSevereError( "ProcessInput: " + inputIddFileName + " appears to be a Unicode or binary file." ); ShowContinueError( "...This file cannot be read by this program. Please save as PC or Unix file and try again" ); ShowFatalError( "Program terminates due to previous condition." ); } @@ -283,7 +283,7 @@ namespace InputProcessor { NumLines = 0; DoingInputProcessing = true; - gio::write( EchoInputFile, fmtLD ) << " Processing Data Dictionary ("+inputEnergyFile+") File -- Start"; + gio::write( EchoInputFile, fmtLD ) << " Processing Data Dictionary ("+inputIddFileName+") File -- Start"; DisplayString( "Processing Data Dictionary" ); ProcessingIDD = true; @@ -313,7 +313,7 @@ namespace InputProcessor { } ProcessingIDD = false; - gio::write( EchoInputFile, fmtLD ) << " Processing Data Dictionary ("+inputEnergyFile+") File -- Complete"; + gio::write( EchoInputFile, fmtLD ) << " Processing Data Dictionary ("+inputIddFileName+") File -- Complete"; gio::write( EchoInputFile, fmtLD ) << " Maximum number of Alpha Args=" << MaxAlphaArgsFound; gio::write( EchoInputFile, fmtLD ) << " Maximum number of Numeric Args=" << MaxNumericArgsFound; @@ -325,23 +325,23 @@ namespace InputProcessor { gio::write( EchoInputFile, fmtLD ) << " Processing Input Data File (inputFileName) -- Start"; - { IOFlags flags; gio::inquire( inputFileName, flags ); FileExists = flags.exists(); } + { IOFlags flags; gio::inquire( inputIdfFileName, flags ); FileExists = flags.exists(); } if ( ! FileExists ) { - DisplayString( "Missing " + CurrentWorkingFolder + inputFileName ); - ShowFatalError( "ProcessInput: " + inputFileName + " missing. Program terminates." ); + DisplayString( "Missing " + CurrentWorkingFolder + inputIdfFileName ); + ShowFatalError( "ProcessInput: " + inputIdfFileName + " missing. Program terminates." ); } IDFFile = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "READ" ); gio::open( IDFFile, inputFileName, flags ); read_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "READ" ); gio::open( IDFFile, inputIdfFileName, flags ); read_stat = flags.ios(); } if ( read_stat != 0 ) { - DisplayString( "Could not open (read)" + inputFileName ); + DisplayString( "Could not open (read)" + inputIdfFileName ); ShowFatalError( "ProcessInput: Could not open file \"in.idf\" for input (read)." ); } gio::read( IDFFile, fmtA ) >> InputLine; endcol = len( InputLine ); if ( endcol > 0 ) { if ( int( InputLine[ endcol - 1 ] ) == iUnicode_end ) { - ShowSevereError( "ProcessInput: " + inputFileName +" appears to be a Unicode or binary file." ); + ShowSevereError( "ProcessInput: " + inputIdfFileName +" appears to be a Unicode or binary file." ); ShowContinueError( "...This file cannot be read by this program. Please save as PC or Unix file and try again" ); ShowFatalError( "Program terminates due to previous condition." ); } @@ -627,7 +627,7 @@ namespace InputProcessor { ErrorsFound = true; } } else { - ShowSevereError( "IP: Blank Sections not allowed. Review " + outputAuditFile + " file.", EchoInputFile ); + ShowSevereError( "IP: Blank Sections not allowed. Review " + outputAuditFileName + " file.", EchoInputFile ); errFlag = true; ErrorsFound = true; } diff --git a/src/EnergyPlus/OutputProcessor.cc b/src/EnergyPlus/OutputProcessor.cc index d7de5116592..6469c0bf150 100644 --- a/src/EnergyPlus/OutputProcessor.cc +++ b/src/EnergyPlus/OutputProcessor.cc @@ -1581,9 +1581,9 @@ namespace OutputProcessor { int write_stat; OutputFileMeterDetails = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileMeterDetails, outputMtdFile, flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileMeterDetails, outputMtdFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "InitializeMeters: Could not open file "+outputMtdFile+" for output (write)." ); + ShowFatalError( "InitializeMeters: Could not open file "+outputMtdFileName+" for output (write)." ); } } @@ -6694,7 +6694,7 @@ SetInitialMeterReportingAndOutputNames( if ( ! CumulativeIndicator ) { if ( MeterFileOnlyIndicator ) { if ( EnergyMeters( WhichMeter ).RptTS ) { - ShowWarningError( "Output:Meter:MeterFileOnly requested for \"" + EnergyMeters( WhichMeter ).Name + "\" (TimeStep), " "already on \"Output:Meter\". Will report to both " + outputEsoFile + " and " +outputMtrFile ); + ShowWarningError( "Output:Meter:MeterFileOnly requested for \"" + EnergyMeters( WhichMeter ).Name + "\" (TimeStep), " "already on \"Output:Meter\". Will report to both " + outputEsoFileName + " and " +outputMtrFileName ); } } if ( ! EnergyMeters( WhichMeter ).RptTS ) { @@ -6707,7 +6707,7 @@ SetInitialMeterReportingAndOutputNames( } else { if ( MeterFileOnlyIndicator ) { if ( EnergyMeters( WhichMeter ).RptAccTS ) { - ShowWarningError( "Output:Meter:MeterFileOnly requested for \"Cumulative " + EnergyMeters( WhichMeter ).Name + "\" (TimeStep), " "already on \"Output:Meter\". Will report to both "+outputEsoFile+ " and " +outputMtrFile ); + ShowWarningError( "Output:Meter:MeterFileOnly requested for \"Cumulative " + EnergyMeters( WhichMeter ).Name + "\" (TimeStep), " "already on \"Output:Meter\". Will report to both "+outputEsoFileName+ " and " +outputMtrFileName ); } } if ( ! EnergyMeters( WhichMeter ).RptAccTS ) { @@ -6722,7 +6722,7 @@ SetInitialMeterReportingAndOutputNames( if ( ! CumulativeIndicator ) { if ( MeterFileOnlyIndicator ) { if ( EnergyMeters( WhichMeter ).RptHR ) { - ShowWarningError( "Output:Meter:MeterFileOnly requested for \"" + EnergyMeters( WhichMeter ).Name + "\" (Hourly), " "already on \"Output:Meter\". Will report to both " + outputEsoFile + " and " +outputMtrFile ); + ShowWarningError( "Output:Meter:MeterFileOnly requested for \"" + EnergyMeters( WhichMeter ).Name + "\" (Hourly), " "already on \"Output:Meter\". Will report to both " + outputEsoFileName + " and " +outputMtrFileName ); } } if ( ! EnergyMeters( WhichMeter ).RptHR ) { @@ -6736,7 +6736,7 @@ SetInitialMeterReportingAndOutputNames( } else { if ( MeterFileOnlyIndicator ) { if ( EnergyMeters( WhichMeter ).RptAccHR ) { - ShowWarningError( "Output:Meter:MeterFileOnly requested for \"Cumulative " + EnergyMeters( WhichMeter ).Name + "\" (Hourly), " "already on \"Output:Meter\". Will report to both " + outputEsoFile + " and " +outputMtrFile ); + ShowWarningError( "Output:Meter:MeterFileOnly requested for \"Cumulative " + EnergyMeters( WhichMeter ).Name + "\" (Hourly), " "already on \"Output:Meter\". Will report to both " + outputEsoFileName + " and " +outputMtrFileName ); } } if ( ! EnergyMeters( WhichMeter ).RptAccHR ) { @@ -6752,7 +6752,7 @@ SetInitialMeterReportingAndOutputNames( if ( ! CumulativeIndicator ) { if ( MeterFileOnlyIndicator ) { if ( EnergyMeters( WhichMeter ).RptDY ) { - ShowWarningError( "Output:Meter:MeterFileOnly requested for \"" + EnergyMeters( WhichMeter ).Name + "\" (Daily), " "already on \"Output:Meter\". Will report to both " +outputEsoFile+ " and " +outputMtrFile ); + ShowWarningError( "Output:Meter:MeterFileOnly requested for \"" + EnergyMeters( WhichMeter ).Name + "\" (Daily), " "already on \"Output:Meter\". Will report to both " +outputEsoFileName+ " and " +outputMtrFileName ); } } if ( ! EnergyMeters( WhichMeter ).RptDY ) { @@ -6766,7 +6766,7 @@ SetInitialMeterReportingAndOutputNames( } else { if ( MeterFileOnlyIndicator ) { if ( EnergyMeters( WhichMeter ).RptAccDY ) { - ShowWarningError( "Output:Meter:MeterFileOnly requested for \"Cumulative " + EnergyMeters( WhichMeter ).Name + "\" (Hourly), " "already on \"Output:Meter\". Will report to both "+outputEsoFile+ " and " +outputMtrFile ); + ShowWarningError( "Output:Meter:MeterFileOnly requested for \"Cumulative " + EnergyMeters( WhichMeter ).Name + "\" (Hourly), " "already on \"Output:Meter\". Will report to both "+outputEsoFileName+ " and " +outputMtrFileName ); } } if ( ! EnergyMeters( WhichMeter ).RptAccDY ) { @@ -6782,7 +6782,7 @@ SetInitialMeterReportingAndOutputNames( if ( ! CumulativeIndicator ) { if ( MeterFileOnlyIndicator ) { if ( EnergyMeters( WhichMeter ).RptMN ) { - ShowWarningError( "Output:Meter:MeterFileOnly requested for \"" + EnergyMeters( WhichMeter ).Name + "\" (Monthly), " "already on \"Output:Meter\". Will report to both "+outputEsoFile+ " and " +outputMtrFile ); + ShowWarningError( "Output:Meter:MeterFileOnly requested for \"" + EnergyMeters( WhichMeter ).Name + "\" (Monthly), " "already on \"Output:Meter\". Will report to both "+outputEsoFileName+ " and " +outputMtrFileName ); } } if ( ! EnergyMeters( WhichMeter ).RptMN ) { @@ -6796,7 +6796,7 @@ SetInitialMeterReportingAndOutputNames( } else { if ( MeterFileOnlyIndicator ) { if ( EnergyMeters( WhichMeter ).RptAccMN ) { - ShowWarningError( "Output:Meter:MeterFileOnly requested for \"Cumulative " + EnergyMeters( WhichMeter ).Name + "\" (Monthly), " "already on \"Output:Meter\". Will report to both "+outputEsoFile+ " and " +outputMtrFile ); + ShowWarningError( "Output:Meter:MeterFileOnly requested for \"Cumulative " + EnergyMeters( WhichMeter ).Name + "\" (Monthly), " "already on \"Output:Meter\". Will report to both "+outputEsoFileName+ " and " +outputMtrFileName ); } } if ( ! EnergyMeters( WhichMeter ).RptAccMN ) { @@ -6812,7 +6812,7 @@ SetInitialMeterReportingAndOutputNames( if ( ! CumulativeIndicator ) { if ( MeterFileOnlyIndicator ) { if ( EnergyMeters( WhichMeter ).RptSM ) { - ShowWarningError( "Output:Meter:MeterFileOnly requested for \"" + EnergyMeters( WhichMeter ).Name + "\" (RunPeriod), " "already on \"Output:Meter\". Will report to both "+outputEsoFile+" and " +outputMtrFile ); + ShowWarningError( "Output:Meter:MeterFileOnly requested for \"" + EnergyMeters( WhichMeter ).Name + "\" (RunPeriod), " "already on \"Output:Meter\". Will report to both "+outputEsoFileName+" and " +outputMtrFileName ); } } if ( ! EnergyMeters( WhichMeter ).RptSM ) { @@ -6826,7 +6826,7 @@ SetInitialMeterReportingAndOutputNames( } else { if ( MeterFileOnlyIndicator ) { if ( EnergyMeters( WhichMeter ).RptAccSM ) { - ShowWarningError( "Output:Meter:MeterFileOnly requested for \"Cumulative " + EnergyMeters( WhichMeter ).Name + "\" (RunPeriod), " "already on \"Output:Meter\". Will report to both "+outputEsoFile+" and " +outputMtrFile ); + ShowWarningError( "Output:Meter:MeterFileOnly requested for \"Cumulative " + EnergyMeters( WhichMeter ).Name + "\" (RunPeriod), " "already on \"Output:Meter\". Will report to both "+outputEsoFileName+" and " +outputMtrFileName ); } } if ( ! EnergyMeters( WhichMeter ).RptAccSM ) { @@ -8259,31 +8259,31 @@ ProduceRDDMDD() if ( ProduceReportVDD == ReportVDD_Yes ) { OutputFileRVDD = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileRVDD, outputRddFile, flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileRVDD, outputRddFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "ProduceRDDMDD: Could not open file "+outputRddFile+" for output (write)." ); + ShowFatalError( "ProduceRDDMDD: Could not open file "+outputRddFileName+" for output (write)." ); } gio::write( OutputFileRVDD, fmtA ) << "Program Version," + VerString + ',' + IDDVerString; gio::write( OutputFileRVDD, fmtA ) << "Var Type (reported time step),Var Report Type,Variable Name [Units]"; OutputFileMVDD = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileMVDD, outputMddFile, flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileMVDD, outputMddFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "ProduceRDDMDD: Could not open file "+outputMddFile+" for output (write)." ); + ShowFatalError( "ProduceRDDMDD: Could not open file "+outputMddFileName+" for output (write)." ); } gio::write( OutputFileMVDD, fmtA ) << "Program Version," + VerString + ',' + IDDVerString; gio::write( OutputFileMVDD, fmtA ) << "Var Type (reported time step),Var Report Type,Variable Name [Units]"; } else if ( ProduceReportVDD == ReportVDD_IDF ) { OutputFileRVDD = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileRVDD, outputRddFile, flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileRVDD, outputRddFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "ProduceRDDMDD: Could not open file "+outputRddFile+" for output (write)." ); + ShowFatalError( "ProduceRDDMDD: Could not open file "+outputRddFileName+" for output (write)." ); } gio::write( OutputFileRVDD, fmtA ) << "! Program Version," + VerString + ',' + IDDVerString; gio::write( OutputFileRVDD, fmtA ) << "! Output:Variable Objects (applicable to this run)"; OutputFileMVDD = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileMVDD, outputMddFile, flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileMVDD, outputMddFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "ProduceRDDMDD: Could not open file "+outputMddFile+" for output (write)." ); + ShowFatalError( "ProduceRDDMDD: Could not open file "+outputMddFileName+" for output (write)." ); } gio::write( OutputFileMVDD, fmtA ) << "! Program Version," + VerString + ',' + IDDVerString; gio::write( OutputFileMVDD, fmtA ) << "! Output:Meter Objects (applicable to this run)"; diff --git a/src/EnergyPlus/OutputReportTabular.cc b/src/EnergyPlus/OutputReportTabular.cc index 6e3b76aab58..775acf1257e 100644 --- a/src/EnergyPlus/OutputReportTabular.cc +++ b/src/EnergyPlus/OutputReportTabular.cc @@ -3111,9 +3111,9 @@ namespace OutputReportTabular { curDel = del( iStyle ); if ( TableStyle( iStyle ) == tableStyleComma ) { DisplayString( "Writing tabular output file results using comma format." ); - { IOFlags flags; flags.ACTION( "WRITE" ); gio::open( curFH, outputCsvFile, flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "WRITE" ); gio::open( curFH, outputTblCsvFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "OpenOutputTabularFile: Could not open file (" + outputCsvFile + ") for output (write)." ); + ShowFatalError( "OpenOutputTabularFile: Could not open file (" + outputTblCsvFileName + ") for output (write)." ); } gio::write( curFH, fmtA ) << "Program Version:" + curDel + VerString; gio::write( curFH, fmtLD ) << "Tabular Output Report in Format: " + curDel + "Comma"; @@ -3127,9 +3127,9 @@ namespace OutputReportTabular { gio::write( curFH, fmtA ) << ""; } else if ( TableStyle( iStyle ) == tableStyleTab ) { DisplayString( "Writing tabular output file results using tab format." ); - { IOFlags flags; flags.ACTION( "WRITE" ); gio::open( curFH, outputTabFile, flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "WRITE" ); gio::open( curFH, outputTblTabFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "OpenOutputTabularFile: Could not open file "+outputTabFile+" for output (write)." ); + ShowFatalError( "OpenOutputTabularFile: Could not open file "+outputTblTabFileName+" for output (write)." ); } gio::write( curFH, fmtA ) << "Program Version" + curDel + VerString; gio::write( curFH, fmtA ) << "Tabular Output Report in Format: " + curDel + "Tab"; @@ -3143,9 +3143,9 @@ namespace OutputReportTabular { gio::write( curFH, fmtA ) << ""; } else if ( TableStyle( iStyle ) == tableStyleHTML ) { DisplayString( "Writing tabular output file results using HTML format." ); - { IOFlags flags; flags.ACTION( "WRITE" ); gio::open( curFH, outputHtmFile, flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "WRITE" ); gio::open( curFH, outputTblHtmFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "OpenOutputTabularFile: Could not open file "+outputHtmFile+" for output (write)." ); + ShowFatalError( "OpenOutputTabularFile: Could not open file "+outputTblHtmFileName+" for output (write)." ); } gio::write( curFH, fmtA ) << ""; gio::write( curFH, fmtA ) << ""; @@ -3174,9 +3174,9 @@ namespace OutputReportTabular { gio::write( curFH, TimeStampFmt2 ) << " " << td( 5 ) << ":" << td( 6 ) << ":" << td( 7 ) << "

"; } else if ( TableStyle( iStyle ) == tableStyleXML ) { DisplayString( "Writing tabular output file results using XML format." ); - { IOFlags flags; flags.ACTION( "WRITE" ); gio::open( curFH, outputXmlFile, flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "WRITE" ); gio::open( curFH, outputTblXmlFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "OpenOutputTabularFile: Could not open file "+outputXmlFile+" for output (write)." ); + ShowFatalError( "OpenOutputTabularFile: Could not open file "+outputTblXmlFileName+" for output (write)." ); } gio::write( curFH, fmtA ) << ""; gio::write( curFH, fmtA ) << ""; @@ -3195,9 +3195,9 @@ namespace OutputReportTabular { gio::write( curFH ); } else { DisplayString( "Writing tabular output file results using text format." ); - { IOFlags flags; flags.ACTION( "write" ); gio::open( curFH, outputTxtFile, flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( curFH, outputTblTxtFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "OpenOutputTabularFile: Could not open file "+outputTxtFile+" for output (write)." ); + ShowFatalError( "OpenOutputTabularFile: Could not open file "+outputTblTxtFileName+" for output (write)." ); } gio::write( curFH, fmtA ) << "Program Version: " + VerString; gio::write( curFH, fmtA ) << "Tabular Output Report in Format: " + curDel + "Fixed"; @@ -4827,7 +4827,7 @@ namespace OutputReportTabular { WriteTimeBinTables(); } } - EchoInputFile = FindUnitNumber( outputAuditFile ); + EchoInputFile = FindUnitNumber( outputAuditFileName ); gio::write( EchoInputFile, fmtLD ) << "MonthlyInputCount=" << MonthlyInputCount; gio::write( EchoInputFile, fmtLD ) << "sizeMonthlyInput=" << sizeMonthlyInput; gio::write( EchoInputFile, fmtLD ) << "MonthlyFieldSetInputCount=" << MonthlyFieldSetInputCount; @@ -4943,7 +4943,7 @@ namespace OutputReportTabular { bool coolingDesignlinepassed; bool desConditionlinepassed; - { IOFlags flags; gio::inquire( "in.stat", flags ); fileExists = flags.exists(); } + { IOFlags flags; gio::inquire( inStatFileName, flags ); fileExists = flags.exists(); } readStat = 0; isASHRAE = false; iscalc = false; @@ -4956,9 +4956,9 @@ namespace OutputReportTabular { lineTypeinterim = 0; if ( fileExists ) { statFile = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "READ" ); gio::open( statFile, "in.stat", flags ); readStat = flags.ios(); } + { IOFlags flags; flags.ACTION( "READ" ); gio::open( statFile, inStatFileName, flags ); readStat = flags.ios(); } if ( readStat != 0 ) { - ShowFatalError( "FillWeatherPredefinedEntries: Could not open file \"in.stat\" for input (read)." ); + ShowFatalError( "FillWeatherPredefinedEntries: Could not open file "+inStatFileName+" for input (read)." ); } IOFlags flags; while ( readStat == 0 ) { //end of file, or error diff --git a/src/EnergyPlus/OutputReports.cc b/src/EnergyPlus/OutputReports.cc index e464458b5f9..9ffa038255d 100644 --- a/src/EnergyPlus/OutputReports.cc +++ b/src/EnergyPlus/OutputReports.cc @@ -232,9 +232,9 @@ LinesOut( std::string const & option ) optiondone = true; unit = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); gio::open( unit, "eplusout.sln", flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( unit, outputSlnFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "LinesOut: Could not open file \"eplusout.sln\" for output (write)." ); + ShowFatalError( "LinesOut: Could not open file "+ outputSlnFileName +" for output (write)." ); } if ( option != "IDF" ) { @@ -422,9 +422,9 @@ DXFOut( } unit = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); gio::open( unit, outputDxfFile, flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( unit, outputDxfFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "DXFOut: Could not open file "+outputDxfFile+" for output (write)." ); + ShowFatalError( "DXFOut: Could not open file "+outputDxfFileName+" for output (write)." ); } gio::write( unit, Format_702 ); // Start of Entities section @@ -915,9 +915,9 @@ DXFOutLines( std::string const & ColorScheme ) } unit = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); gio::open( unit, outputDxfFile, flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( unit, outputDxfFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "DXFOutLines: Could not open file "+outputDxfFile+" for output (write)." ); + ShowFatalError( "DXFOutLines: Could not open file "+outputDxfFileName+" for output (write)." ); } gio::write( unit, Format_702 ); // Start of Entities section @@ -1342,9 +1342,9 @@ DXFOutWireFrame( std::string const & ColorScheme ) } unit = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); gio::open( unit, outputDxfFile, flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( unit, outputDxfFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "DXFOutWireFrame: Could not open file "+outputDxfFile+" for output (write)." ); + ShowFatalError( "DXFOutWireFrame: Could not open file "+outputDxfFileName+" for output (write)." ); } gio::write( unit, Format_702 ); // Start of Entities section @@ -2118,9 +2118,9 @@ CostInfoOut() unit = GetNewUnitNumber(); // .sci = surface cost info - { IOFlags flags; flags.ACTION( "write" ); gio::open( unit, "eplusout.sci", flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( unit, outputSciFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "CostInfoOut: Could not open file \"eplusout.sci\" for output (write)." ); + ShowFatalError( "CostInfoOut: Could not open file "+outputSciFileName+" for output (write)." ); } gio::write( unit, fmtLD ) << TotSurfaces << int( count( uniqueSurf ) ); gio::write( unit, fmtLD ) << "data for surfaces useful for cost information"; @@ -2247,9 +2247,9 @@ VRMLOut( } unit = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); gio::open( unit, "eplusout.wrl", flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( unit, outputWrlFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "VRMLOut: Could not open file \"eplusout.wrl\" for output (write)." ); + ShowFatalError( "VRMLOut: Could not open file "+ outputWrlFileName +" for output (write)." ); } gio::write( unit, Format_702 ); // Beginning diff --git a/src/EnergyPlus/ScheduleManager.cc b/src/EnergyPlus/ScheduleManager.cc index b6c455f3693..f76d255b4d6 100644 --- a/src/EnergyPlus/ScheduleManager.cc +++ b/src/EnergyPlus/ScheduleManager.cc @@ -474,7 +474,7 @@ namespace ScheduleManager { Schedule( 0 ).ScheduleTypePtr = 0; Schedule( 0 ).WeekSchedulePointer = 0; - UnitNumber = FindUnitNumber( outputAuditFile ); + UnitNumber = FindUnitNumber( outputAuditFileName ); gio::write( UnitNumber, fmtLD ) << " Processing Schedule Input -- Start"; //!! Get Schedule Types diff --git a/src/EnergyPlus/SimulationManager.cc b/src/EnergyPlus/SimulationManager.cc index e2cd8952ca4..d4669e317e3 100644 --- a/src/EnergyPlus/SimulationManager.cc +++ b/src/EnergyPlus/SimulationManager.cc @@ -1044,7 +1044,7 @@ namespace SimulationManager { NumDesignDays = GetNumObjectsFound( "SizingPeriod:DesignDay" ); NumRunPeriodDesign = GetNumObjectsFound( "SizingPeriod:WeatherFileDays" ) + GetNumObjectsFound( "SizingPeriod:WeatherFileConditionType" ); NumSizingDays = NumDesignDays + NumRunPeriodDesign; - { IOFlags flags; gio::inquire( inputWeatherFile, flags ); WeatherFileAttached = flags.exists(); } + { IOFlags flags; gio::inquire( inputWeatherFileName, flags ); WeatherFileAttached = flags.exists(); } if ( RunControlInInput ) { if ( DoZoneSizing ) { @@ -1207,34 +1207,34 @@ namespace SimulationManager { // FLOW: OutputFileStandard = GetNewUnitNumber(); StdOutputRecordCount = 0; - { IOFlags flags; flags.ACTION( "write" ); flags.STATUS( "UNKNOWN" ); gio::open( OutputFileStandard, outputEsoFile, flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); flags.STATUS( "UNKNOWN" ); gio::open( OutputFileStandard, outputEsoFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "OpenOutputFiles: Could not open file "+outputEsoFile+" for output (write)." ); + ShowFatalError( "OpenOutputFiles: Could not open file "+outputEsoFileName+" for output (write)." ); } gio::write( OutputFileStandard, fmtA ) << "Program Version," + VerString; // Open the Initialization Output File OutputFileInits = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); flags.STATUS( "UNKNOWN" ); gio::open( OutputFileInits, outputEioFile, flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); flags.STATUS( "UNKNOWN" ); gio::open( OutputFileInits, outputEioFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "OpenOutputFiles: Could not open file "+outputEioFile+" for output (write)." ); + ShowFatalError( "OpenOutputFiles: Could not open file "+outputEioFileName+" for output (write)." ); } gio::write( OutputFileInits, fmtA ) << "Program Version," + VerString; // Open the Meters Output File OutputFileMeters = GetNewUnitNumber(); StdMeterRecordCount = 0; - { IOFlags flags; flags.ACTION( "write" ); flags.STATUS( "UNKNOWN" ); gio::open( OutputFileMeters, outputMtrFile, flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); flags.STATUS( "UNKNOWN" ); gio::open( OutputFileMeters, outputMtrFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "OpenOutputFiles: Could not open file "+outputMtrFile+" for output (write)." ); + ShowFatalError( "OpenOutputFiles: Could not open file "+outputMtrFileName+" for output (write)." ); } gio::write( OutputFileMeters, fmtA ) << "Program Version," + VerString; // Open the Branch-Node Details Output File OutputFileBNDetails = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); flags.STATUS( "UNKNOWN" ); gio::open( OutputFileBNDetails, outputBndFile, flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); flags.STATUS( "UNKNOWN" ); gio::open( OutputFileBNDetails, outputBndFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "OpenOutputFiles: Could not open file "+outputBndFile+" for output (write)." ); + ShowFatalError( "OpenOutputFiles: Could not open file "+outputBndFileName+" for output (write)." ); } gio::write( OutputFileBNDetails, fmtA ) << "Program Version," + VerString; @@ -1314,7 +1314,7 @@ namespace SimulationManager { std::string cepEnvSetThreads; std::string cIDFSetThreads; - EchoInputFile = FindUnitNumber( outputAuditFile ); + EchoInputFile = FindUnitNumber( outputAuditFileName ); // Record some items on the audit file gio::write( EchoInputFile, fmtLD ) << "NumOfRVariable=" << NumOfRVariable_Setup; gio::write( EchoInputFile, fmtLD ) << "NumOfRVariable(Total)=" << NumTotalRVariable; diff --git a/src/EnergyPlus/SizingManager.cc b/src/EnergyPlus/SizingManager.cc index 4c1abe69122..d2419e0f6ce 100644 --- a/src/EnergyPlus/SizingManager.cc +++ b/src/EnergyPlus/SizingManager.cc @@ -8,6 +8,7 @@ #include // EnergyPlus Headers +#include #include #include #include @@ -54,6 +55,7 @@ namespace SizingManager { // OTHER NOTES: none // Using/Aliasing + using namespace CommandLineInterface; using namespace DataPrecisionGlobals; using namespace DataGlobals; using namespace HeatBalanceManager; @@ -221,19 +223,19 @@ namespace SizingManager { Available = true; OutputFileZoneSizing = GetNewUnitNumber(); if ( SizingFileColSep == CharComma ) { - { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileZoneSizing, "epluszsz.csv", flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileZoneSizing, outputZszCsvFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( RoutineName + "Could not open file \"epluszsz.csv\" for output (write)." ); + ShowFatalError( RoutineName + "Could not open file "+ outputZszCsvFileName +" for output (write)." ); } } else if ( SizingFileColSep == CharTab ) { - { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileZoneSizing, "epluszsz.tab", flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileZoneSizing, outputZszTabFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( RoutineName + "Could not open file \"epluszsz.tab\" for output (write)." ); + ShowFatalError( RoutineName + "Could not open file "+outputZszTabFileName+" for output (write)." ); } } else { - { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileZoneSizing, "epluszsz.txt", flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileZoneSizing, outputZszTxtFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( RoutineName + "Could not open file \"epluszsz.txt\" for output (write)." ); + ShowFatalError( RoutineName + "Could not open file "+ outputZszTxtFileName +" for output (write)." ); } } @@ -433,19 +435,19 @@ namespace SizingManager { Available = true; OutputFileSysSizing = GetNewUnitNumber(); if ( SizingFileColSep == CharComma ) { - { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileSysSizing, "eplusssz.csv", flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileSysSizing, outputSszCsvFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( RoutineName + "Could not open file \"eplusssz.csv\" for output (write)." ); + ShowFatalError( RoutineName + "Could not open file "+ outputSszCsvFileName +" for output (write)." ); } } else if ( SizingFileColSep == CharTab ) { - { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileSysSizing, "eplusssz.tab", flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileSysSizing, outputSszTabFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( RoutineName + "Could not open file \"eplusssz.tab\" for output (write)." ); + ShowFatalError( RoutineName + "Could not open file "+ outputSszTabFileName +" for output (write)." ); } } else { - { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileSysSizing, "eplusssz.txt", flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileSysSizing, outputSszTxtFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( RoutineName + "Could not open file \"eplusssz.txt\" for output (write)." ); + ShowFatalError( RoutineName + "Could not open file "+outputSszTxtFileName+ " for output (write)." ); } } SimAir = true; diff --git a/src/EnergyPlus/SolarShading.cc b/src/EnergyPlus/SolarShading.cc index 853dba9738e..843289d4454 100644 --- a/src/EnergyPlus/SolarShading.cc +++ b/src/EnergyPlus/SolarShading.cc @@ -256,9 +256,9 @@ namespace SolarShading { if ( BeginSimFlag ) { OutputFileShading = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileShading, outputShdFile, flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileShading, outputShdFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - ShowFatalError( "InitSolarCalculations: Could not open file "+outputShdFile+" for output (write)." ); + ShowFatalError( "InitSolarCalculations: Could not open file "+outputShdFileName+" for output (write)." ); } if ( GetInputFlag ) { diff --git a/src/EnergyPlus/TARCOGOutput.cc b/src/EnergyPlus/TARCOGOutput.cc index 4b0cb5dbc3f..27cd1fa9daf 100644 --- a/src/EnergyPlus/TARCOGOutput.cc +++ b/src/EnergyPlus/TARCOGOutput.cc @@ -8,6 +8,7 @@ // EnergyPlus Headers #include +#include #include #include #include @@ -43,6 +44,7 @@ namespace TARCOGOutput { // USE STATEMENTS: // Using/Aliasing + using namespace CommandLineInterface; using namespace DataPrecisionGlobals; using namespace TARCOGCommon; using namespace TARCOGGassesParams; @@ -1528,11 +1530,11 @@ namespace TARCOGOutput { TarcogIterationsFileNumber = GetNewUnitNumber(); // open(newunit=TarcogIterationsFileNumber, file=TRIM(DBGD)//'TarcogIterations.dbg', status='unknown', position='APPEND', & // form='formatted', iostat=nperr) - { IOFlags flags; flags.FORM( "formatted" ); flags.STATUS( "unknown" ); flags.POSITION( "APPEND" ); gio::open( TarcogIterationsFileNumber, DBGD + "TarcogIterations.dbg", flags ); nperr = flags.ios(); } + { IOFlags flags; flags.FORM( "formatted" ); flags.STATUS( "unknown" ); flags.POSITION( "APPEND" ); gio::open( TarcogIterationsFileNumber, DBGD + TarcogIterationsFileName, flags ); nperr = flags.ios(); } // if (nperr.ne.0) open(newunit=TarcogIterationsFileNumber, file='TarcogIterations.dbg',status='unknown', position='APPEND', & // & form='formatted', iostat=nperr) - if ( nperr != 0 ) { IOFlags flags; flags.FORM( "formatted" ); flags.STATUS( "unknown" ); flags.POSITION( "APPEND" ); gio::open( TarcogIterationsFileNumber, "TarcogIterations.dbg", flags ); nperr = flags.ios(); } + if ( nperr != 0 ) { IOFlags flags; flags.FORM( "formatted" ); flags.STATUS( "unknown" ); flags.POSITION( "APPEND" ); gio::open( TarcogIterationsFileNumber, TarcogIterationsFileName, flags ); nperr = flags.ios(); } IterationCSVFileNumber = GetNewUnitNumber(); // open(newunit=IterationCSVFileNumber, file=TRIM(DBGD)//TRIM(IterationCSVName), status='unknown', position='APPEND', & diff --git a/src/EnergyPlus/ThermalComfort.cc b/src/EnergyPlus/ThermalComfort.cc index 0497cce79df..67698a6edea 100644 --- a/src/EnergyPlus/ThermalComfort.cc +++ b/src/EnergyPlus/ThermalComfort.cc @@ -2468,14 +2468,14 @@ namespace ThermalComfort { } if ( initiate && weathersimulation ) { - { IOFlags flags; gio::inquire( "in.stat", flags ); statFileExists = flags.exists(); } - { IOFlags flags; gio::inquire( inputWeatherFile, flags ); epwFileExists = flags.exists(); } + { IOFlags flags; gio::inquire( inStatFileName, flags ); statFileExists = flags.exists(); } + { IOFlags flags; gio::inquire( inputWeatherFileName, flags ); epwFileExists = flags.exists(); } readStat = 0; if ( statFileExists ) { statFile = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "READ" ); gio::open( statFile, "in.stat", flags ); readStat = flags.ios(); } + { IOFlags flags; flags.ACTION( "READ" ); gio::open( statFile, inStatFileName, flags ); readStat = flags.ios(); } if ( readStat != 0 ) { - ShowFatalError( "CalcThermalComfortAdaptiveASH55: Could not open file \"in.stat\" for input (read)." ); + ShowFatalError( "CalcThermalComfortAdaptiveASH55: Could not open file "+inStatFileName+" for input (read)." ); } while ( readStat == 0 ) { { IOFlags flags; gio::read( statFile, fmtA, flags ) >> lineIn; readStat = flags.ios(); } @@ -2494,9 +2494,9 @@ namespace ThermalComfort { useStatData = true; } else if ( epwFileExists ) { epwFile = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "READ" ); gio::open( epwFile, inputWeatherFile, flags ); readStat = flags.ios(); } + { IOFlags flags; flags.ACTION( "READ" ); gio::open( epwFile, inputWeatherFileName, flags ); readStat = flags.ios(); } if ( readStat != 0 ) { - ShowFatalError( "CalcThermalComfortAdaptiveASH55: Could not open file " + inputWeatherFile+ " for input (read)." ); + ShowFatalError( "CalcThermalComfortAdaptiveASH55: Could not open file " + inputWeatherFileName+ " for input (read)." ); } for ( i = 1; i <= 9; ++i ) { // Headers { IOFlags flags; gio::read( epwFile, fmtA, flags ); readStat = flags.ios(); } @@ -2720,13 +2720,13 @@ namespace ThermalComfort { } if ( initiate && weathersimulation ) { - { IOFlags flags; gio::inquire( inputWeatherFile, flags ); epwFileExists = flags.exists(); } + { IOFlags flags; gio::inquire( inputWeatherFileName, flags ); epwFileExists = flags.exists(); } readStat = 0; if ( epwFileExists ) { epwFile = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "READ" ); gio::open( epwFile, inputWeatherFile, flags ); readStat = flags.ios(); } + { IOFlags flags; flags.ACTION( "READ" ); gio::open( epwFile, inputWeatherFileName, flags ); readStat = flags.ios(); } if ( readStat != 0 ) { - ShowFatalError( "CalcThermalComfortAdaptiveCEN15251: Could not open file "+inputWeatherFile+" for input (read)." ); + ShowFatalError( "CalcThermalComfortAdaptiveCEN15251: Could not open file "+inputWeatherFileName+" for input (read)." ); } for ( i = 1; i <= 9; ++i ) { // Headers { IOFlags flags; gio::read( epwFile, fmtA, flags ); readStat = flags.ios(); } diff --git a/src/EnergyPlus/UtilityRoutines.cc b/src/EnergyPlus/UtilityRoutines.cc index 97836ad6789..a5c136bf30d 100644 --- a/src/EnergyPlus/UtilityRoutines.cc +++ b/src/EnergyPlus/UtilityRoutines.cc @@ -168,12 +168,12 @@ AbortEnergyPlus( strip( NumSevereDuringSizing ); if ( NoIDD ) { - DisplayString( "No EnergyPlus Data Dictionary (" + inputEnergyFile+") was found. It is possible " ); + DisplayString( "No EnergyPlus Data Dictionary (" + inputIddFileName+") was found. It is possible " ); DisplayString( "you \"double-clicked\"EnergyPlus.exe rather than using one of the methods" ); DisplayString( "to run Energyplus as found in the GettingStarted document in the" ); DisplayString( "documentation folder. Using EP-Launch may be best -- " ); DisplayString( "it provides extra help for new users." ); - ShowMessage( "No EnergyPlus Data Dictionary (" + inputEnergyFile+") was found. It is possible you \"double-clicked\" EnergyPlus.exe " ); + ShowMessage( "No EnergyPlus Data Dictionary (" + inputIddFileName+") was found. It is possible you \"double-clicked\" EnergyPlus.exe " ); ShowMessage( "rather than using one of the methods to run Energyplus as found in the GettingStarted document" ); ShowMessage( "in the documentation folder. Using EP-Launch may be best -- it provides extra help for new users." ); { IOFlags flags; flags.ADVANCE( "NO" ); gio::write( OutFmt, flags ); } @@ -213,9 +213,9 @@ AbortEnergyPlus( ShowMessage( "EnergyPlus Terminated--Fatal Error Detected. " + NumWarnings + " Warning; " + NumSevere + " Severe Errors; Elapsed Time=" + Elapsed ); DisplayString( "EnergyPlus Run Time=" + Elapsed ); tempfl = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); gio::open( tempfl, outputEndFile, flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( tempfl, outputEndFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - DisplayString( "AbortEnergyPlus: Could not open file "+ outputEndFile +" for output (write)." ); + DisplayString( "AbortEnergyPlus: Could not open file "+ outputEndFileName +" for output (write)." ); } gio::write( tempfl, fmtLD ) << "EnergyPlus Terminated--Fatal Error Detected. " + NumWarnings + " Warning; " + NumSevere + " Severe Errors; Elapsed Time=" + Elapsed; @@ -446,9 +446,9 @@ EndEnergyPlus() ShowMessage( "EnergyPlus Completed Successfully-- " + NumWarnings + " Warning; " + NumSevere + " Severe Errors; Elapsed Time=" + Elapsed ); DisplayString( "EnergyPlus Run Time=" + Elapsed ); tempfl = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); gio::open( tempfl, outputEndFile, flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( tempfl, outputEndFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { - DisplayString( "EndEnergyPlus: Could not open file " + outputEndFile + " for output (write)." ); + DisplayString( "EndEnergyPlus: Could not open file " + outputEndFileName + " for output (write)." ); } gio::write( tempfl, fmtA ) << "EnergyPlus Completed Successfully-- " + NumWarnings + " Warning; " + NumSevere + " Severe Errors; Elapsed Time=" + Elapsed; gio::close( tempfl ); @@ -832,8 +832,9 @@ ShowFatalError( ShowErrorMessage( " ** Fatal ** " + ErrorMessage, OutUnit1, OutUnit2 ); DisplayString( "**FATAL:" + ErrorMessage ); - if ( has( ErrorMessage, "in.idf missing" ) ) NoIdf = true; - if ( has( ErrorMessage, inputEnergyFile +" missing" ) ) NoIDD = true; + + if ( has( ErrorMessage, inputIdfFileName +" missing" ) ) NoIdf = true; + if ( has( ErrorMessage, inputIddFileName +" missing" ) ) NoIDD = true; ShowErrorMessage( " ...Summary of Errors that led to program termination:", OutUnit1, OutUnit2 ); ShowErrorMessage( " ..... Reference severe error count=" + RoundSigDigits( TotalSevereErrors ), OutUnit1, OutUnit2 ); ShowErrorMessage( " ..... Last severe error=" + LastSevereError, OutUnit1, OutUnit2 ); @@ -1586,7 +1587,6 @@ ShowErrorMessage( // SUBROUTINE PARAMETER DEFINITIONS: static gio::Fmt const ErrorFormat( "(2X,A)" ); static gio::Fmt const fmtA( "(A)" ); - // INTERFACE BLOCK SPECIFICATIONS // na @@ -1601,10 +1601,10 @@ ShowErrorMessage( if ( TotalErrors == 0 && ! ErrFileOpened ) { StandardErrorOutput = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); gio::open( StandardErrorOutput, outputErrFile, flags ); write_stat = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( StandardErrorOutput, outputErrFileName, flags ); write_stat = flags.ios(); } if ( write_stat != 0 ) { DisplayString( "Trying to display error: \"" + ErrorMessage + "\"" ); - ShowFatalError( "ShowErrorMessage: Could not open file "+outputErrFile+" for output (write)." ); + ShowFatalError( "ShowErrorMessage: Could not open file "+outputErrFileName+" for output (write)." ); } gio::write( StandardErrorOutput, fmtA ) << "Program Version," + VerString + ',' + IDDVerString; ErrFileOpened = true; diff --git a/src/EnergyPlus/WeatherManager.cc b/src/EnergyPlus/WeatherManager.cc index be13c5469de..f5f0496f78a 100644 --- a/src/EnergyPlus/WeatherManager.cc +++ b/src/EnergyPlus/WeatherManager.cc @@ -4391,7 +4391,7 @@ Label903: ; // FLOW: - { IOFlags flags; gio::inquire( inputWeatherFile, flags ); WeatherFileExists = flags.exists(); } + { IOFlags flags; gio::inquire( inputWeatherFileName, flags ); WeatherFileExists = flags.exists(); } if ( WeatherFileExists ) { OpenEPlusWeatherFile( ErrorsFound, true ); @@ -4444,11 +4444,11 @@ Label903: ; bool EPWOpen; int unitnumber; - { IOFlags flags; gio::inquire( inputWeatherFile, flags ); unitnumber = flags.unit(); EPWOpen = flags.open(); } + { IOFlags flags; gio::inquire( inputWeatherFileName, flags ); unitnumber = flags.unit(); EPWOpen = flags.open(); } if ( EPWOpen ) gio::close( unitnumber ); WeatherFileUnitNumber = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "read" ); gio::open( WeatherFileUnitNumber, inputWeatherFile, flags ); if ( flags.err() ) goto Label9999; } + { IOFlags flags; flags.ACTION( "read" ); gio::open( WeatherFileUnitNumber, inputWeatherFileName, flags ); if ( flags.err() ) goto Label9999; } if ( ProcessHeader ) { // Read in Header Information @@ -4532,7 +4532,7 @@ Label9999: ; // Make sure it's open - { IOFlags flags; gio::inquire( inputWeatherFile, flags ); unitnumber = flags.unit(); EPWOpen = flags.open(); } + { IOFlags flags; gio::inquire( inputWeatherFileName, flags ); unitnumber = flags.unit(); EPWOpen = flags.open(); } if ( EPWOpen ) gio::close( unitnumber ); } diff --git a/src/EnergyPlus/WindTurbine.cc b/src/EnergyPlus/WindTurbine.cc index 8cee95020d7..1aa15648a3f 100644 --- a/src/EnergyPlus/WindTurbine.cc +++ b/src/EnergyPlus/WindTurbine.cc @@ -9,6 +9,7 @@ // EnergyPlus Headers #include +#include #include #include #include @@ -50,6 +51,7 @@ namespace WindTurbine { // OTHER NOTES: none // Using/Aliasing + using namespace CommandLineInterface; using namespace DataPrecisionGlobals; using namespace DataGenerators; using DataGlobals::Pi; @@ -617,7 +619,7 @@ namespace WindTurbine { std::string::size_type lnPtr; // scan pointer for Line input int mon; // loop counter bool wsStatFound; // logical noting that wind stats were found - bool fileExists; // true if in.stat file exists + bool fileExists; // true if inStatFileName file exists bool warningShown; // true if the <365 warning has already been shown std::string lineIn; FArray1D< Real64 > MonthWS( 12 ); @@ -627,13 +629,13 @@ namespace WindTurbine { // Estimate average annual wind speed once if ( MyOneTimeFlag ) { wsStatFound = false; - { IOFlags flags; gio::inquire( "in.stat", flags ); fileExists = flags.exists(); } + { IOFlags flags; gio::inquire( inStatFileName, flags ); fileExists = flags.exists(); } if ( fileExists ) { statFile = GetNewUnitNumber(); ReadStatus = 0; - { IOFlags flags; flags.ACTION( "READ" ); gio::open( statFile, "in.stat", flags ); ReadStatus = flags.ios(); } + { IOFlags flags; flags.ACTION( "READ" ); gio::open( statFile, inStatFileName, flags ); ReadStatus = flags.ios(); } if ( ReadStatus != 0 ) { - ShowFatalError( "InitWindTurbine: Could not open file \"in.stat\" for input (read)." ); + ShowFatalError( "InitWindTurbine: Could not open file "+inStatFileName+" for input (read)." ); } while ( ReadStatus == 0 ) { //end of file { IOFlags flags; gio::read( statFile, fmtA, flags ) >> lineIn; ReadStatus = flags.ios(); } @@ -660,14 +662,14 @@ namespace WindTurbine { } } else { // blank field if ( ! warningShown ) { - ShowWarningError( "InitWindTurbine: read from in.stat file shows <365 days in weather file. " "Annual average wind speed used will be inaccurate." ); + ShowWarningError( "InitWindTurbine: read from "+ inStatFileName +" file shows <365 days in weather file. " "Annual average wind speed used will be inaccurate." ); lineIn.erase( 0, lnPtr + 1 ); warningShown = true; } } } else { // two tabs in succession if ( ! warningShown ) { - ShowWarningError( "InitWindTurbine: read from in.stat file shows <365 days in weather file. " "Annual average wind speed used will be inaccurate." ); + ShowWarningError( "InitWindTurbine: read from "+ inStatFileName +" file shows <365 days in weather file. " "Annual average wind speed used will be inaccurate." ); lineIn.erase( 0, lnPtr + 1 ); warningShown = true; } diff --git a/src/EnergyPlus/WindowManager.cc b/src/EnergyPlus/WindowManager.cc index e5fb3979a36..8e90a89bfa3 100644 --- a/src/EnergyPlus/WindowManager.cc +++ b/src/EnergyPlus/WindowManager.cc @@ -9,6 +9,7 @@ #include // EnergyPlus Headers +#include #include #include #include @@ -69,6 +70,7 @@ namespace WindowManager { // for DOE-2, Lawrence Berkeley National Laboratory, Jan. 1996. // Using/Aliasing + using namespace CommandLineInterface; using namespace DataPrecisionGlobals; using namespace DataEnvironment; using namespace DataHeatBalance; @@ -7692,7 +7694,7 @@ namespace WindowManager { if ( PrintTransMap ) { ScreenTransUnitNo = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); flags.STATUS( "unknown" ); gio::open( ScreenTransUnitNo, "eplusscreen.csv", flags ); if ( flags.err() ) goto Label99999; } + { IOFlags flags; flags.ACTION( "write" ); flags.STATUS( "unknown" ); gio::open( ScreenTransUnitNo, outputScreenCsvFileName, flags ); if ( flags.err() ) goto Label99999; } // WRITE(ScreenTransUnitNo,*)' ' for ( ScreenNum = 1; ScreenNum <= NumSurfaceScreens; ++ScreenNum ) { MatNum = SurfaceScreens( ScreenNum ).MaterialNumber; diff --git a/src/EnergyPlus/main.cc b/src/EnergyPlus/main.cc index 26db437a8b0..99fcf78a273 100644 --- a/src/EnergyPlus/main.cc +++ b/src/EnergyPlus/main.cc @@ -330,22 +330,22 @@ main(int argc, const char * argv[]) get_environment_variable( TraceHVACControllerEnvVar, cEnvValue ); if ( ! cEnvValue.empty() ) TraceHVACControllerEnvFlag = env_var_on( cEnvValue ); // Yes or True - { IOFlags flags; gio::inquire( outputEndFile, flags ); FileExists = flags.exists(); } + { IOFlags flags; gio::inquire( outputEndFileName, flags ); FileExists = flags.exists(); } if ( FileExists ) { LFN = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "read" ); gio::open( LFN, outputEndFile, flags ); iostatus = flags.ios(); } + { IOFlags flags; flags.ACTION( "read" ); gio::open( LFN, outputEndFileName, flags ); iostatus = flags.ios(); } if ( iostatus != 0 ) { - ShowFatalError( "EnergyPlus: Could not open file "+ outputEndFile +" for input (read)." ); + ShowFatalError( "EnergyPlus: Could not open file "+ outputEndFileName +" for input (read)." ); } { IOFlags flags; flags.DISPOSE( "delete" ); gio::close( LFN, flags ); } } - { IOFlags flags; gio::inquire( "Energy+.ini", flags ); EPlusINI = flags.exists(); } + { IOFlags flags; gio::inquire( EnergyPlusIniFileName, flags ); EPlusINI = flags.exists(); } if ( EPlusINI ) { LFN = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "read" ); gio::open( LFN, "Energy+.ini", flags ); iostatus = flags.ios(); } + { IOFlags flags; flags.ACTION( "read" ); gio::open( LFN, EnergyPlusIniFileName, flags ); iostatus = flags.ios(); } if ( iostatus != 0 ) { - ShowFatalError( "EnergyPlus: Could not open file \"Energy+.ini\" for input (read)." ); + ShowFatalError( "EnergyPlus: Could not open file "+EnergyPlusIniFileName+" for input (read)." ); } { IOFlags flags; gio::inquire( LFN, flags ); CurrentWorkingFolder = flags.name(); } // Relying on compiler to supply full path name here @@ -360,12 +360,12 @@ main(int argc, const char * argv[]) gio::close( LFN ); } else { - DisplayString( "Missing Energy+.ini" ); + DisplayString( "Missing " +EnergyPlusIniFileName ); ProgramPath = ""; LFN = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); gio::open( LFN, "Energy+.ini", flags ); iostatus = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( LFN, EnergyPlusIniFileName, flags ); iostatus = flags.ios(); } if ( iostatus != 0 ) { - ShowFatalError( "EnergyPlus: Could not open file \"Energy+.ini\" for output (write)." ); + ShowFatalError( "EnergyPlus: Could not open file "+EnergyPlusIniFileName+" for output (write)." ); } // Relying on compiler to supply full path name here { IOFlags flags; gio::inquire( LFN, flags ); CurrentWorkingFolder = flags.name(); } @@ -384,7 +384,7 @@ main(int argc, const char * argv[]) DisplayString( VerString ); OutputFileDebug = GetNewUnitNumber(); - { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileDebug, "eplusout.dbg", flags ); iostatus = flags.ios(); } + { IOFlags flags; flags.ACTION( "write" ); gio::open( OutputFileDebug, outputDbgFileName, flags ); iostatus = flags.ios(); } if ( iostatus != 0 ) { ShowFatalError( "EnergyPlus: Could not open file \"eplusout.dbg\" for output (write)." ); }