Merge pull request #14616 from cxp484/FireX

FireX FDS Merge: Merging with firemodels/master

Author: cxp484

Build/makefile

@@ -72,8 +72,8 @@ MKL_DIR_UNIX  := $(subst \,/,$(MKLROOT))
 MKL_DIR_INTEL := $(MKL_DIR_UNIX)/lib/intel64
 MKL_DIR_BASE  := $(MKL_DIR_UNIX)/lib
 MKL_BLA_LIB   := mkl_blacs_intelmpi_lp64
-MKL_BLA_PATH_A := $(MKL_DIR_INTEL)/lib$(MKL_BLA_LIB).a
-MKL_BLA_PATH_LIB := $(MKL_DIR_INTEL)/$(MKL_BLA_LIB).lib
+MKL_BLA_PATH_A := "$(MKL_DIR_INTEL)/lib$(MKL_BLA_LIB).a"
+MKL_BLA_PATH_LIB := "$(MKL_DIR_INTEL)/$(MKL_BLA_LIB).lib"
 ifneq (,$(wildcard $(MKL_BLA_PATH_A) $(MKL_BLA_PATH_LIB)))
     MKLLIBDIR := $(MKL_DIR_INTEL)
 else

Source/cons.f90

@@ -182,6 +182,7 @@ MODULE GLOBAL_CONSTANTS
 
 LOGICAL :: HVAC_DEBUG=.FALSE.               !< Output known hvac values to smokeview
 LOGICAL :: RADIATION=.TRUE.                 !< Perform radiation transport
+LOGICAL :: UPDATE_ALL_ANGLES=.FALSE.        !< Update all radiation angles the next time the solver is called
 LOGICAL :: INCLUDE_PYROLYSIS=.FALSE.        !< Solid phase pyrolysis is included in the simulation
 LOGICAL :: EXCHANGE_RADIATION=.FALSE.       !< Do an MPI radiation exchange at this time step
 LOGICAL :: EXCHANGE_OBST_MASS=.FALSE.       !< Exchange mass loss information for obstructions bordering interpolated meshes
@@ -572,7 +573,7 @@ MODULE GLOBAL_CONSTANTS
 
 INTEGER :: ICYC,NFRAMES,PERIODIC_TEST=0,SIM_MODE=3,TURB_MODEL=0,FISHPAK_BC(3)=-1,&
            STOP_AT_ITER=0,WALL_INCREMENT=2,WALL_COUNTER=0,&
-           CLIP_DT_RESTRICTIONS_MAX=5,BNDF_TIME_INTEGRALS=0
+           CLIP_DT_RESTRICTIONS_MAX=0,BNDF_TIME_INTEGRALS=0
 
 LOGICAL  :: UPDATE_DEVICES_AGAIN=.FALSE.
 

Source/dump.f90

@@ -6724,7 +6724,7 @@ SUBROUTINE DUMP_SLCF(T,DT,NM,IFRMT)
       STRING => MESHES(NM)%STRING
    ENDIF
    N_STRINGS = N_STRINGS + 1
-   WRITE(STRING(N_STRINGS),'(A,I8,A,I0,I6)')  'PL3D ',ITM,'.',ITM1,NM
+   WRITE(STRING(N_STRINGS),'(A,I8,A,I2.2,I6)')  'PL3D ',ITM,'.',ITM1,NM
    N_STRINGS = N_STRINGS + 1
    WRITE(STRING(N_STRINGS),'(1X,A)') TRIM(FN_PL3D(NM))
    DO IQ=1,5

Source/init.f90

@@ -52,6 +52,24 @@ SUBROUTINE INITIALIZE_WALL_ARRAY(NM)
 M%WALL(0)%BOUNDARY_TYPE = NULL_BOUNDARY
 M%WALL(0)%SURF_INDEX    = DEFAULT_SURF_INDEX
 
+! Allocate arrays that hold boundary info. For the moment, these arrays are sized to handle only the external cells, but they
+! will be expanded to include internal cells as needed.
+
+M%N_BOUNDARY_COORD_DIM = M%N_WALL_CELLS_DIM
+M%N_BOUNDARY_PROP1_DIM = M%N_WALL_CELLS_DIM
+M%N_BOUNDARY_PROP2_DIM = M%N_WALL_CELLS_DIM
+M%N_BOUNDARY_RADIA_DIM = M%N_WALL_CELLS_DIM
+
+ALLOCATE(M%BOUNDARY_COORD_OCCUPANCY(M%N_BOUNDARY_COORD_DIM)) ; M%BOUNDARY_COORD_OCCUPANCY = 0
+ALLOCATE(M%BOUNDARY_PROP1_OCCUPANCY(M%N_BOUNDARY_PROP1_DIM)) ; M%BOUNDARY_PROP1_OCCUPANCY = 0
+ALLOCATE(M%BOUNDARY_PROP2_OCCUPANCY(M%N_BOUNDARY_PROP2_DIM)) ; M%BOUNDARY_PROP2_OCCUPANCY = 0
+ALLOCATE(M%BOUNDARY_RADIA_OCCUPANCY(M%N_BOUNDARY_RADIA_DIM)) ; M%BOUNDARY_RADIA_OCCUPANCY = 0
+
+ALLOCATE(M%BOUNDARY_COORD(M%N_BOUNDARY_COORD_DIM))
+ALLOCATE(M%BOUNDARY_PROP1(M%N_BOUNDARY_PROP1_DIM))
+ALLOCATE(M%BOUNDARY_PROP2(M%N_BOUNDARY_PROP2_DIM))
+ALLOCATE(M%BOUNDARY_RADIA(M%N_BOUNDARY_RADIA_DIM))
+
 ! Set up WALL for external boundaries of the current mesh
 
 M%N_WALL_CELLS = 0

Source/main.f90

@@ -1703,7 +1703,7 @@ SUBROUTINE CREATE_OR_REMOVE_OBSTRUCTIONS
    DO NM=LOWER_MESH_INDEX,UPPER_MESH_INDEX
       CALL REASSIGN_WALL_CELLS(T,NM)
    ENDDO
-
+   UPDATE_ALL_ANGLES = .TRUE.  ! Update all radiation angles the next time radiation is updated
 ENDIF
 
 END SUBROUTINE CREATE_OR_REMOVE_OBSTRUCTIONS

Source/prec.f90

@@ -43,6 +43,7 @@ MODULE PRECISION_PARAMETERS
 REAL(FB), PARAMETER :: TWO_EPSILON_FB=2._EB*EPSILON(1._FB)    !< A very small number 4 byte accuracy
 REAL(EB), PARAMETER :: TINY_EB=TINY(1._EB)                    !< The smallest resolvable 8 byte real number
 REAL(EB), PARAMETER :: HUGE_EB=HUGE(1._EB)                    !< The largest resolvable 8 btye real number
+REAL(EB), PARAMETER :: HUGE_FB=HUGE(1._FB)                    !< A large number but not too large for various operations
 
 ! Often used numbers
 

Source/radi.f90

@@ -3525,7 +3525,7 @@ SUBROUTINE RADIATION_FVM
 
 ! Check if it time to update radiation intensity field
 
-IF ( MOD(RAD_CALL_COUNTER,TIME_STEP_INCREMENT)==0 .OR. INITIALIZATION_PHASE .OR. ICYC==1) THEN
+IF ( MOD(RAD_CALL_COUNTER,TIME_STEP_INCREMENT)==0 .OR. INITIALIZATION_PHASE .OR. ICYC==1 .OR. UPDATE_ALL_ANGLES) THEN
    UPDATE_INTENSITY   = .TRUE.
    EXCHANGE_RADIATION = .TRUE.
 ELSE
@@ -3558,7 +3558,7 @@ SUBROUTINE RADIATION_FVM
 IF (UPDATE_INTENSITY) THEN
    DO IW=1,N_INTERNAL_WALL_CELLS+N_EXTERNAL_WALL_CELLS
       WC => WALL(IW)
-      IF (WC%B1_INDEX==0) CYCLE
+      IF (WC%B1_INDEX==0 .OR. WC%BOUNDARY_TYPE==NULL_BOUNDARY) CYCLE
       B1 => BOUNDARY_PROP1(WC%B1_INDEX)
       B1%Q_RAD_IN = 0._EB
       SF  => SURFACE(WALL(IW)%SURF_INDEX)
@@ -3949,7 +3949,7 @@ SUBROUTINE RADIATION_FVM
       ! If updating intensities first time, sweep ALL angles
 
       N_UPDATES = 1
-      IF (INITIALIZATION_PHASE .OR. ICYC==1) N_UPDATES = ANGLE_INCREMENT
+      IF (INITIALIZATION_PHASE .OR. ICYC==1 .OR. UPDATE_ALL_ANGLES) N_UPDATES = ANGLE_INCREMENT
 
       UPDATE_LOOP: DO I_UIID = 1,N_UPDATES
 
@@ -4580,6 +4580,10 @@ SUBROUTINE RADIATION_FVM
 
 ENDIF
 
+! UPDATE_ALL_ANGLES is a one-time only logical. If needed again, it will be reset again.
+
+UPDATE_ALL_ANGLES = .FALSE.
+
 END SUBROUTINE RADIATION_FVM
 
 

Source/read.f90

@@ -1902,7 +1902,6 @@ SUBROUTINE READ_MISC
 
 TMPMIN = MAX(1._EB , MIN(TMPA,TMPM)-10._EB)
 TMPMAX = 3000._EB
-RHOMAX = 0._EB
 
 ! Miscellaneous
 
@@ -2376,32 +2375,32 @@ SUBROUTINE READ_DUMP
 ENDIF
 
 DT_BNDF      = -1._EB                  ; RAMP_BNDF    = 'null' ; DT_BNDF_SPECIFIED    = DT_BNDF
-DT_CPU       =  HUGE(EB)               ; RAMP_CPU     = 'null' ; DT_CPU_SPECIFIED     = DT_CPU
+DT_CPU       =  HUGE_FB                ; RAMP_CPU     = 'null' ; DT_CPU_SPECIFIED     = DT_CPU
 DT_CTRL      = -1._EB                  ; RAMP_CTRL    = 'null' ; DT_CTRL_SPECIFIED    = DT_CTRL
 DT_DEVC      = -1._EB                  ; RAMP_DEVC    = 'null' ; DT_DEVC_SPECIFIED    = DT_DEVC
 DT_FLUSH     = -1._EB                  ; RAMP_FLUSH   = 'null' ; DT_FLUSH_SPECIFIED   = DT_FLUSH
-DT_GEOM      =  HUGE(EB)               ; RAMP_GEOM    = 'null' ; DT_GEOM_SPECIFIED    = DT_GEOM
+DT_GEOM      =  HUGE_FB                ; RAMP_GEOM    = 'null' ; DT_GEOM_SPECIFIED    = DT_GEOM
 DT_HRR       = -1._EB                  ; RAMP_HRR     = 'null' ; DT_HRR_SPECIFIED     = DT_HRR
 DT_HVAC      = -1._EB                  ; RAMP_HVAC    = 'null' ; DT_HVAC_SPECIFIED    = DT_HVAC
 DT_ISOF      = -1._EB                  ; RAMP_ISOF    = 'null' ; DT_ISOF_SPECIFIED    = DT_ISOF
 DT_MASS      = -1._EB                  ; RAMP_MASS    = 'null' ; DT_MASS_SPECIFIED    = DT_MASS
 DT_PART      = -1._EB                  ; RAMP_PART    = 'null' ; DT_PART_SPECIFIED    = DT_PART
-DT_PL3D      =  HUGE(EB)               ; RAMP_PL3D    = 'null' ; DT_PL3D_SPECIFIED    = DT_PL3D
+DT_PL3D      =  HUGE_FB                ; RAMP_PL3D    = 'null' ; DT_PL3D_SPECIFIED    = DT_PL3D
 DT_PROF      = -1._EB                  ; RAMP_PROF    = 'null' ; DT_PROF_SPECIFIED    = DT_PROF
-DT_RADF      =  HUGE(EB)               ; RAMP_RADF    = 'null' ; DT_RADF_SPECIFIED    = DT_RADF
+DT_RADF      =  HUGE_FB                ; RAMP_RADF    = 'null' ; DT_RADF_SPECIFIED    = DT_RADF
 DT_RESTART   =  (T_END-T_BEGIN)/20._EB ; RAMP_RESTART = 'null' ; DT_RESTART_SPECIFIED = DT_RESTART
 DT_SLCF      = -1._EB                  ; RAMP_SLCF    = 'null' ; DT_SLCF_SPECIFIED    = DT_SLCF
 DT_SL3D      =  (T_END-T_BEGIN)/5._EB  ; RAMP_SL3D    = 'null' ; DT_SL3D_SPECIFIED    = DT_SL3D
 DT_SMOKE3D   = -1._EB                  ; RAMP_SMOKE3D = 'null' ; DT_SMOKE3D_SPECIFIED = DT_SMOKE3D
-DT_UVW       =  HUGE(EB)               ; RAMP_UVW     = 'null' ; DT_UVW_SPECIFIED     = DT_UVW
-DT_VTK       =  HUGE(EB)               ; RAMP_VTK     = 'null' ; DT_VTK_SPECIFIED     = DT_VTK
-DT_SLCF_VTK  =  HUGE(EB)               ; !RAMP_SLCF_VTK  = 'null'
-DT_SL3D_VTK  =  HUGE(EB)               ; !RAMP_SL3D_VTK  = 'null'
-DT_SM3D_VTK  =  HUGE(EB)               ; !RAMP_SM3D_VTK  = 'null'
-DT_BNDF_VTK  =  HUGE(EB)               ; !RAMP_BNDF_VTK  = 'null'
-DT_PART_VTK  =  HUGE(EB)               ; !RAMP_PART_VTK  = 'null'
-DT_TMP       =  HUGE(EB)               ; RAMP_TMP     = 'null' ; DT_TMP_SPECIFIED     = DT_TMP
-DT_SPEC      =  HUGE(EB)               ; RAMP_SPEC    = 'null' ; DT_SPEC_SPECIFIED    = DT_SPEC
+DT_UVW       =  HUGE_FB                ; RAMP_UVW     = 'null' ; DT_UVW_SPECIFIED     = DT_UVW
+DT_VTK       =  HUGE_FB                ; RAMP_VTK     = 'null' ; DT_VTK_SPECIFIED     = DT_VTK
+DT_SLCF_VTK  =  HUGE_FB                ; !RAMP_SLCF_VTK  = 'null'
+DT_SL3D_VTK  =  HUGE_FB                ; !RAMP_SL3D_VTK  = 'null'
+DT_SM3D_VTK  =  HUGE_FB                ; !RAMP_SM3D_VTK  = 'null'
+DT_BNDF_VTK  =  HUGE_FB                ; !RAMP_BNDF_VTK  = 'null'
+DT_PART_VTK  =  HUGE_FB                ; !RAMP_PART_VTK  = 'null'
+DT_TMP       =  HUGE_FB                ; RAMP_TMP     = 'null' ; DT_TMP_SPECIFIED     = DT_TMP
+DT_SPEC      =  HUGE_FB                ; RAMP_SPEC    = 'null' ; DT_SPEC_SPECIFIED    = DT_SPEC
 DIAGNOSTICS_INTERVAL = 100
 
 ! Read the DUMP line
@@ -7494,7 +7493,7 @@ SUBROUTINE SET_MATL_DEFAULTS
 HEAT_OF_COMBUSTION     = -1._EB      ! kJ/kg
 HEAT_OF_REACTION       = -1.E15_EB   ! kJ/kg
 ID                     = 'null'
-MAX_REACTION_RATE      = HUGE(1._EB)
+MAX_REACTION_RATE      = HUGE_EB
 MW                     = -1._EB
 N_REACTIONS            = 0
 N_O2                   = 0._EB
@@ -10203,8 +10202,8 @@ SUBROUTINE READ_CLIP
 REAL(EB) :: MAXIMUM_DENSITY,MINIMUM_DENSITY,MINIMUM_TEMPERATURE,MAXIMUM_TEMPERATURE
 NAMELIST /CLIP/ CLIP_DT_RESTRICTIONS_MAX,FYI,MAXIMUM_DENSITY,MAXIMUM_TEMPERATURE,MINIMUM_DENSITY,MINIMUM_TEMPERATURE
 
-MINIMUM_DENSITY       = -999._EB
-MAXIMUM_DENSITY       = -999._EB
+MINIMUM_DENSITY       = 0.01_EB
+MAXIMUM_DENSITY       = 100._EB
 MINIMUM_TEMPERATURE   = -999._EB
 MAXIMUM_TEMPERATURE   = -999._EB
 
@@ -10225,17 +10224,8 @@ SUBROUTINE READ_CLIP
    IF (MY_RANK==0) WRITE(LU_ERR,'(A)') TRIM(MESSAGE)
 ENDIF
 
-IF (MINIMUM_DENSITY>0._EB) THEN
-   RHOMIN = MINIMUM_DENSITY
-ELSE
-   RHOMIN = MIN(0.1_EB*RHOA,2._EB*P_INF*MW_MIN/(R0*TMPMAX))
-ENDIF
-
-IF (MAXIMUM_DENSITY>0._EB) THEN
-   RHOMAX = MAXIMUM_DENSITY
-ELSE
-   RHOMAX = 2._EB*P_INF*MW_MAX/(R0*MAX(TMPMIN,1._EB))
-ENDIF
+RHOMIN = MINIMUM_DENSITY
+RHOMAX = MAXIMUM_DENSITY
 
 END SUBROUTINE READ_CLIP
 

Utilities/Scripts/qfds.sh

@@ -135,6 +135,7 @@ benchmark=no
 showinput=0
 exe=
 walltime=99-99:99:99
+ACCOUNT=
 
 if [ $# -lt 1 ]; then
   usage
@@ -145,9 +146,12 @@ commandline=`echo $* | sed 's/-V//' | sed 's/-v//'`
 
 #*** read in parameters from command line
 
-while getopts 'b:d:e:GhHIj:Ln:o:Pp:q:stT:U:vw:y:Y' OPTION
+while getopts 'A:b:d:e:GhHIj:Ln:o:Pp:q:stT:U:vw:y:Y' OPTION
 do
 case $OPTION  in
+  A)
+   ACCOUNT="$OPTARG"
+   ;;
   b)
    EMAIL="$OPTARG"
    ;;
@@ -387,6 +391,11 @@ cat << EOF >> $scriptfile
 #SBATCH --nodes=$nodes
 #SBATCH --time=$walltime
 EOF
+if [ "$ACCOUNT" != "" ]; then
+cat << EOF >> $scriptfile
+#SBATCH -A=$ACCOUNT
+EOF
+fi
 
 if [[ $n_openmp_threads -gt 1 ]] || [[ $max_mpi_processes_per_node -lt 1000 ]] ; then
 cat << EOF >> $scriptfile

Validation/NIST_Structure_Separation/FDS_Input_Files/SSE_Verification_4MW.fds

@@ -27,8 +27,6 @@ https://montgomerycomd.alerteagle.com/history2021-jpg.aspx
 
 &REAC FUEL='natural gas', RADIATIVE_FRACTION=0.25/ based off HF5 & HF6 values at 4 MW
 
-&CLIP MINIMUM_DENSITY=0.01/
-
 &RADI NUMBER_RADIATION_ANGLES=400, PATH_LENGTH=2.0/
 
 &VENT DB='XMIN', SURF_ID='OPEN'/