Skip to content

Commit

Permalink
fix transition
Browse files Browse the repository at this point in the history
  • Loading branch information
Yujie Xu authored and Yujie Xu committed Nov 16, 2023
1 parent 1c4c554 commit 27ca128
Showing 1 changed file with 43 additions and 41 deletions.
84 changes: 43 additions & 41 deletions src/Transition/CreateNewIDFUsingRulesV24_1_0.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFile

! If your original object starts with H, insert the rules here

CASE('HeatExchanger:AirToAir:SensibleAndLatent')
CASE('HEATEXCHANGER:AIRTOAIR:SENSIBLEANDLATENT')
CALL GetNewObjectDefInIDD(ObjectName,NwNumArgs,NwAorN,NwReqFld,NwObjMinFlds,NwFldNames,NwFldDefaults,NwFldUnits)
nodiff=.false.

Expand All @@ -423,14 +423,15 @@ SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFile
READ(HxEffectAt75Airflow(i), *) effect75
READ(HxEffectAt100Airflow(i), *) effect100
IF (effect75 /= effect100) THEN
WRITE(tableID, *)
HxTableName(i) = InArgs(1) // '_' // tableID
WRITE(tableID, '(I0)') i
HxTableName(i) = TRIM(InArgs(1)) // '_' // tableID
OutArgs(19 + i) = HxTableName(i) ! table name
ELSE
OutArgs(19 + i) = '' ! empty table name
ENDIF
END DO
! removed 4 fields and added 4 fields, no change to CurArgs
CALL WriteOutIDFLines(DifLfn,'HeatExchanger:AirToAir:SensibleAndLatent',CurArgs,OutArgs,NwFldNames,NwFldUnits)

! create table object
DO i = 1, 4
Expand All @@ -443,50 +444,51 @@ SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFile
OutArgs(1) = HxTableName(i)
OutArgs(2) = 'effectiveness_IndependentVariableList'
OutArgs(3) = 'DivisorOnly' !- Normalization Method
OutArgs(4) = '0.0' !- Minimum Output
OutArgs(5) = '10.0' !- Maximum Output
OutArgs(6) = 'Dimensionless' !- Output Unit Type
OutArgs(7) = '' !- External File Name
OutArgs(8) = '' !- External File Column Number
OutArgs(9) = '' !- External File Starting Row Number
OutArgs(10) = HxEffectAt75Airflow(i) !- Output Value 1
OutArgs(11) = HxEffectAt100Airflow(i) !- Output Value 2
CurArgs = 11
OutArgs(4) = HxEffectAt100Airflow(i) !- Normalization Divisor
OutArgs(5) = '0.0' !- Minimum Output
OutArgs(6) = '10.0' !- Maximum Output
OutArgs(7) = 'Dimensionless' !- Output Unit Type
OutArgs(8) = '' !- External File Name
OutArgs(9) = '' !- External File Column Number
OutArgs(10) = '' !- External File Starting Row Number
OutArgs(11) = HxEffectAt75Airflow(i) !- Output Value 1
OutArgs(12) = HxEffectAt100Airflow(i) !- Output Value 2
CurArgs = 12
tableAdded = .true.
CALL WriteOutIDFLines(DifLfn,ObjectName,CurArgs,OutArgs,NwFldNames,NwFldUnits)
Written=.true.
ENDIF
END DO

! add independent variables used in the tables
IF (tableAdded .AND. .NOT. tableIndependentVarAdded) THEN
tableIndependentVarAdded = .false.
ObjectName='Table:IndependentVariableList'
CALL GetNewObjectDefInIDD(ObjectName,NwNumArgs,NwAorN,NwReqFld,NwObjMinFlds,NwFldNames,NwFldDefaults,NwFldUnits)
OutArgs(1) = 'effectiveness_IndependentVariableList'
OutArgs(2) = 'HxAirFlowRatio'
CurArgs = 2
CALL WriteOutIDFLines(DifLfn,ObjectName,CurArgs,OutArgs,NwFldNames,NwFldUnits)
Written=.true.

ObjectName='Table:IndependentVariableList'
CALL GetNewObjectDefInIDD(ObjectName,NwNumArgs,NwAorN,NwReqFld,NwObjMinFlds,NwFldNames,NwFldDefaults,NwFldUnits)
OutArgs(1) = 'HxAirFlowRatio'
OutArgs(2) = 'Linear' ! Interpolation Method
OutArgs(3) = 'Linear' ! Extrapolation Method
OutArgs(4) = '0.0' ! Minimum Value
OutArgs(5) = '10.0' ! Maximum Value
OutArgs(6) = '' ! Normalization Reference Value
OutArgs(7) = 'Dimensionless' ! Unit Type
OutArgs(8) = '' ! External File Name
OutArgs(9) = '' ! External File Column Number
OutArgs(10) = '' ! External File Starting Row Number
OutArgs(11) = '0.75' ! Value 1
OutArgs(12) = '1.0' ! Value 2
CurArgs = 12
CALL WriteOutIDFLines(DifLfn,ObjectName,CurArgs,OutArgs,NwFldNames,NwFldUnits)
Written=.true.
ENDIF
! add independent variables used in the tables
IF (tableAdded .AND. .NOT. tableIndependentVarAdded) THEN
tableIndependentVarAdded = .false.
ObjectName='Table:IndependentVariableList'
CALL GetNewObjectDefInIDD(ObjectName,NwNumArgs,NwAorN,NwReqFld,NwObjMinFlds,NwFldNames,NwFldDefaults,NwFldUnits)
OutArgs(1) = 'effectiveness_IndependentVariableList'
OutArgs(2) = 'HxAirFlowRatio'
CurArgs = 2
CALL WriteOutIDFLines(DifLfn,ObjectName,CurArgs,OutArgs,NwFldNames,NwFldUnits)
Written=.true.

ObjectName='Table:IndependentVariableList'
CALL GetNewObjectDefInIDD(ObjectName,NwNumArgs,NwAorN,NwReqFld,NwObjMinFlds,NwFldNames,NwFldDefaults,NwFldUnits)
OutArgs(1) = 'HxAirFlowRatio'
OutArgs(2) = 'Linear' ! Interpolation Method
OutArgs(3) = 'Linear' ! Extrapolation Method
OutArgs(4) = '0.0' ! Minimum Value
OutArgs(5) = '10.0' ! Maximum Value
OutArgs(6) = '' ! Normalization Reference Value
OutArgs(7) = 'Dimensionless' ! Unit Type
OutArgs(8) = '' ! External File Name
OutArgs(9) = '' ! External File Column Number
OutArgs(10) = '' ! External File Starting Row Number
OutArgs(11) = '0.75' ! Value 1
OutArgs(12) = '1.0' ! Value 2
CurArgs = 12
CALL WriteOutIDFLines(DifLfn,ObjectName,CurArgs,OutArgs,NwFldNames,NwFldUnits)
Written=.true.
ENDIF

! If your original object starts with I, insert the rules here

Expand Down

5 comments on commit 27ca128

@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: OK (3555 of 3581 tests passed, 5 test warnings)

Messages:\n

  • 24 tests had: AUD diffs.
  • 19 tests had: EIO diffs.
  • 21 tests had: ESO small diffs.
  • 15 tests had: MTR small diffs.
  • 26 tests had: Table big diffs.
  • 5 tests had: RDD diffs.
  • 1 test had: ERR diffs.
  • 2 tests had: ESO big diffs.
  • 5 tests had: Table small diffs.
  • 3 tests had: IDF diffs.

Failures:\n

regression Test Summary

  • Passed: 780
  • Failed: 26

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

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

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.
  • 18 tests had: EIO diffs.
  • 21 tests had: ESO small diffs.
  • 15 tests had: MTR small diffs.
  • 26 tests had: Table big diffs.
  • 5 tests had: RDD diffs.
  • 1 test had: ERR diffs.
  • 2 tests had: ESO big diffs.
  • 5 tests had: Table small diffs.
  • 3 tests had: IDF diffs.

Failures:\n

regression Test Summary

  • Passed: 760
  • Failed: 26

Build Badge Test 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-UnitTestsCoverage-Debug: OK (1966 of 1966 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.

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

Build Badge Test Badge Coverage Badge

Please sign in to comment.