Skip to content

Commit

Permalink
fix table max x and y limit for regression and unit test
Browse files Browse the repository at this point in the history
  • Loading branch information
Yujie Xu authored and Yujie Xu committed Nov 15, 2023
1 parent 8e5af49 commit 4580d7c
Show file tree
Hide file tree
Showing 26 changed files with 137 additions and 108 deletions.
4 changes: 2 additions & 2 deletions src/Transition/InputRulesFiles/Rules23-2-0-to-24-1-0.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ sudo code is as follows
DivisorOnly, !- Normalization Method
e100_i, !- Normalization Divisor
0.0, !- Minimum Output
1.0, !- Maximum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
Expand All @@ -100,7 +100,7 @@ sudo code is as follows
Linear, !- Interpolation Method
Linear, !- Extrapolation Method
0.0, !- Minimum Value
1.0, !- Maximum Value
10.0, !- Maximum Value
, !- Normalization Reference Value
Dimensionless, !- Unit Type
, !- External File Name
Expand Down
6 changes: 3 additions & 3 deletions testfiles/5ZoneFanCoilDOASCool.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2820,7 +2820,7 @@
Linear, !- Interpolation Method
Linear, !- Extrapolation Method
0.0, !- Minimum Value
1.0, !- Maximum Value
10.0, !- Maximum Value
, !- Normalization Reference Value
Dimensionless, !- Unit Type
, !- External File Name
Expand All @@ -2839,7 +2839,7 @@
DivisorOnly, !- Normalization Method
0.7, !- Normalization Divisor
0.0, !- Minimum Output
1.0, !- Maximum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
Expand All @@ -2853,7 +2853,7 @@
DivisorOnly, !- Normalization Method
0.65, !- Normalization Divisor
0.0, !- Minimum Output
1.0, !- Maximum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
Expand Down
6 changes: 3 additions & 3 deletions testfiles/5ZoneFanCoilDOAS_ERVOnAirLoopMainBranch.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2808,7 +2808,7 @@
Linear, !- Interpolation Method
Linear, !- Extrapolation Method
0.0, !- Minimum Value
1.0, !- Maximum Value
10.0, !- Maximum Value
, !- Normalization Reference Value
Dimensionless, !- Unit Type
, !- External File Name
Expand All @@ -2827,7 +2827,7 @@
DivisorOnly, !- Normalization Method
0.7, !- Normalization Divisor
0.0, !- Minimum Output
1.0, !- Maximum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
Expand All @@ -2841,7 +2841,7 @@
DivisorOnly, !- Normalization Method
0.65, !- Normalization Divisor
0.0, !- Minimum Output
1.0, !- Maximum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
Expand Down
6 changes: 3 additions & 3 deletions testfiles/5ZoneFanCoilDOAS_HumidifierOnOASystem.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2907,7 +2907,7 @@
Linear, !- Interpolation Method
Linear, !- Extrapolation Method
0.0, !- Minimum Value
1.0, !- Maximum Value
10.0, !- Maximum Value
, !- Normalization Reference Value
Dimensionless, !- Unit Type
, !- External File Name
Expand All @@ -2926,7 +2926,7 @@
DivisorOnly, !- Normalization Method
0.7, !- Normalization Divisor
0.0, !- Minimum Output
1.0, !- Maximum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
Expand All @@ -2940,7 +2940,7 @@
DivisorOnly, !- Normalization Method
0.65, !- Normalization Divisor
0.0, !- Minimum Output
1.0, !- Maximum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
Expand Down
82 changes: 50 additions & 32 deletions testfiles/5Zone_Unitary_HXAssistedCoil.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2750,10 +2750,56 @@
0.083, !- Initial Defrost Time Fraction {dimensionless}
0.012, !- Rate of Defrost Time Fraction Increase {1/K}
Yes, !- Economizer Lockout
heatingSensibleEffCurve, !- Sensible Effectiveness of Heating Air Flow Curve Name
heatingLatentEffCurve, !- Latent Effectiveness of Heating Air Flow Curve Name
coolingSensibleEffCurve, !- Sensible Effectiveness of Cooling Air Flow Curve Name
coolingLatentEffCurve; !- Latent Effectiveness of Cooling Air Flow Curve Name
SenEffectivenessTable, !- Sensible Effectiveness of Heating Air Flow Curve Name
LatEffectivenessTable, !- Latent Effectiveness of Heating Air Flow Curve Name
SenEffectivenessTable, !- Sensible Effectiveness of Cooling Air Flow Curve Name
LatEffectivenessTable; !- Latent Effectiveness of Cooling Air Flow Curve Name

Table:IndependentVariable,
airFlowRatio, !- Name
Linear, !- Interpolation Method
Linear, !- Extrapolation Method
0.0, !- Minimum Value
10.0, !- Maximum Value
, !- Normalization Reference Value
Dimensionless, !- Unit Type
, !- External File Name
, !- External File Column Number
, !- External File Starting Row Number
0.75, !- Value 1
1.0; !- Value 2

Table:IndependentVariableList,
effectiveness_IndependentVariableList, !- Name
airFlowRatio; !- Independent Variable 1 Name

Table:Lookup,
SenEffectivenessTable, !- Name
effectiveness_IndependentVariableList, !- Independent Variable List Name
DivisorOnly, !- Normalization Method
0.7, !- Normalization Divisor
0.0, !- Minimum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
, !- External File Starting Row Number
0.75, !- Output Value 1
0.70; !- Output Value 2

Table:Lookup,
LatEffectivenessTable, !- Name
effectiveness_IndependentVariableList, !- Independent Variable List Name
DivisorOnly, !- Normalization Method
0.65, !- Normalization Divisor
0.0, !- Minimum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
, !- External File Starting Row Number
0.70, !- Output Value 1
0.65; !- Output Value 2

Coil:Cooling:DX:VariableSpeed,
Main Cooling Coil 1, !- Name
Expand Down Expand Up @@ -2847,34 +2893,6 @@
Temperature, !- Input Unit Type for Y
Dimensionless; !- Output Unit Type

Curve:Linear,
heatingSensibleEffCurve, !- Name
0.0, !- Coefficient1 Constant,
0.5, !- Coefficient2 x,
0.0, !- Minimum Value of x,
1.5; !- Maximum Value of x,

Curve:Linear,
heatingLatentEffCurve, !- Name
0.0, !- Coefficient1 Constant,
0.5, !- Coefficient2 x,
0.0, !- Minimum Value of x,
1.5; !- Maximum Value of x,

Curve:Linear,
coolingSensibleEffCurve, !- Name
0.0, !- Coefficient1 Constant,
0.5, !- Coefficient2 x,
0.0, !- Minimum Value of x,
1.5; !- Maximum Value of x,

Curve:Linear,
coolingLatentEffCurve, !- Name
0.0, !- Coefficient1 Constant,
0.5, !- Coefficient2 x,
0.0, !- Minimum Value of x,
1.5; !- Maximum Value of x,

OutdoorAir:Node,
Main Cooling Coil 1 Condenser Node, !- Name
-1.0; !- Height Above Ground {m}
Expand Down
6 changes: 3 additions & 3 deletions testfiles/ASHRAE901_ApartmentHighRise_STD2019_Denver.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39654,7 +39654,7 @@
Linear, !- Interpolation Method
Linear, !- Extrapolation Method
0.0, !- Minimum Value
1.0, !- Maximum Value
10.0, !- Maximum Value
, !- Normalization Reference Value
Dimensionless, !- Unit Type
, !- External File Name
Expand All @@ -39673,7 +39673,7 @@
DivisorOnly, !- Normalization Method
0.6, !- Normalization Divisor
0.0, !- Minimum Output
1.0, !- Maximum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
Expand All @@ -39687,7 +39687,7 @@
DivisorOnly, !- Normalization Method
0.596, !- Normalization Divisor
0.0, !- Minimum Output
1.0, !- Maximum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
Expand Down
6 changes: 3 additions & 3 deletions testfiles/AirflowNetwork_MultiZone_SmallOffice_HeatRecoveryHXSL.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1857,7 +1857,7 @@
Linear, !- Interpolation Method
Linear, !- Extrapolation Method
0.0, !- Minimum Value
1.0, !- Maximum Value
10.0, !- Maximum Value
, !- Normalization Reference Value
Dimensionless, !- Unit Type
, !- External File Name
Expand All @@ -1876,7 +1876,7 @@
DivisorOnly, !- Normalization Method
0.76, !- Normalization Divisor
0.0, !- Minimum Output
1.0, !- Maximum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
Expand All @@ -1890,7 +1890,7 @@
DivisorOnly, !- Normalization Method
0.68, !- Normalization Divisor
0.0, !- Minimum Output
1.0, !- Maximum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
Expand Down
6 changes: 3 additions & 3 deletions testfiles/DOAS_wNeutralSupplyAir_wFanCoilUnits.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3048,7 +3048,7 @@
Linear, !- Interpolation Method
Linear, !- Extrapolation Method
0.0, !- Minimum Value
1.0, !- Maximum Value
10.0, !- Maximum Value
, !- Normalization Reference Value
Dimensionless, !- Unit Type
, !- External File Name
Expand All @@ -3067,7 +3067,7 @@
DivisorOnly, !- Normalization Method
0.76, !- Normalization Divisor
0.0, !- Minimum Output
1.0, !- Maximum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
Expand All @@ -3081,7 +3081,7 @@
DivisorOnly, !- Normalization Method
0.68, !- Normalization Divisor
0.0, !- Minimum Output
1.0, !- Maximum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
Expand Down
6 changes: 3 additions & 3 deletions testfiles/DOAToFanCoilInlet.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2832,7 +2832,7 @@
Linear, !- Interpolation Method
Linear, !- Extrapolation Method
0.0, !- Minimum Value
1.0, !- Maximum Value
10.0, !- Maximum Value
, !- Normalization Reference Value
Dimensionless, !- Unit Type
, !- External File Name
Expand All @@ -2851,7 +2851,7 @@
DivisorOnly, !- Normalization Method
0.7, !- Normalization Divisor
0.0, !- Minimum Output
1.0, !- Maximum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
Expand All @@ -2865,7 +2865,7 @@
DivisorOnly, !- Normalization Method
0.65, !- Normalization Divisor
0.0, !- Minimum Output
1.0, !- Maximum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
Expand Down
6 changes: 3 additions & 3 deletions testfiles/DOAToFanCoilSupply.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2831,7 +2831,7 @@
Linear, !- Interpolation Method
Linear, !- Extrapolation Method
0.0, !- Minimum Value
1.0, !- Maximum Value
10.0, !- Maximum Value
, !- Normalization Reference Value
Dimensionless, !- Unit Type
, !- External File Name
Expand All @@ -2850,7 +2850,7 @@
DivisorOnly, !- Normalization Method
0.7, !- Normalization Divisor
0.0, !- Minimum Output
1.0, !- Maximum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
Expand All @@ -2864,7 +2864,7 @@
DivisorOnly, !- Normalization Method
0.65, !- Normalization Divisor
0.0, !- Minimum Output
1.0, !- Maximum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
Expand Down
7 changes: 3 additions & 4 deletions testfiles/DOAToPTAC.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2833,7 +2833,7 @@
Linear, !- Interpolation Method
Linear, !- Extrapolation Method
0.0, !- Minimum Value
1.0, !- Maximum Value
10.0, !- Maximum Value
, !- Normalization Reference Value
Dimensionless, !- Unit Type
, !- External File Name
Expand All @@ -2852,7 +2852,7 @@
DivisorOnly, !- Normalization Method
0.7, !- Normalization Divisor
0.0, !- Minimum Output
1.0, !- Maximum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
Expand All @@ -2866,15 +2866,14 @@
DivisorOnly, !- Normalization Method
0.65, !- Normalization Divisor
0.0, !- Minimum Output
1.0, !- Maximum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
, !- External File Starting Row Number
0.70, !- Output Value 1
0.65; !- Output Value 2


!- =========== ALL OBJECTS IN CLASS: CONTROLLER:OUTDOORAIR ===========

Controller:OutdoorAir,
Expand Down
6 changes: 3 additions & 3 deletions testfiles/DOAToPTHP.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3106,7 +3106,7 @@
Linear, !- Interpolation Method
Linear, !- Extrapolation Method
0.0, !- Minimum Value
1.0, !- Maximum Value
10.0, !- Maximum Value
, !- Normalization Reference Value
Dimensionless, !- Unit Type
, !- External File Name
Expand All @@ -3125,7 +3125,7 @@
DivisorOnly, !- Normalization Method
0.7, !- Normalization Divisor
0.0, !- Minimum Output
1.0, !- Maximum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
Expand All @@ -3139,7 +3139,7 @@
DivisorOnly, !- Normalization Method
0.65, !- Normalization Divisor
0.0, !- Minimum Output
1.0, !- Maximum Output
10.0, !- Maximum Output
Dimensionless, !- Output Unit Type
, !- External File Name
, !- External File Column Number
Expand Down
Loading

5 comments on commit 4580d7c

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

labHeatExchangerNFP (Unknown) - Win64-Windows-10-VisualStudio-16: OK (2752 of 2753 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

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

labHeatExchangerNFP (Unknown) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (3555 of 3581 tests passed, 5 test warnings)

Messages:\n

  • 24 tests had: AUD diffs.
  • 18 tests had: EIO diffs.
  • 21 tests had: ESO small diffs.
  • 14 tests had: MTR small diffs.
  • 5 tests had: RDD diffs.
  • 25 tests had: Table big diffs.
  • 1 test had: ERR diffs.
  • 1 test had: ESO big diffs.
  • 5 tests had: Table small diffs.
  • 3 tests had: IDF diffs.

Failures:\n

integration Test Summary

  • Passed: 791
  • Failed: 1

regression Test Summary

  • Passed: 781
  • Failed: 25

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.

labHeatExchangerNFP (Unknown) - x86_64-MacOS-10.17-clang-14.0.0: OK (3514 of 3540 tests passed, 5 test warnings)

Messages:\n

  • 24 tests had: AUD diffs.
  • 17 tests had: EIO diffs.
  • 21 tests had: ESO small diffs.
  • 14 tests had: MTR small diffs.
  • 25 tests had: Table big diffs.
  • 5 tests had: RDD diffs.
  • 1 test had: ERR diffs.
  • 1 test had: ESO big diffs.
  • 5 tests had: Table small diffs.
  • 3 tests had: IDF diffs.

Failures:\n

integration Test Summary

  • Passed: 788
  • Failed: 1

regression Test Summary

  • Passed: 761
  • Failed: 25

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.

labHeatExchangerNFP (Unknown) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-Debug: OK (1966 of 1966 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

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

labHeatExchangerNFP (Unknown) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-Debug: OK (789 of 790 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 789
  • Failed: 1

Build Badge Test Badge Coverage Badge

Please sign in to comment.