Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions Source/wall.f90
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ SUBROUTINE WALL_BC(T,DT,NM)
B2 => BOUNDARY_PROP2(WC%B2_INDEX)
SF => SURFACE(WC%SURF_INDEX)

CALL NEAR_SURFACE_GAS_VARIABLES(NM,T,SF,BC,B1,WALL_INDEX=IW)
CALL NEAR_SURFACE_GAS_VARIABLES(T,SF,BC,B1,WALL_INDEX=IW)

IF (.NOT.SF%THERMAL_BC_INDEX==THERMALLY_THICK) THEN
CALL SURFACE_HEAT_TRANSFER(NM,T,SF,BC,B1,WALL_INDEX=IW)
Expand Down Expand Up @@ -204,7 +204,7 @@ SUBROUTINE WALL_BC(T,DT,NM)
BC => BOUNDARY_COORD(LP%BC_INDEX)
B1 => BOUNDARY_PROP1(LP%B1_INDEX)

CALL NEAR_SURFACE_GAS_VARIABLES(NM,T,SF,BC,B1,LP=LP,PARTICLE_INDEX=IP)
CALL NEAR_SURFACE_GAS_VARIABLES(T,SF,BC,B1,LP=LP,PARTICLE_INDEX=IP)

IF (.NOT.SF%THERMAL_BC_INDEX==THERMALLY_THICK) THEN
CALL SURFACE_HEAT_TRANSFER(NM,T,SF,BC,B1,PARTICLE_INDEX=IP)
Expand Down Expand Up @@ -299,17 +299,16 @@ END SUBROUTINE ASSIGN_GHOST_VALUE
!> \param WALL_INDEX Index of wall cell
!> \param PARTICLE_INDEX Index of particle

SUBROUTINE NEAR_SURFACE_GAS_VARIABLES(NM,T,SF,BC,B1,LP,WALL_INDEX,PARTICLE_INDEX)
SUBROUTINE NEAR_SURFACE_GAS_VARIABLES(T,SF,BC,B1,LP,WALL_INDEX,PARTICLE_INDEX)

USE MATH_FUNCTIONS, ONLY: EVALUATE_RAMP
REAL(EB), INTENT(IN) :: T
INTEGER, INTENT(IN) :: NM
INTEGER, INTENT(IN), OPTIONAL :: WALL_INDEX,PARTICLE_INDEX
TYPE(BOUNDARY_PROP1_TYPE), POINTER :: B1
TYPE(BOUNDARY_COORD_TYPE), POINTER :: BC
TYPE(SURFACE_TYPE), POINTER :: SF
TYPE(LAGRANGIAN_PARTICLE_TYPE), POINTER, OPTIONAL :: LP
REAL(EB) :: TSI,RAMP_FACTOR,UBAR,VBAR,WBAR,H_LOCAL
REAL(EB) :: TSI,RAMP_FACTOR,UBAR,VBAR,WBAR

IF (PRESENT(WALL_INDEX)) THEN
IF (ABS(SF%T_IGN-T_BEGIN)<=SPACING(SF%T_IGN) .AND. SF%RAMP(TIME_VELO)%INDEX>=1) THEN
Expand All @@ -332,9 +331,9 @@ SUBROUTINE NEAR_SURFACE_GAS_VARIABLES(NM,T,SF,BC,B1,LP,WALL_INDEX,PARTICLE_INDEX
VBAR = 0.5_EB*(VV(BC%IIG,BC%JJG,BC%KKG)+VV(BC%IIG,BC%JJG-1,BC%KKG)) - SF%VEL_T(2)*RAMP_FACTOR
B1%U_TANG = SQRT(UBAR**2+VBAR**2)
END SELECT
H_LOCAL = HP(BC%IIG,BC%JJG,BC%KKG)
IF (TUNNEL_PRECONDITIONER) H_LOCAL = H_LOCAL - H_BAR(I_OFFSET(NM)+BC%IIG)
B1%U_IMPACT = SQRT(2._EB*MAX(H_LOCAL,TWO_EPSILON_EB))
B1%U_IMPACT = SQRT(MAX(UU(BC%IIG,BC%JJG,BC%KKG),UU(BC%IIG-1,BC%JJG,BC%KKG))**2 + &
MAX(VV(BC%IIG,BC%JJG,BC%KKG),VV(BC%IIG,BC%JJG-1,BC%KKG))**2 + &
MAX(WW(BC%IIG,BC%JJG,BC%KKG),WW(BC%IIG,BC%JJG,BC%KKG-1))**2)
ELSEIF (PRESENT(PARTICLE_INDEX)) THEN
UBAR = 0.5_EB*(UU(BC%IIG,BC%JJG,BC%KKG)+UU(BC%IIG-1,BC%JJG,BC%KKG)) - LP%U
VBAR = 0.5_EB*(VV(BC%IIG,BC%JJG,BC%KKG)+VV(BC%IIG,BC%JJG-1,BC%KKG)) - LP%V
Expand Down
Loading