Merge pull request #15923 from cxp484/FireX

FireX: Merge with firemodels/master

Author: cxp484

Build/makefile

@@ -419,31 +419,34 @@ ompi_gnu_linux_dv : obj = fds_ompi_gnu_linux_dv
 ompi_gnu_linux_dv : setup $(obj_mpi)
 	$(FCOMPL) $(FFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
 
-ompi_gnu_osx : FFLAGS = -O2 -std=f2018 -frecursive -ffpe-summary=none -fall-intrinsics $(GITINFOGNU) $(FFLAGSMKL) $(GFORTRAN_OPTIONS) $(FFLAGS_HYPRE) $(FFLAGS_SUNDIALS) $(FFLAGS_HDF5)
+ompi_gnu_osx : FFLAGS = -O3 -std=f2018 -frecursive -ffpe-summary=none -fall-intrinsics $(GITINFOGNU) $(FFLAGSMKL) $(GFORTRAN_OPTIONS) $(FFLAGS_HYPRE) $(FFLAGS_SUNDIALS) $(FFLAGS_HDF5)
 ompi_gnu_osx : LFLAGSMKL = $(LFLAGSMKL_CUSTOM) $(CLT_VERSION) $(LFLAGS_HYPRE) $(LFLAGS_SUNDIALS) $(LFLAGS_HDF5)
+ompi_gnu_osx : LFLAGS = -static-libgfortran -static-libquadmath
 ompi_gnu_osx : FCOMPL = $(COMP_FC)
-ompi_gnu_osx : FOPENMPFLAGS = -fopenmp
+ompi_gnu_osx : FOPENMPFLAGS = -fopenmp 
 ompi_gnu_osx : obj = fds_ompi_gnu_osx
 ompi_gnu_osx : FFLAGS += -Wno-maybe-uninitialized -Wno-uninitialized -Wno-unused-function
 ompi_gnu_osx : setup $(obj_mpi)
-	$(FCOMPL) $(FFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
+	$(FCOMPL) $(FFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL) $(LFLAGS)
 
 ompi_gnu_osx_db : FFLAGS = -O0 -std=f2018 -ggdb -Wall -Wcharacter-truncation -Wno-target-lifetime -fcheck=all -fbacktrace -ffpe-trap=invalid,zero,overflow -frecursive -ffpe-summary=none -fall-intrinsics $(GITINFOGNU) $(FFLAGSMKL) $(GFORTRAN_OPTIONS) $(FFLAGS_HYPRE) $(FFLAGS_SUNDIALS) $(FFLAGS_HDF5)
 ompi_gnu_osx_db : LFLAGSMKL = $(LFLAGSMKL_CUSTOM) $(CLT_VERSION) $(LFLAGS_HYPRE) $(LFLAGS_SUNDIALS) $(LFLAGS_HDF5)
+ompi_gnu_osx_db : LFLAGS = -static-libgfortran -static-libquadmath
 ompi_gnu_osx_db : FCOMPL = $(COMP_FC)
 ompi_gnu_osx_db : FOPENMPFLAGS = -fopenmp
 ompi_gnu_osx_db : obj = fds_ompi_gnu_osx_db
 ompi_gnu_osx_db : FFLAGS += -Wno-maybe-uninitialized -Wno-uninitialized -Wno-unused-function
 ompi_gnu_osx_db : setup $(obj_mpi)
-	$(FCOMPL) $(FFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
+	$(FCOMPL) $(FFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL) $(LFLAGS)
 
 ompi_gnu_osx_dv : FFLAGS = -O1 -fbacktrace -std=f2018 -frecursive -ffpe-summary=none -fall-intrinsics $(GITINFOGNU) $(FFLAGSMKL) $(GFORTRAN_OPTIONS) $(FFLAGS_HYPRE) $(FFLAGS_SUNDIALS) $(FFLAGS_HDF5)
 ompi_gnu_osx_dv : LFLAGSMKL = $(LFLAGSMKL_CUSTOM) $(CLT_VERSION) $(LFLAGS_HYPRE) $(LFLAGS_SUNDIALS) $(LFLAGS_HDF5)
+ompi_gnu_osx_dv : LFLAGS = -static-libgfortran -static-libquadmath
 ompi_gnu_osx_dv : FCOMPL = $(COMP_FC)
 ompi_gnu_osx_dv : FOPENMPFLAGS = -fopenmp
 ompi_gnu_osx_dv : obj = fds_ompi_gnu_osx_dv
 ompi_gnu_osx_dv : setup $(obj_mpi)
-	$(FCOMPL) $(FFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
+	$(FCOMPL) $(FFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL) $(LFLAGS)
 
 
 # *** Object Dependencies ***

Source/ccib.f90

@@ -422,7 +422,7 @@ MODULE GLOBAL_CONSTANTS
 REAL(EB) :: TIME_SHRINK_FACTOR                              !< Factor to reduce specific heat and total run time
 REAL(EB) :: RELAXATION_FACTOR=1._EB                         !< Factor used to relax normal velocity nudging at immersed boundaries
 REAL(EB) :: MPI_TIMEOUT=600._EB                             !< Time to wait for MPI messages to be received (s)
-REAL(EB) :: DT_END_MINIMUM=TWO_EPSILON_EB                   !< Smallest possible final time step (s)
+REAL(EB) :: DT_END_MINIMUM=TWENTY_EPSILON_EB                   !< Smallest possible final time step (s)
 REAL(EB) :: DT_END_FILL=1.E-6_EB
 INTEGER  :: DIAGNOSTICS_INTERVAL                            !< Number of time steps between diagnostic outputs
 REAL(EB) :: UNFREEZE_TIME                                   !< Time to unfreeze a simulation

Source/cons.f90

@@ -239,7 +239,7 @@ RECURSIVE SUBROUTINE EVALUATE_CONTROL(T,ID,DT,CTRL_STOP_STATUS)
             T_CHANGE = T
          END SELECT
       ! Special case first flip
-      IF ( CF%INSTANT_VALUE >= CF%DELAY .AND. ABS(CF%T_CHANGE-1000000._EB) <= TWO_EPSILON_EB) &
+      IF ( CF%INSTANT_VALUE >= CF%DELAY .AND. ABS(CF%T_CHANGE-1000000._EB) <= TWENTY_EPSILON_EB) &
          CF%CURRENT_STATE = .NOT. CF%PRIOR_STATE
 
    CASE (CUSTOM)
@@ -406,15 +406,15 @@ RECURSIVE SUBROUTINE EVALUATE_CONTROL(T,ID,DT,CTRL_STOP_STATUS)
       SELECT CASE (CF%INPUT_TYPE(2))
          CASE (DEVICE_INPUT)
             DV => DEVICE(CF%INPUT(2))
-            IF (ABS(DV%SMOOTHED_VALUE)>TWO_EPSILON_EB) CF%INSTANT_VALUE = CF%INSTANT_VALUE / DV%SMOOTHED_VALUE
+            IF (ABS(DV%SMOOTHED_VALUE)>TWENTY_EPSILON_EB) CF%INSTANT_VALUE = CF%INSTANT_VALUE / DV%SMOOTHED_VALUE
             CF%MESH = DV%MESH
          CASE (CONTROL_INPUT)
             IF (.NOT. CONTROL(CF%INPUT(2))%UPDATED) THEN
                CALL EVALUATE_CONTROL(T,CF%INPUT(2),DT,CTRL_STOP_STATUS)
                CF => CONTROL(ID)
             ENDIF
             CF%MESH=CONTROL(CF%INPUT(2))%MESH
-            IF (ABS(CONTROL(CF%INPUT(2))%INSTANT_VALUE)>TWO_EPSILON_EB) CF%INSTANT_VALUE = &
+            IF (ABS(CONTROL(CF%INPUT(2))%INSTANT_VALUE)>TWENTY_EPSILON_EB) CF%INSTANT_VALUE = &
                                                                         CF%INSTANT_VALUE / CONTROL(CF%INPUT(2))%INSTANT_VALUE
          CASE (CONSTANT_INPUT)
             CF%INSTANT_VALUE = CF%INSTANT_VALUE / CF%CONSTANT
@@ -446,7 +446,7 @@ RECURSIVE SUBROUTINE EVALUATE_CONTROL(T,ID,DT,CTRL_STOP_STATUS)
          ENDIF
       ENDDO
 
-      IF (CF%PSUM(K)-CF%PSUM(K-1)>TWO_EPSILON_EB) THEN
+      IF (CF%PSUM(K)-CF%PSUM(K-1)>TWENTY_EPSILON_EB) THEN
          CF%INSTANT_VALUE = CF%LSUM(K-1) + (CF%LSUM(K)-CF%LSUM(K-1))*(CF%PERCENTILE*CF%PSUM(DV%N_POINTS)-CF%PSUM(K-1))/&
                             (CF%PSUM(K)-CF%PSUM(K-1))
       ELSE
@@ -709,7 +709,7 @@ RECURSIVE SUBROUTINE EVALUATE_CONTROL(T,ID,DT,CTRL_STOP_STATUS)
       T_CHANGE = T
 
     CASE (CF_MIN)
-      CF%INSTANT_VALUE=HUGE(TWO_EPSILON_EB)
+      CF%INSTANT_VALUE=HUGE(TWENTY_EPSILON_EB)
 
       DO NC = 1, CF%N_INPUTS
          SELECT CASE (CF%INPUT_TYPE(NC))
@@ -737,7 +737,7 @@ RECURSIVE SUBROUTINE EVALUATE_CONTROL(T,ID,DT,CTRL_STOP_STATUS)
       T_CHANGE = T
 
     CASE (CF_MAX)
-      CF%INSTANT_VALUE=-HUGE(TWO_EPSILON_EB)
+      CF%INSTANT_VALUE=-HUGE(TWENTY_EPSILON_EB)
       DO NC = 1, CF%N_INPUTS
          SELECT CASE (CF%INPUT_TYPE(NC))
             CASE (DEVICE_INPUT)

Source/ctrl.f90

@@ -3196,13 +3196,13 @@ SUBROUTINE WRITE_ATOM_BALANCE_DIAGNOSTICS(LU_OUT)
 WRITE(LU_OUT,'(/3X,A)')     'Primitive Species'
 WRITE(LU_OUT,'(3X,A)')      'Species ID                                                 Stoich. Coeff.'
 DO NN=1,N_SPECIES
-   IF (ABS(RN%NU_SPECIES(NN))>=TWO_EPSILON_EB) WRITE(LU_OUT,'(3X,A,1X,F12.6)') SPECIES(NN)%ID,RN%NU_SPECIES(NN)
+   IF (ABS(RN%NU_SPECIES(NN))>=TWENTY_EPSILON_EB) WRITE(LU_OUT,'(3X,A,1X,F12.6)') SPECIES(NN)%ID,RN%NU_SPECIES(NN)
 ENDDO
 
 WRITE(LU_OUT,'(/3X,A)')     'Tracked (Lumped) Species'
 WRITE(LU_OUT,'(3X,A)')      'Species ID                                                 Stoich. Coeff.'
 DO NN=1,N_TRACKED_SPECIES
-   IF (ABS(RN%NU(NN)) < TWO_EPSILON_EB) CYCLE
+   IF (ABS(RN%NU(NN)) < TWENTY_EPSILON_EB) CYCLE
    IF (ABS(RN%NU(NN)) < 10000._EB) WRITE(LU_OUT,'(3X,A,1X,F12.6)') SPECIES_MIXTURE(NN)%ID,RN%NU(NN)
    IF (ABS(RN%NU(NN)) > 10000._EB) WRITE(LU_OUT,'(3X,A,1X,E12.5)') SPECIES_MIXTURE(NN)%ID,RN%NU(NN)
 ENDDO
@@ -3214,7 +3214,7 @@ SUBROUTINE WRITE_ATOM_BALANCE_DIAGNOSTICS(LU_OUT)
    WRITE(LU_OUT,'(3X,A)') 'Element  nu*Atom Count'
    REACTION_BALANCE = RN%NU(NS)*SPECIES_MIXTURE(NS)%ATOMS
    DO I=1,118
-      IF (ABS(REACTION_BALANCE(I))>TWO_EPSILON_EB) THEN
+      IF (ABS(REACTION_BALANCE(I))>TWENTY_EPSILON_EB) THEN
          WRITE(LU_OUT,'(3X,A,3X,F12.6)') ELEMENT(I)%ABBREVIATION,REACTION_BALANCE(I)
       ENDIF
    ENDDO

Source/data.f90

@@ -142,7 +142,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
+         IF (SM%SC_T_USER>TWENTY_EPSILON_EB) THEN
             RHO_D = RHO_D + RHO_D_TURB*SC_T/SM%SC_T_USER
          ELSE
             RHO_D = RHO_D + RHO_D_TURB
@@ -159,7 +159,7 @@ SUBROUTINE DIVERGENCE_PART_1(T,DT,NM)
          DO K=0,KBP1
             DO J=0,JBP1
                DO I=0,IBP1
-                  D_Z_MAX(I,J,K) = MAX(D_Z_MAX(I,J,K),RHO_D(I,J,K)/(RHOP(I,J,K)+TWO_EPSILON_EB))
+                  D_Z_MAX(I,J,K) = MAX(D_Z_MAX(I,J,K),RHO_D(I,J,K)/(RHOP(I,J,K)+TWENTY_EPSILON_EB))
                ENDDO
             ENDDO
          ENDDO
@@ -236,7 +236,7 @@ SUBROUTINE DIVERGENCE_PART_1(T,DT,NM)
 
    ! Ensure RHO_D terms sum to zero over all species.  Gather error into largest mass fraction present.
 
-   IF (SIM_MODE==DNS_MODE .OR. SIM_MODE==LES_MODE) THEN
+   IF (SIM_MODE==DNS_MODE .OR. SIM_MODE==LES_MODE .OR. TENSOR_DIFFUSIVITY) THEN
       ! for VLES and SVLES modes, the diffusivity is the same for all species
       ! so, as long as ZZP is realizable, the sum of diffusive fluxes will be zero
       ! and the flux corrections below are not required
@@ -1353,12 +1353,12 @@ SUBROUTINE PREDICT_NORMAL_VELOCITY(IW,T,DT)
                CASE(-3); B1%U_NORMAL_S = (W(BC%IIG,BC%JJG,BC%KKG-1) + SF%VEL_GRAD*B1%RDN)
             END SELECT
          ENDIF NEUMANN_IF
-         IF (ABS(SURFACE(WC%SURF_INDEX)%MASS_FLUX_TOTAL)>=TWO_EPSILON_EB) B1%U_NORMAL_S = &
+         IF (ABS(SURFACE(WC%SURF_INDEX)%MASS_FLUX_TOTAL)>=TWENTY_EPSILON_EB) B1%U_NORMAL_S = &
                                                                           B1%U_NORMAL_S*RHOA/B1%RHO_F
          VENT_IF: IF (WC%VENT_INDEX>0) THEN
             VT=>VENTS(WC%VENT_INDEX)
             IF (VT%N_EDDY>0) THEN ! Synthetic Eddy Method
-               IF (SF%PROFILE/=0 .AND. ABS(SF%VEL)>TWO_EPSILON_EB) THEN
+               IF (SF%PROFILE/=0 .AND. ABS(SF%VEL)>TWENTY_EPSILON_EB) THEN
                   PROFILE_FACTOR = ABS(B1%U_NORMAL_0/SF%VEL)
                ELSE
                   PROFILE_FACTOR = 1._EB
@@ -1500,7 +1500,7 @@ SUBROUTINE DIVERGENCE_PART_2(DT,NM)
    ! Compute change in background pressure
 
    DO IPZ=1,N_ZONE
-      IF (ABS(PSUM(IPZ)) > TWO_EPSILON_EB) D_PBAR_DT_P(IPZ) = (DSUM(IPZ) - USUM(IPZ))/PSUM(IPZ)
+      IF (ABS(PSUM(IPZ)) > TWENTY_EPSILON_EB) D_PBAR_DT_P(IPZ) = (DSUM(IPZ) - USUM(IPZ))/PSUM(IPZ)
       IF (CORRECTOR) P_ZONE(IPZ)%DPSTAR =  D_PBAR_DT_P(IPZ)
    ENDDO