Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix 9-3-0 to 9-4-0 transition for objects that accept report variable or meter name #8366

Merged
merged 9 commits into from
Nov 25, 2020
Merged

Fix 9-3-0 to 9-4-0 transition for objects that accept report variable or meter name #8366

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e16fead
Fix 9-3-0 to 9-4-0 transition
dareumnam Nov 4, 2020
2ace993
update transition for Meter:CustomDecrement
dareumnam Nov 4, 2020
99756bb
Merge remote-tracking branch 'upstream/develop' into Issue8362
dareumnam Nov 4, 2020
22b93ff
add line
dareumnam Nov 4, 2020
782f872
fix CurVar num
dareumnam Nov 4, 2020
db608a7
remove unused variable
dareumnam Nov 4, 2020
212a72e
add omitted comment
dareumnam Nov 4, 2020
44887a9
add special transition for objects that accepts report variables or m…
dareumnam Nov 10, 2020
a56aba6
Merge remote-tracking branch 'upstream/develop' into Issue8362
dareumnam Nov 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 131 additions & 5 deletions src/Transition/CreateNewIDFUsingRulesV9_4_0.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFile
CHARACTER(len=MaxNameLength) :: OutputDiagnosticsName
CHARACTER(len=MaxNameLength), ALLOCATABLE, DIMENSION(:) :: OutputDiagnosticsNames
LOGICAL :: alreadyProcessedOneOutputDiagnostic=.false.
INTEGER :: nE, nEC, nG, nNG, nFO, nFON

LOGICAL :: changeMeterNameFlag
INTEGER :: totMeterCustom = 0
Expand Down Expand Up @@ -765,6 +764,21 @@ SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFile
.true.)
IF (DelThis) CYCLE

! Begin - Special section for v9.4
IF (CurArgs .GE. 3) THEN
changeMeterNameFlag = .true.
DO numMeterCustom=1, totMeterCustom + totMeterCustomDecr
MeterCustomName = MeterCustomNames(numMeterCustom)
IF (MeterCustomName .eq. MakeUPPERCase(InArgs(3))) THEN
changeMeterNameFlag = .false.
END IF
END DO
IF (changeMeterNameFlag) THEN
CALL ReplaceFuelNameWithEndUseSubcategory(OutArgs(3), NoDiff)
END IF
END IF
! End - Special section for v9.4

CASE('OUTPUT:TABLE:MONTHLY')
CALL GetNewObjectDefInIDD(ObjectName,NwNumArgs,NwAorN,NwReqFld,NwObjMinFlds,NwFldNames,NwFldDefaults,NwFldUnits)
nodiff=.true.
Expand Down Expand Up @@ -1103,7 +1117,23 @@ SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFile
EXIT
ENDIF
ENDDO
IF (.not. DelThis) CurVar=CurVar+2
IF (.not. DelThis) THEN

! Begin - Special section for v9.4
changeMeterNameFlag = .true.
DO numMeterCustom=1, totMeterCustom + totMeterCustomDecr
MeterCustomName = MeterCustomNames(numMeterCustom)
IF (MeterCustomName .eq. MakeUPPERCase(InArgs(Var))) THEN
changeMeterNameFlag = .false.
END IF
END DO
IF (changeMeterNameFlag) THEN
CALL ReplaceFuelNameWithEndUseSubcategory(OutArgs(CurVar), NoDiff)
END IF
! End - Special section for v9.4

CurVar=CurVar+2
END IF
ENDDO
CurArgs=CurVar
DO Arg=CurVar,1,-1
Expand All @@ -1118,8 +1148,8 @@ SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFile
CALL GetNewObjectDefInIDD(ObjectName,NwNumArgs,NwAorN,NwReqFld,NwObjMinFlds,NwFldNames,NwFldDefaults,NwFldUnits)
OutArgs(1:CurArgs)=InArgs(1:CurArgs)
nodiff=.true.
CurVar=4 ! In case Source Meter would change
DO Var=4,CurArgs,2
CurVar=3 ! In case Source Meter would change
DO Var=3,CurArgs,2
UCRepVarName=MakeUPPERCase(InArgs(Var))
OutArgs(CurVar)=InArgs(Var)
OutArgs(CurVar+1)=InArgs(Var+1)
Expand Down Expand Up @@ -1211,7 +1241,23 @@ SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFile
EXIT
ENDIF
ENDDO
IF (.not. DelThis) CurVar=CurVar+2
IF (.not. DelThis) THEN

! Begin - Special section for v9.4
changeMeterNameFlag = .true.
DO numMeterCustom=1, totMeterCustom + totMeterCustomDecr
MeterCustomName = MeterCustomNames(numMeterCustom)
IF (MeterCustomName .eq. MakeUPPERCase(InArgs(Var))) THEN
changeMeterNameFlag = .false.
END IF
END DO
IF (changeMeterNameFlag) THEN
CALL ReplaceFuelNameWithEndUseSubcategory(OutArgs(CurVar), NoDiff)
END IF
! End - Special section for v9.4

CurVar=CurVar+2
END IF
ENDDO
CurArgs=CurVar
DO Arg=CurVar,1,-1
Expand Down Expand Up @@ -1243,6 +1289,57 @@ SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFile
Written, &
.false.)

! Begin - Special section for v9.4
IF (CurArgs .GE. 2) THEN
changeMeterNameFlag = .true.
DO numMeterCustom=1, totMeterCustom + totMeterCustomDecr
MeterCustomName = MeterCustomNames(numMeterCustom)
IF (MeterCustomName .eq. MakeUPPERCase(InArgs(2))) THEN
changeMeterNameFlag = .false.
END IF
END DO
IF (changeMeterNameFlag) THEN
CALL ReplaceFuelNameWithEndUseSubcategory(OutArgs(2), NoDiff)
END IF
END IF
! End - Special section for v9.4

CASE('ELECTRICLOADCENTER:TRANSFORMER')
CALL GetNewObjectDefInIDD(ObjectName,NwNumArgs,NwAorN,NwReqFld,NwObjMinFlds,NwFldNames,NwFldDefaults,NwFldUnits)
OutArgs(1:CurArgs)=InArgs(1:CurArgs)
nodiff=.true.

DO Var=19,28,1
CALL ScanOutputVariablesForReplacement( &
Var, &
DelThis, &
checkrvi, &
nodiff, &
ObjectName, &
DifLfn, &
.false., & !OutVar
.true., & !MtrVar
.false., & !TimeBinVar
CurArgs, &
Written, &
.false.)

! Begin - Special section for v9.4
IF (CurArgs .GE. Var) THEN
changeMeterNameFlag = .true.
DO numMeterCustom=1, totMeterCustom + totMeterCustomDecr
MeterCustomName = MeterCustomNames(numMeterCustom)
IF (MeterCustomName .eq. MakeUPPERCase(InArgs(Var))) THEN
changeMeterNameFlag = .false.
END IF
END DO
IF (changeMeterNameFlag) THEN
CALL ReplaceFuelNameWithEndUseSubcategory(OutArgs(Var), NoDiff)
END IF
END IF
! End - Special section for v9.4
END DO

CASE('ELECTRICLOADCENTER:DISTRIBUTION')
CALL GetNewObjectDefInIDD(ObjectName,NwNumArgs,NwAorN,NwReqFld,NwObjMinFlds,NwFldNames,NwFldDefaults,NwFldUnits)
OutArgs(1:CurArgs)=InArgs(1:CurArgs)
Expand All @@ -1263,6 +1360,21 @@ SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFile
Written, &
.false.)

! Begin - Special section for v9.4
IF (CurArgs .GE. 6) THEN
changeMeterNameFlag = .true.
DO numMeterCustom=1, totMeterCustom + totMeterCustomDecr
MeterCustomName = MeterCustomNames(numMeterCustom)
IF (MeterCustomName .eq. MakeUPPERCase(InArgs(6))) THEN
changeMeterNameFlag = .false.
END IF
END DO
IF (changeMeterNameFlag) THEN
CALL ReplaceFuelNameWithEndUseSubcategory(OutArgs(6), NoDiff)
END IF
END IF
! End - Special section for v9.4

! Field 12 A11, \field Storage Control Track Meter Name
CALL ScanOutputVariablesForReplacement( &
12, &
Expand All @@ -1278,6 +1390,20 @@ SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFile
Written, &
.false.)

! Begin - Special section for v9.4
IF (CurArgs .GE. 12) THEN
changeMeterNameFlag = .true.
DO numMeterCustom=1, totMeterCustom + totMeterCustomDecr
MeterCustomName = MeterCustomNames(numMeterCustom)
IF (MeterCustomName .eq. MakeUPPERCase(InArgs(12))) THEN
changeMeterNameFlag = .false.
END IF
END DO
IF (changeMeterNameFlag) THEN
CALL ReplaceFuelNameWithEndUseSubcategory(OutArgs(12), NoDiff)
END IF
END IF
! End - Special section for v9.4

! ANY OTHER OBJECT
CASE DEFAULT
Expand Down