Skip to content

Commit ce2d53a

Browse files
authored
Merge pull request #16225 from drjfloyd/master
FDS User's Guide: more update remove QUANTITY2 for SLCF.
2 parents e3728ad + c8d6cb7 commit ce2d53a

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

Source/read.f90

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15787,7 +15787,6 @@ SUBROUTINE READ_SLCF
1578715787
REWIND(LU_INPUT) ; INPUT_FILE_LINE_NUMBER = 0
1578815788
SLCF_LOOP: DO NN=1,N_SLCF_O
1578915789
QUANTITY = 'null'
15790-
QUANTITY2 = 'null'
1579115790
PBX = -1.E6_EB
1579215791
PBY = -1.E6_EB
1579315792
PBZ = -1.E6_EB
@@ -15968,9 +15967,9 @@ SUBROUTINE READ_SLCF
1596815967
SL%RLE = .FALSE.
1596915968
ENDIF
1597015969
SL%VELO_INDEX = VELO_INDEX
15971-
CALL GET_QUANTITY_INDEX(SL%SMOKEVIEW_LABEL,SL%SMOKEVIEW_BAR_LABEL,SL%INDEX,SL%INDEX2, &
15970+
CALL GET_QUANTITY_INDEX(SL%SMOKEVIEW_LABEL,SL%SMOKEVIEW_BAR_LABEL,SL%INDEX,N, &
1597215971
SL%Y_INDEX,SL%Z_INDEX,I_DUM(1),SL%PART_INDEX,I_DUM(1),I_DUM(2),SL%REAC_INDEX,SL%MATL_INDEX, &
15973-
'SLCF',QUANTITY,QUANTITY2,SPEC_ID,'null',PART_ID,'null','null',REAC_ID,'null',-1._EB,I_DUM(3),&
15972+
'SLCF',QUANTITY,'null',SPEC_ID,'null',PART_ID,'null','null',REAC_ID,'null',-1._EB,I_DUM(3),&
1597415973
SLICETYPE=SLICETYPE)
1597515974

1597615975
! If the user needs to do a particle flux calculation, detect that here.
@@ -16603,10 +16602,10 @@ SUBROUTINE GET_QUANTITY_INDEX(SMOKEVIEW_LABEL,SMOKEVIEW_BAR_LABEL,OUTPUT_INDEX,O
1660316602
CALL SHUTDOWN(MESSAGE) ; RETURN
1660416603
ENDIF
1660516604

16606-
! QUANTITY2 only works with SLCF at the moment
16605+
! QUANTITY2 only works for SLCF appropriate quantities at the moment
1660716606

1660816607
IF (.NOT.OUTPUT_QUANTITY(ND)%SLCF_APPROPRIATE) THEN
16609-
WRITE(MESSAGE,'(3A)') 'ERROR(1014): Output QUANTITY2 ',TRIM(QUANTITY2),' is not appropriate for SLCF.'
16608+
WRITE(MESSAGE,'(3A)') 'ERROR(1014): Output QUANTITY2 ',TRIM(QUANTITY2),' needs to be a SLCF appropriate quantity.'
1661016609
CALL SHUTDOWN(MESSAGE) ; RETURN
1661116610
ENDIF
1661216611

0 commit comments

Comments
 (0)