Skip to content

Commit

Permalink
Merge branch 'develop' into fuelCellGenPlantCompRefactor
Browse files Browse the repository at this point in the history
  • Loading branch information
@mitchute
mitchute committed Nov 26, 2019
2 parents ef95f91 + f85864f commit 78e3fe8
Show file tree
Hide file tree
Showing 595 changed files with 59,680 additions and 63,436 deletions.
90 changes: 45 additions & 45 deletions performance_tests/15zonePSZ.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1807,7 +1807,7 @@
InternalMass,
ZN_1_FLR_1_SEC_1_InternalMass_1, !- Name
InteriorFurnishings, !- Construction Name
ZN_1_FLR_1_SEC_1, !- Zone Name
ZN_1_FLR_1_SEC_1, !- Zone or ZoneList Name
95.3302; !- Surface Area {m2}

ZoneInfiltration:DesignFlowRate,
Expand Down Expand Up @@ -1998,8 +1998,8 @@
ZN_1_FLR_1_SEC_1 Direct Air, !- Zone Equipment 1 Name
1, !- Zone Equipment 1 Cooling Sequence
1, !- Zone Equipment 1 Heating or No-Load Sequence
, !- Zone Equipment 1 Sequential Cooling Load Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Load Fraction Schedule Name
, !- Zone Equipment 1 Sequential Cooling Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Fraction Schedule Name

AirTerminal:SingleDuct:Uncontrolled,
ZN_1_FLR_1_SEC_1 Direct Air, !- Name
Expand Down Expand Up @@ -2186,7 +2186,7 @@
InternalMass,
ZN_1_FLR_1_SEC_2_InternalMass_1, !- Name
InteriorFurnishings, !- Construction Name
ZN_1_FLR_1_SEC_2, !- Zone Name
ZN_1_FLR_1_SEC_2, !- Zone or ZoneList Name
137.1000; !- Surface Area {m2}

ZoneInfiltration:DesignFlowRate,
Expand Down Expand Up @@ -2377,8 +2377,8 @@
ZN_1_FLR_1_SEC_2 Direct Air, !- Zone Equipment 1 Name
1, !- Zone Equipment 1 Cooling Sequence
1, !- Zone Equipment 1 Heating or No-Load Sequence
, !- Zone Equipment 1 Sequential Cooling Load Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Load Fraction Schedule Name
, !- Zone Equipment 1 Sequential Cooling Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Fraction Schedule Name

AirTerminal:SingleDuct:Uncontrolled,
ZN_1_FLR_1_SEC_2 Direct Air, !- Name
Expand Down Expand Up @@ -2565,7 +2565,7 @@
InternalMass,
ZN_1_FLR_1_SEC_3_InternalMass_1, !- Name
InteriorFurnishings, !- Construction Name
ZN_1_FLR_1_SEC_3, !- Zone Name
ZN_1_FLR_1_SEC_3, !- Zone or ZoneList Name
133.1698; !- Surface Area {m2}

ZoneInfiltration:DesignFlowRate,
Expand Down Expand Up @@ -2756,8 +2756,8 @@
ZN_1_FLR_1_SEC_3 Direct Air, !- Zone Equipment 1 Name
1, !- Zone Equipment 1 Cooling Sequence
1, !- Zone Equipment 1 Heating or No-Load Sequence
, !- Zone Equipment 1 Sequential Cooling Load Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Load Fraction Schedule Name
, !- Zone Equipment 1 Sequential Cooling Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Fraction Schedule Name

AirTerminal:SingleDuct:Uncontrolled,
ZN_1_FLR_1_SEC_3 Direct Air, !- Name
Expand Down Expand Up @@ -2944,7 +2944,7 @@
InternalMass,
ZN_1_FLR_1_SEC_4_InternalMass_1, !- Name
InteriorFurnishings, !- Construction Name
ZN_1_FLR_1_SEC_4, !- Zone Name
ZN_1_FLR_1_SEC_4, !- Zone or ZoneList Name
137.1000; !- Surface Area {m2}

ZoneInfiltration:DesignFlowRate,
Expand Down Expand Up @@ -3135,8 +3135,8 @@
ZN_1_FLR_1_SEC_4 Direct Air, !- Zone Equipment 1 Name
1, !- Zone Equipment 1 Cooling Sequence
1, !- Zone Equipment 1 Heating or No-Load Sequence
, !- Zone Equipment 1 Sequential Cooling Load Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Load Fraction Schedule Name
, !- Zone Equipment 1 Sequential Cooling Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Fraction Schedule Name

AirTerminal:SingleDuct:Uncontrolled,
ZN_1_FLR_1_SEC_4 Direct Air, !- Name
Expand Down Expand Up @@ -3323,7 +3323,7 @@
InternalMass,
ZN_1_FLR_1_SEC_5_InternalMass_1, !- Name
InteriorFurnishings, !- Construction Name
ZN_1_FLR_1_SEC_5, !- Zone Name
ZN_1_FLR_1_SEC_5, !- Zone or ZoneList Name
95.3302; !- Surface Area {m2}

ZoneInfiltration:DesignFlowRate,
Expand Down Expand Up @@ -3514,8 +3514,8 @@
ZN_1_FLR_1_SEC_5 Direct Air, !- Zone Equipment 1 Name
1, !- Zone Equipment 1 Cooling Sequence
1, !- Zone Equipment 1 Heating or No-Load Sequence
, !- Zone Equipment 1 Sequential Cooling Load Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Load Fraction Schedule Name
, !- Zone Equipment 1 Sequential Cooling Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Fraction Schedule Name

AirTerminal:SingleDuct:Uncontrolled,
ZN_1_FLR_1_SEC_5 Direct Air, !- Name
Expand Down Expand Up @@ -3702,7 +3702,7 @@
InternalMass,
ZN_1_FLR_1_SEC_6_InternalMass_1, !- Name
InteriorFurnishings, !- Construction Name
ZN_1_FLR_1_SEC_6, !- Zone Name
ZN_1_FLR_1_SEC_6, !- Zone or ZoneList Name
323.8302; !- Surface Area {m2}

ZoneInfiltration:DesignFlowRate,
Expand Down Expand Up @@ -3893,8 +3893,8 @@
ZN_1_FLR_1_SEC_6 Direct Air, !- Zone Equipment 1 Name
1, !- Zone Equipment 1 Cooling Sequence
1, !- Zone Equipment 1 Heating or No-Load Sequence
, !- Zone Equipment 1 Sequential Cooling Load Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Load Fraction Schedule Name
, !- Zone Equipment 1 Sequential Cooling Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Fraction Schedule Name

AirTerminal:SingleDuct:Uncontrolled,
ZN_1_FLR_1_SEC_6 Direct Air, !- Name
Expand Down Expand Up @@ -4081,7 +4081,7 @@
InternalMass,
ZN_1_FLR_1_SEC_7_InternalMass_1, !- Name
InteriorFurnishings, !- Construction Name
ZN_1_FLR_1_SEC_7, !- Zone Name
ZN_1_FLR_1_SEC_7, !- Zone or ZoneList Name
95.3302; !- Surface Area {m2}

ZoneInfiltration:DesignFlowRate,
Expand Down Expand Up @@ -4272,8 +4272,8 @@
ZN_1_FLR_1_SEC_7 Direct Air, !- Zone Equipment 1 Name
1, !- Zone Equipment 1 Cooling Sequence
1, !- Zone Equipment 1 Heating or No-Load Sequence
, !- Zone Equipment 1 Sequential Cooling Load Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Load Fraction Schedule Name
, !- Zone Equipment 1 Sequential Cooling Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Fraction Schedule Name

AirTerminal:SingleDuct:Uncontrolled,
ZN_1_FLR_1_SEC_7 Direct Air, !- Name
Expand Down Expand Up @@ -4460,7 +4460,7 @@
InternalMass,
ZN_1_FLR_1_SEC_8_InternalMass_1, !- Name
InteriorFurnishings, !- Construction Name
ZN_1_FLR_1_SEC_8, !- Zone Name
ZN_1_FLR_1_SEC_8, !- Zone or ZoneList Name
137.1000; !- Surface Area {m2}

ZoneInfiltration:DesignFlowRate,
Expand Down Expand Up @@ -4651,8 +4651,8 @@
ZN_1_FLR_1_SEC_8 Direct Air, !- Zone Equipment 1 Name
1, !- Zone Equipment 1 Cooling Sequence
1, !- Zone Equipment 1 Heating or No-Load Sequence
, !- Zone Equipment 1 Sequential Cooling Load Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Load Fraction Schedule Name
, !- Zone Equipment 1 Sequential Cooling Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Fraction Schedule Name

AirTerminal:SingleDuct:Uncontrolled,
ZN_1_FLR_1_SEC_8 Direct Air, !- Name
Expand Down Expand Up @@ -4839,7 +4839,7 @@
InternalMass,
ZN_1_FLR_1_SEC_9_InternalMass_1, !- Name
InteriorFurnishings, !- Construction Name
ZN_1_FLR_1_SEC_9, !- Zone Name
ZN_1_FLR_1_SEC_9, !- Zone or ZoneList Name
133.1698; !- Surface Area {m2}

ZoneInfiltration:DesignFlowRate,
Expand Down Expand Up @@ -5030,8 +5030,8 @@
ZN_1_FLR_1_SEC_9 Direct Air, !- Zone Equipment 1 Name
1, !- Zone Equipment 1 Cooling Sequence
1, !- Zone Equipment 1 Heating or No-Load Sequence
, !- Zone Equipment 1 Sequential Cooling Load Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Load Fraction Schedule Name
, !- Zone Equipment 1 Sequential Cooling Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Fraction Schedule Name

AirTerminal:SingleDuct:Uncontrolled,
ZN_1_FLR_1_SEC_9 Direct Air, !- Name
Expand Down Expand Up @@ -5218,7 +5218,7 @@
InternalMass,
ZN_1_FLR_1_SEC_10_InternalMass_1, !- Name
InteriorFurnishings, !- Construction Name
ZN_1_FLR_1_SEC_10, !- Zone Name
ZN_1_FLR_1_SEC_10, !- Zone or ZoneList Name
137.1000; !- Surface Area {m2}

ZoneInfiltration:DesignFlowRate,
Expand Down Expand Up @@ -5409,8 +5409,8 @@
ZN_1_FLR_1_SEC_10 Direct Air, !- Zone Equipment 1 Name
1, !- Zone Equipment 1 Cooling Sequence
1, !- Zone Equipment 1 Heating or No-Load Sequence
, !- Zone Equipment 1 Sequential Cooling Load Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Load Fraction Schedule Name
, !- Zone Equipment 1 Sequential Cooling Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Fraction Schedule Name

AirTerminal:SingleDuct:Uncontrolled,
ZN_1_FLR_1_SEC_10 Direct Air, !- Name
Expand Down Expand Up @@ -5597,7 +5597,7 @@
InternalMass,
ZN_1_FLR_1_SEC_11_InternalMass_1, !- Name
InteriorFurnishings, !- Construction Name
ZN_1_FLR_1_SEC_11, !- Zone Name
ZN_1_FLR_1_SEC_11, !- Zone or ZoneList Name
95.3302; !- Surface Area {m2}

ZoneInfiltration:DesignFlowRate,
Expand Down Expand Up @@ -5788,8 +5788,8 @@
ZN_1_FLR_1_SEC_11 Direct Air, !- Zone Equipment 1 Name
1, !- Zone Equipment 1 Cooling Sequence
1, !- Zone Equipment 1 Heating or No-Load Sequence
, !- Zone Equipment 1 Sequential Cooling Load Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Load Fraction Schedule Name
, !- Zone Equipment 1 Sequential Cooling Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Fraction Schedule Name

AirTerminal:SingleDuct:Uncontrolled,
ZN_1_FLR_1_SEC_11 Direct Air, !- Name
Expand Down Expand Up @@ -5976,7 +5976,7 @@
InternalMass,
ZN_1_FLR_1_SEC_12_InternalMass_1, !- Name
InteriorFurnishings, !- Construction Name
ZN_1_FLR_1_SEC_12, !- Zone Name
ZN_1_FLR_1_SEC_12, !- Zone or ZoneList Name
323.8302; !- Surface Area {m2}

ZoneInfiltration:DesignFlowRate,
Expand Down Expand Up @@ -6167,8 +6167,8 @@
ZN_1_FLR_1_SEC_12 Direct Air, !- Zone Equipment 1 Name
1, !- Zone Equipment 1 Cooling Sequence
1, !- Zone Equipment 1 Heating or No-Load Sequence
, !- Zone Equipment 1 Sequential Cooling Load Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Load Fraction Schedule Name
, !- Zone Equipment 1 Sequential Cooling Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Fraction Schedule Name

AirTerminal:SingleDuct:Uncontrolled,
ZN_1_FLR_1_SEC_12 Direct Air, !- Name
Expand Down Expand Up @@ -6332,7 +6332,7 @@
InternalMass,
ZN_1_FLR_1_SEC_13_InternalMass_1, !- Name
InteriorFurnishings, !- Construction Name
ZN_1_FLR_1_SEC_13, !- Zone Name
ZN_1_FLR_1_SEC_13, !- Zone or ZoneList Name
361.6792; !- Surface Area {m2}

ZoneInfiltration:DesignFlowRate,
Expand Down Expand Up @@ -6523,8 +6523,8 @@
ZN_1_FLR_1_SEC_13 Direct Air, !- Zone Equipment 1 Name
1, !- Zone Equipment 1 Cooling Sequence
1, !- Zone Equipment 1 Heating or No-Load Sequence
, !- Zone Equipment 1 Sequential Cooling Load Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Load Fraction Schedule Name
, !- Zone Equipment 1 Sequential Cooling Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Fraction Schedule Name

AirTerminal:SingleDuct:Uncontrolled,
ZN_1_FLR_1_SEC_13 Direct Air, !- Name
Expand Down Expand Up @@ -6656,7 +6656,7 @@
InternalMass,
ZN_1_FLR_1_SEC_14_InternalMass_1, !- Name
InteriorFurnishings, !- Construction Name
ZN_1_FLR_1_SEC_14, !- Zone Name
ZN_1_FLR_1_SEC_14, !- Zone or ZoneList Name
32.9208; !- Surface Area {m2}

ZoneInfiltration:DesignFlowRate,
Expand Down Expand Up @@ -6847,8 +6847,8 @@
ZN_1_FLR_1_SEC_14 Direct Air, !- Zone Equipment 1 Name
1, !- Zone Equipment 1 Cooling Sequence
1, !- Zone Equipment 1 Heating or No-Load Sequence
, !- Zone Equipment 1 Sequential Cooling Load Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Load Fraction Schedule Name
, !- Zone Equipment 1 Sequential Cooling Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Fraction Schedule Name

AirTerminal:SingleDuct:Uncontrolled,
ZN_1_FLR_1_SEC_14 Direct Air, !- Name
Expand Down Expand Up @@ -7012,7 +7012,7 @@
InternalMass,
ZN_1_FLR_1_SEC_15_InternalMass_1, !- Name
InteriorFurnishings, !- Construction Name
ZN_1_FLR_1_SEC_15, !- Zone Name
ZN_1_FLR_1_SEC_15, !- Zone or ZoneList Name
361.6792; !- Surface Area {m2}

ZoneInfiltration:DesignFlowRate,
Expand Down Expand Up @@ -7203,8 +7203,8 @@
ZN_1_FLR_1_SEC_15 Direct Air, !- Zone Equipment 1 Name
1, !- Zone Equipment 1 Cooling Sequence
1, !- Zone Equipment 1 Heating or No-Load Sequence
, !- Zone Equipment 1 Sequential Cooling Load Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Load Fraction Schedule Name
, !- Zone Equipment 1 Sequential Cooling Fraction Schedule Name
; !- Zone Equipment 1 Sequential Heating Fraction Schedule Name

AirTerminal:SingleDuct:Uncontrolled,
ZN_1_FLR_1_SEC_15 Direct Air, !- Name
Expand Down
Loading

7 comments on commit 78e3fe8

@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.

fuelCellGenPlantCompRefactor (mitchute) - x86_64-MacOS-10.13-clang: OK (2583 of 2584 tests passed, 1 test warnings)

Messages:\n

  • 2 tests had: BND diffs.
  • 2 tests had: EIO diffs.
  • 1 test had: ESO small diffs.
  • 2 tests had: MDD diffs.
  • 2 tests had: MTD diffs.
  • 1 test had: MTR small diffs.
  • 2 tests had: RDD diffs.
  • 1 test had: Table big diffs.

Failures:\n

regression Test Summary

  • Passed: 668
  • 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.

fuelCellGenPlantCompRefactor (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.4: OK (2623 of 2624 tests passed, 1 test warnings)

Messages:\n

  • 2 tests had: BND diffs.
  • 2 tests had: EIO diffs.
  • 1 test had: ESO small diffs.
  • 2 tests had: MDD diffs.
  • 2 tests had: MTD diffs.
  • 1 test had: MTR small diffs.
  • 2 tests had: RDD diffs.
  • 1 test had: Table big diffs.

Failures:\n

regression Test Summary

  • Passed: 688
  • 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.

fuelCellGenPlantCompRefactor (mitchute) - x86_64-Linux-Ubuntu-18.04-cppcheck: OK (0 of 0 tests passed, 0 test warnings)

Build 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.

fuelCellGenPlantCompRefactor (mitchute) - x86_64-Linux-Ubuntu-18.04-custom_check: OK (11 of 11 tests passed, 0 test warnings)

Build 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.

fuelCellGenPlantCompRefactor (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-UnitTestsCoverage-Debug: OK (1244 of 1244 tests passed, 0 test warnings)

Build Badge Test Badge Coverage 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.

fuelCellGenPlantCompRefactor (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-IntegrationCoverage-Debug: OK (674 of 674 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.

fuelCellGenPlantCompRefactor (mitchute) - Win64-Windows-10-VisualStudio-16: OK (2583 of 2584 tests passed, 1 test warnings)

Messages:\n

  • 2 tests had: BND diffs.
  • 2 tests had: EIO diffs.
  • 1 test had: ESO small diffs.
  • 2 tests had: MDD diffs.
  • 2 tests had: MTD diffs.
  • 1 test had: MTR small diffs.
  • 2 tests had: RDD diffs.
  • 1 test had: Table big diffs.

Failures:\n

regression Test Summary

  • Passed: 668
  • Failed: 1

Build Badge Test Badge

Please sign in to comment.