Merge pull request #6715 from mcgratta/master

FDS Source: Issue #6714. Add ABSOLUTE_VALUE for DEVC.
firemodels · Jul 30, 2018 · 7463e92 · 7463e92
2 parents fc1a8e7 + 9d627ff
commit 7463e92
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/Source/devc.f90 b/Source/devc.f90
@@ -52,7 +52,7 @@ MODULE DEVICE_VARIABLES
                     INIT_ID='null',NO_UPDATE_DEVC_ID='null',NO_UPDATE_CTRL_ID='null',REAC_ID='null'
    CHARACTER(60) :: SMOKEVIEW_LABEL
    LOGICAL :: INITIAL_STATE,CURRENT_STATE,LATCH,PRIOR_STATE,DRY=.FALSE.,TIME_AVERAGED=.TRUE., &
-              EVACUATION=.FALSE.,RELATIVE=.FALSE.,OUTPUT=.TRUE.
+              EVACUATION=.FALSE.,RELATIVE=.FALSE.,OUTPUT=.TRUE.,ABSOLUTE_VALUE=.FALSE.
    REAL(EB), ALLOCATABLE, DIMENSION(:) :: PDPA_HISTOGRAM_COUNTS
 END TYPE DEVICE_TYPE
 

diff --git a/Source/dump.f90 b/Source/dump.f90
@@ -5577,6 +5577,10 @@ SUBROUTINE UPDATE_DEVICES(T,DT,NM)
          VALUE = ZC(LOCATION_INDICES(3))
    END SELECT
 
+   ! Optional absolute value
+
+   IF (DV%ABSOLUTE_VALUE) VALUE = ABS(VALUE)
+
    ! Convert units of device quantity
 
    VALUE = DV%CONVERSION_FACTOR*VALUE + DV%CONVERSION_ADDEND

diff --git a/Source/read.f90 b/Source/read.f90
@@ -11345,11 +11345,11 @@ SUBROUTINE READ_DEVC
 CHARACTER(LABEL_LENGTH) :: QUANTITY,QUANTITY2,PROP_ID,CTRL_ID,DEVC_ID,INIT_ID,SURF_ID,STATISTICS,PART_ID,MATL_ID,SPEC_ID,UNITS, &
                  DUCT_ID,NODE_ID(2),R_ID,X_ID,Y_ID,Z_ID,NO_UPDATE_DEVC_ID,NO_UPDATE_CTRL_ID,REAC_ID,XYZ_UNITS
 LOGICAL :: INITIAL_STATE,LATCH,DRY,TIME_AVERAGED,EVACUATION,HIDE_COORDINATES,RELATIVE,OUTPUT,NEW_ORIENTATION_VECTOR,TIME_HISTORY,&
-           LINE_DEVICE
+           LINE_DEVICE,ABSOLUTE_VALUE
 TYPE (DEVICE_TYPE), POINTER :: DV=>NULL()
-NAMELIST /DEVC/ BYPASS_FLOWRATE,CONVERSION_FACTOR,CONVERSION_ADDEND,COORD_FACTOR,CTRL_ID,DELAY,DEPTH,DEVC_ID,DRY,DUCT_ID,&
-                EVACUATION,FLOWRATE,FYI,GHOST_CELL_IOR,HIDE_COORDINATES,ID,INITIAL_STATE,INIT_ID,IOR,LATCH,MATL_ID,NODE_ID, &
-                NO_UPDATE_DEVC_ID,NO_UPDATE_CTRL_ID,ORIENTATION,ORIENTATION_NUMBER,OUTPUT,PART_ID,PIPE_INDEX,POINTS,&
+NAMELIST /DEVC/ ABSOLUTE_VALUE,BYPASS_FLOWRATE,CONVERSION_FACTOR,CONVERSION_ADDEND,COORD_FACTOR,CTRL_ID,DELAY,DEPTH,DEVC_ID,DRY,&
+                DUCT_ID,EVACUATION,FLOWRATE,FYI,GHOST_CELL_IOR,HIDE_COORDINATES,ID,INITIAL_STATE,INIT_ID,IOR,LATCH,MATL_ID,&
+                NODE_ID,NO_UPDATE_DEVC_ID,NO_UPDATE_CTRL_ID,ORIENTATION,ORIENTATION_NUMBER,OUTPUT,PART_ID,PIPE_INDEX,POINTS,&
                 PROP_ID,QUANTITY,QUANTITY2,QUANTITY_RANGE,&
                 REAC_ID,RELATIVE,R_ID,ROTATION,SETPOINT,SMOOTHING_FACTOR,SPEC_ID,STATISTICS,STATISTICS_START,SURF_ID,&
                 TIME_AVERAGED,TIME_HISTORY,TRIP_DIRECTION,UNITS,VELO_INDEX,XB,XYZ,X_ID,Y_ID,Z_ID,XYZ_UNITS
@@ -11643,6 +11643,7 @@ SUBROUTINE READ_DEVC
       DV%SETPOINT          = SETPOINT
       DV%LATCH             = LATCH
       DV%OUTPUT            = OUTPUT
+      DV%ABSOLUTE_VALUE    = ABSOLUTE_VALUE
       DV%ORIENTATION_NUMBER = ORIENTATION_NUMBER
       DV%TRIP_DIRECTION    = TRIP_DIRECTION
       DV%INITIAL_STATE     = INITIAL_STATE
@@ -11779,6 +11780,7 @@ SUBROUTINE READ_DEVC
 
 SUBROUTINE SET_DEVC_DEFAULTS
 
+ABSOLUTE_VALUE   = .FALSE.
 RELATIVE         = .FALSE.
 CONVERSION_ADDEND = 0._EB
 CONVERSION_FACTOR = 1._EB