Skip to content

Commit d7464fc

Browse files
authoredMar 25, 2024··
Merge pull request firemodels#12679 from ericvmueller/master
FDS Source: prevent floating point error in value of M%CELLSI/J/K at …
2 parents dd59a93 + 54db39a commit d7464fc

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed
 

‎Source/read.f90

+6-3
Original file line numberDiff line numberDiff line change
@@ -1417,6 +1417,7 @@ SUBROUTINE READ_TRAN
14171417
M%CELLSI_HI=NIPX+NIPXF
14181418
DO I=M%CELLSI_LO,M%CELLSI_HI
14191419
M%CELLSI(I) = GINV(REAL(I,EB)/M%RDXINT,1,NM)*M%RDXI
1420+
IF(MOD(I,500)==0) M%CELLSI(I) = REAL(NINT(M%CELLSI(I)),EB)
14201421
M%CELLSI(I) = MAX(M%CELLSI(I),-0.9_EB)
14211422
M%CELLSI(I) = MIN(M%CELLSI(I),REAL(M%IBAR)+0.9_EB)
14221423
ENDDO
@@ -1425,6 +1426,7 @@ SUBROUTINE READ_TRAN
14251426
M%CELLSJ_HI=NIPY+NIPYF
14261427
DO J=M%CELLSJ_LO,M%CELLSJ_HI
14271428
M%CELLSJ(J) = GINV(REAL(J,EB)/M%RDYINT,2,NM)*M%RDETA
1429+
IF(MOD(J,500)==0) M%CELLSJ(J) = REAL(NINT(M%CELLSJ(J)),EB)
14281430
M%CELLSJ(J) = MAX(M%CELLSJ(J),-0.9_EB)
14291431
M%CELLSJ(J) = MIN(M%CELLSJ(J),REAL(M%JBAR)+0.9_EB)
14301432
ENDDO
@@ -1433,6 +1435,7 @@ SUBROUTINE READ_TRAN
14331435
M%CELLSK_HI=NIPZ+NIPZF
14341436
DO K=M%CELLSK_LO,M%CELLSK_HI
14351437
M%CELLSK(K) = GINV(REAL(K,EB)/M%RDZINT,3,NM)*M%RDZETA
1438+
IF(MOD(K,500)==0) M%CELLSK(K) = REAL(NINT(M%CELLSK(K)),EB)
14361439
M%CELLSK(K) = MAX(M%CELLSK(K),-0.9_EB)
14371440
M%CELLSK(K) = MIN(M%CELLSK(K),REAL(M%KBAR)+0.9_EB)
14381441
ENDDO
@@ -6264,7 +6267,7 @@ SUBROUTINE READ_PROP
62646267
IF (PY%VIEW_ANGLE<TWO_EPSILON_EB .OR. PY%VIEW_ANGLE>180._EB) THEN
62656268
WRITE(MESSAGE,'(A,A,A)') 'ERROR(xxx): PROP ',TRIM(PY%ID),' VIEW_ANGLE must be between 0 and 180.'
62666269
CALL SHUTDOWN(MESSAGE) ; RETURN
6267-
ENDIF
6270+
ENDIF
62686271

62696272
ENDDO READ_PROP_LOOP
62706273

@@ -13942,10 +13945,10 @@ SUBROUTINE PROC_DEVC
1394213945
ENDIF
1394313946

1394413947
IF (DV%QUANTITY(1)=='null' .AND. PROPERTY(DV%PROP_INDEX)%QUANTITY/='null') DV%QUANTITY(1) = PROPERTY(DV%PROP_INDEX)%QUANTITY
13945-
13948+
1394613949
IF (DV%PROP_INDEX > 0) THEN
1394713950
IF (PROPERTY(DV%PROP_INDEX)%VIEW_ANGLE < 180._EB) &
13948-
ORIENTATION_VIEW_ANGLE(DV%ORIENTATION_INDEX) = COS(PROPERTY(DV%PROP_INDEX)%VIEW_ANGLE/360._EB * PI)
13951+
ORIENTATION_VIEW_ANGLE(DV%ORIENTATION_INDEX) = COS(PROPERTY(DV%PROP_INDEX)%VIEW_ANGLE/360._EB * PI)
1394913952
ENDIF
1395013953
! Create an auto-ignition exclusion zone (AIT) in the cell containing a SPARK
1395113954

0 commit comments

Comments
 (0)
Please sign in to comment.