Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Finish removing Objexx gio #8248

Merged
merged 16 commits into from
Oct 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions src/EnergyPlus/AirflowNetwork/src/Solver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@

// ObjexxFCL Headers
#include <ObjexxFCL/Fmath.hh>
#include <ObjexxFCL/gio.hh>

#include "AirflowNetwork/Solver.hpp"
#include "AirflowNetwork/Elements.hpp"
Expand Down Expand Up @@ -194,12 +193,6 @@ namespace AirflowNetwork {
int n;

// Formats
static ObjexxFCL::gio::Fmt Format_900("(1X,i2)");
static ObjexxFCL::gio::Fmt Format_901("(1X,2I4,4F9.4)");
static ObjexxFCL::gio::Fmt Format_902("(1X,2I4,4F9.4)");
static ObjexxFCL::gio::Fmt Format_903("(9X,4F9.4)");
static ObjexxFCL::gio::Fmt Format_904("(1X,2I4,1F9.4)");
static ObjexxFCL::gio::Fmt Format_910("(1X,I4,2(I4,F9.4),I4,2F4.1)");

// Assume a network to simulate multizone airflow is a subset of the network to simulate air distribution system.
// Network array size is allocated based on the network of air distribution system.
Expand Down Expand Up @@ -885,9 +878,6 @@ namespace AirflowNetwork {
std::array<Real64, 2> F{{0.0, 0.0}};
std::array<Real64, 2> DF{{0.0, 0.0}};

// Formats
static ObjexxFCL::gio::Fmt Format_901("(A5,3I3,4E16.7)");

// FLOW:
for (n = 1; n <= NetworkNumOfNodes; ++n) {
SUMF(n) = 0.0;
Expand Down
5 changes: 3 additions & 2 deletions src/EnergyPlus/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -433,8 +433,8 @@ SET( SRC
OutAirNodeManager.hh
OutdoorAirUnit.cc
OutdoorAirUnit.hh
IOFiles.cc
IOFiles.hh
IOFiles.cc
IOFiles.hh
OutputProcessor.cc
OutputProcessor.hh
OutputReportPredefined.cc
Expand Down Expand Up @@ -587,6 +587,7 @@ SET( SRC
SteamBaseboardRadiator.hh
SteamCoils.cc
SteamCoils.hh
StringUtilities.hh
SurfaceGeometry.cc
SurfaceGeometry.hh
SurfaceGroundHeatExchanger.cc
Expand Down
4 changes: 0 additions & 4 deletions src/EnergyPlus/CommandLineInterface.cc
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@
// CLI Headers
#include <ezOptionParser.hpp>

// ObjexxFCL Headers
#include <ObjexxFCL/gio.hh>

// Project headers
#include <EnergyPlus/CommandLineInterface.hh>
#include <EnergyPlus/Data/EnergyPlusData.hh>
Expand Down Expand Up @@ -650,7 +647,6 @@ namespace CommandLineInterface {
std::string::size_type ILEN;

// Formats
static ObjexxFCL::gio::Fmt Format_700("(A)");

DataOut.clear();

Expand Down
1 change: 0 additions & 1 deletion src/EnergyPlus/CurveManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
#include <ObjexxFCL/Array.functions.hh>
#include <ObjexxFCL/Array3D.hh>
#include <ObjexxFCL/Fmath.hh>
#include <ObjexxFCL/gio.hh>
#include <ObjexxFCL/string.functions.hh>

// EnergyPlus Headers
Expand Down
21 changes: 11 additions & 10 deletions src/EnergyPlus/CurveManager.hh
Original file line number Diff line number Diff line change
Expand Up @@ -392,22 +392,23 @@ namespace CurveManager {
} // namespace CurveManager

struct CurveManagerData : BaseGlobalStruct {
int NumCurves;
bool GetCurvesInputFlag;
int NumCurves = 0;
bool GetCurvesInputFlag = true;
bool CurveValueMyBeginTimeStepFlag = false;
bool FrictionFactorErrorHasOccurred = false;
Array1D<CurveManager::PerformanceCurveData> PerfCurve;
CurveManager::BtwxtManager btwxtManager;
std::unordered_map<std::string, std::string> UniqueCurveNames;
bool CurveValueMyBeginTimeStepFlag;
bool FrictionFactorErrorHasOccurred;

CurveManagerData()
: NumCurves(0), GetCurvesInputFlag(true), CurveValueMyBeginTimeStepFlag(false), FrictionFactorErrorHasOccurred(false)
{
}

void clear_state() override
{
*this = CurveManagerData();
this->NumCurves = 0;
this->GetCurvesInputFlag = true;
this->CurveValueMyBeginTimeStepFlag = false;
this->FrictionFactorErrorHasOccurred = false;
PerfCurve.deallocate();
btwxtManager.clear();
UniqueCurveNames.clear();
}
};

Expand Down
1 change: 0 additions & 1 deletion src/EnergyPlus/DElightManagerF.cc
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@

// ObjexxFCL Headers
#include <ObjexxFCL/Array1D.hh>
#include <ObjexxFCL/gio.hh>
#include <ObjexxFCL/string.functions.hh>

// EnergyPlus Headers
Expand Down
1 change: 0 additions & 1 deletion src/EnergyPlus/DataSizing.hh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
// ObjexxFCL Headers
#include <ObjexxFCL/Array1D.hh>
#include <ObjexxFCL/Array2D.hh>
#include <ObjexxFCL/gio_Fmt.hh>

// EnergyPlus Headers
#include <EnergyPlus/DataGlobals.hh>
Expand Down
7 changes: 2 additions & 5 deletions src/EnergyPlus/DataSystemVariables.cc
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@

// ObjexxFCL Headers
#include <ObjexxFCL/environment.hh>
#include <ObjexxFCL/gio.hh>
#include <ObjexxFCL/string.functions.hh>

// EnergyPlus Headers
Expand Down Expand Up @@ -229,8 +228,6 @@ namespace DataSystemVariables {
// SUBROUTINE ARGUMENT DEFINITIONS:

// SUBROUTINE PARAMETER DEFINITIONS:
static std::string const blank;
static ObjexxFCL::gio::Fmt fmtA("(A)");

// INTERFACE BLOCK SPECIFICATIONS:
// na
Expand All @@ -245,7 +242,7 @@ namespace DataSystemVariables {
if (firstTime) {
state.files.audit.ensure_open("CheckForActualFileName", state.files.outputControl.audit);
get_environment_variable(cInputPath1, envinputpath1);
if (envinputpath1 != blank) {
if (!envinputpath1.empty()) {
pos = index(envinputpath1, pathChar, true); // look backwards for pathChar
if (pos != std::string::npos) envinputpath1.erase(pos + 1);
}
Expand All @@ -256,7 +253,7 @@ namespace DataSystemVariables {


FileFound = false;
CheckedFileName = blank;
CheckedFileName.clear();
InputFileName = originalInputFileName;
makeNativePath(InputFileName);

Expand Down
2 changes: 0 additions & 2 deletions src/EnergyPlus/DataTimings.cc
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
// POSSIBILITY OF SUCH DAMAGE.

// ObjexxFCL Headers
#include <ObjexxFCL/gio.hh>
#include <ObjexxFCL/time.hh>

// EnergyPlus Headers
Expand Down Expand Up @@ -361,7 +360,6 @@ namespace DataTimings {
// SUBROUTINE ARGUMENT DEFINITIONS:

// SUBROUTINE PARAMETER DEFINITIONS:
static ObjexxFCL::gio::Fmt fmtA("(A)");

// INTERFACE BLOCK SPECIFICATIONS:
// na
Expand Down
1 change: 0 additions & 1 deletion src/EnergyPlus/DaylightingDevices.cc
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@

// ObjexxFCL Headers
#include <ObjexxFCL/Fmath.hh>
#include <ObjexxFCL/gio.hh>
#include <ObjexxFCL/numeric.hh>

// EnergyPlus Headers
Expand Down
12 changes: 0 additions & 12 deletions src/EnergyPlus/DaylightingManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
#include <ObjexxFCL/Vector2.hh>
#include <ObjexxFCL/Vector3.hh>
#include <ObjexxFCL/Vector4.hh>
#include <ObjexxFCL/gio.hh>
#include <ObjexxFCL/member.functions.hh>
#include <ObjexxFCL/random.hh>
#include <ObjexxFCL/string.functions.hh>
Expand Down Expand Up @@ -530,7 +529,6 @@ namespace DaylightingManager {
// na

// SUBROUTINE PARAMETER DEFINITIONS:
static ObjexxFCL::gio::Fmt fmtA("(A)");

// INTERFACE BLOCK SPECIFICATIONS
// na
Expand Down Expand Up @@ -4379,8 +4377,6 @@ namespace DaylightingManager {
using namespace DataIPShortCuts;
using namespace DElightManagerF; // Module for managing DElight subroutines

static ObjexxFCL::gio::Fmt fmtA("(A)");

int TotDaylightingControls; // Total Daylighting:Controls inputs (splitflux or delight type)
bool ErrorsFound; // Error flag
Real64 dLatitude; // double for argument passing
Expand Down Expand Up @@ -4686,8 +4682,6 @@ namespace DaylightingManager {
using General::RoundSigDigits;
using General::TrimSigDigits;

static ObjexxFCL::gio::Fmt fmtA("(A)");

Array1D_int ZoneMapCount;
int MapNum;
int IOStat;
Expand Down Expand Up @@ -5297,8 +5291,6 @@ namespace DaylightingManager {
using namespace OutputReportPredefined;
using ScheduleManager::GetScheduleIndex;

static ObjexxFCL::gio::Fmt fmtA("(A)");

int refPtNum;
std::string refName;
Real64 CosBldgRelNorth; // Cosine of Building rotation
Expand Down Expand Up @@ -5525,7 +5517,6 @@ namespace DaylightingManager {
// na

// SUBROUTINE PARAMETER DEFINITIONS:
static ObjexxFCL::gio::Fmt fmtA("(A)");

// INTERFACE BLOCK SPECIFICATIONS
// na
Expand Down Expand Up @@ -9956,8 +9947,6 @@ namespace DaylightingManager {
// SUBROUTINE ARGUMENT DEFINITIONS:

// SUBROUTINE PARAMETER DEFINITIONS:
static ObjexxFCL::gio::Fmt FmtA("(A)");


// INTERFACE BLOCK SPECIFICATIONS:
// na
Expand Down Expand Up @@ -10167,7 +10156,6 @@ namespace DaylightingManager {
// na

// SUBROUTINE PARAMETER DEFINITIONS:
static ObjexxFCL::gio::Fmt FmtA("(A)");

// INTERFACE BLOCK SPECIFICATIONS
// na
Expand Down
1 change: 0 additions & 1 deletion src/EnergyPlus/DualDuct.cc
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
// ObjexxFCL Headers
#include <ObjexxFCL/Array.functions.hh>
#include <ObjexxFCL/Fmath.hh>
#include <ObjexxFCL/gio.hh>

// EnergyPlus Headers
#include <EnergyPlus/Autosizing/Base.hh>
Expand Down
2 changes: 0 additions & 2 deletions src/EnergyPlus/EnergyPlus.hh
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ typedef std::int64_t Int64;
#include <ObjexxFCL/Array4D.fwd.hh>
#include <ObjexxFCL/Array5D.fwd.hh>
#include <ObjexxFCL/Array6D.fwd.hh>
#include <ObjexxFCL/IOFlags.fwd.hh>
#include <ObjexxFCL/MArray1.fwd.hh>
#include <ObjexxFCL/Omit.fwd.hh>
#include <ObjexxFCL/Optional.fwd.hh>
Expand Down Expand Up @@ -130,7 +129,6 @@ using ObjexxFCL::Array4D;
using ObjexxFCL::Array4D_int;
using ObjexxFCL::Array5D;
using ObjexxFCL::Array6D;
using ObjexxFCL::IOFlags;
using ObjexxFCL::MArray1;
using ObjexxFCL::Optional;
using ObjexxFCL::Optional_bool;
Expand Down
1 change: 0 additions & 1 deletion src/EnergyPlus/ExternalInterface.cc
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ extern "C" {

// ObjexxFCL Headers
#include <ObjexxFCL/Array.functions.hh>
#include <ObjexxFCL/gio.hh>
#include <ObjexxFCL/string.functions.hh>

// EnergyPlus Headers
Expand Down
3 changes: 0 additions & 3 deletions src/EnergyPlus/FluidProperties.cc
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@

// ObjexxFCL Headers
#include <ObjexxFCL/Fmath.hh>
#include <ObjexxFCL/gio.hh>

// EnergyPlus Headers
#include <EnergyPlus/Data/EnergyPlusData.hh>
Expand Down Expand Up @@ -5360,7 +5359,6 @@ CurrentModuleObject,
// na

// SUBROUTINE PARAMETER DEFINITIONS:
static ObjexxFCL::gio::Fmt fmtA("(A)");
Real64 const incr(10.0);
static std::string const RoutineName("ReportAndTestGlycols");

Expand Down Expand Up @@ -5630,7 +5628,6 @@ CurrentModuleObject,
// na

// SUBROUTINE PARAMETER DEFINITIONS:
static ObjexxFCL::gio::Fmt fmtA("(A)");
Real64 const incr(10.0);
Real64 const Quality(1.0);
static std::string const RoutineName("ReportAndTestRefrigerants");
Expand Down
1 change: 0 additions & 1 deletion src/EnergyPlus/GroundHeatExchangers.cc
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
// ObjexxFCL Headers
#include <ObjexxFCL/Array.functions.hh>
#include <ObjexxFCL/Fmath.hh>
#include <ObjexxFCL/gio.hh>

// JSON Headers
#include <nlohmann/json.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@
// C++ Headers
#include <memory>

// ObjexxFCL Headers
#include <ObjexxFCL/gio.hh>

// EnergyPlus Headers
#include <EnergyPlus/Data/EnergyPlusData.hh>
#include <EnergyPlus/DataEnvironment.hh>
Expand Down Expand Up @@ -83,7 +80,6 @@ SiteFCFactorMethodGroundTemps::FCFactorGTMFactory(EnergyPlusData &state, int obj
using DataEnvironment::FCGroundTemps;
using namespace DataIPShortCuts;
using namespace GroundTemperatureManager;
using namespace ObjexxFCL::gio;

// Locals
// SUBROUTINE LOCAL VARIABLE DECLARATIONS:
Expand Down
1 change: 0 additions & 1 deletion src/EnergyPlus/HVACControllers.cc
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
#include <ObjexxFCL/Array.functions.hh>
#include <ObjexxFCL/Array2D.hh>
#include <ObjexxFCL/Fmath.hh>
#include <ObjexxFCL/gio.hh>
#include <ObjexxFCL/numeric.hh>
#include <ObjexxFCL/string.functions.hh>

Expand Down
3 changes: 0 additions & 3 deletions src/EnergyPlus/HVACSizingSimulationManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@
// C++ Headers
#include <vector>

// ObjexxFCL Headers
#include <ObjexxFCL/gio.hh>

// EnergyPlus Headers
#include <EnergyPlus/Data/EnergyPlusData.hh>
#include <EnergyPlus/DataEnvironment.hh>
Expand Down
3 changes: 0 additions & 3 deletions src/EnergyPlus/HVACSizingSimulationManager.hh
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@
// C++ Headers
#include <vector>

// ObjexxFCL Headers
#include <ObjexxFCL/gio.hh>

// EnergyPlus Headers
#include <EnergyPlus/DataEnvironment.hh>
#include <EnergyPlus/DataErrorTracking.hh>
Expand Down
9 changes: 0 additions & 9 deletions src/EnergyPlus/HVACVariableRefrigerantFlow.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7056,13 +7056,6 @@ namespace HVACVariableRefrigerantFlow {
int CapSizingMethod(0); // capacity sizing methods (HeatingDesignCapacity, CapacityPerFloorArea, FractionOfAutosizedCoolingCapacity, and
// FractionOfAutosizedHeatingCapacity )

// Formats
static ObjexxFCL::gio::Fmt Format_990(
"('! <VRF System Information>, VRF System Type, VRF System Name, ','VRF System Cooling Combination Ratio, VRF "
"System Heating Combination Ratio, ','VRF System Cooling Piping Correction Factor, VRF System Heating Piping "
"Correction Factor')");
static ObjexxFCL::gio::Fmt Format_991("(' VRF System Information',6(', ',A))");

DataSizing::ZoneEqSizingData *select_EqSizing(nullptr);

// sweep specific data into one pointer to avoid if statements throughout this subroutine
Expand Down Expand Up @@ -8316,7 +8309,6 @@ namespace HVACVariableRefrigerantFlow {
int const MaxIte(500); // maximum number of iterations
Real64 const MinPLF(0.0); // minimum part load factor allowed
Real64 const ErrorTol(0.001); // tolerance for RegulaFalsi iterations
static ObjexxFCL::gio::Fmt fmtLD("*");

int VRFCond = this->VRFSysNum;
Real64 FullOutput = 0.0; // unit full output when compressor is operating [W]
Expand Down Expand Up @@ -11506,7 +11498,6 @@ namespace HVACVariableRefrigerantFlow {
int const MaxIte(500); // maximum number of iterations
Real64 const MinPLF(0.0); // minimum part load factor allowed
Real64 const ErrorTol(0.001); // tolerance for RegulaFalsi iterations
static ObjexxFCL::gio::Fmt fmtLD("*");

Real64 FullOutput; // unit full output when compressor is operating [W]
Real64 TempOutput; // unit output when iteration limit exceeded [W]
Expand Down
Loading