Skip to content

Commit

Permalink
Merge branch 'develop' into Issue10626_EIR_ashp_tempLimit
Browse files Browse the repository at this point in the history
  • Loading branch information
@Nigusse
Nigusse committed Aug 5, 2024
2 parents ae57eac + eb6665f commit 374613f
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 10 deletions.
26 changes: 17 additions & 9 deletions src/Transition/CreateNewIDFUsingRulesV24_1_0.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFile
CHARACTER(20), DIMENSION(4) :: HxEffectAt75Airflow
CHARACTER(20), DIMENSION(4) :: HxEffectAt100Airflow
CHARACTER(MaxNameLength + 2), DIMENSION(4) :: HxTableName
LOGICAL :: tableAdded
LOGICAL :: tableAdded = .false.
LOGICAL :: tableIndependentVarAdded = .false.
CHARACTER(10) :: tableID
REAL :: effect75
Expand Down Expand Up @@ -429,14 +429,22 @@ SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFile
nodiff=.false.

! read in 8 reference value for the effectiveness at 75% and 100%
HxEffectAt75Airflow(1) = TRIM(InArgs(6)) ! Sensible Effectiveness at 75% Heating Air Flow
HxEffectAt75Airflow(2) = TRIM(InArgs(7)) ! Latent Effectiveness at 75% Heating Air Flow
HxEffectAt75Airflow(3) = TRIM(InArgs(10)) ! Sensible Effectiveness at 75% Cooling Air Flow
HxEffectAt75Airflow(4) = TRIM(InArgs(11)) ! Latent Effectiveness at 75% Cooling Air Flow
HxEffectAt100Airflow(1) = TRIM(InArgs(4)) ! Sensible Effectiveness at 100% Heating Air Flow
HxEffectAt100Airflow(2) = TRIM(InArgs(5)) ! Latent Effectiveness at 100% Heating Air Flow
HxEffectAt100Airflow(3) = TRIM(InArgs(8)) ! Sensible Effectiveness at 100% Cooling Air Flow
HxEffectAt100Airflow(4) = TRIM(InArgs(9)) ! Latent Effectiveness at 100% Cooling Air Flow
! Sensible Effectiveness at 75% Heating Air Flow
HxEffectAt75Airflow(1) = GetFieldOrIDDDefault(InArgs(6), FldDefaults(6))
! Latent Effectiveness at 75% Heating Air Flow
HxEffectAt75Airflow(2) = GetFieldOrIDDDefault(InArgs(7), FldDefaults(7))
! Sensible Effectiveness at 75% Cooling Air Flow
HxEffectAt75Airflow(3) = GetFieldOrIDDDefault(InArgs(10), FldDefaults(10))
! Latent Effectiveness at 75% Cooling Air Flow
HxEffectAt75Airflow(4) = GetFieldOrIDDDefault(InArgs(11), FldDefaults(11))
! Sensible Effectiveness at 100% Heating Air Flow
HxEffectAt100Airflow(1) = GetFieldOrIDDDefault(InArgs(4), FldDefaults(4))
! Latent Effectiveness at 100% Heating Air Flow
HxEffectAt100Airflow(2) = GetFieldOrIDDDefault(InArgs(5), FldDefaults(5))
! Sensible Effectiveness at 100% Cooling Air Flow
HxEffectAt100Airflow(3) = GetFieldOrIDDDefault(InArgs(8), FldDefaults(8))
! Latent Effectiveness at 100% Cooling Air Flow
HxEffectAt100Airflow(4) = GetFieldOrIDDDefault(InArgs(9), FldDefaults(9))

! Remove the 4 fields for 75% airflow and adjust the index of the fields
OutArgs(1:5) = InArgs(1:5)
Expand Down
23 changes: 22 additions & 1 deletion src/Transition/InputProcessor.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4814,6 +4814,28 @@ FUNCTION IPTrimSigDigits(IntegerValue) RESULT(OutputString)

END FUNCTION IPTrimSigDigits

FUNCTION GetFieldOrIDDDefault(InArgString, FldDefaultString) RESULT (ResultString)

! PURPOSE OF THIS SUBROUTINE:
! If InArgString is Blank, replace with FldDefaultString

IMPLICIT NONE ! Enforce explicit typing of all variables in this routine


! FUNCTION ARGUMENT DEFINITIONS:
CHARACTER(len=*), INTENT(IN) :: InArgString ! Input String
CHARACTER(len=*), INTENT(IN) :: FldDefaultString ! Default String
CHARACTER(len=LEN(InArgString)) :: ResultString ! Result String

ResultString=InArgString
IF (ResultString == Blank) THEN
ResultString = FldDefaultString
ENDIF

RETURN

END FUNCTION GetFieldOrIDDDefault

! NOTICE
!
! Copyright © 1996-2009 The Board of Trustees of the University of Illinois
Expand All @@ -4839,4 +4861,3 @@ END FUNCTION IPTrimSigDigits
!

END MODULE InputProcessor

5 comments on commit 374613f

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

Issue10626_EIR_ashp_tempLimit (Nigusse) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (3696 of 3696 tests passed, 1 test warnings)

Messages:\n

  • 1 test had: EIO diffs.
  • 1 test had: ESO small diffs.

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.

Issue10626_EIR_ashp_tempLimit (Nigusse) - Win64-Windows-10-VisualStudio-16: OK (2863 of 2863 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.

Issue10626_EIR_ashp_tempLimit (Nigusse) - x86_64-MacOS-10.18-clang-15.0.0: OK (3655 of 3655 tests passed, 1 test warnings)

Messages:\n

  • 1 test had: EIO diffs.
  • 1 test had: ESO small diffs.

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.

Issue10626_EIR_ashp_tempLimit (Nigusse) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-Debug: OK (2071 of 2071 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.

Issue10626_EIR_ashp_tempLimit (Nigusse) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-Debug: OK (795 of 795 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.