Skip to content

Commit 788d149

Browse files
authored
Merge pull request #15577 from rmcdermo/master
FDS Source: fix format for large tga files
2 parents 2bbf795 + 6983ed3 commit 788d149

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

Source/wall.f90

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3780,7 +3780,8 @@ SUBROUTINE TGA_ANALYSIS(NM)
37803780
REAL(EB), ALLOCATABLE, DIMENSION(:) :: SURF_DEN
37813781
INTEGER, INTENT(IN) :: NM
37823782
INTEGER :: N_TGA,I,IW,IP,N,NR,ITMP
3783-
CHARACTER(80) :: MESSAGE,TCFORM
3783+
CHARACTER(80) :: MESSAGE
3784+
CHARACTER(256) :: TCFORM
37843785
LOGICAL :: EX
37853786
TYPE(SURFACE_TYPE), POINTER :: SF
37863787
TYPE(WALL_TYPE), POINTER :: WC
@@ -3836,7 +3837,7 @@ SUBROUTINE TGA_ANALYSIS(NM)
38363837
! Open CHID_tga.csv for the output
38373838

38383839
OPEN (LU_TGA,FILE=FN_TGA,FORM='FORMATTED',STATUS='REPLACE')
3839-
WRITE(TCFORM,'(A,I3.3,A,I3.3,A)') "(A,",SF%N_MATL+1,"(A,',')",SF%N_MATL+1,"(A,','),A)"
3840+
WRITE(TCFORM,'(A,I3.3,A,I3.3,A)') "(A,",SF%N_MATL+1,"(A,','),",SF%N_MATL+1,"(A,','),A)"
38403841
WRITE(LU_TGA,TCFORM) 's,C,C,',('g/g',N=1,SF%N_MATL+1),('1/s',N=1,SF%N_MATL+1),'W/g,W/g,W/g'
38413842
WRITE(LU_TGA,TCFORM) 'Time,Temp,T_surf,','Total Mass',(TRIM(MATERIAL(ONE_D%MATL_INDEX(N))%ID)//' Mass',N=1,SF%N_MATL),&
38423843
'Total MLR',(TRIM(MATERIAL(ONE_D%MATL_INDEX(N))%ID)//' MLR',N=1,SF%N_MATL),'MCC,DSC,STA'
@@ -3846,6 +3847,7 @@ SUBROUTINE TGA_ANALYSIS(NM)
38463847
B1%HEAT_TRANS_COEF = SF%H_FIXED
38473848
SURF_DEN_0 = SF%SURFACE_DENSITY
38483849
WRITE(TCFORM,'(A,I3.3,5A)') "(",2*SF%N_MATL+7,"(",TRIM(FMT_R),",','),",TRIM(FMT_R),")"
3850+
38493851
TMP_DUMP = TMPA + TGA_DUMP
38503852
T_TGA = 0._EB
38513853

Verification/WUI/Morvan_TGA.fds

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
&HEAD CHID='Morvan_TGA', TITLE='TGA analysis of Morvan 2004 data' /
22

3-
&MESH IJK=5,5,5, XB=-1.2,3.6,-1.2,1.2,0.0,9.6
3+
&MESH IJK=5,5,5, XB=-1.2,3.6,-1.2,1.2,0.0,9.6 /
44

55
&TIME T_END=1. /
66

Verification/WUI/Morvan_TGA_2.fds

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
&HEAD CHID='Morvan_TGA_2', TITLE='Same as Morvan_TGA, except directly specifying A and E' /
22

3-
&MESH IJK=5,5,5, XB=-1.2,3.6,-1.2,1.2,0.0,9.6
3+
&MESH IJK=5,5,5, XB=-1.2,3.6,-1.2,1.2,0.0,9.6 /
44

55
&TIME T_END=1. /
66

0 commit comments

Comments
 (0)