Skip to content

Commit 5d7cfad

Browse files
authored
Merge pull request #14625 from mcgratta/master
FDS Source: Add global max CFL and VN
2 parents f0b8b63 + 232b1aa commit 5d7cfad

File tree

1 file changed

+27
-3
lines changed

1 file changed

+27
-3
lines changed

Source/dump.f90

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3924,10 +3924,10 @@ SUBROUTINE WRITE_DIAGNOSTICS(T,DT)
39243924

39253925
USE COMP_FUNCTIONS, ONLY : CURRENT_TIME,GET_DATE,GET_DATE_ISO_8601
39263926
REAL(EB), INTENT(IN) :: T,DT
3927-
INTEGER :: NM,II,JJ,KK,OUT_DIGITS,SOUT_DIGITS
3927+
INTEGER :: NM,II,JJ,KK,OUT_DIGITS,SOUT_DIGITS,MAX_VN_IJK(3),MAX_CFL_IJK(3),MAX_CFL_MESH,MAX_VN_MESH
39283928
CHARACTER(120) :: SIMPLE_OUTPUT,SIMPLE_OUTPUT_ERR,OUT_FORMAT
39293929
CHARACTER(LABEL_LENGTH) :: DATE
3930-
REAL(EB) :: TNOW,CPUTIME,STIME,DTS
3930+
REAL(EB) :: TNOW,CPUTIME,STIME,DTS,MAX_CFL,MAX_VN
39313931

39323932
TNOW = CURRENT_TIME()
39333933

@@ -3985,6 +3985,24 @@ SUBROUTINE WRITE_DIAGNOSTICS(T,DT)
39853985

39863986
WRITE(LU_ERR,'(A)') TRIM(SIMPLE_OUTPUT_ERR)
39873987

3988+
! Determine the mesh where the maximum CFL, VN, etc, occur
3989+
3990+
MAX_CFL = -1._EB
3991+
MAX_VN = -1._EB
3992+
DO NM=1,NMESHES
3993+
M => MESHES(NM)
3994+
IF (M%CFL>MAX_CFL) THEN
3995+
MAX_CFL = MAX(M%CFL,MAX_CFL)
3996+
MAX_CFL_MESH = NM
3997+
MAX_CFL_IJK = (/M%ICFL,M%JCFL,M%KCFL/)
3998+
ENDIF
3999+
IF (CHECK_VN .AND. M%VN>MAX_VN) THEN
4000+
MAX_VN = MAX(M%VN,MAX_VN)
4001+
MAX_VN_MESH = NM
4002+
MAX_VN_IJK = (/M%I_VN,M%J_VN,M%K_VN/)
4003+
ENDIF
4004+
ENDDO
4005+
39884006
! Header for .out file
39894007

39904008
IF (ICYC==1) WRITE(LU_OUTPUT,100)
@@ -4037,6 +4055,13 @@ SUBROUTINE WRITE_DIAGNOSTICS(T,DT)
40374055
' on Mesh ',NM,' at (',II,',',JJ,',',KK,')'
40384056
ENDIF
40394057

4058+
WRITE(LU_OUTPUT,'(7X,A,E9.2,A,4(I0,A))') 'Maximum CFL Number : ',MAX_CFL,' on Mesh ',MAX_CFL_MESH,&
4059+
' at (',MAX_CFL_IJK(1),',',MAX_CFL_IJK(2),',',MAX_CFL_IJK(3),')'
4060+
IF (CHECK_VN) THEN
4061+
WRITE(LU_OUTPUT,'(7X,A,E9.2,A,4(I0,A))') 'Maximum VN Number : ',MAX_VN,' on Mesh ',MAX_VN_MESH,&
4062+
' at (',MAX_VN_IJK(1),',',MAX_VN_IJK(2),',',MAX_VN_IJK(3),')'
4063+
ENDIF
4064+
40404065
WRITE(LU_OUTPUT,'(7X,A)') '---------------------------------------------------------------'
40414066

40424067
DO NM=1,NMESHES
@@ -4052,7 +4077,6 @@ SUBROUTINE WRITE_DIAGNOSTICS(T,DT)
40524077
WRITE(LU_OUTPUT,121) M%DT_RESTRICT_STORE
40534078
M%DT_RESTRICT_STORE=0
40544079
ENDIF
4055-
40564080
ENDDO
40574081

40584082
WRITE(LU_OUTPUT,*)

0 commit comments

Comments
 (0)