Merge remote-tracking branch 'origin/FireX' into FireX

Author: cxp484

Build/Scripts/HYPRE/build_hypre.bat

@@ -76,6 +76,15 @@ echo ----------------------------------------------------------
 echo ----------------------------------------------------------
 echo.
 
+echo Running CMake version check...
+call %CURDIR%/../check_cmake_version.bat
+if errorlevel 1 (
+    echo Exiting due to CMake version error.
+    pause
+    exit /b 1
+)
+echo Proceeding with build...
+
 echo.
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------

Build/Scripts/HYPRE/build_hypre.sh

@@ -31,6 +31,10 @@ echo "Checking for hypre repository..."
 
 if [ -d "$FIREMODELS/hypre" ]; then
   echo "Hypre repository exists. Building hypre library."
+
+  # Check CMake version.
+  source ../Scripts/check_cmake_version.sh
+
   cd $FIREMODELS/hypre
   # Handle possible corrupted state of repository
   if git branch | grep -q "* master"; then

Build/Scripts/check_cmake_version.bat

@@ -0,0 +1,40 @@
+@echo off
+setlocal enabledelayedexpansion
+
+set REQUIRED_MAJOR=3
+set REQUIRED_MINOR=21
+set VERSION_STRING=%REQUIRED_MAJOR%.%REQUIRED_MINOR%.0
+
+:: Check if cmake is installed
+where cmake >nul 2>nul
+if errorlevel 1 (
+    echo Error: CMake is not installed. Please install CMake version %VERSION_STRING% or newer.
+    exit /b 1
+)
+
+:: Extract the version number
+for /f "tokens=3" %%v in ('cmake --version ^| findstr /i "version"') do (
+    set VERSION=%%v
+)
+
+:: Parse version into major, minor, patch
+for /f "tokens=1,2,3 delims=." %%a in ("!VERSION!") do (
+    set MAJOR=%%a
+    set MINOR=%%b
+    set PATCH=%%c
+)
+
+:: Compare major version
+if !MAJOR! LSS %REQUIRED_MAJOR% (
+    echo Error: Installed CMake version is !VERSION!. Version %VERSION_STRING% or newer is required.
+    exit /b 1
+)
+
+:: Compare minor version if major matches
+if !MAJOR! EQU %REQUIRED_MAJOR% if !MINOR! LSS %REQUIRED_MINOR% (
+    echo Error: Installed CMake version is !VERSION!. Version %VERSION_STRING% or newer is required.
+    exit /b 1
+)
+
+echo CMake version !VERSION! is sufficient.
+exit /b 0

Build/Scripts/check_cmake_version.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# Required minimum version
+REQUIRED_VERSION="3.21.0"
+
+# Function to compare versions
+version_ge() {
+  [ "$(printf '%s\n' "$2" "$1" | sort -V | head -n1)" = "$2" ]
+}
+
+# Check if cmake is installed
+if ! command -v cmake &> /dev/null; then
+  echo "Error: CMake is not installed. Please install CMake version $REQUIRED_VERSION or newer."
+  exit 1
+fi
+
+# Get installed cmake version
+INSTALLED_VERSION=$(cmake --version | head -n1 | awk '{print $3}')
+
+# Compare versions
+if version_ge "$INSTALLED_VERSION" "$REQUIRED_VERSION"; then
+  echo "CMake version $INSTALLED_VERSION is sufficient."
+else
+  echo "Error: Installed CMake version is $INSTALLED_VERSION. Version $REQUIRED_VERSION or newer is required."
+  exit 1
+fi

Source/cons.f90

@@ -573,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=0,BNDF_TIME_INTEGRALS=0
+           CLIP_DT_RESTRICTIONS_MAX=5,BNDF_TIME_INTEGRALS=0
 
 LOGICAL  :: UPDATE_DEVICES_AGAIN=.FALSE.
 

Source/dump.f90

@@ -99,7 +99,7 @@ END SUBROUTINE UPDATE_GLOBAL_OUTPUTS
 SUBROUTINE DUMP_MESH_OUTPUTS(T,DT,NM,FAKEWRITE)
 
 USE COMP_FUNCTIONS, ONLY : CURRENT_TIME
-USE TURBULENCE, ONLY: SANDIA_OUT, SPECTRAL_OUTPUT
+USE TURBULENCE, ONLY: SANDIA_OUT
 REAL(EB) :: TNOW
 REAL(EB), INTENT(IN) :: T,DT
 INTEGER, INTENT(IN) :: NM
@@ -649,9 +649,7 @@ END SUBROUTINE ASSIGN_FILE_NAMES
 SUBROUTINE INITIALIZE_GLOBAL_DUMPS(T,DT)
 
 USE COMP_FUNCTIONS, ONLY: CURRENT_TIME,GET_FILE_NUMBER,APPEND_FILE
-USE PHYSICAL_FUNCTIONS, ONLY: GET_MASS_FRACTION_ALL,GET_MOLECULAR_WEIGHT
 USE HVAC_ROUTINES, ONLY: N_DUCT_QUANTITY,N_NODE_QUANTITY
-USE CONTROL_VARIABLES
 REAL(EB) :: TNOW
 REAL(EB), INTENT(IN) :: T,DT
 INTEGER :: NN,I,N,N_OUT,N_ZONE_TMP,LU,J, N_NODE_OUT, N_DUCT_OUT, NS
@@ -4213,10 +4211,10 @@ SUBROUTINE WRITE_DIAGNOSTICS(T,DT)
 
 USE COMP_FUNCTIONS, ONLY : CURRENT_TIME,GET_DATE,GET_DATE_ISO_8601
 REAL(EB), INTENT(IN) :: T,DT
-INTEGER :: NM,II,JJ,KK,OUT_DIGITS,SOUT_DIGITS
+INTEGER :: NM,II,JJ,KK,OUT_DIGITS,SOUT_DIGITS,MAX_VN_IJK(3),MAX_CFL_IJK(3),MAX_CFL_MESH,MAX_VN_MESH
 CHARACTER(120) :: SIMPLE_OUTPUT,SIMPLE_OUTPUT_ERR,OUT_FORMAT
 CHARACTER(LABEL_LENGTH) :: DATE
-REAL(EB) :: TNOW,CPUTIME,STIME,DTS
+REAL(EB) :: TNOW,CPUTIME,STIME,DTS,MAX_CFL,MAX_VN
 
 TNOW = CURRENT_TIME()
 
@@ -4274,6 +4272,24 @@ SUBROUTINE WRITE_DIAGNOSTICS(T,DT)
 
 WRITE(LU_ERR,'(A)') TRIM(SIMPLE_OUTPUT_ERR)
 
+! Determine the mesh where the maximum CFL, VN, etc, occur
+
+MAX_CFL = -1._EB
+MAX_VN  = -1._EB
+DO NM=1,NMESHES
+   M => MESHES(NM)
+   IF (M%CFL>MAX_CFL) THEN
+      MAX_CFL = MAX(M%CFL,MAX_CFL)
+      MAX_CFL_MESH = NM
+      MAX_CFL_IJK = (/M%ICFL,M%JCFL,M%KCFL/)
+   ENDIF
+   IF (CHECK_VN .AND. M%VN>MAX_VN) THEN
+      MAX_VN  = MAX(M%VN,MAX_VN)
+      MAX_VN_MESH = NM
+      MAX_VN_IJK = (/M%I_VN,M%J_VN,M%K_VN/)
+   ENDIF
+ENDDO
+
 ! Header for .out file
 
 IF (ICYC==1) WRITE(LU_OUTPUT,100)
@@ -4326,6 +4342,13 @@ SUBROUTINE WRITE_DIAGNOSTICS(T,DT)
                                             ' on Mesh ',NM,' at (',II,',',JJ,',',KK,')'
 ENDIF
 
+WRITE(LU_OUTPUT,'(7X,A,E9.2,A,4(I0,A))') 'Maximum CFL Number    : ',MAX_CFL,' on Mesh ',MAX_CFL_MESH,&
+                                         ' at (',MAX_CFL_IJK(1),',',MAX_CFL_IJK(2),',',MAX_CFL_IJK(3),')'
+IF (CHECK_VN) THEN
+   WRITE(LU_OUTPUT,'(7X,A,E9.2,A,4(I0,A))') 'Maximum VN Number     : ',MAX_VN,' on Mesh ',MAX_VN_MESH,&
+                                            ' at (',MAX_VN_IJK(1),',',MAX_VN_IJK(2),',',MAX_VN_IJK(3),')'
+ENDIF
+
 WRITE(LU_OUTPUT,'(7X,A)') '---------------------------------------------------------------'
 
 DO NM=1,NMESHES
@@ -4341,7 +4364,6 @@ SUBROUTINE WRITE_DIAGNOSTICS(T,DT)
       WRITE(LU_OUTPUT,121) M%DT_RESTRICT_STORE
       M%DT_RESTRICT_STORE=0
    ENDIF
-
 ENDDO
 
 WRITE(LU_OUTPUT,*)
@@ -8464,7 +8486,7 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z
                                            PROP_INDEX,REAC_INDEX,MATL_INDEX,ICC_IN,JCC_IN) RESULT(GAS_PHASE_OUTPUT_RES)
 
 USE MEMORY_FUNCTIONS, ONLY: REALLOCATE
-USE MATH_FUNCTIONS, ONLY: INTERPOLATE1D,INTERPOLATE1D_UNIFORM,EVALUATE_RAMP,UPDATE_HISTOGRAM
+USE MATH_FUNCTIONS, ONLY: INTERPOLATE1D,INTERPOLATE1D_UNIFORM,UPDATE_HISTOGRAM
 USE PHYSICAL_FUNCTIONS, ONLY: GET_MASS_FRACTION,FED,FIC,GET_SPECIFIC_HEAT,RELATIVE_HUMIDITY, &
                               GET_CONDUCTIVITY,GET_MOLECULAR_WEIGHT,GET_MASS_FRACTION_ALL,GET_ENTHALPY,GET_SENSIBLE_ENTHALPY, &
                               GET_VISCOSITY,GET_POTENTIAL_TEMPERATURE,GET_SPECIFIC_GAS_CONSTANT,&

Utilities/Scripts/qfds.sh

@@ -38,6 +38,7 @@ function usage {
   echo ""
   echo "qfds.sh runs FDS using an executable from the repository or one specified with the -e option."
   echo ""
+  echo " -A AccountName - Allocation account name to charge "
   echo " -e exe - full path of FDS used to run case "
   echo "    [default: $FDSROOT/fds/Build/${MPI}_intel_linux$DB/fds_${MPI}_intel_linux$DB]"
   echo " -h   - show commonly used options"
@@ -393,7 +394,7 @@ cat << EOF >> $scriptfile
 EOF
 if [ "$ACCOUNT" != "" ]; then
 cat << EOF >> $scriptfile
-#SBATCH -A=$ACCOUNT
+#SBATCH --account=$ACCOUNT
 EOF
 fi
 

Validation/Memorial_Tunnel/FDS_Input_Files/Cold_Flow_Series_1.fds

@@ -9,8 +9,6 @@
 &MESH IJK=36,32,28, XB=0.0,10.2,-4.4,4.4,0.0,7.9, MULT_ID='mesh' /
 &MULT ID='mesh', DX=10.2, I_UPPER=83 /
 
-&OBST XB=622.4,623.6,-2.0,2.0,0.4,0.8, SURF_ID='COVER' / 
-
 &VENT XB=0.0,0.0,-4.4,4.4,0.0,4.4,SURF_ID='OPEN' /
 &VENT XB=856.8,856.8,-4.4,4.4,0.0,4.4,SURF_ID='OPEN' /
 
@@ -73,7 +71,7 @@
 &RAMP ID='VENTR_JF15',T=4200.0,F=0.0 /
 &RAMP ID='VENTR_JF15',T=4205.0,F=1.0 /
 
-&CATF OTHER_FILES='materials.txt', 'loop_obstructions.txt','vault_obstructions.txt', 'fans.txt' /
+&CATF OTHER_FILES='materials.txt', 'loop_obstructions.txt','vault_obstructions.txt', 'fans.txt', 'pans_only.txt' /
 
 &DUMP DT_DEVC=30., DT_HRR=30. /
 

Validation/Memorial_Tunnel/FDS_Input_Files/Test_502.fds

@@ -121,6 +121,6 @@
 &RAMP ID='VENTR_JF15',T=  0.0,F=0.0 /
 &RAMP ID='VENTR_JF15',T=300.0,F=0.0 /
 
-&CATF OTHER_FILES='materials.txt', 'loop_obstructions.txt','vault_obstructions.txt', 'output.txt', 'fans.txt', 'fire_20_MW_fans.txt' /
+&CATF OTHER_FILES='materials.txt', 'loop_obstructions.txt','vault_obstructions.txt', 'output.txt', 'fans.txt', 'fire_50_MW_fans.txt' /
 
 &TAIL / 

Validation/Memorial_Tunnel/FDS_Input_Files/pans_only.txt

@@ -0,0 +1,10 @@
+
+&OBST XB=608.7,624.6,-2.1, 2.1,0.0,0.3, SURF_ID='COVER' /
+&OBST XB=608.7,624.6,-2.1,-1.8,0.3,0.6, SURF_ID='COVER' /
+&OBST XB=608.7,624.6, 1.8, 2.1,0.3,0.6, SURF_ID='COVER' /
+&OBST XB=608.7,609.0,-1.8, 1.8,0.3,0.6, SURF_ID='COVER' /
+&OBST XB=615.1,615.7,-1.8, 1.8,0.3,0.6, SURF_ID='COVER' /
+&OBST XB=618.2,618.8,-1.8, 1.8,0.3,0.6, SURF_ID='COVER' /
+&OBST XB=620.0,620.6,-1.8, 1.8,0.3,0.6, SURF_ID='COVER' /
+&OBST XB=624.3,624.6,-1.8, 1.8,0.3,0.6, SURF_ID='COVER' /
+