Skip to content

Commit

Permalink
FDS Source: Issue #9856. Remove some particle parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
mcgratta committed Oct 6, 2021
1 parent 474dc41 commit 28c7681
Show file tree
Hide file tree
Showing 22 changed files with 139 additions and 124 deletions.
8 changes: 4 additions & 4 deletions Source/ccib.f90
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ MODULE CC_SCALARS_IBM
TYPE(CFACE_TYPE), POINTER :: CFA
TYPE(BOUNDARY_COORD_TYPE), POINTER :: BC
TYPE(EXTERNAL_WALL_TYPE), POINTER :: EWC
TYPE(ONE_D_M_AND_E_XFER_TYPE), POINTER :: ONE_D
TYPE(BOUNDARY_ONE_D_TYPE_TYPE), POINTER :: ONE_D
TYPE(BOUNDARY_PROPS_TYPE), POINTER :: BP

PRIVATE
Expand Down Expand Up @@ -2412,7 +2412,7 @@ END SUBROUTINE GET_UVWGAS_CFACE

SUBROUTINE GET_PRES_CFACE(PRESS,IND1,IND2,ONE_D)

TYPE(ONE_D_M_AND_E_XFER_TYPE), INTENT(IN) :: ONE_D
TYPE(BOUNDARY_ONE_D_TYPE_TYPE), INTENT(IN) :: ONE_D
INTEGER, INTENT( IN) :: IND1, IND2
REAL(EB), INTENT(OUT) :: PRESS

Expand Down Expand Up @@ -2460,7 +2460,7 @@ END SUBROUTINE GET_PRES_CFACE

SUBROUTINE GET_PRES_CFACE_TEST(PRESS,IND1,IND2,ONE_D)

TYPE(ONE_D_M_AND_E_XFER_TYPE), INTENT(IN) :: ONE_D
TYPE(BOUNDARY_ONE_D_TYPE_TYPE), INTENT(IN) :: ONE_D
INTEGER, INTENT( IN) :: IND1, IND2
REAL(EB), INTENT(OUT) :: PRESS

Expand Down Expand Up @@ -2494,7 +2494,7 @@ END SUBROUTINE GET_PRES_CFACE_TEST

SUBROUTINE CFACE_THERMAL_GASVARS(ICF,ONE_D)

TYPE(ONE_D_M_AND_E_XFER_TYPE) :: ONE_D
TYPE(BOUNDARY_ONE_D_TYPE_TYPE) :: ONE_D
INTEGER, INTENT(IN) :: ICF

! Local Variables:
Expand Down
2 changes: 1 addition & 1 deletion Source/divg.f90
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ MODULE DIVG
TYPE(WALL_TYPE), POINTER :: WC
TYPE(BOUNDARY_COORD_TYPE), POINTER :: BC
TYPE(BOUNDARY_PROPS_TYPE), POINTER :: BP
TYPE(ONE_D_M_AND_E_XFER_TYPE), POINTER :: ONE_D
TYPE(BOUNDARY_ONE_D_TYPE_TYPE), POINTER :: ONE_D
TYPE(EXTERNAL_WALL_TYPE), POINTER :: EWC

PUBLIC DIVERGENCE_PART_1,DIVERGENCE_PART_2,CHECK_DIVERGENCE
Expand Down
2 changes: 1 addition & 1 deletion Source/dump.f90
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ MODULE DUMP
TYPE (BOUNDARY_FILE_TYPE), POINTER :: BF=>NULL()
TYPE (ISOSURFACE_FILE_TYPE), POINTER :: IS=>NULL()
TYPE (INITIALIZATION_TYPE), POINTER :: IN=>NULL()
TYPE (ONE_D_M_AND_E_XFER_TYPE), POINTER :: ONE_D
TYPE (BOUNDARY_ONE_D_TYPE_TYPE), POINTER :: ONE_D
TYPE (BOUNDARY_PROPS_TYPE), POINTER :: BP
TYPE (BOUNDARY_RADIA_TYPE), POINTER :: BR
TYPE (BOUNDARY_COORD_TYPE), POINTER :: BC
Expand Down
2 changes: 1 addition & 1 deletion Source/fire.f90
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,7 @@ SUBROUTINE CONDENSATION_EVAPORATION(DT,NM)
TYPE (SPECIES_MIXTURE_TYPE), POINTER :: SM=>NULL(), SM2=>NULL()
TYPE(WALL_TYPE), POINTER :: WC
!TYPE(CFACE_TYPE), POINTER :: CFA
TYPE(ONE_D_M_AND_E_XFER_TYPE), POINTER :: ONE_D
TYPE(BOUNDARY_ONE_D_TYPE_TYPE), POINTER :: ONE_D
TYPE(BOUNDARY_PROPS_TYPE), POINTER :: BP
TYPE(BOUNDARY_COORD_TYPE), POINTER :: BC

Expand Down
65 changes: 15 additions & 50 deletions Source/func.f90
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,8 @@ END SUBROUTINE CHANGE_UNITS
END MODULE COMP_FUNCTIONS


!> \brief This module contains a routine that allows one to switch the left and right sides of an equality

MODULE COMP_OPERATORS

USE PRECISION_PARAMETERS
Expand Down Expand Up @@ -659,7 +661,7 @@ SUBROUTINE REALLOCATE_P_ZONE(N1,N2)
END SUBROUTINE REALLOCATE_P_ZONE


!> \brief Determines the size of the ONE_D_M_AND_E_XFER type structure for a surface type
!> \brief Determines the size of the BOUNDARY_ONE_D_TYPE derived type variable
!> \param SURF_INDEX Index of the surface type

SUBROUTINE COMPUTE_ONE_D_STORAGE_DIMENSIONS(SURF_INDEX)
Expand Down Expand Up @@ -702,7 +704,7 @@ SUBROUTINE COMPUTE_ONE_D_STORAGE_DIMENSIONS(SURF_INDEX)
END SUBROUTINE COMPUTE_ONE_D_STORAGE_DIMENSIONS


!> \brief Determines the size of the BOUNDARY_PROPS type structure for a surface type
!> \brief Determines the size of the BOUNDARY_PROPS_TYPE derived type variable

SUBROUTINE COMPUTE_BOUNDARY_PROPS_STORAGE_DIMENSIONS

Expand All @@ -720,7 +722,7 @@ SUBROUTINE COMPUTE_BOUNDARY_PROPS_STORAGE_DIMENSIONS
END SUBROUTINE COMPUTE_BOUNDARY_PROPS_STORAGE_DIMENSIONS


!> \brief Determines the size of the BOUNDARY_RADIA derived type
!> \brief Determines the size of the BOUNDARY_RADIA_TYPE derived type variable

SUBROUTINE COMPUTE_BOUNDARY_RADIA_STORAGE_DIMENSIONS

Expand All @@ -736,7 +738,7 @@ SUBROUTINE COMPUTE_BOUNDARY_RADIA_STORAGE_DIMENSIONS
END SUBROUTINE COMPUTE_BOUNDARY_RADIA_STORAGE_DIMENSIONS


!> \brief Determines the size of the BOUNDARY_COORD type structure for a surface type
!> \brief Determines the size of the BOUNDARY_COORD_TYPE derived type variable

SUBROUTINE COMPUTE_BOUNDARY_COORD_STORAGE_DIMENSIONS

Expand All @@ -747,7 +749,7 @@ SUBROUTINE COMPUTE_BOUNDARY_COORD_STORAGE_DIMENSIONS
END SUBROUTINE COMPUTE_BOUNDARY_COORD_STORAGE_DIMENSIONS


!> \brief Determine the size of the LAGRAGIAN_PARTICLE type structure for the input particle class
!> \brief Determine the size of the LAGRAGIAN_PARTICLE_TYPE derived type variable
!> \param LPC_INDEX Index of the particle class

SUBROUTINE COMPUTE_PARTICLE_STORAGE_DIMENSIONS(LPC_INDEX)
Expand Down Expand Up @@ -780,7 +782,7 @@ SUBROUTINE COMPUTE_PARTICLE_STORAGE_DIMENSIONS(LPC_INDEX)
END SUBROUTINE COMPUTE_PARTICLE_STORAGE_DIMENSIONS


!> \brief Determines the size of the WALL type structure for a surface type
!> \brief Determines the size of the WALL_TYPE derived type variable
!> \param SURF_INDEX Index of the surface type

SUBROUTINE COMPUTE_WALL_STORAGE_DIMENSIONS(SURF_INDEX)
Expand Down Expand Up @@ -815,7 +817,7 @@ SUBROUTINE COMPUTE_WALL_STORAGE_DIMENSIONS(SURF_INDEX)
END SUBROUTINE COMPUTE_WALL_STORAGE_DIMENSIONS


!> \brief Determines the size of the CFACE type structure for a surface type
!> \brief Determines the size of the CFACE_TYPE derived type variable
!> \param SURF_INDEX Index of the surface type

SUBROUTINE COMPUTE_CFACE_STORAGE_DIMENSIONS(SURF_INDEX)
Expand Down Expand Up @@ -850,10 +852,10 @@ SUBROUTINE COMPUTE_CFACE_STORAGE_DIMENSIONS(SURF_INDEX)
END SUBROUTINE COMPUTE_CFACE_STORAGE_DIMENSIONS


!> \brief Re-allocate arrays of derived types related to WALLs, CFACE, or LAGRANGIAN_PARTICLEs
!> \brief Create the appropriate storage space for derived types WALL, CFACE, or LAGRANGIAN_PARTICLE
!> \param NM Index to the current mesh
!> \param LP_INDEX Index within the LAGRANGIAN_PARTICLE array
!> \param LP_INDEX Index within the LAGRANGIAN_PARTICLE_CLASS array
!> \param LPC_INDEX Index within the LAGRANGIAN_PARTICLE_CLASS array
!> \param SURF_INDEX Index within the SURFACE array
!> \param WALL_INDEX Index within the WALL array
!> \param CFACE_INDEX Index within the CFACE array
Expand All @@ -870,7 +872,7 @@ SUBROUTINE ALLOCATE_STORAGE(NM,LP_INDEX,LPC_INDEX,SURF_INDEX,WALL_INDEX,CFACE_IN
TYPE (BOUNDARY_COORD_TYPE), ALLOCATABLE, DIMENSION(:) :: BC_DUMMY
TYPE (BOUNDARY_PROPS_TYPE), ALLOCATABLE, DIMENSION(:) :: BP_DUMMY
TYPE (BOUNDARY_RADIA_TYPE), ALLOCATABLE, DIMENSION(:) :: BR_DUMMY
TYPE (ONE_D_M_AND_E_XFER_TYPE), ALLOCATABLE, DIMENSION(:) :: OD_DUMMY
TYPE (BOUNDARY_ONE_D_TYPE_TYPE), ALLOCATABLE, DIMENSION(:) :: OD_DUMMY
TYPE (MESH_TYPE), POINTER :: M
TYPE (SURFACE_TYPE), POINTER :: SF
TYPE (LAGRANGIAN_PARTICLE_CLASS_TYPE), POINTER :: LPC
Expand Down Expand Up @@ -986,7 +988,7 @@ END SUBROUTINE ALLOCATE_BOUNDARY_COORD_ARRAYS
SUBROUTINE ALLOCATE_BOUNDARY_ONE_D_ARRAYS

USE GLOBAL_CONSTANTS, ONLY: THERMALLY_THICK,TMPM,SIGMA,TMPA4,RSUM0,TMPA,RHOA
TYPE(ONE_D_M_AND_E_XFER_TYPE), POINTER :: ONE_D
TYPE(BOUNDARY_ONE_D_TYPE_TYPE), POINTER :: ONE_D
REAL(EB) :: X_POS
INTEGER :: NN,N

Expand All @@ -1005,48 +1007,22 @@ SUBROUTINE ALLOCATE_BOUNDARY_ONE_D_ARRAYS

ONE_D => M%BOUNDARY_ONE_D(OD_INDEX)

! Integers

IF (ALLOCATED(ONE_D%N_LAYER_CELLS)) DEALLOCATE(ONE_D%N_LAYER_CELLS)
ALLOCATE(ONE_D%N_LAYER_CELLS(SF%ONE_D_INTEGERS_ARRAY_SIZE(1)))
ONE_D%N_LAYER_CELLS(1:SF%N_LAYERS) = SF%N_LAYER_CELLS(1:SF%N_LAYERS)

! Logicals

ONE_D%BURNAWAY = .FALSE.

! Reals

ONE_D%AREA = 0._EB
ONE_D%HEAT_TRANS_COEF = 0._EB
ONE_D%Q_CON_F = 0._EB
ONE_D%Q_RAD_IN = SF%EMISSIVITY*SIGMA*TMPA4
ONE_D%Q_RAD_OUT = SF%EMISSIVITY*SIGMA*TMPA4
ONE_D%EMISSIVITY = SF%EMISSIVITY
ONE_D%AREA_ADJUST = 1._EB
ONE_D%T_IGN = SF%T_IGN
ONE_D%TMP_F = SF%TMP_FRONT
ONE_D%TMP_B = SF%TMP_INNER(SF%N_LAYERS)
ONE_D%U_NORMAL = 0._EB
ONE_D%U_NORMAL_S = 0._EB
ONE_D%U_NORMAL_0 = 0._EB
ONE_D%RSUM_G = RSUM0
ONE_D%TMP_G = TMPA
ONE_D%RHO_G = RHOA
ONE_D%U_TANG = 0._EB
ONE_D%RHO_F = RHOA
ONE_D%RDN = 1._EB
ONE_D%MU_G = 0.1_EB
ONE_D%K_G = 0.1_EB
ONE_D%Q_DOT_G_PP = 0._EB
ONE_D%Q_DOT_O2_PP = 0._EB
ONE_D%Q_CONDENSE = 0._EB
ONE_D%TMP_F_OLD = SF%TMP_FRONT
ONE_D%BURN_DURATION = SF%BURN_DURATION
ONE_D%T_SCALE = 0._EB
ONE_D%Q_SCALE = 0._EB
ONE_D%T_MATL_PART = 0._EB
ONE_D%B_NUMBER = 0._EB

IF (ALLOCATED(ONE_D%M_DOT_G_PP_ACTUAL)) DEALLOCATE(ONE_D%M_DOT_G_PP_ACTUAL)
ALLOCATE(ONE_D%M_DOT_G_PP_ACTUAL(SF%ONE_D_REALS_ARRAY_SIZE(1))) ; ONE_D%M_DOT_G_PP_ACTUAL = 0._EB
Expand Down Expand Up @@ -1152,15 +1128,6 @@ SUBROUTINE ALLOCATE_BOUNDARY_PROPS_ARRAYS

BP => M%BOUNDARY_PROPS(BP_INDEX)

BP%U_TAU = 0._EB
BP%Y_PLUS = 1._EB
BP%Z_STAR = 1._EB
BP%PHI_LS = -1._EB
BP%WORK1 = 0._EB
BP%WORK2 = 0._EB
BP%K_SUPPRESSION = 0._EB
BP%L_OBUKHOV = 0._EB

IF (ALLOCATED(BP%A_LP_MPUA)) DEALLOCATE(BP%A_LP_MPUA)
ALLOCATE(BP%A_LP_MPUA(BOUNDARY_PROPS_REALS_ARRAY_SIZE(1))) ; BP%A_LP_MPUA = 0._EB
IF (ALLOCATED(BP%LP_CPUA)) DEALLOCATE(BP%LP_CPUA)
Expand Down Expand Up @@ -1281,8 +1248,6 @@ SUBROUTINE PACK_PARTICLE(NM,LP_INDEX,LPC_INDEX,STORAGE_INDEX,UNPACK_IT,NOM)
RC=RC+1 ; CALL EQUATE(OS%REALS(RC,STORAGE_INDEX),LP%DX,UNPACK_IT)
RC=RC+1 ; CALL EQUATE(OS%REALS(RC,STORAGE_INDEX),LP%DY,UNPACK_IT)
RC=RC+1 ; CALL EQUATE(OS%REALS(RC,STORAGE_INDEX),LP%DZ,UNPACK_IT)
RC=RC+1 ; CALL EQUATE(OS%REALS(RC,STORAGE_INDEX),LP%M_DOT,UNPACK_IT)
RC=RC+1 ; CALL EQUATE(OS%REALS(RC,STORAGE_INDEX),LP%HTC_LIMIT,UNPACK_IT)
RC=RC+1 ; CALL EQUATE(OS%REALS(RC,STORAGE_INDEX),LP%C_DRAG,UNPACK_IT)

! Boundary Coordinates
Expand Down Expand Up @@ -1467,7 +1432,7 @@ SUBROUTINE PACK_BOUNDARY_ONE_D(NM,IC,RC,LC,OS,SF,STORAGE_INDEX,OD_INDEX,UNPACK_I
INTEGER, INTENT(INOUT) :: IC,RC,LC
LOGICAL, INTENT(IN) :: UNPACK_IT
INTEGER :: I1,I2,NN
TYPE(ONE_D_M_AND_E_XFER_TYPE), POINTER :: ONE_D
TYPE(BOUNDARY_ONE_D_TYPE_TYPE), POINTER :: ONE_D
TYPE(STORAGE_TYPE), POINTER :: OS
TYPE(SURFACE_TYPE), POINTER :: SF

Expand Down Expand Up @@ -4176,7 +4141,7 @@ REAL(EB) FUNCTION SURFACE_DENSITY(NM,MODE,WALL_INDEX,LAGRANGIAN_PARTICLE_INDEX,M
INTEGER :: I_GRAD=0,NWP,II2,N,ITMP
REAL(EB) :: WGT,R_S(0:NWP_MAX),EPUM,DTMP
TYPE(MESH_TYPE), POINTER :: M=>NULL()
TYPE(ONE_D_M_AND_E_XFER_TYPE), POINTER :: ONE_D=>NULL()
TYPE(BOUNDARY_ONE_D_TYPE_TYPE), POINTER :: ONE_D=>NULL()
TYPE(SURFACE_TYPE), POINTER :: SF=>NULL()
TYPE (MATERIAL_TYPE),POINTER :: ML=>NULL()

Expand Down
2 changes: 1 addition & 1 deletion Source/geom.f90
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ MODULE COMPLEX_GEOMETRY

TYPE(BODINT_PLANE_TYPE) :: BODINT_PLANE, BODINT_PLANE2
TYPE(BOUNDARY_COORD_TYPE), POINTER :: BC,WC_BC
TYPE(ONE_D_M_AND_E_XFER_TYPE), POINTER :: ONE_D,WC_ONE_D
TYPE(BOUNDARY_ONE_D_TYPE_TYPE), POINTER :: ONE_D,WC_ONE_D

REAL(EB), PARAMETER :: GAMMA_MULT = 1._EB
INTEGER, PARAMETER :: DELTA_TBIN = 200, DELTA_SEGBIN = 50
Expand Down
2 changes: 1 addition & 1 deletion Source/hvac.f90
Original file line number Diff line number Diff line change
Expand Up @@ -1946,7 +1946,7 @@ SUBROUTINE HVAC_BC_IN(NM)
TYPE (SURFACE_TYPE), POINTER :: SF
TYPE (WALL_TYPE), POINTER :: WC
TYPE (CFACE_TYPE), POINTER :: CFA
TYPE (ONE_D_M_AND_E_XFER_TYPE), POINTER :: ONE_D
TYPE (BOUNDARY_ONE_D_TYPE_TYPE), POINTER :: ONE_D
TYPE (BOUNDARY_COORD_TYPE), POINTER :: BC

IF (DO_EVACUATION) RETURN
Expand Down
12 changes: 6 additions & 6 deletions Source/init.f90
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ SUBROUTINE INITIALIZE_MESH_VARIABLES_1(DT,NM)
TYPE (OBSTRUCTION_TYPE), POINTER :: OB=>NULL()
TYPE (WALL_TYPE), POINTER :: WC=>NULL()
TYPE (BOUNDARY_COORD_TYPE), POINTER :: BC=>NULL()
TYPE (ONE_D_M_AND_E_XFER_TYPE), POINTER :: ONE_D
TYPE (BOUNDARY_ONE_D_TYPE_TYPE), POINTER :: ONE_D
TYPE (SURFACE_TYPE), POINTER :: SF=>NULL()
TYPE (MESH_TYPE), POINTER :: M=>NULL()
TYPE (RAMPS_TYPE), POINTER :: RP=>NULL()
Expand Down Expand Up @@ -1055,7 +1055,7 @@ SUBROUTINE INITIALIZE_MESH_VARIABLES_2(NM)
TYPE (MESH_TYPE), POINTER :: M
TYPE (WALL_TYPE), POINTER :: WC
TYPE (BOUNDARY_COORD_TYPE), POINTER :: BC
TYPE (ONE_D_M_AND_E_XFER_TYPE), POINTER :: ONE_D
TYPE (BOUNDARY_ONE_D_TYPE_TYPE), POINTER :: ONE_D
TYPE (CFACE_TYPE), POINTER :: CFA
TYPE (EXTERNAL_WALL_TYPE), POINTER :: EWC
TYPE (MESH_TYPE), POINTER :: OM
Expand Down Expand Up @@ -2152,7 +2152,7 @@ SUBROUTINE INIT_WALL_CELL(NM,I,J,K,OBST_INDEX,IW,IOR,SURF_INDEX,IERR,TT)
TYPE (WALL_TYPE), POINTER :: WC=>NULL()
TYPE (BOUNDARY_COORD_TYPE), POINTER :: BC
TYPE (BOUNDARY_PROPS_TYPE), POINTER :: BP
TYPE (ONE_D_M_AND_E_XFER_TYPE), POINTER :: ONE_D
TYPE (BOUNDARY_ONE_D_TYPE_TYPE), POINTER :: ONE_D
TYPE (SURFACE_TYPE), POINTER :: SF

IERR = 0
Expand Down Expand Up @@ -2777,7 +2777,7 @@ SUBROUTINE OPEN_AND_CLOSE(T,NM)
TYPE (VENTS_TYPE), POINTER :: VT
TYPE (OBSTRUCTION_TYPE), POINTER :: OB
TYPE (BOUNDARY_COORD_TYPE), POINTER :: BC
TYPE (ONE_D_M_AND_E_XFER_TYPE), POINTER :: ONE_D
TYPE (BOUNDARY_ONE_D_TYPE_TYPE), POINTER :: ONE_D

TNOW = CURRENT_TIME()

Expand Down Expand Up @@ -3315,7 +3315,7 @@ SUBROUTINE REASSIGN_WALL_CELLS(T,NM)
SUBROUTINE GET_BOUNDARY_TYPE

INTEGER :: IOR,IIG,JJG,KKG,IW_OLD,IERR,PRESSURE_BC_INDEX
TYPE (ONE_D_M_AND_E_XFER_TYPE), POINTER :: ONE_D
TYPE (BOUNDARY_ONE_D_TYPE_TYPE), POINTER :: ONE_D

IF (IW==0) RETURN

Expand Down Expand Up @@ -3778,7 +3778,7 @@ SUBROUTINE UVW_INIT(NM,FN_UVW)
CHARACTER(3) :: STR
TYPE(WALL_TYPE), POINTER :: WC
TYPE(BOUNDARY_COORD_TYPE), POINTER :: BC
TYPE(ONE_D_M_AND_E_XFER_TYPE), POINTER :: ONE_D
TYPE(BOUNDARY_ONE_D_TYPE_TYPE), POINTER :: ONE_D

CALL POINT_TO_MESH(NM)

Expand Down
2 changes: 1 addition & 1 deletion Source/main.f90
Original file line number Diff line number Diff line change
Expand Up @@ -2588,7 +2588,7 @@ SUBROUTINE MESH_EXCHANGE(CODE)
TYPE (LAGRANGIAN_PARTICLE_CLASS_TYPE), POINTER :: LPC
TYPE (WALL_TYPE), POINTER :: WC
TYPE (BOUNDARY_COORD_TYPE), POINTER :: BC
TYPE (ONE_D_M_AND_E_XFER_TYPE), POINTER :: ONE_D
TYPE (BOUNDARY_ONE_D_TYPE_TYPE), POINTER :: ONE_D

IF(CC_IBM) CALL MESH_CC_EXCHANGE(CODE)

Expand Down
4 changes: 2 additions & 2 deletions Source/mass.f90
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ SUBROUTINE MASS_FINITE_DIFFERENCES(NM)
LOGICAL :: THIN_OBSTRUCTION
TYPE(WALL_TYPE), POINTER :: WC
TYPE(BOUNDARY_COORD_TYPE), POINTER :: BC
TYPE(ONE_D_M_AND_E_XFER_TYPE), POINTER :: ONE_D
TYPE(BOUNDARY_ONE_D_TYPE_TYPE), POINTER :: ONE_D

IF (DO_EVACUATION .OR. SOLID_PHASE_ONLY) RETURN

Expand Down Expand Up @@ -232,7 +232,7 @@ SUBROUTINE DENSITY(T,DT,NM)
REAL(EB), POINTER, DIMENSION(:,:,:) :: UU=>NULL(),VV=>NULL(),WW=>NULL()
TYPE(WALL_TYPE), POINTER :: WC=>NULL()
TYPE(BOUNDARY_COORD_TYPE), POINTER :: BC
TYPE(ONE_D_M_AND_E_XFER_TYPE), POINTER :: ONE_D
TYPE(BOUNDARY_ONE_D_TYPE_TYPE), POINTER :: ONE_D

IF (DO_EVACUATION) RETURN
IF (SOLID_PHASE_ONLY) RETURN
Expand Down
4 changes: 2 additions & 2 deletions Source/mesh.f90
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ MODULE MESH_VARIABLES
TYPE(EXTERNAL_WALL_TYPE), ALLOCATABLE, DIMENSION(:) :: EXTERNAL_WALL
TYPE(OMESH_TYPE), ALLOCATABLE, DIMENSION(:) :: OMESH
TYPE(LAGRANGIAN_PARTICLE_TYPE), ALLOCATABLE, DIMENSION(:) :: LAGRANGIAN_PARTICLE
TYPE(ONE_D_M_AND_E_XFER_TYPE), ALLOCATABLE, DIMENSION(:) :: BOUNDARY_ONE_D
TYPE(BOUNDARY_ONE_D_TYPE_TYPE), ALLOCATABLE, DIMENSION(:) :: BOUNDARY_ONE_D
TYPE(BOUNDARY_COORD_TYPE), ALLOCATABLE, DIMENSION(:) :: BOUNDARY_COORD
TYPE(BOUNDARY_PROPS_TYPE), ALLOCATABLE, DIMENSION(:) :: BOUNDARY_PROPS
TYPE(BOUNDARY_RADIA_TYPE), ALLOCATABLE, DIMENSION(:) :: BOUNDARY_RADIA
Expand Down Expand Up @@ -430,7 +430,7 @@ MODULE MESH_POINTERS
TYPE(EXTERNAL_WALL_TYPE), POINTER, DIMENSION(:) :: EXTERNAL_WALL
TYPE(OMESH_TYPE), POINTER, DIMENSION(:) :: OMESH
TYPE(LAGRANGIAN_PARTICLE_TYPE), POINTER, DIMENSION(:) :: LAGRANGIAN_PARTICLE
TYPE(ONE_D_M_AND_E_XFER_TYPE), POINTER, DIMENSION(:) :: BOUNDARY_ONE_D
TYPE(BOUNDARY_ONE_D_TYPE_TYPE), POINTER, DIMENSION(:) :: BOUNDARY_ONE_D
TYPE(BOUNDARY_COORD_TYPE), POINTER, DIMENSION(:) :: BOUNDARY_COORD
TYPE(BOUNDARY_PROPS_TYPE), POINTER, DIMENSION(:) :: BOUNDARY_PROPS
TYPE(BOUNDARY_RADIA_TYPE), POINTER, DIMENSION(:) :: BOUNDARY_RADIA
Expand Down
Loading

0 comments on commit 28c7681

Please sign in to comment.