Skip to content

Commit

Permalink
Remove unused constructions. Fix error in where CFactor and FFactor c…
Browse files Browse the repository at this point in the history
…onstructions were not being accounted for.
  • Loading branch information
Matt Mitchell committed Sep 15, 2017
1 parent 4cd62e2 commit 307ff4c
Show file tree
Hide file tree
Showing 118 changed files with 92 additions and 4,980 deletions.
40 changes: 12 additions & 28 deletions datasets/Window5DataFile.dat
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,29 @@ W5 Final PreRelease v0.64
Date : Tue Sep 25 14:54:50 2001
Window name : DoubleClear
Description : Horizontal Slider, custom
# Glazing Systems: 2
# Glazing Systems: 1
GLAZING SYSTEM DATA: Height Width nPanes Uval-center SC-center SHGC-center Tvis-center
System1 : 1386 514 2 2.764 0.892 0.774 0.824
System2 : 1386 514 2 2.764 0.892 0.774 0.824
FRAME/MULLION DATA: Width OutsideProj InsideProj Cond EdgeCondRatio SolAbs VisAbs Emiss Orient'n (mull)
L Sill : 57.2 25.4 25.4 56.424 1.458 0.900 0.900 0.90
R Sill : 57.2 25.4 25.4 56.424 1.458 0.900 0.900 0.90
L Head : 57.2 25.4 25.4 56.424 1.458 0.900 0.900 0.90
R Head : 57.2 25.4 25.4 56.424 1.458 0.900 0.900 0.90
Top L Jamb : 57.2 25.4 25.4 56.424 1.458 0.900 0.900 0.90
Bot L Jamb : 57.2 25.4 25.4 56.424 1.458 0.900 0.900 0.90
Top R Jamb : 57.2 25.4 25.4 56.424 1.458 0.900 0.900 0.90
Bot R Jamb : 57.2 25.4 25.4 56.424 1.458 0.900 0.900 0.90
L Sill : 57.2 25.4 25.4 56.424 1.458 0.900 0.900 0.90
R Sill : 57.2 25.4 25.4 56.424 1.458 0.900 0.900 0.90
L Head : 57.2 25.4 25.4 56.424 1.458 0.900 0.900 0.90
R Head : 57.2 25.4 25.4 56.424 1.458 0.900 0.900 0.90
Top L Jamb : 57.2 25.4 25.4 56.424 1.458 0.900 0.900 0.90
Bot L Jamb : 57.2 25.4 25.4 56.424 1.458 0.900 0.900 0.90
Top R Jamb : 57.2 25.4 25.4 56.424 1.458 0.900 0.900 0.90
Bot R Jamb : 57.2 25.4 25.4 56.424 1.458 0.900 0.900 0.90
Mullion : 57.2 25.4 25.4 56.424 1.458 0.900 0.900 0.90 Vertical
Average frame: 57.2 25.4 25.4 56.424 1.458 0.900 0.900 0.90
Average frame: 57.2 25.4 25.4 56.424 1.458 0.900 0.900 0.90
DIVIDER DATA : Width OutsideProj InsideProj Cond EdgeCondRatio SolAbs VisAbs Emiss Type #Hor #Vert
System1 : 16.0 0.0 0.0 24.000 1.916 0.300 0.300 0.900 Suspended 1 4
System2 : 16.0 25.4 25.4 24.000 1.916 0.300 0.300 0.900 DividedLite 2 2
GLASS DATA : Layer# Thickness Cond Tsol Rfsol Rbsol Tvis Rfvis Rbvis Tir EmissF EmissB SpectralDataFile
System1 : 1 2.97 0.900 0.85 0.08 0.08 0.90 0.08 0.08 0.00 0.84 0.84 CLR-3.CIG
2 2.97 0.900 0.85 0.08 0.08 0.90 0.08 0.08 0.00 0.84 0.84 CLR-3.CIG
System2 : 1 2.97 0.900 0.85 0.08 0.08 0.90 0.08 0.08 0.00 0.84 0.84 CLR-3.CIG
2 2.97 0.900 0.85 0.08 0.08 0.90 0.08 0.08 0.00 0.84 0.84 CLR-3.CIG
GAP DATA : Gap# Thick nGasses
System1 : 1 12.70 1
System2 : 1 12.70 1
System1 : 1 12.70 1
GAS DATA : GasName Fraction MolWeight ACond BCond CCond AVisc BVisc CVisc ASpHeat BSpHeat CSpHeat
System1 Gap1 : Air 1.0000 28.97 0.002301 0.000080 0.000000 0.003516 0.000050 0.000000 1.001760 0.000015 0.000000
System2 Gap1 : Air 1.0000 28.97 0.002301 0.000080 0.000000 0.003516 0.000050 0.000000 1.001760 0.000015 0.000000
System1 Gap1 : Air 1.0000 28.97 0.002301 0.000080 0.000000 0.003516 0.000050 0.000000 1.001760 0.000015 0.000000
GLAZING SYSTEM OPTICAL DATA:
Angle 0 10 20 30 40 50 60 70 80 90 Hemis
System1
Expand All @@ -43,14 +37,4 @@ Rbsol 0.131 0.131 0.131 0.134 0.143 0.168 0.233 0.374 0.625 1.000 0.211
Tvis 0.824 0.823 0.822 0.818 0.807 0.776 0.703 0.545 0.278 0.000 0.721
Rfvis 0.150 0.150 0.150 0.154 0.164 0.193 0.265 0.422 0.688 1.000 0.239
Rbvis 0.150 0.150 0.150 0.154 0.164 0.193 0.265 0.422 0.688 1.000 0.239
System2
Tsol 0.727 0.726 0.723 0.717 0.703 0.671 0.601 0.458 0.220 0.000 0.624
Abs1 0.081 0.081 0.083 0.085 0.089 0.094 0.100 0.108 0.111 0.000 0.092
Abs2 0.062 0.062 0.063 0.064 0.066 0.067 0.066 0.060 0.044 0.000 0.063
Rfsol 0.131 0.131 0.131 0.134 0.143 0.168 0.233 0.374 0.625 1.000 0.211
Rbsol 0.131 0.131 0.131 0.134 0.143 0.168 0.233 0.374 0.625 1.000 0.211
Tvis 0.824 0.823 0.822 0.818 0.807 0.776 0.703 0.545 0.278 0.000 0.721
Rfvis 0.150 0.150 0.150 0.154 0.164 0.193 0.265 0.422 0.688 1.000 0.239
Rbvis 0.150 0.150 0.150 0.154 0.164 0.193 0.265 0.422 0.688 1.000 0.239


6 changes: 6 additions & 0 deletions src/EnergyPlus/DataHeatBalance.cc
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,10 @@ namespace DataHeatBalance {
bool AnyConstructInternalSourceInInput( false ); // true if the user has entered any constructions with internal sources
bool AdaptiveComfortRequested_CEN15251( false ); // true if people objects have adaptive comfort requests. CEN15251
bool AdaptiveComfortRequested_ASH55( false ); // true if people objects have adaptive comfort requests. ASH55

bool NoFfactorConstructionsUsed( true );
bool NoCfactorConstructionsUsed( true );

int NumRefrigeratedRacks( 0 ); // Total number of refrigerated case compressor racks in input
int NumRefrigSystems( 0 ); // Total number of detailed refrigeration systems in input
int NumRefrigCondensers( 0 ); // Total number of detailed refrigeration condensers in input
Expand Down Expand Up @@ -766,6 +770,8 @@ namespace DataHeatBalance {
AnyConstructInternalSourceInInput = false;
AdaptiveComfortRequested_CEN15251 = false;
AdaptiveComfortRequested_ASH55 = false;
NoFfactorConstructionsUsed = true;
NoCfactorConstructionsUsed = true;
NumRefrigeratedRacks = 0;
NumRefrigSystems = 0;
NumRefrigCondensers = 0;
Expand Down
4 changes: 4 additions & 0 deletions src/EnergyPlus/DataHeatBalance.hh
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,10 @@ namespace DataHeatBalance {
extern bool AnyConstructInternalSourceInInput; // true if the user has entered any constructions with internal sources
extern bool AdaptiveComfortRequested_CEN15251; // true if people objects have adaptive comfort requests. CEN15251
extern bool AdaptiveComfortRequested_ASH55; // true if people objects have adaptive comfort requests. ASH55

extern bool NoFfactorConstructionsUsed;
extern bool NoCfactorConstructionsUsed;

extern int NumRefrigeratedRacks; // Total number of refrigerated case compressor racks in input
extern int NumRefrigSystems; // Total number of detailed refrigeration systems in input
extern int NumRefrigCondensers; // Total number of detailed refrigeration condensers in input
Expand Down
38 changes: 32 additions & 6 deletions src/EnergyPlus/HeatBalanceManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1408,7 +1408,7 @@ namespace HeatBalanceManager {
Array1D< Real64 > MaterialProps( 27 ); // Temporary array to transfer material properties
int RegMat; // Regular Materials -- full property definition
int RegRMat; // Regular Materials -- R only property definition
int AirMat; // Air space materias in opaque constructions
int AirMat; // Air space materials in opaque constructions
int IRTMat; // Infrared Transmitting Materials -- R only property definition

int EcoRoofMat; // Materials for ecoRoof
Expand All @@ -1429,7 +1429,7 @@ namespace HeatBalanceManager {
Real64 TransmittivityVis; // Glass transmittivity, visible
static bool DoReport( false );
Real64 DenomRGas; // Denominator for WindowGas calculations of NominalR
Real64 Openness; // insect screen oppenness fraction = (1-d/s)^2
Real64 Openness; // insect screen openness fraction = (1-d/s)^2
Real64 minAngValue; // minimum value of angle
Real64 maxAngValue; // maximum value of angle
Real64 minLamValue; // minimum value of wavelength
Expand All @@ -1439,7 +1439,7 @@ namespace HeatBalanceManager {
static int iTC( 0 );
static int iMat( 0 );

// Added TH 7/27/2009 for constructions defined with F or C factro method
// Added TH 7/27/2009 for constructions defined with F or C factor method
int TotFfactorConstructs; // Number of slabs-on-grade or underground floor constructions defined with F factors
int TotCfactorConstructs; // Number of underground wall constructions defined with C factors

Expand Down Expand Up @@ -1476,6 +1476,15 @@ namespace HeatBalanceManager {

TotFfactorConstructs = GetNumObjectsFound( "Construction:FfactorGroundFloor" );
TotCfactorConstructs = GetNumObjectsFound( "Construction:CfactorUndergroundWall" );

if ( TotFfactorConstructs > 0 ) {
NoFfactorConstructionsUsed = false;
}

if ( TotCfactorConstructs > 0 ) {
NoCfactorConstructionsUsed = false;
}

if ( TotFfactorConstructs + TotCfactorConstructs >= 1 ) {
// Add a new fictitious insulation layer and a thermal mass layer for each F or C factor defined construction
TotMaterials += 1 + TotFfactorConstructs + TotCfactorConstructs;
Expand Down Expand Up @@ -3895,7 +3904,7 @@ namespace HeatBalanceManager {
// Window5 data file
bool EOFonW5File; // True if EOF encountered reading Window5 data file
static bool NoRegularMaterialsUsed( true );
int MaterialLayerGroup; // window contruction layer material group index
int MaterialLayerGroup; // window construction layer material group index

int iMatGlass; // number of glass layers
Array1D_string WConstructNames;
Expand All @@ -3908,6 +3917,15 @@ namespace HeatBalanceManager {

TotFfactorConstructs = GetNumObjectsFound( "Construction:FfactorGroundFloor" );
TotCfactorConstructs = GetNumObjectsFound( "Construction:CfactorUndergroundWall" );

if ( TotFfactorConstructs > 0 ) {
NoFfactorConstructionsUsed = false;
}

if ( TotCfactorConstructs > 0 ) {
NoCfactorConstructionsUsed = false;
}

TotComplexFenStates = GetNumObjectsFound( "Construction:ComplexFenestrationState" );
TotWindow5Constructs = GetNumObjectsFound( "Construction:WindowDataFile" );
TotWinEquivLayerConstructs = GetNumObjectsFound( "Construction:WindowEquivalentLayer" );
Expand Down Expand Up @@ -4116,8 +4134,8 @@ namespace HeatBalanceManager {
TotRegConstructs += TotSourceConstructs;
TotConstructs = TotRegConstructs;

if ( TotConstructs > 0 && NoRegularMaterialsUsed ) {
ShowSevereError( "This building has no thermal mass which can cause an unstable solution." );
if ( TotConstructs > 0 && ( NoRegularMaterialsUsed && NoCfactorConstructionsUsed && NoFfactorConstructionsUsed ) ) {
ShowWarningError( "This building has no thermal mass which can cause an unstable solution." );
ShowContinueError( "Use Material object for all opaque material definitions except very light insulation layers." );
}

Expand Down Expand Up @@ -6756,6 +6774,14 @@ Label1000: ;
TotFfactorConstructs = GetNumObjectsFound( "Construction:FfactorGroundFloor" );
TotCfactorConstructs = GetNumObjectsFound( "Construction:CfactorUndergroundWall" );

if ( TotFfactorConstructs > 0 ) {
NoFfactorConstructionsUsed = false;
}

if ( TotCfactorConstructs > 0 ) {
NoCfactorConstructionsUsed = false;
}

// First create ground floor constructions defined with F factor method if any
CurrentModuleObject = "Construction:FfactorGroundFloor";

Expand Down
6 changes: 3 additions & 3 deletions src/EnergyPlus/UnitVentilator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ namespace UnitVentilator {
if ( !UnitVent( UnitVentNum ).ATMixerExists ) {
UnitVent( UnitVentNum ).AirInNode = GetOnlySingleNode( Alphas( 6 ), ErrorsFound, CurrentModuleObject, Alphas( 1 ), NodeType_Air, NodeConnectionType_Inlet, 1, ObjectIsParent );
UnitVent( UnitVentNum ).AirInNode = GetOnlySingleNode( Alphas( 6 ), ErrorsFound, CurrentModuleObject + "-OA MIXER", Alphas( 1 ), NodeType_Air, NodeConnectionType_Inlet, 1, ObjectIsNotParent );
} else {
} else {
UnitVent( UnitVentNum ).AirInNode = GetOnlySingleNode( Alphas( 6 ), ErrorsFound, CurrentModuleObject, Alphas( 1 ), NodeType_Air, NodeConnectionType_Inlet, 1, ObjectIsParent );
}
UnitVent( UnitVentNum ).AirOutNode = GetOnlySingleNode( Alphas( 7 ), ErrorsFound, CurrentModuleObject, Alphas( 1 ), NodeType_Air, NodeConnectionType_Outlet, 1, ObjectIsParent );
Expand Down Expand Up @@ -2886,7 +2886,7 @@ namespace UnitVentilator {
} else {
SimUnitVentOAMixer( UnitVentNum, FanOpMode );
}
if ( UnitVent( UnitVentNum ).FanType_Num != DataHVACGlobals::FanType_SystemModelObject ) {
if ( UnitVent( UnitVentNum ).FanType_Num != DataHVACGlobals::FanType_SystemModelObject ) {
Fans::SimulateFanComponents( UnitVent( UnitVentNum ).FanName, FirstHVACIteration, UnitVent( UnitVentNum ).Fan_Index, _, ZoneCompTurnFansOn, ZoneCompTurnFansOff );
} else {
DataHVACGlobals::OnOffFanPartLoadFraction = 1.0; // used for cycling fan, set to 1.0 to be sure
Expand Down Expand Up @@ -2960,7 +2960,7 @@ namespace UnitVentilator {
} else {
SimUnitVentOAMixer( UnitVentNum, FanOpMode );
}
if ( UnitVent( UnitVentNum ).FanType_Num != DataHVACGlobals::FanType_SystemModelObject ) {
if ( UnitVent( UnitVentNum ).FanType_Num != DataHVACGlobals::FanType_SystemModelObject ) {
Fans::SimulateFanComponents( UnitVent( UnitVentNum ).FanName, FirstHVACIteration, UnitVent( UnitVentNum ).Fan_Index, _, ZoneCompTurnFansOn, ZoneCompTurnFansOff );
} else {
HVACFan::fanObjs[ UnitVent( UnitVentNum ).Fan_Index ]->simulate( _, ZoneCompTurnFansOn, ZoneCompTurnFansOff, _ );
Expand Down
15 changes: 0 additions & 15 deletions testfiles/1ZoneUncontrolled_FCfactor_Slab_UGWall.idf
Original file line number Diff line number Diff line change
Expand Up @@ -206,17 +206,6 @@
0.7500000, !- Solar Absorptance
0.7500000; !- Visible Absorptance

Material,
C5 - 4 IN HW CONCRETE, !- Name
MediumRough, !- Roughness
0.1014984, !- Thickness {m}
1.729577, !- Conductivity {W/m-K}
2242.585, !- Density {kg/m3}
836.8000, !- Specific Heat {J/kg-K}
0.9000000, !- Thermal Absorptance
0.6500000, !- Solar Absorptance
0.6500000; !- Visible Absorptance

Construction,
R13WALL, !- Name
R13LAYER; !- Outside Layer
Expand All @@ -231,10 +220,6 @@
1.14, !- C-Factor {W/m2-K}
4.57; !- Height {m}

Construction,
FLOOR, !- Name
C5 - 4 IN HW CONCRETE; !- Outside Layer

Construction,
ROOF31, !- Name
R31LAYER; !- Outside Layer
Expand Down
6 changes: 0 additions & 6 deletions testfiles/BasicsFiles/AdultEducationCenter.idf
Original file line number Diff line number Diff line change
Expand Up @@ -343,12 +343,6 @@
F05 Ceiling air space resistance, !- Layer 2
M14a 100mm heavyweight concrete; !- Layer 3

! use with InternalMass at 50% of floor area

Construction,
Medium Furnishings, !- Name
G05 25mm wood; !- Outside Layer

!- =========== ALL OBJECTS IN CLASS: ZONE ===========

Zone,
Expand Down
8 changes: 0 additions & 8 deletions testfiles/BasicsFiles/Exercise2.idf
Original file line number Diff line number Diff line change
Expand Up @@ -396,14 +396,6 @@
CLNG-1, !- Name
MAT-CLNG-1; !- Outside Layer

Construction,
SB-U, !- Name
MAT-SB-U; !- Outside Layer

Construction,
FLOOR-1, !- Name
MAT-FLOOR-1; !- Outside Layer

Construction,
FLOOR-SLAB-1, !- Name
CC03; !- Outside Layer
Expand Down
8 changes: 0 additions & 8 deletions testfiles/BasicsFiles/Exercise2A-Solution.idf
Original file line number Diff line number Diff line change
Expand Up @@ -492,14 +492,6 @@
CLNG-1, !- Name
MAT-CLNG-1; !- Outside Layer

Construction,
SB-U, !- Name
MAT-SB-U; !- Outside Layer

Construction,
FLOOR-1, !- Name
MAT-FLOOR-1; !- Outside Layer

Construction,
FLOOR-SLAB-1, !- Name
CC03; !- Outside Layer
Expand Down
8 changes: 0 additions & 8 deletions testfiles/BasicsFiles/Exercise2B-Solution.idf
Original file line number Diff line number Diff line change
Expand Up @@ -770,14 +770,6 @@
CLNG-1, !- Name
MAT-CLNG-1; !- Outside Layer

Construction,
SB-U, !- Name
MAT-SB-U; !- Outside Layer

Construction,
FLOOR-1, !- Name
MAT-FLOOR-1; !- Outside Layer

Construction,
FLOOR-SLAB-1, !- Name
CC03; !- Outside Layer
Expand Down
8 changes: 0 additions & 8 deletions testfiles/BasicsFiles/Exercise2C-Solution.idf
Original file line number Diff line number Diff line change
Expand Up @@ -790,14 +790,6 @@
CLNG-1, !- Name
MAT-CLNG-1; !- Outside Layer

Construction,
SB-U, !- Name
MAT-SB-U; !- Outside Layer

Construction,
FLOOR-1, !- Name
MAT-FLOOR-1; !- Outside Layer

Construction,
FLOOR-SLAB-1, !- Name
CC03; !- Outside Layer
Expand Down
6 changes: 0 additions & 6 deletions testfiles/CentralChillerHeaterSystem_Cooling_Heating.idf
Original file line number Diff line number Diff line change
Expand Up @@ -803,12 +803,6 @@
Sgl Grey 3mm, !- Name
GREY 3MM; !- Outside Layer

Construction,
Dbl Clr 6mm/6mm Air, !- Name
CLEAR 6MM, !- Outside Layer
AIR 6MM, !- Layer 2
CLEAR 6MM; !- Layer 3

Construction,
Dbl Clr 3mm/13mm Air, !- Name
CLEAR 3MM, !- Outside Layer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -423,10 +423,6 @@
DropCeiling, !- Name
Std AC02; !- Outside Layer

Construction,
AIR-WALL, !- Name
MAT-AIR-WALL; !- Outside Layer

Construction,
InteriorFurnishings, !- Name
Std Wood 6inch; !- Outside Layer
Expand Down Expand Up @@ -9244,8 +9240,6 @@

Output:Meter,Heating:Gas,HOURLY;

Output:Meter,InteriorEquipment:Gas,HOURLY;

Output:Meter,Water Heater:WaterSystems:Gas,HOURLY;

Output:Variable,*,Site Outdoor Air Drybulb Temperature,HOURLY;
Expand Down
Loading

0 comments on commit 307ff4c

Please sign in to comment.