Skip to content

Commit

Permalink
Merge pull request #9478 from mcgratta/master
Browse files Browse the repository at this point in the history
FDS Source: Issue #9468. Do not change increment variable within a loop
  • Loading branch information
mcgratta committed May 4, 2021
2 parents 8b7c165 + 0a816c0 commit a4423bb
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions Source/main.f90
Expand Up @@ -2867,12 +2867,16 @@ SUBROUTINE MESH_EXCHANGE(CODE)

SEND_RADIATION: IF (CODE==2 .AND. M3%NIC_S>0) THEN
IF (RNODE/=SNODE) THEN
IF (ICYC>1) ANG_INC_COUNTER = M%ANGLE_INC_COUNTER
IF (ICYC>1) THEN
AIC = M%ANGLE_INC_COUNTER
ELSE
AIC = ANG_INC_COUNTER
ENDIF
LLL = 0
PACK_REAL_SEND_PKG5: DO LL=1,M3%NIC_S
IOR = M3%IOR_S(LL)
DO NN2=1,NUMBER_SPECTRAL_BANDS
DO NN1=NUMBER_RADIATION_ANGLES-ANG_INC_COUNTER+1,1,-ANGLE_INCREMENT
DO NN1=NUMBER_RADIATION_ANGLES-AIC+1,1,-ANGLE_INCREMENT
IF (DLN(IOR,NN1)<=0._EB) CYCLE
LLL = LLL + 1
M3%REAL_SEND_PKG5(LLL) = M3%IL_S(LL,NN1,NN2)
Expand Down Expand Up @@ -3218,12 +3222,16 @@ SUBROUTINE MESH_EXCHANGE(CODE)
! Unpack radiation information at the end of the CORRECTOR stage of the time step

RECEIVE_RADIATION: IF (CODE==2 .AND. M2%NIC_R>0 .AND. RNODE/=SNODE) THEN
IF (ICYC>1) ANG_INC_COUNTER = M%ANGLE_INC_COUNTER
IF (ICYC>1) THEN
AIC = M%ANGLE_INC_COUNTER
ELSE
AIC = ANG_INC_COUNTER
ENDIF
LLL = 0
UNPACK_REAL_RECV_PKG5: DO LL=1,M2%NIC_R
IOR = M2%IOR_R(LL)
DO NN2=1,NUMBER_SPECTRAL_BANDS
DO NN1=NUMBER_RADIATION_ANGLES-ANG_INC_COUNTER+1,1,-ANGLE_INCREMENT
DO NN1=NUMBER_RADIATION_ANGLES-AIC+1,1,-ANGLE_INCREMENT
IF (DLN(IOR,NN1)<=0._EB) CYCLE
LLL = LLL + 1
M2%IL_R(LL,NN1,NN2) = M2%REAL_RECV_PKG5(LLL)
Expand Down

0 comments on commit a4423bb

Please sign in to comment.