From ba24650ee8ffabb8fa6893f6645d87279ee40ac9 Mon Sep 17 00:00:00 2001 From: mcgratta Date: Tue, 16 Jan 2024 10:09:14 -0500 Subject: [PATCH] FDS Source: Remove unused variables/routines --- Manuals/FDS_User_Guide/FDS_User_Guide.tex | 9 +-------- Source/func.f90 | 24 ----------------------- Source/read.f90 | 6 ++---- Source/type.f90 | 1 - Source/wall.f90 | 2 +- 5 files changed, 4 insertions(+), 38 deletions(-) diff --git a/Manuals/FDS_User_Guide/FDS_User_Guide.tex b/Manuals/FDS_User_Guide/FDS_User_Guide.tex index dc0b8998a78..ed767df5732 100644 --- a/Manuals/FDS_User_Guide/FDS_User_Guide.tex +++ b/Manuals/FDS_User_Guide/FDS_User_Guide.tex @@ -11316,7 +11316,7 @@ \chapter{Alphabetical List of Input Parameters} % ignorenamelistkw: /DUMP/MMS_TIMER, /DUMP/TURB_INIT_CLOCK, /DUMP/GET_CUTCELLS_VERBOSE % ignorenamelistkw: /HVAC/DEBUG % ignorenamelistkw: /MISC/BAROCLINIC, /MISC/PERIODIC_TEST, /MISC/POSITIVE_ERROR_TEST, /MISC/PROFILING, /MISC/RADIATION -% ignorenamelistkw: /MISC/STRATIFICATION, /MISC/SUPPRESSION, /MISC/UVW_FILE +% ignorenamelistkw: /MISC/STRATIFICATION, /MISC/SUPPRESSION, /MISC/UVW_FILE, /MISC/TENSOR_DIFFUSIVITY % ignorenamelistkw: /MISC/CC_IBM, /MISC/CCVOL_LINK % ignorenamelistkw: /PART/DEBUG % ignorenamelistkw: /REAC/C, /REAC/H, /REAC/O, /REAC/N, /REAC/FORMULA, @@ -11350,7 +11350,6 @@ \section{\texorpdfstring{{\tt BNDF}}{BNDF} (Boundary File Parameters)} {\ct TEMPORAL\_STATISTIC} & Character & Section \ref{info:BNDF} & & \\ \hline \end{longtable} -% Undocumented: DEBUG \vspace{\baselineskip} @@ -11872,8 +11871,6 @@ \section{\texorpdfstring{{\tt HVAC}}{HVAC} (HVAC System Definition)} {\ct XYZ} & Real Triplet & Section~\ref{info:HVACnode} & m & 0.0 \\ \hline \end{longtable} -% Undocumented: QFAN_BETA, SURF_ID - \vspace{\baselineskip} @@ -11939,7 +11936,6 @@ \section{\texorpdfstring{{\tt INIT}}{INIT} (Initial Conditions)} {\ct XYZ(3)} & Real Array & Section~\ref{info:initial_droplets} & m & \\ \hline \end{longtable} -% Undocumented: PATH_RAMP (JF,RJM) \vspace{\baselineskip} @@ -12022,14 +12018,12 @@ \section{\texorpdfstring{{\tt MATL}}{MATL} (Material Properties)} {\ct REFERENCE\_ENTHALPY\_TEMPERATURE} & Real & Section~\ref{solid_phase_energy_conservation} & K & \\ \hline {\ct REFERENCE\_RATE(:)} & Real Array & Section~\ref{info:solid_pyrolysis} & 1/s & \\ \hline {\ct REFERENCE\_TEMPERATURE(:)} & Real Array & Section~\ref{info:solid_pyrolysis} & $^\circ$C & \\ \hline -{\ct REFRACTIVE\_INDEX} & Real & Section~\ref{info:ht3d} & & 1. \\ \hline {\ct SPECIFIC\_HEAT} & Real & Section~\ref{info:thermal_properties} & \si{kJ/(kg.K)} & 0. \\ \hline {\ct SPECIFIC\_HEAT\_RAMP} & Character & Section~\ref{info:thermal_properties} & & \\ \hline {\ct SPEC\_ID(:,:)} & Char.~Array & Section~\ref{info:solid_pyrolysis} & & \\ \hline {\ct SURFACE\_OXIDATION\_MODEL} & Logical & Section~\ref{vegetation_model} & & {\ct F} \\ \hline \end{longtable} -% Undocumented: COLOR, REFRACTIVE_INDEX, RGB \vspace{\baselineskip} @@ -12173,7 +12167,6 @@ \section{\texorpdfstring{{\tt MISC}}{MISC} (Miscellaneous Parameters)} {\ct Y\_O2\_INFTY} & Real & Section~\ref{info:simple_chemistry} & kg/kg & \\ \hline \end{longtable} -% Undocumented: RAD_CFACE_INTERPOLATE, TENSOR_DIFFUSIVITY \vspace{\baselineskip} diff --git a/Source/func.f90 b/Source/func.f90 index de95cb71fa6..c18a68a1e9b 100644 --- a/Source/func.f90 +++ b/Source/func.f90 @@ -4633,30 +4633,6 @@ SUBROUTINE GET_SOLID_ABSORPTION_COEFFICIENT(KAPPA_OUT,SURF_INDEX,RHO_IN) END SUBROUTINE GET_SOLID_ABSORPTION_COEFFICIENT -SUBROUTINE GET_SOLID_REFRACTIVE_INDEX(INDEX_OUT,SURF_INDEX,RHO_IN) - -INTEGER, INTENT(IN) :: SURF_INDEX -REAL(EB), INTENT(IN) :: RHO_IN(1:N_MATL) -REAL(EB), INTENT(OUT) :: INDEX_OUT -INTEGER :: N -REAL(EB) :: VOLSUM -TYPE(MATERIAL_TYPE), POINTER :: ML=>NULL() -TYPE(SURFACE_TYPE), POINTER :: SF=>NULL() - -INDEX_OUT = 0._EB -VOLSUM = 0._EB -SF => SURFACE(SURF_INDEX) -DO N=1,SF%N_MATL - IF (RHO_IN(N)<=TWO_EPSILON_EB) CYCLE - ML => MATERIAL(SF%MATL_INDEX(N)) - VOLSUM = VOLSUM + RHO_IN(N)/ML%RHO_S - INDEX_OUT = INDEX_OUT + RHO_IN(N)*ML%REFRACTIVE_INDEX/ML%RHO_S -ENDDO -IF (VOLSUM>0._EB) INDEX_OUT = INDEX_OUT/VOLSUM - -END SUBROUTINE GET_SOLID_REFRACTIVE_INDEX - - !> \brief Get viscosity of gas mixture at a specified temperature !> \param Z_IN Array of lumped species mass fractions !> \param MU_OUT Viscosity of gas mixture (kg/m/s) diff --git a/Source/read.f90 b/Source/read.f90 index 8a665c1c0ca..0c4abb20335 100644 --- a/Source/read.f90 +++ b/Source/read.f90 @@ -6382,7 +6382,7 @@ SUBROUTINE READ_MATL CHARACTER(LABEL_LENGTH) :: CONDUCTIVITY_RAMP,SPECIFIC_HEAT_RAMP CHARACTER(LABEL_LENGTH) :: SPEC_ID(MAX_SPECIES,MAX_REACTIONS),PART_ID(MAX_LPC,MAX_REACTIONS) REAL(EB) :: EMISSIVITY,CONDUCTIVITY,SPECIFIC_HEAT,DENSITY,ABSORPTION_COEFFICIENT,BOILING_TEMPERATURE, & - PEAK_REACTION_RATE,REFRACTIVE_INDEX,MW,& + PEAK_REACTION_RATE,MW,& REFERENCE_ENTHALPY,REFERENCE_ENTHALPY_TEMPERATURE REAL(EB), DIMENSION(MAX_MATERIALS,MAX_REACTIONS) :: NU_MATL,HEAT_OF_COMBUSTION REAL(EB), DIMENSION(MAX_REACTIONS) :: A,E,HEATING_RATE,PYROLYSIS_RANGE,HEAT_OF_REACTION, & @@ -6399,7 +6399,7 @@ SUBROUTINE READ_MATL GAS_DIFFUSION_DEPTH,HEATING_RATE,HEAT_OF_COMBUSTION,HEAT_OF_REACTION,ID,MATL_ID,& MAX_REACTION_RATE,MW,N_O2,N_REACTIONS,N_S,N_T,NU_MATL,NU_PART,NU_SPEC,PART_ID,& PYROLYSIS_RANGE,REFERENCE_ENTHALPY,REFERENCE_ENTHALPY_TEMPERATURE,& - REFERENCE_RATE,REFERENCE_TEMPERATURE,REFRACTIVE_INDEX,& + REFERENCE_RATE,REFERENCE_TEMPERATURE,& SPECIFIC_HEAT,SPECIFIC_HEAT_RAMP,SPEC_ID,SURFACE_OXIDATION_MODEL ! Count the MATL lines in the input file @@ -6587,7 +6587,6 @@ SUBROUTINE READ_MATL ML%RHO_S = DENSITY ! This is bulk density of pure material. ML%REFERENCE_ENTHALPY_TEMPERATURE = REFERENCE_ENTHALPY_TEMPERATURE + TMPM ML%REFERENCE_ENTHALPY = REFERENCE_ENTHALPY*1000._EB - ML%REFRACTIVE_INDEX = REFRACTIVE_INDEX ML%RESIDUE_MATL_NAME = MATL_ID ALLOCATE(ML%HEATING_RATE(N_REACTIONS),STAT=IZERO) CALL ChkMemErr('READ','ML%HEATING_RATE',IZERO) @@ -6777,7 +6776,6 @@ SUBROUTINE SET_MATL_DEFAULTS REFERENCE_ENTHALPY_TEMPERATURE = -273.15_EB REFERENCE_RATE = -1._EB REFERENCE_TEMPERATURE = -1000._EB -REFRACTIVE_INDEX = 1._EB MATL_ID = 'null' SPECIFIC_HEAT = 0.0_EB ! kJ/kg/K SPECIFIC_HEAT_RAMP = 'null' diff --git a/Source/type.f90 b/Source/type.f90 index cc754090f1a..ebf6a495ac4 100644 --- a/Source/type.f90 +++ b/Source/type.f90 @@ -720,7 +720,6 @@ MODULE TYPES REAL(EB) :: THERMAL_DIFFUSIVITY !< Thermal diffusivity (m2/s) REAL(EB) :: KAPPA_S !< Absorption coefficient (1/m) REAL(EB) :: TMP_BOIL !< Boiling temperature (K) of a liquid - REAL(EB) :: REFRACTIVE_INDEX REAL(EB) :: MW=-1._EB !< Molecular weight (g/mol) REAL(EB) :: REFERENCE_ENTHALPY !< Reference enthalpy (J/kg) REAL(EB) :: REFERENCE_ENTHALPY_TEMPERATURE !< Temperature for the reference enthalpy (J/kg) diff --git a/Source/wall.f90 b/Source/wall.f90 index f1ee68f47f3..425a42afb98 100644 --- a/Source/wall.f90 +++ b/Source/wall.f90 @@ -86,7 +86,7 @@ SUBROUTINE THERMAL_BC(T,NM) USE MATH_FUNCTIONS, ONLY: EVALUATE_RAMP USE PHYSICAL_FUNCTIONS, ONLY : GET_SPECIFIC_GAS_CONSTANT,GET_SOLID_CONDUCTIVITY,GET_SOLID_RHOCBAR,& - GET_SOLID_ABSORPTION_COEFFICIENT,GET_SOLID_REFRACTIVE_INDEX + GET_SOLID_ABSORPTION_COEFFICIENT USE CC_SCALARS, ONLY : CFACE_THERMAL_GASVARS REAL(EB), INTENT(IN) :: T REAL(EB) :: DT_BC,DTMP,TSI,UBAR,VBAR,WBAR,RAMP_FACTOR,RSUM_G,MU_G