Merge pull request #14946 from rmcdermo/master

FDS Source: change variable names from PR,SC to PR_T,SC_T

Author: rmcdermo

Source/ccib.f90

@@ -10623,15 +10623,15 @@ SUBROUTINE GET_CC_CELL_DIFFUSIVITY(RHO_CELL,D_Z_N,MU_CELL,MU_DNS_CELL,TMP_CELL,D
 SELECT CASE(SIM_MODE)
 CASE(LES_MODE)
    CALL INTERPOLATE1D_UNIFORM(LBOUND(D_Z_N,1),D_Z_N,TMP_CELL,D_Z_TEMP_DNS)
-   D_Z_TEMP = D_Z_TEMP_DNS + MAX(0._EB,MU_CELL-MU_DNS_CELL)*RSC/RHO_CELL
+   D_Z_TEMP = D_Z_TEMP_DNS + MAX(0._EB,MU_CELL-MU_DNS_CELL)*RSC_T/RHO_CELL
 CASE(DNS_MODE)
    IF(PERIODIC_TEST==7) THEN
       D_Z_TEMP = DIFF_MMS / RHO_CELL
    ELSE
       CALL INTERPOLATE1D_UNIFORM(LBOUND(D_Z_N,1),D_Z_N,TMP_CELL,D_Z_TEMP)
    ENDIF
 CASE DEFAULT
-   D_Z_TEMP = MU_CELL*RSC/RHO_CELL ! VLES
+   D_Z_TEMP = MU_CELL*RSC_T/RHO_CELL ! VLES
 END SELECT
 
 RETURN
@@ -10654,7 +10654,7 @@ SUBROUTINE GET_CC_CELL_CONDUCTIVITY(ZZ_CELL,MU_CELL,MU_DNS_CELL,TMP_CELL,KP_CELL
    IF (SIM_MODE==LES_MODE) THEN
       IF (.NOT.CONSTANT_SPECIFIC_HEAT_RATIO) THEN
          CALL GET_SPECIFIC_HEAT(ZZ_CELL,CP_CELL,TMP_CELL)
-         KP_CELL = KP_CELL + MAX(0._EB,MU_CELL-MU_DNS_CELL)*CP_CELL*RPR
+         KP_CELL = KP_CELL + MAX(0._EB,MU_CELL-MU_DNS_CELL)*CP_CELL*RPR_T
       ELSE
          KP_CELL = KP_CELL + MAX(0._EB,MU_CELL-MU_DNS_CELL)*CPOPR
       ENDIF

Source/cons.f90

@@ -306,8 +306,8 @@ MODULE GLOBAL_CONSTANTS
 ! Miscellaneous real constants
 
 REAL(EB) :: CPOPR                              !< Specific heat divided by the Prandtl number (J/kg/K)
-REAL(EB) :: RSC                                !< Reciprocal of the Schmidt number
-REAL(EB) :: RPR                                !< Reciprocal of the Prandtl number
+REAL(EB) :: RSC_T                              !< Reciprocal of the turbulent Schmidt number
+REAL(EB) :: RPR_T                              !< Reciprocal of the turbulent Prandtl number
 REAL(EB) :: TMPA                               !< Ambient temperature (K)
 REAL(EB) :: TMPA4                              !< Ambient temperature to the fourth power (K^4)
 REAL(EB) :: RHOA                               !< Ambient density (kg/m3)
@@ -335,8 +335,8 @@ MODULE GLOBAL_CONSTANTS
 REAL(EB) :: CFL_MIN=0.8_EB                     !< Lower bound of CFL constraint
 REAL(EB) :: VN_MAX=1.0_EB                      !< Upper bound of von Neumann constraint
 REAL(EB) :: VN_MIN=0.8_EB                      !< Lower bound of von Neumann constraint
-REAL(EB) :: PR                                 !< Prandtl number
-REAL(EB) :: SC                                 !< Schmidt number
+REAL(EB) :: PR_T                               !< Turbulent Prandtl number
+REAL(EB) :: SC_T                               !< Turbulent Schmidt number
 REAL(EB) :: GROUND_LEVEL=0._EB                 !< Height of the ground, used for establishing atmospheric profiles (m)
 REAL(EB) :: LIMITING_DT_RATIO=1.E-4_EB         !< Ratio of current to initial time step when code is stopped
 REAL(EB) :: NOISE_VELOCITY=0.005_EB            !< Velocity of random noise vectors (m/s)

Source/data.f90

@@ -2456,7 +2456,7 @@ END SUBROUTINE THERMO_TABLE_LIQUID
 
 SUBROUTINE GAS_PROPS(GAS_INDEX,SIGMA,EPSOK,PR_GAS,MW,FORMULA,LISTED,ATOM_COUNTS,H_F,RADCAL_NAME)
 
-USE GLOBAL_CONSTANTS, ONLY: PR
+USE GLOBAL_CONSTANTS, ONLY: PR_T
 REAL(EB), INTENT(INOUT) :: SIGMA,EPSOK,MW,H_F,PR_GAS
 INTEGER, INTENT (IN) :: GAS_INDEX
 LOGICAL, INTENT(OUT) :: LISTED
@@ -2472,7 +2472,7 @@ SUBROUTINE GAS_PROPS(GAS_INDEX,SIGMA,EPSOK,PR_GAS,MW,FORMULA,LISTED,ATOM_COUNTS,
 MWIN = MW
 MW = -1._EB
 PR_GASIN = PR_GAS
-PR_GAS = PR
+PR_GAS = PR_T
 FORMULAIN = FORMULA
 FORMULA = 'null'
 
@@ -2707,7 +2707,7 @@ END SUBROUTINE LOOKUP_LOWER_OXYGEN_LIMIT
 
 SUBROUTINE CALC_MIX_PROPS(J,D_TMP,MU_TMP,K_TMP,CP_TMP,EPSK,SIG,D_USER,MU_USER,K_USER,MW,CP_USER,PR_USER)
 USE TYPES, ONLY:SPECIES_TYPE,SPECIES,SPECIES_MIXTURE_TYPE,SPECIES_MIXTURE
-USE GLOBAL_CONSTANTS, ONLY: PR
+USE GLOBAL_CONSTANTS, ONLY: PR_T
 INTEGER,INTENT(IN) :: J
 INTEGER :: I(1)
 REAL(EB), INTENT(IN) :: EPSK,SIG,D_USER,MU_USER,K_USER,MW,CP_USER,PR_USER
@@ -2734,7 +2734,7 @@ SUBROUTINE CALC_MIX_PROPS(J,D_TMP,MU_TMP,K_TMP,CP_TMP,EPSK,SIG,D_USER,MU_USER,K_
 IF (D_USER>=0._EB) D_TMP = D_USER
 IF (MU_USER>=0._EB) MU_TMP = MU_USER / SQRT(MW)
 IF (CP_USER > 0._EB) CP_TMP = CP_USER
-PR_TMP = PR
+PR_TMP = PR_T
 IF (PR_USER > 0._EB) PR_TMP = PR_USER
 IF (SIG > 0._EB .AND. EPSK > 0._EB) K_TMP = MU_TMP*CP_TMP/PR_TMP
 IF (K_USER>=0._EB) K_TMP = K_USER/SQRT(MW)

Source/divg.f90

@@ -119,9 +119,9 @@ SUBROUTINE DIVERGENCE_PART_1(T,DT,NM)
    IF (SIM_MODE/=DNS_MODE) THEN
       IF (SIM_MODE==LES_MODE) THEN
          RHO_D_TURB => WORK9
-         RHO_D_TURB = MAX(0._EB,MU-MU_DNS)*RSC
+         RHO_D_TURB = MAX(0._EB,MU-MU_DNS)*RSC_T
       ELSE
-         RHO_D = MAX(0._EB,MU)*RSC
+         RHO_D = MAX(0._EB,MU)*RSC_T
       ENDIF
    ENDIF
 
@@ -143,7 +143,7 @@ SUBROUTINE DIVERGENCE_PART_1(T,DT,NM)
       IF (SIM_MODE==LES_MODE .AND. .NOT.TENSOR_DIFFUSIVITY) THEN
          SM=>SPECIES_MIXTURE(N)
          IF (SM%SC_T_USER>TWO_EPSILON_EB) THEN
-            RHO_D = RHO_D + RHO_D_TURB*SC/SM%SC_T_USER
+            RHO_D = RHO_D + RHO_D_TURB*SC_T/SM%SC_T_USER
          ELSE
             RHO_D = RHO_D + RHO_D_TURB
          ENDIF
@@ -465,7 +465,7 @@ SUBROUTINE DIVERGENCE_PART_1(T,DT,NM)
 
    IF (SIM_MODE==LES_MODE .AND. .NOT.TENSOR_DIFFUSIVITY) THEN
       IF(.NOT.CONSTANT_SPECIFIC_HEAT_RATIO) THEN
-         KP = KP + MAX(0._EB,(MU-MU_DNS))*CP*RPR
+         KP = KP + MAX(0._EB,(MU-MU_DNS))*CP*RPR_T
       ELSE
          KP = KP + MAX(0._EB,(MU-MU_DNS))*CPOPR
       ENDIF

Source/dump.f90

@@ -2809,8 +2809,8 @@ SUBROUTINE INITIALIZE_DIAGNOSTIC_FILE(DT)
          END SELECT
       ENDIF
    ENDDO
-   WRITE(LU_OUTPUT,'(A,F8.2)')   '   Turbulent Prandtl Number:     ',PR
-   WRITE(LU_OUTPUT,'(A,F8.2)')   '   Turbulent Schmidt Number:     ',SC
+   WRITE(LU_OUTPUT,'(A,F8.2)')   '   Turbulent Prandtl Number:     ',PR_T
+   WRITE(LU_OUTPUT,'(A,F8.2)')   '   Turbulent Schmidt Number:     ',SC_T
    IF (ANY(SPECIES_MIXTURE(:)%SC_T_USER>0._EB)) &
         WRITE(LU_OUTPUT,'(A)')   '   Differential turbulent transport specified, see Tracked Species Information'
 
@@ -7518,9 +7518,7 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z
    CASE(37)  ! DIFFUSIVITY
       SELECT CASE (SIM_MODE)
          CASE DEFAULT
-            GAS_PHASE_OUTPUT_RES = MU(II,JJ,KK)*RSC/RHO(II,JJ,KK)
-         CASE (LES_MODE)
-            GAS_PHASE_OUTPUT_RES = (MU(II,JJ,KK)-MU_DNS(II,JJ,KK)*RSC)/RHO(II,JJ,KK)
+            GAS_PHASE_OUTPUT_RES = MU(II,JJ,KK)*RSC_T/RHO(II,JJ,KK)
          CASE (DNS_MODE)
             D_Z_N = D_Z(:,Z_INDEX)
             CALL INTERPOLATE1D_UNIFORM(LBOUND(D_Z_N,1),D_Z_N,TMP(II,JJ,KK),GAS_PHASE_OUTPUT_RES)
@@ -7641,7 +7639,7 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z
       ELSE
          R_DX2 = RDX(II)**2 + RDY(JJ)**2 + RDZ(KK)**2
       ENDIF
-      GAS_PHASE_OUTPUT_RES = DT*2._EB*R_DX2*MAX(D_Z_MAX(II,JJ,KK),MAX(RPR,RSC)*MU(II,JJ,KK)/RHO(II,JJ,KK))
+      GAS_PHASE_OUTPUT_RES = DT*2._EB*R_DX2*MAX(D_Z_MAX(II,JJ,KK),MAX(RPR_T,RSC_T)*MU(II,JJ,KK)/RHO(II,JJ,KK))
 
    CASE(72)  ! CFL MAX
       GAS_PHASE_OUTPUT_RES = CFL

Source/part.f90

@@ -2644,16 +2644,16 @@ SUBROUTINE MOVE_IN_GAS
 
 TRACER_IF: IF (LPC%MASSLESS_TRACER .OR. LP%PWT<=TWO_EPSILON_EB) THEN
    IF (LPC%TURBULENT_DISPERSION) THEN
-      DD_X = RSC * (MU(IIG_OLD+1,JJG_OLD,KKG_OLD) - MU(IIG_OLD-1,JJG_OLD,KKG_OLD)) * &
+      DD_X = RSC_T * (MU(IIG_OLD+1,JJG_OLD,KKG_OLD) - MU(IIG_OLD-1,JJG_OLD,KKG_OLD)) * &
              RDXN(IIG_OLD-1)*RDXN(IIG_OLD)/(RDXN(IIG_OLD-1) + RDXN(IIG_OLD))
-      DD_Y = RSC * (MU(IIG_OLD,JJG_OLD+1,KKG_OLD) - MU(IIG_OLD,JJG_OLD-1,KKG_OLD)) * &
+      DD_Y = RSC_T * (MU(IIG_OLD,JJG_OLD+1,KKG_OLD) - MU(IIG_OLD,JJG_OLD-1,KKG_OLD)) * &
              RDYN(JJG_OLD-1)*RDYN(JJG_OLD)/(RDYN(JJG_OLD-1) + RDYN(JJG_OLD))
-      DD_Z = RSC * (MU(IIG_OLD,JJG_OLD,KKG_OLD+1) - MU(IIG_OLD,JJG_OLD,KKG_OLD-1)) * &
+      DD_Z = RSC_T * (MU(IIG_OLD,JJG_OLD,KKG_OLD+1) - MU(IIG_OLD,JJG_OLD,KKG_OLD-1)) * &
              RDZN(KKG_OLD-1)*RDZN(KKG_OLD)/(RDZN(KKG_OLD-1) + RDZN(KKG_OLD))
       LP%U = UBAR + DD_X/RHO(IIG_OLD,JJG_OLD,KKG_OLD)
       LP%V = VBAR + DD_Y/RHO(IIG_OLD,JJG_OLD,KKG_OLD)
       LP%W = WBAR + DD_Z/RHO(IIG_OLD,JJG_OLD,KKG_OLD)
-      DD   = SQRT(2._EB*MU(IIG_OLD,JJG_OLD,KKG_OLD)/RHO(IIG_OLD,JJG_OLD,KKG_OLD)*RSC*DT_P)
+      DD   = SQRT(2._EB*MU(IIG_OLD,JJG_OLD,KKG_OLD)/RHO(IIG_OLD,JJG_OLD,KKG_OLD)*RSC_T*DT_P)
       ! generate pairs of standard Gaussian random variables
       CALL BOX_MULLER(DW_X,DW_Y)
       CALL BOX_MULLER(DW_Z,DW_X)

Source/read.f90

@@ -1729,7 +1729,7 @@ END SUBROUTINE READ_MULT
 
 SUBROUTINE READ_MISC
 
-REAL(EB) :: MAXIMUM_VISIBILITY
+REAL(EB) :: MAXIMUM_VISIBILITY,PR,SC
 CHARACTER(LABEL_LENGTH) :: RAMP_GX,RAMP_GY,RAMP_GZ,TURBULENCE_MODEL,&
                            SIMULATION_MODE,FLUX_LIMITER,LES_FILTER_TYPE,&
                            RAMP_UX,RAMP_UY,RAMP_UZ,RAMP_VX,RAMP_VY,RAMP_VZ,RAMP_WX,RAMP_WY,RAMP_WZ
@@ -1748,10 +1748,10 @@ SUBROUTINE READ_MISC
                 MINIMUM_ZONE_VOLUME,MPI_TIMEOUT,NEAR_WALL_PARTICLE_INTERPOLATION,NEIGHBOR_SEPARATION_DISTANCE,NORTH_BEARING,&
                 NOISE,NOISE_VELOCITY,NO_PRESSURE_ZONES,NUCLEATION_SITES,ORIGIN_LAT,ORIGIN_LON,&
                 OVERWRITE,PARTICLE_CFL,PARTICLE_CFL_MAX,PARTICLE_CFL_MIN,PERIODIC_TEST,POSITIVE_ERROR_TEST,&
-                POROUS_FLOOR,PR,PROFILING,&
+                POROUS_FLOOR,PR,PR_T,PROFILING,&
                 P_INF,RAMP_GX,RAMP_GY,RAMP_GZ,&
                 RAMP_UX,RAMP_UY,RAMP_UZ,RAMP_VX,RAMP_VY,RAMP_VZ,RAMP_WX,RAMP_WY,RAMP_WZ,&
-                RESTART,RESTART_CHID,SC,&
+                RESTART,RESTART_CHID,SC,SC_T,&
                 RND_SEED,SIMULATION_MODE,SMOKE_ALBEDO,SOLID_PHASE_ONLY,SOOT_DENSITY,SOOT_OXIDATION,&
                 TAU_DEFAULT,TENSOR_DIFFUSIVITY,TERRAIN_IMAGE,TEST_NEW_CHAR_MODEL,TEXTURE_ORIGIN,&
                 THERMOPHORETIC_DEPOSITION,THERMOPHORETIC_SETTLING,THICKEN_OBSTRUCTIONS,&
@@ -1779,6 +1779,11 @@ SUBROUTINE READ_MISC
 
 ! LES parameters
 
+PR_T                 = -1.0_EB  ! Turbulent Prandtl number
+SC_T                 = -1.0_EB  ! Turbulent Schmidt number
+
+! Keep for backward compatibility
+
 PR                   = -1.0_EB  ! Turbulent Prandtl number
 SC                   = -1.0_EB  ! Turbulent Schmidt number
 
@@ -1938,16 +1943,19 @@ SUBROUTINE READ_MISC
 
 ! Prandtl and Schmidt numbers
 
+IF (PR>0._EB) PR_T = PR ! backward compatibility
+IF (SC>0._EB) SC_T = SC ! backward compatibility
+
 IF (SIM_MODE==DNS_MODE) THEN
-   IF (PR<0._EB) PR = 0.7_EB
-   IF (SC<0._EB) SC = 1.0_EB
+   IF (PR_T<0._EB) PR_T = 0.7_EB
+   IF (SC_T<0._EB) SC_T = 1.0_EB
 ELSE
-   IF (PR<0._EB) PR = 0.5_EB
-   IF (SC<0._EB) SC = 0.5_EB
+   IF (PR_T<0._EB) PR_T = 0.5_EB
+   IF (SC_T<0._EB) SC_T = 0.5_EB
 ENDIF
 
-RSC = 1._EB/SC
-RPR = 1._EB/PR
+RSC_T = 1._EB/SC_T
+RPR_T = 1._EB/PR_T
 
 ! Check for a restart file
 
@@ -3419,7 +3427,7 @@ SUBROUTINE READ_SPEC
 
 GM1OG = (GAMMA-1._EB)/GAMMA
 CP_GAMMA = SPECIES_MIXTURE(1)%RCON/GM1OG
-CPOPR = CP_GAMMA/PR
+CPOPR = CP_GAMMA/PR_T
 
 ! Check for user-specified turbulent Schmidt number and, if present, transfer value from SPECIES to SPECIES_MIXTURE
 

Source/turb.f90

@@ -1567,7 +1567,7 @@ SUBROUTINE LOGLAW_HEAT_FLUX_MODEL(H,YPLUS,U_TAU,K_G,RHO_G,CP_G,MU_G)
    TPLUS = PR_M*YPLUS
 ELSE
    B_T = (3.85_EB*PR_M**ONTH-1.3_EB)**2 + 2.12_EB*LOG(PR_M) ! Kader, 1981
-   TPLUS = PR*RKAPPA*LOG(YPLUS)+B_T
+   TPLUS = PR_T*RKAPPA*LOG(YPLUS)+B_T
 ENDIF
 
 H = RHO_G*U_TAU*CP_G/TPLUS

Source/wall.f90

@@ -926,7 +926,7 @@ SUBROUTINE SURFACE_HEAT_TRANSFER(NM,T,SF,BC,B1,WALL_INDEX,CFACE_INDEX,PARTICLE_I
                         RHO_OTHER = OM_RHOP(IIO,JJO,KKO)
                         MODE_SELECT: SELECT CASE(SIM_MODE)
                            CASE DEFAULT
-                              RHO_D = MAX(0._EB, 0.5_EB*(MU_OTHER+MU_G) )*RSC
+                              RHO_D = MAX(0._EB, 0.5_EB*(MU_OTHER+MU_G) )*RSC_T
                            CASE(DNS_MODE,LES_MODE)
                               D_Z_N = D_Z(:,N)
                               ZZ_GET(1:N_TRACKED_SPECIES) = OM_ZZP(IIO,JJO,KKO,1:N_TRACKED_SPECIES)
@@ -937,7 +937,7 @@ SUBROUTINE SURFACE_HEAT_TRANSFER(NM,T,SF,BC,B1,WALL_INDEX,CFACE_INDEX,PARTICLE_I
                               RHO_D_TURB = 0._EB
                               IF (SIM_MODE==LES_MODE) THEN
                                  CALL GET_VISCOSITY(ZZ_GET,MU_DNS_OTHER,TMP_OTHER)
-                                 RSC_LOC = RSC
+                                 RSC_LOC = RSC_T
                                  IF (SPECIES_MIXTURE(N)%SC_T_USER>TWO_EPSILON_EB) RSC_LOC=1._EB/SPECIES_MIXTURE(N)%SC_T_USER
                                  RHO_D_TURB = 0.5_EB*(MU_OTHER-MU_DNS_OTHER + MU_G-MU_DNS_G)*RSC_LOC
                               ENDIF
@@ -1030,12 +1030,12 @@ SUBROUTINE CALCULATE_RHO_D_F(B1,BC,WALL_INDEX,CFACE_INDEX)
 SELECT CASE(SIM_MODE)
    CASE DEFAULT
       DO N=1,N_TRACKED_SPECIES
-         B1%RHO_D_F(N) = MU_G*RSC*B1%RHO_F/B1%RHO_G
+         B1%RHO_D_F(N) = MU_G*RSC_T*B1%RHO_F/B1%RHO_G
       ENDDO
    CASE (LES_MODE)
       ITMP = MIN(I_MAX_TEMP-1,NINT(B1%TMP_F))
       DO N=1,N_TRACKED_SPECIES
-         RSC_LOC = RSC
+         RSC_LOC = RSC_T
          IF (SPECIES_MIXTURE(N)%SC_T_USER>TWO_EPSILON_EB) RSC_LOC=1._EB/SPECIES_MIXTURE(N)%SC_T_USER
          B1%RHO_D_F(N) = B1%RHO_F*( D_Z(ITMP,N) + (MU_G-MU_DNS(BC%IIG,BC%JJG,BC%KKG))/B1%RHO_G*RSC_LOC )
       ENDDO