Merge remote-tracking branch 'firemodels/master'

Author: cxp484

Manuals/Bibliography/commoncommands.tex

@@ -44,6 +44,7 @@
 \usepackage{geometry}
 \usepackage{relsize}
 \usepackage{longtable}
+\usepackage{xltabular}
 \usepackage{lscape}
 \usepackage{booktabs}
 \usepackage{colortbl}

Manuals/FDS_User_Guide/FDS_User_Guide.tex

@@ -2314,10 +2314,10 @@ \section{Ekman Layers (\texorpdfstring{\ct{ekman_}}{ekman\_})}
 
 \begin{figure}[ht]
    \centering
-   \includegraphics[height=2.2in]{../FDS_Validation_Guide/SCRIPT_FIGURES/Schoenberg_Ekman_Layers/ekman_neutral_winds}
+   \includegraphics[height=2.2in]{SCRIPT_FIGURES/ekman_neutral_winds}
    \begin{tabular*}{\textwidth}{l@{\extracolsep{\fill}}r}
-      \includegraphics[height=2.2in]{../FDS_Validation_Guide/SCRIPT_FIGURES/Schoenberg_Ekman_Layers/ekman_stable_winds} &
-      \includegraphics[height=2.2in]{../FDS_Validation_Guide/SCRIPT_FIGURES/Schoenberg_Ekman_Layers/ekman_unstable_winds}
+      \includegraphics[height=2.2in]{SCRIPT_FIGURES/ekman_stable_winds} &
+      \includegraphics[height=2.2in]{SCRIPT_FIGURES/ekman_unstable_winds}
    \end{tabular*}
    \caption[Schoenberg Ekman Layers]{\label{fig:ekman_layers} Comparison Ekman layer profiles for neutral (top), stable (bottom-left), and unstable (bottom-right) atmospheric boundary layers with the simulation results of Schoenberg \cite{Schoenberg:2004}.}
 \end{figure}

Manuals/FDS_Validation_Guide/SCRIPT_FIGURES/Schoenberg_Ekman_Layers/.gitignore

@@ -294,6 +294,8 @@ MODULE GLOBAL_CONSTANTS
 CHARACTER(CHID_LENGTH) :: RESTART_CHID                                    !< Job ID for a restarted case
 CHARACTER(FILE_LENGTH) :: RESULTS_DIR                                     !< Custom directory for output
 CHARACTER(FILE_LENGTH) :: BINGEOM_DIR                                     !< Custom directory for writing binary geometry files
+CHARACTER(5) :: DECIMAL_SPECIFIER='POINT'                                 !< Use point or comma for real outputs
+CHARACTER(1) :: SEPARATOR                                                 !< Decimal point or comma
 
 ! Dates, version numbers, revision numbers
 
@@ -582,6 +584,9 @@ MODULE GLOBAL_CONSTANTS
 CHARACTER(FN_LENGTH), ALLOCATABLE, DIMENSION(:,:) :: FN_SLCF,FN_SLCF_GEOM,FN_BNDF,FN_BNDG,FN_ISOF,FN_ISOF2,FN_SMOKE3D,FN_RADF
 
 CHARACTER(9) :: FMT_R
+CHARACTER(25) :: REAL_LIST
+CHARACTER( 9) :: CHAR_LIST
+CHARACTER(11) :: INTG_LIST
 LOGICAL :: OUT_FILE_OPENED=.FALSE.
 
 ! Boundary condition arrays

Manuals/FDS_Verification_Guide/FDS_Verification_Guide.tex

@@ -3752,7 +3752,7 @@ SUBROUTINE ALLOCATE_BOUNDARY_PROP2_ARRAYS
    B2_INDEX = M%NEXT_AVAILABLE_BOUNDARY_PROP2_SLOT
 ENDIF
 
-IF (B2_INDeX==0 .OR. B2_INDEX>M%N_BOUNDARY_PROP2_DIM) THEN  ! There are no open slots for boundary coordinates
+IF (B2_INDEX==0 .OR. B2_INDEX>M%N_BOUNDARY_PROP2_DIM) THEN  ! There are no open slots for boundary coordinates
    ALLOCATE(B2_DUMMY(1:M%N_BOUNDARY_PROP2_DIM+N_NEW_STORAGE_SLOTS))
    IF (M%N_BOUNDARY_PROP2_DIM>0) B2_DUMMY(1:M%N_BOUNDARY_PROP2_DIM) = M%BOUNDARY_PROP2(1:M%N_BOUNDARY_PROP2_DIM)
    CALL MOVE_ALLOC(B2_DUMMY,M%BOUNDARY_PROP2)

Source/cons.f90

@@ -1297,9 +1297,11 @@ SUBROUTINE INIT_DUCT_NODE
 USE PHYSICAL_FUNCTIONS, ONLY: GET_ENTHALPY
 USE MATH_FUNCTIONS, ONLY: EVALUATE_RAMP
 REAL(EB) :: ZZ_GET(1:N_TRACKED_SPECIES) !< Species mass fraction array.
+REAL(EB) :: VF(1:N_TRACKED_SPECIES) !< Species volunme fraction array.
 REAL(EB) :: TNOW !< Current CPU time (s) used in computing length of time spent in HVAC routines.
 INTEGER :: NN,N
 TYPE(DUCTNODE_TYPE), POINTER :: DN
+TYPE(INITIALIZATION_TYPE), POINTER :: IN
 
 TNOW = CURRENT_TIME()
 
@@ -1332,11 +1334,18 @@ SUBROUTINE INIT_DUCT_NODE
 
    INIT_LOOP: DO N = 1,N_INIT
       IF (TRIM(INITIALIZATION(N)%NODE_ID)==TRIM(DN%ID)) THEN
-         DN%ZZ0 = INITIALIZATION(N)%MASS_FRACTION
-         IF (INITIALIZATION(N)%TEMPERATURE > 0._EB) THEN
-            DN%TMP0 = INITIALIZATION(N)%TEMPERATURE
-         ELSE
-            DN%TMP0 = DN%TMP
+         IN => INITIALIZATION(N)
+         IF (IN%VOLUME_FRACTIONS_SPECIFIED) THEN
+            VF(2:N_TRACKED_SPECIES) = IN%VOLUME_FRACTION(2:N_TRACKED_SPECIES)
+            VF(1) = 1._EB - SUM(VF)
+            DN%ZZ0 = VF(1:N_TRACKED_SPECIES)*SPECIES_MIXTURE(1:N_TRACKED_SPECIES)%MW / &
+                                          SUM(VF(1:N_TRACKED_SPECIES)*SPECIES_MIXTURE(1:N_TRACKED_SPECIES)%MW)
+         ELSEIF (IN%MASS_FRACTIONS_SPECIFIED) THEN
+            DN%ZZ0(2:N_TRACKED_SPECIES) = IN%MASS_FRACTION(2:N_TRACKED_SPECIES)
+            DN%ZZ0(1) = 1._EB - SUM(DN%ZZ0(2:N_TRACKED_SPECIES))
+         ENDIF       
+         IF (IN%TEMPERATURE > 0._EB) THEN
+            DN%TMP0 = IN%TEMPERATURE
          ENDIF
          EXIT INIT_LOOP
       ENDIF

Source/dump.f90

@@ -2333,7 +2333,7 @@ SUBROUTINE READ_DUMP
                            RAMP_PART,RAMP_PL3D,RAMP_PROF,RAMP_RADF,RAMP_RESTART,RAMP_SLCF,RAMP_SL3D,RAMP_SMOKE3D,RAMP_UVW,&
                            RAMP_TMP,RAMP_SPEC
 NAMELIST /DUMP/ BINGEOM_DIR,CFL_FILE,CLIP_RESTART_FILES,COLUMN_DUMP_LIMIT,CTRL_COLUMN_LIMIT,DEVC_COLUMN_LIMIT,&
-                DIAGNOSTICS_INTERVAL,&
+                DECIMAL_SPECIFIER,DIAGNOSTICS_INTERVAL,&
                 DT_BNDF,DT_CPU,DT_CTRL,DT_DEVC,DT_FLUSH,DT_HRR,DT_HVAC,DT_ISOF,DT_MASS,DT_PART,DT_PL3D,DT_PROF,&
                 DT_RADF,DT_RESTART,DT_SL3D,DT_SLCF,DT_SMOKE3D,DT_UVW,DT_TMP,DT_SPEC,&
                 FLUSH_FILE_BUFFERS,GET_CUTCELLS_VERBOSE,HRRPUV_MAX_SMV,MASS_FILE,MAXIMUM_PARTICLES,MMS_TIMER,&
@@ -2454,6 +2454,14 @@ SUBROUTINE READ_DUMP
 ! Set format of real number output
 
 WRITE(FMT_R,'(A,I2.2,A,I2.2,A,I1.1)') 'ES',SIG_FIGS+SIG_FIGS_EXP+4,'.',SIG_FIGS-1,'E',SIG_FIGS_EXP
+IF (DECIMAL_SPECIFIER=='COMMA') THEN
+   SEPARATOR = ';'
+ELSE
+   SEPARATOR = ','
+ENDIF
+WRITE(REAL_LIST,'(6A)') "(",FMT_R,",'",SEPARATOR,"'),",FMT_R
+WRITE(CHAR_LIST,'(6A)') "(","A",",'",SEPARATOR,"'),","A"
+WRITE(INTG_LIST,'(6A)') "(","I0",",'",SEPARATOR,"'),","I0"
 
 ! Check Plot3D QUANTITIES
 
@@ -11402,15 +11410,7 @@ SUBROUTINE READ_OBST(QUICK_READ)
                      IF (OB%I1==OB%I2) THEN ; OBT%X1=OB%X1 ; OBT%X2=OB%X2 ; ENDIF
                      IF (OB%J1==OB%J2) THEN ; OBT%Y1=OB%Y1 ; OBT%Y2=OB%Y2 ; ENDIF
                      IF (OB%K1==OB%K2) THEN ; OBT%Z1=OB%Z1 ; OBT%Z2=OB%Z2 ; ENDIF
-                     IF (OB%BULK_DENSITY > 0._EB .AND. OB%MASS<1.E5_EB) THEN
-                        OBT%MASS = OB%BULK_DENSITY*(OBT%X2-OBT%X1)*(OBT%Y2-OBT%Y1)*(OBT%Z2-OBT%Z1)
-                        IF (OB%I1==OB%I2 .AND. OB%UNDIVIDED_INPUT_LENGTH(1)<0.5_EB*DX(OB%I1)) &
-                           OBT%MASS = OB%BULK_DENSITY*OB%UNDIVIDED_INPUT_LENGTH(1)*(OBT%Y2-OBT%Y1)*(OBT%Z2-OBT%Z1)
-                        IF (OB%J1==OB%J2 .AND. OB%UNDIVIDED_INPUT_LENGTH(2)<0.5_EB*DY(OB%J1)) &
-                           OBT%MASS = OB%BULK_DENSITY*(OBT%X2-OBT%X1)*OB%UNDIVIDED_INPUT_LENGTH(2)*(OBT%Z2-OBT%Z1)
-                        IF (OB%K1==OB%K2 .AND. OB%UNDIVIDED_INPUT_LENGTH(3)<0.5_EB*DZ(OB%K1)) &
-                           OBT%MASS = OB%BULK_DENSITY*(OBT%X2-OBT%X1)*(OBT%Y2-OBT%Y1)*OB%UNDIVIDED_INPUT_LENGTH(3)
-                     ENDIF
+                     IF (OB%BULK_DENSITY > 0._EB .AND. OB%MASS<1.E5_EB) OBT%MASS = OB%MASS/N_NEW_OBST
                   ENDDO
                 ENDDO
             ENDDO
@@ -11574,7 +11574,7 @@ SUBROUTINE READ_HOLE
 USE MISC_FUNCTIONS, ONLY: PROCESS_MESH_NEIGHBORHOOD
 CHARACTER(LABEL_LENGTH) :: DEVC_ID,CTRL_ID,MULT_ID
 CHARACTER(25) :: COLOR
-INTEGER :: NM,N_HOLE,NN,NDO,N,I1,I2,J1,J2,K1,K2,RGB(3),N_HOLE_NEW,N_HOLE_O,II,JJ,KK,NNN,DEVC_INDEX_O,CTRL_INDEX_O
+INTEGER :: NM,N_HOLE,NN,NDO,N,I1,I2,J1,J2,K1,K2,RGB(3),N_HOLE_NEW,N_HOLE_O,II,JJ,KK,NNN,NNNN,DEVC_INDEX_O,CTRL_INDEX_O
 REAL(EB) :: X1,X2,Y1,Y2,Z1,Z2,TRANSPARENCY
 NAMELIST /HOLE/ COLOR,CTRL_ID,DEVC_ID,FYI,ID,MULT_ID,RGB,TRANSPARENCY,XB
 REAL(EB), ALLOCATABLE, DIMENSION(:,:) :: TEMP_XB
@@ -11853,7 +11853,13 @@ SUBROUTINE READ_HOLE
                   NEW_OBST_IF: IF (NDO>0) THEN
                         CALL RE_ALLOCATE_OBST(NM,N_OBST,NDO)
                         OBSTRUCTION=>M%OBSTRUCTION
-                        OBSTRUCTION(N_OBST+1:N_OBST+NDO) = TEMP_OBST(1:NDO)
+                        DO NNNN = 1,NDO
+                           OB => OBSTRUCTION(N_OBST+NNNN)
+                           OB = TEMP_OBST(NNNN)
+                           IF (OB%BULK_DENSITY > 0._EB) &
+                              OB%MASS = OB%BULK_DENSITY*(TEMP_OBST(NNNN)%X2-TEMP_OBST(NNNN)%X1)*&
+                                        (TEMP_OBST(NNNN)%Y2-TEMP_OBST(NNNN)%Y1)*(TEMP_OBST(NNNN)%Z2-TEMP_OBST(NNNN)%Z1)
+                        ENDDO
                         N_OBST = N_OBST + NDO
                   ENDIF NEW_OBST_IF
 
@@ -11863,6 +11869,9 @@ SUBROUTINE READ_HOLE
 
                      OBSTRUCTION(NN) = TEMP_OBST(0)
                      OB => OBSTRUCTION(NN)
+                     IF (OB%BULK_DENSITY > 0._EB) &
+                        OB%MASS = OB%BULK_DENSITY*(TEMP_OBST(0)%X2-TEMP_OBST(0)%X1)*&
+                                  (TEMP_OBST(0)%Y2-TEMP_OBST(0)%Y1)*(TEMP_OBST(0)%Z2-TEMP_OBST(0)%Z1)
                      OB%DEVC_INDEX_O = DEVC_INDEX_O
                      OB%CTRL_INDEX_O = CTRL_INDEX_O
                      OB%DEVC_ID = DEVC_ID
@@ -14889,7 +14898,7 @@ SUBROUTINE PROC_DEVC
 USE DEVICE_VARIABLES, ONLY: DEVICE_TYPE,SUBDEVICE_TYPE,DEVICE,N_DEVC,PROPERTY,PROPERTY_TYPE,MAX_HISTOGRAM_NBINS,&
                             N_HISTOGRAM
 
-INTEGER  :: N,NN,NNN,NS,MAXCELLS,I,J,K,NOM,NR,II,JJ,KK
+INTEGER  :: N,NN,NNN,NS,MAXCELLS,I,J,K,NOM,NR,II,JJ,KK,COMMA_POSITION
 REAL(EB) :: XX,YY,ZZ,DISTANCE,SCANDISTANCE,DX,DY,DZ,XI,YJ,ZK,F,DFDD,NU,UU,TOL,RE,ZZ_G(1:N_TRACKED_SPECIES),MU_G,K_G
 TYPE (DEVICE_TYPE),  POINTER :: DV
 TYPE (SUBDEVICE_TYPE),  POINTER :: SDV
@@ -14903,6 +14912,14 @@ SUBROUTINE PROC_DEVC
 
    DV => DEVICE(N)
 
+   ! Check if the ID has a comma (or semi-colon)
+
+   COMMA_POSITION = INDEX(DV%ID,SEPARATOR)
+   IF (COMMA_POSITION>0) THEN
+      WRITE(MESSAGE,'(4A)')  'ERROR(899): DEVC ',TRIM(DV%ID),' should not contain a ',SEPARATOR
+      CALL SHUTDOWN(MESSAGE) ; RETURN
+   ENDIF
+   
    ! Check for HVAC outputs with no HVAC inputs
 
    IF ((DV%DUCT_ID/='null' .OR. DV%NODE_ID(1)/='null') .AND. .NOT. HVAC_SOLVE) THEN

Source/func.f90

@@ -51,9 +51,9 @@ SUBROUTINE WALL_BC(T,DT,NM)
 CALL POINT_TO_MESH(NM)
 
 IF (PREDICTOR) THEN
-   UU => U
-   VV => V
-   WW => W
+   UU => US
+   VV => VS
+   WW => WS
    RHOP => RHOS
    ZZP  => ZZS
    PBAR_P => PBAR_S