Merge pull request #14960 from rmcdermo/master

FDS Source: fix output format for near exact powers of 10

Author: rmcdermo

Source/dump.f90

@@ -3945,7 +3945,7 @@ SUBROUTINE WRITE_DIAGNOSTICS(T,DT)
 INTEGER :: NM,II,JJ,KK,OUT_DIGITS,SOUT_DIGITS,MAX_VN_IJK(3),MAX_CFL_IJK(3),MAX_CFL_MESH,MAX_VN_MESH
 CHARACTER(120) :: SIMPLE_OUTPUT,SIMPLE_OUTPUT_ERR,OUT_FORMAT
 CHARACTER(LABEL_LENGTH) :: DATE
-REAL(EB) :: TNOW,CPUTIME,STIME,DTS,MAX_CFL,MAX_VN
+REAL(EB) :: TNOW,CPUTIME,STIME,DTS,MAX_CFL,MAX_VN,TROUND
 
 TNOW = CURRENT_TIME()
 
@@ -3954,10 +3954,11 @@ SUBROUTINE WRITE_DIAGNOSTICS(T,DT)
 CALL GET_DATE_ISO_8601(DATE)
 CALL CPU_TIME(CPUTIME)
 
+TROUND = ANINT(T * 1.E7_EB) / 1.E7_EB
 
 IF (SIM_MODE==DNS_MODE) THEN
-   IF (ABS(T) > 0._EB) THEN
-      OUT_DIGITS = MAX(0,MIN(7,7-INT(LOG10(ABS(T)))))
+   IF (ABS(TROUND) > 0._EB) THEN
+      OUT_DIGITS = MAX(0,MIN(7,7-INT(LOG10(ABS(TROUND)))))
    ELSE
       OUT_DIGITS = 7
    ENDIF
@@ -3971,8 +3972,8 @@ SUBROUTINE WRITE_DIAGNOSTICS(T,DT)
       DTS = DT * TIME_SHRINK_FACTOR
    ENDIF
 ELSE
-   IF (ABS(T) > 0._EB) THEN
-      OUT_DIGITS = MAX(2,MIN(5,7-INT(LOG10(ABS(T)))))
+   IF (ABS(TROUND) > 0._EB) THEN
+      OUT_DIGITS = MAX(2,MIN(5,7-INT(LOG10(ABS(TROUND)))))
    ELSE
       OUT_DIGITS = 5
    ENDIF