Skip to content

Commit

Permalink
fix EvapCooler naming conflict, remove UC resource strings, cleanup D…
Browse files Browse the repository at this point in the history 
…ataPrecisionGlobals usages
  • Loading branch information
@mitchute
mitchute committed Oct 11, 2020
1 parent a9ba76d commit 2de59ef
Show file tree
Hide file tree
Showing 118 changed files with 168 additions and 544 deletions.
5 changes: 2 additions & 3 deletions src/EnergyPlus/BaseboardRadiator.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ namespace BaseboardRadiator {
// RE-ENGINEERED na

// Using/Aliasing
using namespace DataPrecisionGlobals;
using namespace DataGlobals;
using DataHVACGlobals::SmallLoad;
using DataPlant::PlantLoop;
Expand Down Expand Up @@ -1087,13 +1086,13 @@ namespace BaseboardRadiator {
// To prevent possible underflows (numbers smaller than the computer can handle) we must break
// the calculation up into steps and check the size of the exponential arguments.
AA = -CapacityRatio * std::pow(NTU, 0.78);
if (AA < EXP_LowerLimit) {
if (AA < DataPrecisionGlobals::EXP_LowerLimit) {
BB = 0.0;
} else {
BB = std::exp(AA);
}
CC = (1.0 / CapacityRatio) * std::pow(NTU, 0.22) * (BB - 1.0);
if (CC < EXP_LowerLimit) {
if (CC < DataPrecisionGlobals::EXP_LowerLimit) {
Effectiveness = 1.0;
} else {
Effectiveness = 1.0 - std::exp(CC);
Expand Down
1 change: 0 additions & 1 deletion src/EnergyPlus/ChillerGasAbsorption.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
#include <EnergyPlus/DataIPShortCuts.hh>
#include <EnergyPlus/DataLoopNode.hh>
#include <EnergyPlus/Plant/DataPlant.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/DataSizing.hh>
#include <EnergyPlus/EMSManager.hh>
#include <EnergyPlus/FluidProperties.hh>
Expand Down
1 change: 0 additions & 1 deletion src/EnergyPlus/Coils/CoilCoolingDXCurveFitSpeed.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
#include <EnergyPlus/Autosizing/CoolingAirFlowSizing.hh>
#include <EnergyPlus/Autosizing/CoolingCapacitySizing.hh>
#include <EnergyPlus/Autosizing/CoolingSHRSizing.hh>
#include <EnergyPlus/Coils/CoilCoolingDXCurveFitOperatingMode.hh>
#include <EnergyPlus/Coils/CoilCoolingDXCurveFitSpeed.hh>
#include <EnergyPlus/CurveManager.hh>
#include <EnergyPlus/Data/EnergyPlusData.hh>
Expand Down
10 changes: 4 additions & 6 deletions src/EnergyPlus/DXCoils.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
#include <EnergyPlus/CurveManager.hh>
#include <EnergyPlus/DXCoils.hh>
#include <EnergyPlus/Data/EnergyPlusData.hh>
#include <EnergyPlus/DataAirLoop.hh>
#include <EnergyPlus/DataAirSystems.hh>
#include <EnergyPlus/DataBranchNodeConnections.hh>
#include <EnergyPlus/DataContaminantBalance.hh>
Expand Down Expand Up @@ -126,7 +125,6 @@ namespace DXCoils {
// USE STATEMENTS:
// Use statements for data only modules
// Using/Aliasing
using namespace DataPrecisionGlobals;
using namespace DataLoopNode;
using namespace DataGlobals;
using namespace DataHVACGlobals;
Expand Down Expand Up @@ -8728,7 +8726,7 @@ namespace DXCoils {
A0 = 0.0;
}
ADiff = -A0 / AirMassFlow;
if (ADiff >= EXP_LowerLimit) {
if (ADiff >= DataPrecisionGlobals::EXP_LowerLimit) {
CBF = std::exp(ADiff);
} else {
CBF = 0.0;
Expand Down Expand Up @@ -9677,7 +9675,7 @@ namespace DXCoils {
A0 = 0.0;
}
ADiff = -A0 / AirMassFlow;
if (ADiff >= EXP_LowerLimit) {
if (ADiff >= DataPrecisionGlobals::EXP_LowerLimit) {
CBF = std::exp(ADiff);
} else {
CBF = 0.0;
Expand Down Expand Up @@ -11058,7 +11056,7 @@ namespace DXCoils {
A0 = 0.0;
}
ADiff = -A0 / AirMassFlowRate;
if (ADiff >= EXP_LowerLimit) {
if (ADiff >= DataPrecisionGlobals::EXP_LowerLimit) {
CBFAdj = std::exp(ADiff);
} else {
CBFAdj = 1.0e-6;
Expand Down Expand Up @@ -15923,7 +15921,7 @@ namespace DXCoils {
A0 = 0.0;
}
ADiff = -A0 / AirMassFlow;
if (ADiff >= EXP_LowerLimit) {
if (ADiff >= DataPrecisionGlobals::EXP_LowerLimit) {
CBF = std::exp(ADiff);
} else {
CBF = 0.0;
Expand Down
2 changes: 0 additions & 2 deletions src/EnergyPlus/DXFEarClipping.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
#include <EnergyPlus/Data/EnergyPlusData.hh>
#include <EnergyPlus/DXFEarClipping.hh>
#include <EnergyPlus/DataGlobals.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/DataSurfaces.hh>
#include <EnergyPlus/UtilityRoutines.hh>

Expand Down Expand Up @@ -87,7 +86,6 @@ namespace DXFEarClipping {

// Use statements:
// Using/Aliasing
using namespace DataPrecisionGlobals;
using namespace DataVectorTypes;
// Data

Expand Down
3 changes: 0 additions & 3 deletions src/EnergyPlus/DataBSDFWindow.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@
// EnergyPlus Headers
#include <EnergyPlus/DataBSDFWindow.hh>
#include <EnergyPlus/DataGlobals.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>

namespace EnergyPlus {

namespace DataBSDFWindow {
Expand Down Expand Up @@ -80,7 +78,6 @@ namespace DataBSDFWindow {
// USE STATEMENTS:
// <use statements for data only modules>
// Using/Aliasing
using namespace DataPrecisionGlobals;
using namespace DataVectorTypes;

// <use statements for access to subroutines in other modules>
Expand Down
3 changes: 0 additions & 3 deletions src/EnergyPlus/DataBranchAirLoopPlant.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@

// EnergyPlus Headers
#include <EnergyPlus/DataBranchAirLoopPlant.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>

namespace EnergyPlus {

namespace DataBranchAirLoopPlant {
Expand Down Expand Up @@ -77,7 +75,6 @@ namespace DataBranchAirLoopPlant {
// USE STATEMENTS:
// <use statements for data only modules>
// Using/Aliasing
using namespace DataPrecisionGlobals;
// <use statements for access to subroutines in other modules>

// Data
Expand Down
4 changes: 0 additions & 4 deletions src/EnergyPlus/DataComplexFenestration.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@

// EnergyPlus Headers
#include <EnergyPlus/DataComplexFenestration.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>

namespace EnergyPlus {

namespace DataComplexFenestration {
Expand All @@ -62,8 +60,6 @@ namespace DataComplexFenestration {
// This module contains data necessary for complex fenestration calculations

// Using/Aliasing
using namespace DataPrecisionGlobals;

// Data
// Parameters for complex shade
int const csVenetianHorizontal(1);
Expand Down
2 changes: 0 additions & 2 deletions src/EnergyPlus/DataContaminantBalance.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@

// EnergyPlus Headers
#include <EnergyPlus/DataContaminantBalance.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/DataSurfaces.hh>

namespace EnergyPlus {
Expand All @@ -65,7 +64,6 @@ namespace DataContaminantBalance {
// that is needed to pass from the Contaminant Balance Module.

// Using/Aliasing
using namespace DataPrecisionGlobals;
using DataSurfaces::MaxSlatAngs;

// Data
Expand Down
4 changes: 0 additions & 4 deletions src/EnergyPlus/DataConvergParams.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@

// EnergyPlus Headers
#include <EnergyPlus/DataConvergParams.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>

namespace EnergyPlus {

namespace DataConvergParams {
Expand All @@ -62,8 +60,6 @@ namespace DataConvergParams {
// of the HVAC simulation.

// Using/Aliasing
using namespace DataPrecisionGlobals;

// Data
// -only module should be available to other modules and routines.
// Thus, all variables in this module must be PUBLIC.
Expand Down
4 changes: 0 additions & 4 deletions src/EnergyPlus/DataConversions.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@

// EnergyPlus Headers
#include <EnergyPlus/DataConversions.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>

namespace EnergyPlus {

namespace DataConversions {
Expand Down Expand Up @@ -79,8 +77,6 @@ namespace DataConversions {
// na

// Using/Aliasing
using namespace DataPrecisionGlobals;

// Data
// -only module should be available to other modules and routines.
// Thus, all variables in this module must be PUBLIC.
Expand Down
4 changes: 0 additions & 4 deletions src/EnergyPlus/DataDElight.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@

// EnergyPlus Headers
#include <EnergyPlus/DataDElight.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>

namespace EnergyPlus {

namespace DataDElight {
Expand All @@ -73,8 +71,6 @@ namespace DataDElight {
// na

// Using/Aliasing
using namespace DataPrecisionGlobals;

// Data
// -only module should be available to other modules and routines.
// Thus, all variables in this module must be PUBLIC.
Expand Down
4 changes: 0 additions & 4 deletions src/EnergyPlus/DataDaylighting.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@

// EnergyPlus Headers
#include <EnergyPlus/DataDaylighting.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>

namespace EnergyPlus {

namespace DataDaylighting {
Expand All @@ -73,8 +71,6 @@ namespace DataDaylighting {
// na

// Using/Aliasing
using namespace DataPrecisionGlobals;

// Data
// -only module should be available to other modules and routines.
// Thus, all variables in this module must be PUBLIC.
Expand Down
4 changes: 0 additions & 4 deletions src/EnergyPlus/DataDaylightingDevices.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@

// EnergyPlus Headers
#include <EnergyPlus/DataDaylightingDevices.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>

namespace EnergyPlus {

namespace DataDaylightingDevices {
Expand All @@ -68,8 +66,6 @@ namespace DataDaylightingDevices {
// OTHER NOTES: na

// Using/Aliasing
using namespace DataPrecisionGlobals;

// Data
// -only module should be available to other modules and routines.
// Thus, all variables in this module must be PUBLIC.
Expand Down
4 changes: 0 additions & 4 deletions src/EnergyPlus/DataDefineEquip.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@

// EnergyPlus Headers
#include <EnergyPlus/DataDefineEquip.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>

namespace EnergyPlus {

namespace DataDefineEquip {
Expand All @@ -69,8 +67,6 @@ namespace DataDefineEquip {
// OTHER NOTES: none

// Using/Aliasing
using namespace DataPrecisionGlobals;

// Data
// -only module should be available to other modules and routines.
// Thus, all variables in this module must be PUBLIC.
Expand Down
2 changes: 0 additions & 2 deletions src/EnergyPlus/DataEnvironment.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
// EnergyPlus Headers
#include <EnergyPlus/DataEnvironment.hh>
#include <EnergyPlus/DataGlobals.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>
#include <EnergyPlus/General.hh>
#include <EnergyPlus/UtilityRoutines.hh>

Expand Down Expand Up @@ -81,7 +80,6 @@ namespace DataEnvironment {
// na

// Using/Aliasing
using namespace DataPrecisionGlobals;
// Data
// -only module should be available to other modules and routines.
// Thus, all variables in this module must be PUBLIC.
Expand Down
4 changes: 0 additions & 4 deletions src/EnergyPlus/DataErrorTracking.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@

// EnergyPlus Headers
#include <EnergyPlus/DataErrorTracking.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>

namespace EnergyPlus {

namespace DataErrorTracking {
Expand All @@ -73,8 +71,6 @@ namespace DataErrorTracking {
// na

// Using/Aliasing
using namespace DataPrecisionGlobals;

// Data
// -only module should be available to other modules and routines.
// Thus, all variables in this module must be PUBLIC.
Expand Down
4 changes: 0 additions & 4 deletions src/EnergyPlus/DataGenerators.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@

// EnergyPlus Headers
#include <EnergyPlus/DataGenerators.hh>
#include <EnergyPlus/DataPrecisionGlobals.hh>

namespace EnergyPlus {

namespace DataGenerators {
Expand All @@ -73,8 +71,6 @@ namespace DataGenerators {
// na

// Using/Aliasing
using namespace DataPrecisionGlobals;

// Data
// -only module should be available to other modules and routines.
// Thus, all variables in this module must be PUBLIC.
Expand Down
Loading

5 comments on commit 2de59ef

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

global_dataGlobals_2_again (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.5: OK (3023 of 3024 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 721
  • Failed: 1

Build Badge Test Badge

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

global_dataGlobals_2_again (mitchute) - x86_64-MacOS-10.15-clang-11.0.0: OK (2983 of 2984 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 718
  • Failed: 1

Build Badge Test Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

global_dataGlobals_2_again (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-UnitTestsCoverage-Debug: OK (1548 of 1548 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

global_dataGlobals_2_again (mitchute) - Win64-Windows-10-VisualStudio-16: OK (2239 of 2240 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 718
  • Failed: 1

Build Badge Test Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

global_dataGlobals_2_again (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-IntegrationCoverage-Debug: OK (721 of 722 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 721
  • Failed: 1

Build Badge Test Badge Coverage Badge

Please sign in to comment.