Skip to content

Commit

Permalink
Merge pull request firemodels#12270 from marcosvanella/master
Browse files Browse the repository at this point in the history
FDS Source : Initialize variable in read.f90.
  • Loading branch information
marcosvanella authored Dec 5, 2023
2 parents 905c488 + 7c0b9a9 commit bb142eb
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Source/read.f90
Original file line number Diff line number Diff line change
Expand Up @@ -13174,7 +13174,7 @@ SUBROUTINE CHECK_STATISTIC_NAME(STAT_NAME,TYPE_CODE,ERROR_CODE)
CASE('FAVRE RMS') ; TEMPORAL_STATISTIC = 'FAVRE RMS'
CASE('COV') ; TEMPORAL_STATISTIC = 'COV'
CASE('CORRCOEF') ; TEMPORAL_STATISTIC = 'CORRCOEF'
CASE DEFAULT
CASE DEFAULT
IF (TYPE_CODE==2) THEN
WRITE(MESSAGE,'(A,A,A)') 'ERROR: TEMPORAL_STATISTIC for DEVC ',TRIM(ID),' is not recognized'
ERROR_CODE = 1
Expand Down Expand Up @@ -13212,7 +13212,7 @@ SUBROUTINE CHECK_STATISTIC_NAME(STAT_NAME,TYPE_CODE,ERROR_CODE)
CASE('MINLOC Z') ; SPATIAL_STATISTIC = 'MINLOC Z'
CASE('MEAN') ; SPATIAL_STATISTIC = 'MEAN'
CASE('INTERPOLATION') ; SPATIAL_STATISTIC = 'INTERPOLATION'
CASE DEFAULT
CASE DEFAULT
IF (TYPE_CODE==3) THEN
WRITE(MESSAGE,'(A,A,A)') 'ERROR: SPATIAL_STATISTIC for DEVC ',TRIM(ID),' is not recognized'
ERROR_CODE = 1
Expand Down Expand Up @@ -13404,6 +13404,7 @@ SUBROUTINE SET_CTRL_DEFAULTS
ID = 'null'
LATCH = .TRUE.
INITIAL_STATE = .FALSE.
CONTROL_FORCE = .FALSE.
SETPOINT = 1.E30_EB
DELAY = 0._EB
FUNCTION_TYPE = 'null'
Expand Down Expand Up @@ -13767,7 +13768,7 @@ SUBROUTINE PROC_DEVC
ENDIF

IF (OUTPUT_QUANTITY(DV%QUANTITY_INDEX(1))%HVAC .AND. DV%MESH /= 1) THEN
WRITE(MESSAGE,'(A,A,A)') 'ERROR: DEVC ',TRIM(DV%ID),'. Do not specify XYZ or XB for an HVAC output QUANTITY.'
WRITE(MESSAGE,'(A,A,A)') 'ERROR: DEVC ',TRIM(DV%ID),'. Do not specify XYZ or XB for an HVAC output QUANTITY.'
CALL SHUTDOWN(MESSAGE) ; RETURN
ENDIF

Expand Down

0 comments on commit bb142eb

Please sign in to comment.