Merge pull request #9474 from marcosvanella/master

FDS Source and Build : Remove unused, change GNU targets -std flag to 2018.
firemodels · May 3, 2021 · e68c4bb · e68c4bb
2 parents dc493ea + dfbf891
commit e68c4bb
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 49 deletions.
diff --git a/Build/makefile b/Build/makefile
@@ -306,39 +306,39 @@ mpi_xlf_aix : $(obj_mpi)
 
 #*** GNU Compilers ***
 
-mpi_gnu_linux_64 : FFLAGS = -m64 -O2 -std=f2008 -frecursive -ffpe-summary=none -fall-intrinsics $(GITINFOGNU) $(GNU_COMPINFO) $(FFLAGSMKL_GNU_OPENMPI) $(GFORTRAN_OPTIONS)
+mpi_gnu_linux_64 : FFLAGS = -m64 -O2 -std=f2018 -frecursive -ffpe-summary=none -fall-intrinsics $(GITINFOGNU) $(GNU_COMPINFO) $(FFLAGSMKL_GNU_OPENMPI) $(GFORTRAN_OPTIONS)
 mpi_gnu_linux_64 : LFLAGSMKL = $(LFLAGSMKL_GNU_OPENMPI)
 mpi_gnu_linux_64 : FCOMPL = mpifort
 mpi_gnu_linux_64 : FOPENMPFLAGS = -fopenmp
 mpi_gnu_linux_64 : obj = fds_mpi_gnu_linux_64
 mpi_gnu_linux_64 : setup $(obj_mpi)
 	$(FCOMPL) $(FFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
 
-mpi_gnu_linux_64_db : FFLAGS = -m64 -O0 -std=f2008 -ggdb -Wall -Wcharacter-truncation -Wno-target-lifetime -fcheck=all -fbacktrace -ffpe-trap=invalid,zero,overflow -frecursive -ffpe-summary=none -fall-intrinsics $(GITINFOGNU) $(GNU_COMPINFO) $(FFLAGSMKL_GNU_OPENMPI) $(GFORTRAN_OPTIONS)
+mpi_gnu_linux_64_db : FFLAGS = -m64 -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) $(GNU_COMPINFO) $(FFLAGSMKL_GNU_OPENMPI) $(GFORTRAN_OPTIONS)
 mpi_gnu_linux_64_db : LFLAGSMKL = $(LFLAGSMKL_GNU_OPENMPI)
 mpi_gnu_linux_64_db : FCOMPL = mpifort
 mpi_gnu_linux_64_db : FOPENMPFLAGS = -fopenmp
 mpi_gnu_linux_64_db : obj = fds_mpi_gnu_linux_64_db
 mpi_gnu_linux_64_db : setup $(obj_mpi)
 	$(FCOMPL) $(FFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
 
-mpi_gnu_osx_64 : FFLAGS = -m64 -O2 -std=f2008 -frecursive -ffpe-summary=none -fall-intrinsics $(GITINFOGNU) $(GNU_COMPINFO) $(FFLAGSMKL_GNU_CUSTOM) $(GFORTRAN_OPTIONS)
+mpi_gnu_osx_64 : FFLAGS = -m64 -O2 -std=f2018 -frecursive -ffpe-summary=none -fall-intrinsics $(GITINFOGNU) $(GNU_COMPINFO) $(FFLAGSMKL_GNU_CUSTOM) $(GFORTRAN_OPTIONS)
 mpi_gnu_osx_64 : LFLAGSMKL = $(LFLAGSMKL_GNU_CUSTOM)
 mpi_gnu_osx_64 : FCOMPL = mpifort
 mpi_gnu_osx_64 : FOPENMPFLAGS =
 mpi_gnu_osx_64 : obj = fds_mpi_gnu_osx_64
 mpi_gnu_osx_64 : setup $(obj_mpi)
 	$(FCOMPL) $(FFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
 
-mpi_gnu_osx_64_db : FFLAGS = -m64 -O0 -std=f2008 -ggdb -Wall -Wcharacter-truncation -Wno-target-lifetime -fcheck=all -fbacktrace -ffpe-trap=invalid,zero,overflow -frecursive -ffpe-summary=none -fall-intrinsics $(GITINFOGNU) $(GNU_COMPINFO) $(FFLAGSMKL_GNU_CUSTOM) $(GFORTRAN_OPTIONS)
+mpi_gnu_osx_64_db : FFLAGS = -m64 -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) $(GNU_COMPINFO) $(FFLAGSMKL_GNU_CUSTOM) $(GFORTRAN_OPTIONS)
 mpi_gnu_osx_64_db : LFLAGSMKL = $(LFLAGSMKL_GNU_CUSTOM)
 mpi_gnu_osx_64_db : FCOMPL = mpifort
 mpi_gnu_osx_64_db : FOPENMPFLAGS =
 mpi_gnu_osx_64_db : obj = fds_mpi_gnu_osx_64_db
 mpi_gnu_osx_64_db : setup $(obj_mpi)
 	$(FCOMPL) $(FFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
 
-mpi_gnu_osx_64_dv : FFLAGS = -m64 -O1 -fbacktrace -std=f2008 -frecursive -ffpe-summary=none -fall-intrinsics $(GITINFOGNU) $(GNU_COMPINFO) $(FFLAGSMKL_GNU_CUSTOM) $(GFORTRAN_OPTIONS)
+mpi_gnu_osx_64_dv : FFLAGS = -m64 -O1 -fbacktrace -std=f2018 -frecursive -ffpe-summary=none -fall-intrinsics $(GITINFOGNU) $(GNU_COMPINFO) $(FFLAGSMKL_GNU_CUSTOM) $(GFORTRAN_OPTIONS)
 mpi_gnu_osx_64_dv : LFLAGSMKL = $(LFLAGSMKL_GNU_CUSTOM)
 mpi_gnu_osx_64_dv : FCOMPL = mpifort
 mpi_gnu_osx_64_dv : FOPENMPFLAGS =

diff --git a/Source/ccib.f90 b/Source/ccib.f90
@@ -34,8 +34,7 @@ MODULE CC_SCALARS_IBM
 ! Allocatable real arrays
 ! Grid position containers:
 REAL(EB), SAVE, TARGET, ALLOCATABLE, DIMENSION(:) :: XFACE,YFACE,ZFACE,XCELL,YCELL,ZCELL, &
-          DXFACE,DYFACE,DZFACE,DXCELL,DYCELL,DZCELL,X1FACE,X2FACE,X3FACE,  &
-          X2CELL,X3CELL,DX1FACE,DX2FACE,DX3FACE,DX2CELL,DX3CELL ! X1CELL,DX1CELL not used.
+          DXFACE,DYFACE,DZFACE,DXCELL,DYCELL,DZCELL
 
 REAL(EB), POINTER, DIMENSION(:) :: X1FACEP,X2FACEP,X3FACEP,  &
                    X2CELLP,X3CELLP ! X1CELLP,DX1FACEP,DX2FACEP,DX3FACEP,DX1CELLP,DX2CELLP,DX3CELLP not used.
@@ -5061,7 +5060,7 @@ SUBROUTINE CCSPECIES_ADVECTION
 ! region and adds components to thermodynamic divergence.
 
 ! Local Variables:
-REAL(EB) :: RHO_Z_PV(-2:1), VELC, ALPHAP1, AM_P1, AP_P1, FN_ZZ, ZZ_GET_N
+REAL(EB) :: RHO_Z_PV(-2:1), VELC, FN_ZZ, ZZ_GET_N
 REAL(EB), PARAMETER :: SGNFCT=1._EB
 INTEGER :: IOR, ICFA
 TYPE(IBM_REGFACEZ_TYPE),  POINTER, DIMENSION(:) :: REGFACE_Z=>NULL()
@@ -5646,7 +5645,7 @@ SUBROUTINE CCENTHALPY_ADVECTION
 
 
 ! Local Variables:
-REAL(EB) :: RHO_H_S_PV(-2:1), VELC, VELC2, ALPHAP1, AM_P1, AP_P1, FN_H_S, TMP_F_GAS
+REAL(EB) :: RHO_H_S_PV(-2:1), VELC, VELC2, FN_H_S, TMP_F_GAS
 INTEGER  :: IOR, ICFA
 TYPE(IBM_REGFACEZ_TYPE),  POINTER, DIMENSION(:) :: REGFACE_Z=>NULL()
 LOGICAL :: DO_LO, DO_HI
@@ -6310,9 +6309,8 @@ SUBROUTINE CCREGION_DIFFUSIVE_HEAT_FLUXES
 ! NOTE: this routine assumes POINT_TO_MESH(NM) has been previously called.
 
 ! Local Variables:
-INTEGER :: IIG, JJG, KKG , IOR, N_ZZ_MAX
-REAL(EB) :: UN_P, RHO_D_DZDN
-REAL(EB) :: RHO_D_DZDN_GET(1:N_TRACKED_SPECIES)
+INTEGER :: IIG, JJG, KKG , IOR
+REAL(EB) :: UN_P
 TYPE(CFACE_TYPE), POINTER :: CFA=>NULL()
 LOGICAL :: DO_LO, DO_HI
 
@@ -9398,7 +9396,7 @@ SUBROUTINE CCIBM_VELOCITY_BC(T,NM,APPLY_TO_ESTIMATED_VARIABLES)
 SUBROUTINE IBM_RCEDGE_DUIDXJ
 
 INTEGER :: IOE
-REAL(EB):: VEL_GAS(-2:2),XB_IB(-2:2),MU_RC,DEL_RC,UB,U1,BFC,CFC
+REAL(EB):: VEL_GAS(-2:2),XB_IB(-2:2),MU_RC,DEL_RC
 
 IE = IBM_EDGE%IE
 II     = IJKE( 1,IE)
@@ -9506,8 +9504,6 @@ END SUBROUTINE IBM_RCEDGE_DUIDXJ
 
 SUBROUTINE IBM_RCEDGE_TAU_OMG
 
-REAL(EB) :: MU_RC
-
 IE = IBM_EDGE%IE
 SIGN_LOOP_2: DO I_SGN=-1,1,2
    ORIENTATION_LOOP_2: DO ICD=1,2
@@ -9549,14 +9545,12 @@ END SUBROUTINE IBM_RCEDGE_TAU_OMG
 
 SUBROUTINE IBM_EDGE_TAU_OMG
 
-REAL(EB) :: ADDV,VEL_T,VEL_GHOST,I_SGNR,I_SGN2,DUDXN,MU_DUDXN,MUA
+REAL(EB) :: VEL_T,VEL_GHOST,MUA
 INTEGER  :: IEP,JEP,KEP,SURF_INDEX,ITMP,SKIP_FCT,NPE_LIST_START,NPE_LIST_COUNT,IRCEDG,IRC,JRC,KRC
 LOGICAL, PARAMETER :: WALL_MODEL_IN_NRMPLANE_TO_EDGE = .TRUE.
 LOGICAL :: ALTERED_GRADIENT(-2:2)
 REAL(EB):: XB_IB,OMEV_EP(-2:2),TAUV_EP(-2:2),DWDY,DVDZ,DUDZ,DWDX,DUDY,DVDX, &
-           DUIDXJ_EP(-2:2),MU_DUIDXJ_EP(-2:2),EC_B(-2:2),EC_EP(-2:2),DEL_UB,DEL_EP,VEL_GAS,CEP,CB
-
-REAL(EB):: DEL_EP1, DEL_EP2, AINV(2,2), UE1, UE2, B_POLY, C_POLY, USTR_1, USTR_2, ZETA
+           DUIDXJ_EP(-2:2),MU_DUIDXJ_EP(-2:2),EC_B(-2:2),EC_EP(-2:2),DEL_EP,VEL_GAS,CEP,CB
 
 REAL(EB) :: VLG(-2:2),NUV(-2:2),RGH(-2:2),UTA(-2:2)
 VLG(-2:2)=0._EB; NUV(-2:2)=0._EB; RGH(-2:2)=0._EB; UTA(-2:2)=0._EB

diff --git a/Source/geom.f90 b/Source/geom.f90
@@ -297,9 +297,6 @@ MODULE COMPLEX_GEOMETRY
 INTEGER, SAVE :: ILO_CELL,IHI_CELL,JLO_CELL,JHI_CELL,KLO_CELL,KHI_CELL
 INTEGER, SAVE :: ILO_FACE,IHI_FACE,JLO_FACE,JHI_FACE,KLO_FACE,KHI_FACE
 INTEGER, SAVE :: NXB, NYB, NZB
-INTEGER, SAVE :: X1LO_FACE,X1LO_CELL,X1HI_FACE,X1HI_CELL, &
-                 X2LO_FACE,X2LO_CELL,X2HI_FACE,X2HI_CELL, &
-                 X3LO_FACE,X3LO_CELL,X3HI_FACE,X3HI_CELL
 
 INTEGER, PARAMETER :: NODS_WSEL = 3 ! Three nodes per wet surface element (i.e. surface triangle).
 
@@ -366,9 +363,6 @@ MODULE COMPLEX_GEOMETRY
           DXFACE,DYFACE,DZFACE,DXCELL,DYCELL,DZCELL,X1FACE,X2FACE,X3FACE,  &
           X2CELL,X3CELL,DX1FACE,DX2FACE,DX3FACE,DX2CELL,DX3CELL ! X1CELL,DX1CELL not used.
 
-REAL(EB), POINTER, DIMENSION(:) :: X1FACEP,X2FACEP,X3FACEP,  &
-                   X2CELLP,X3CELLP ! X1CELLP,DX1FACEP,DX2FACEP,DX3FACEP,DX1CELLP,DX2CELLP,DX3CELLP not used.
-
 ! x2 Intersection data containers:
 INTEGER,  SAVE :: IBM_N_CRS
 INTEGER,  PARAMETER :: DELTA_CROSS_X2 = 512
@@ -2734,8 +2728,6 @@ SUBROUTINE DEALLOCATE_CUTCF_CONN_MESH(NM)
 INTEGER, INTENT(IN) :: NM
 
 INTEGER :: ICC, ICF, I, J, K, DO_BNCF=1
-INTEGER, ALLOCATABLE, DIMENSION(:,:,:,:,:) :: FCVARAUX
-INTEGER, ALLOCATABLE, DIMENSION(:,:,:,  :) :: CCVARAUX
 
 ! Cut-cells and GASPHASE cut-faces:
 DO K=-CCGUARD,MESHES(NM)%KBAR+CCGUARD
@@ -3326,11 +3318,11 @@ END SUBROUTINE ASSIGN_ONE_FACE_RADI
 SUBROUTINE SET_GC_CUTCELLS_3D
 
 ! Local Variables:
-INTEGER :: IW,II,JJ,KK,IOR,IIO,JJO,KKO,IIF,JJF,KKF,IIOF,JJOF,KKOF,ICF,ICOF,IFACE,X1AXIS,ICC,NMICC,NOFC,N_CF,N_CRT
-REAL(EB):: DXYZCEN(IAXIS:KAXIS), DIFF, XNM, XNOM
+INTEGER :: IW,II,JJ,KK,IOR,IIO,JJO,KKO,IIF,JJF,KKF,IIOF,JJOF,KKOF,ICF,ICOF,X1AXIS,ICC,NMICC,NOFC,N_CF,N_CRT
+REAL(EB):: XNM, XNOM
 TYPE (WALL_TYPE), POINTER :: WC
 TYPE (EXTERNAL_WALL_TYPE), POINTER :: EWC
-LOGICAL :: TWINMATCH, WC_PERIODIC, TEST_ICC
+LOGICAL :: WC_PERIODIC, TEST_ICC
 INTEGER, PARAMETER :: INDADD(1:3,1:6) = RESHAPE((/-1,0,0,0,0,0,0,-1,0,0,0,0,0,0,-1,0,0,0/),(/3,6/))
 INTEGER, PARAMETER :: MYAXIS(1:6) = (/ IAXIS,IAXIS,JAXIS,JAXIS,KAXIS,KAXIS /)
 REAL(EB):: AREA_NM, AREA_NOM, AREA_CRT
@@ -3602,10 +3594,10 @@ SUBROUTINE GET_GEOM_TRIBIN
 ! cut-cell generation.
 
 ! Local Variables:
-INTEGER :: IG, IWSEL, IEDGE, IVERT, NTL, SZE, IBIN, ILO_BIN, IHI_BIN, INOD, IWSELDUM, MYAXIS, WSELEM(NOD1:NOD3)
+INTEGER :: IG, IWSEL, IEDGE, NTL, SZE, IBIN, ILO_BIN, IHI_BIN, WSELEM(NOD1:NOD3)
 REAL(EB):: LEDGE, DXYZE(MAX_DIM), LX1, DELBIN, X1V_LO, X1V_HI, X1V(NOD1:NOD3)
 INTEGER, ALLOCATABLE, DIMENSION(:) :: TRI_LIST
-REAL(EB):: FACECUBE(LOW_IND:HIGH_IND,IAXIS:KAXIS),MINMAX_MESHES(LOW_IND:HIGH_IND,IAXIS:KAXIS),MIN_MESHGEOM,MAX_MESHGEOM
+REAL(EB):: MINMAX_MESHES(LOW_IND:HIGH_IND,IAXIS:KAXIS),MIN_MESHGEOM,MAX_MESHGEOM
 TYPE(GEOMETRY_TYPE), POINTER :: G=>NULL()
 INTEGER :: DELTA_TBIN2
 

diff --git a/Source/part.f90 b/Source/part.f90
@@ -511,10 +511,10 @@ END SUBROUTINE INSERT_VENT_PARTICLES
 SUBROUTINE PARTICLE_FACE_INSERT(WALL_INDEX,CFACE_INDEX)
 
 USE COMPLEX_GEOMETRY, ONLY : RANDOM_CFACE_XYZ
-USE PHYSICAL_FUNCTIONS, ONLY: GET_PARTICLE_ENTHALPY 
+USE PHYSICAL_FUNCTIONS, ONLY: GET_PARTICLE_ENTHALPY
 INTEGER, INTENT(IN), OPTIONAL :: WALL_INDEX,CFACE_INDEX
 INTEGER :: I,N_LPC, ITER
-REAL(EB):: CFA_X, CFA_Y, CFA_Z, RN, VEL_PART, PARTICLE_SURFACE_DENSITY = 0._EB, &
+REAL(EB):: CFA_X, CFA_Y, CFA_Z, RN, VEL_PART, &
            C_S, H_1, H_2, TMP_PART, TMP_GUESS
 LOGICAL :: RETURN_FLAG
 
@@ -713,13 +713,13 @@ SUBROUTINE PARTICLE_FACE_INSERT(WALL_INDEX,CFACE_INDEX)
    IF (T < SF%PARTICLE_INSERT_CLOCK(NM)) RETURN
 
    ALLOCATE(LP_INDEX_LOOKUP(SF%NPPC))
-  
+
    LPC_LOOP: DO N_LPC = 1, SF%N_LPC
       LP_INDEX_LOOKUP = 0
 
       IF (ONE_D%PART_MASS(N_LPC) < TWO_EPSILON_EB) CYCLE
       LPC => LAGRANGIAN_PARTICLE_CLASS(SF%MATL_PART_INDEX(N_LPC))
-      
+
       ! Get particle temperature
       TMP_GUESS = ONE_D%TMP(1)
       H_1 = ONE_D%PART_ENTHALPY(N_LPC)/ONE_D%PART_MASS(N_LPC)
@@ -854,9 +854,9 @@ SUBROUTINE PARTICLE_FACE_INSERT(WALL_INDEX,CFACE_INDEX)
             LP%PWT = LP%PWT * ONE_D%PART_MASS(N_LPC)*ONE_D%AREA_ADJUST*ONE_D%AREA*MIN(1._EB,SF%DT_INSERT/ONE_D%T_MATL_PART)/MASS_SUM
          ENDDO
       ENDIF
-      
+
    ENDDO LPC_LOOP
-   
+
    DEALLOCATE(LP_INDEX_LOOKUP)
 
    ! Decrement mass, enthalpy, and aggregation time for current insertion interval
@@ -1343,7 +1343,7 @@ SUBROUTINE INITIALIZE_SINGLE_PARTICLE
             CASE (SURF_CYLINDRICAL)
                LP%ONE_D%AREA = AREA*PI
                IF (SF%THERMAL_BC_INDEX==THERMALLY_THICK) THEN
-                  X1 = SUM(SF%LAYER_THICKNESS)+SF%INNER_RADIUS 
+                  X1 = SUM(SF%LAYER_THICKNESS)+SF%INNER_RADIUS
                   LENGTH = AREA / (2._EB*X1)
                   DO N=SF%N_LAYERS,1,-1
                      X2 = X1 - SF%LAYER_THICKNESS(N)
@@ -1354,7 +1354,7 @@ SUBROUTINE INITIALIZE_SINGLE_PARTICLE
             CASE (SURF_SPHERICAL)
                LP%ONE_D%AREA = AREA*4._EB
                IF (SF%THERMAL_BC_INDEX==THERMALLY_THICK) THEN
-                  X1 = SUM(SF%LAYER_THICKNESS)+SF%INNER_RADIUS 
+                  X1 = SUM(SF%LAYER_THICKNESS)+SF%INNER_RADIUS
                   LP%PWT = AREA/(PI*X1**2)
                   DO N=SF%N_LAYERS,1,-1
                      X2 = X1 - SF%LAYER_THICKNESS(N)
@@ -1382,7 +1382,7 @@ SUBROUTINE INITIALIZE_SINGLE_PARTICLE
             CASE (SURF_CYLINDRICAL)
                LP%ONE_D%AREA = 2._EB*LP_VOLUME/(SF%THICKNESS+SF%INNER_RADIUS)
                IF (SF%THERMAL_BC_INDEX==THERMALLY_THICK) THEN
-                  X1 = SUM(SF%LAYER_THICKNESS)+SF%INNER_RADIUS 
+                  X1 = SUM(SF%LAYER_THICKNESS)+SF%INNER_RADIUS
                   LENGTH = LP_VOLUME/(PI*X1**2)
                   DO N=SF%N_LAYERS,1,-1
                      X2 = X1 - SF%LAYER_THICKNESS(N)
@@ -1394,7 +1394,7 @@ SUBROUTINE INITIALIZE_SINGLE_PARTICLE
                LP%ONE_D%AREA = 3._EB*LP_VOLUME/(SF%THICKNESS+SF%INNER_RADIUS)
                LP%PWT = LP%ONE_D%AREA/(4._EB*PI*SF%THICKNESS**2)
                IF (SF%THERMAL_BC_INDEX==THERMALLY_THICK) THEN
-                  X1 = SUM(SF%LAYER_THICKNESS)+SF%INNER_RADIUS 
+                  X1 = SUM(SF%LAYER_THICKNESS)+SF%INNER_RADIUS
                   DO N=SF%N_LAYERS,1,-1
                      X2 = X1 - SF%LAYER_THICKNESS(N)
                      LP%MASS = LP%MASS + SF%LAYER_DENSITY(N)*FOTHPI*(X1**3-X2**3)
@@ -2104,10 +2104,10 @@ SUBROUTINE MOVE_IN_GAS
 USE MATH_FUNCTIONS, ONLY : AFILL2, EVALUATE_RAMP, RANDOM_CHOICE, BOX_MULLER
 REAL(EB) :: UBAR,VBAR,WBAR,RVC,UREL,VREL,WREL,QREL,RHO_G,TMP_G,MU_AIR, &
             U_OLD,V_OLD,W_OLD,ZZ_GET(1:N_TRACKED_SPECIES),WAKE_VEL,DROP_VOL_FRAC,RE_WAKE,&
-            WE_G,T_BU_BAG,T_BU_STRIP,MPOM,ALBO,SFAC,BREAKUP_RADIUS(0:NDC),&
-            DD,DD_X,DD_Y,DD_Z,DW_X,DW_Y,DW_Z,K_TERM(3),Y_TERM(3),C_DRAG,A_DRAG,HAB,PARACOR,QREL2,X_WGT,Y_WGT,Z_WGT,&
+            WE_G,T_BU_BAG,T_BU_STRIP,MPOM,SFAC,BREAKUP_RADIUS(0:NDC),&
+            DD,DD_X,DD_Y,DD_Z,DW_X,DW_Y,DW_Z,K_TERM(3),Y_TERM(3),C_DRAG,A_DRAG,X_WGT,Y_WGT,Z_WGT,&
             GX_LOC,GY_LOC,GZ_LOC,DUMMY,DRAG_MAX(3)=0._EB,SUM_RHO,K_SGS,U_P,L_WAKE,KAPPA_E,KN
-REAL(EB), SAVE :: HALF_DT2,BETA
+REAL(EB), SAVE :: BETA
 INTEGER :: IIX,JJY,KKZ,SURF_INDEX,N
 REAL(EB), PARAMETER :: MAX_TURBULENCE_INTENSITY = 0.1_EB
 

diff --git a/Source/read.f90 b/Source/read.f90
@@ -4587,7 +4587,7 @@ SUBROUTINE READ_REAC
 CHARACTER(LABEL_LENGTH) :: FUEL,RADCAL_ID='null',SPEC_ID_NU(MAX_SPECIES),SPEC_ID_N_S(MAX_SPECIES),RAMP_CHI_R
 CHARACTER(FORMULA_LENGTH) :: FORMULA
 CHARACTER(255) :: EQUATION
-CHARACTER(100) :: FWD_ID
+CHARACTER(LABEL_LENGTH) :: FWD_ID
 INTEGER :: NR,NS,NS2,NFR,PRIORITY
 REAL(EB) :: SOOT_YIELD,CO_YIELD,HCN_YIELD,EPUMO2,A,LOWER_OXYGEN_LIMIT, &
             CRITICAL_FLAME_TEMPERATURE,HEAT_OF_COMBUSTION,HOC_COMPLETE,E,C,H,N,O, &

diff --git a/Source/wall.f90 b/Source/wall.f90
@@ -467,7 +467,7 @@ SUBROUTINE CALCULATE_TMP_F(WALL_INDEX,CFACE_INDEX,PARTICLE_INDEX)
             CASE(-3) ; ICG = CELL_INDEX(IIG,JJG,KKG-1) ; ICO = MM%CELL_INDEX(IIO,JJO,KKO+1)
          END SELECT
          IF (CC_IBM) THEN ! Test if one of surrounding cells is IBM_SOLID.
-            IF(CCVAR(IIG,JJG,KKG,IBM_CGSC)==IBM_SOLID .OR. CCVAR(II,JJ,KK,IBM_CGSC)==IBM_SOLID) CC_SOLID_FLAG = .TRUE. 
+            IF(CCVAR(IIG,JJG,KKG,IBM_CGSC)==IBM_SOLID .OR. CCVAR(II,JJ,KK,IBM_CGSC)==IBM_SOLID) CC_SOLID_FLAG = .TRUE.
          ENDIF
          IF (.NOT.SOLID(ICG) .AND. .NOT.MM%SOLID(ICO) .AND. .NOT.CC_SOLID_FLAG) SECOND_ORDER_INTERPOLATED_BOUNDARY = .TRUE.
       ENDIF
@@ -1301,8 +1301,8 @@ SUBROUTINE SOLID_PYROLYSIS_3D(DT_SUB,T_SUB)
 INTEGER :: N,NN,NS,I,J,K,IC,IIG,JJG,KKG,II2,JJ2,KK2,IOR,OBST_INDEX,II,JJ,KK,ITMP,ITER
 REAL(EB) :: M_DOT_G_PPP_ADJUST(N_TRACKED_SPECIES),M_DOT_G_PPP_ACTUAL(N_TRACKED_SPECIES),M_DOT_S_PPP(MAX_MATERIALS),&
             RHO_IN(N_MATL),RHO_DOT_OUT(N_MATL),RHO_OUT(N_MATL),GEOM_FACTOR,TIME_FACTOR,VC,VC2,TMP_S,VSRVC_LOC,&
-            RHOCBAR,RHOCBAR2,TMP_F,Q_DOT_G_PPP,Q_DOT_O2_PPP,T_BOIL_EFF,H_NODE,T_NODE,H_S,C_S,RHOH,RHOH2,&
-            ZZ_GET(1:N_TRACKED_SPECIES),M_DOT_P(MAX_LPC),Q_DOT_P(MAX_LPC)
+            TMP_F,Q_DOT_G_PPP,Q_DOT_O2_PPP,T_BOIL_EFF,H_NODE,T_NODE,H_S,C_S,RHOH,RHOH2,&
+            M_DOT_P(MAX_LPC),Q_DOT_P(MAX_LPC)
 LOGICAL :: OB2_FOUND
 REAL(EB), PARAMETER :: SOLID_VOLUME_MERGE_THRESHOLD=0.1_EB, SOLID_VOLUME_CLIP_THRESHOLD=1.E-6_EB
 TYPE(OBSTRUCTION_TYPE), POINTER :: OB=>NULL(),OB2=>NULL()