Merge pull request #14971 from drjfloyd/master

FDS Source: Fix error for PROF and PART with INIT and multiple MESH

Author: drjfloyd

Manuals/FDS_User_Guide/FDS_User_Guide.tex

@@ -14255,6 +14255,7 @@ \chapter{Error Codes}
 446  \> \ct{SURF REFERENCE_THICKNESS values must increase for each} \> Section~\ref{info:scaled_burning}  \\
      \> \ct{new group of REFERENCE_HEAT_FLUX.} \\
 447  \> \ct{RAMP ... used with REFERENCE_HEAT_FLUX must start at T = 0.} \> Section~\ref{info:scaled_burning}  \\
+448  \> \ct{PROF ... MATL_ID ... not a part of surface type ...} \> Section~\ref{info:solidoutputquantities}  \\
      \>                                                                               \>                          \\
 501 \> \ct{No ID provided ...} \> Section~\ref{info:HVAC}  \\
 502 \> \ct{Invalid TYPE_ID provided ...} \> Section~\ref{info:HVAC}  \\
@@ -14491,6 +14492,7 @@ \chapter{Error Codes}
 951 \> \ct{PROF ... requires an orientation index, IOR.} \> Section~\ref{info:PROF} \\
 952 \> \ct{PROF ... is not valid.} \> Section~\ref{info:PROF} \\
 953 \> \ct{PROF ... requires a PART_ID.} \> Section~\ref{info:PROF} \\
+954 \> \ct{PROF ... MATL_ID ... not found.} \> Section~\ref{info:PROF} \\
     \>                                                                                \>                          \\
 961 \> \ct{CELL_CENTERED not allowed with AGL_SLICE.} \> Section~\ref{info:complex_terrain} \\
 962 \> \ct{BNDF ... CPUA_Z, MPUA_Z, and AMPUA_Z require liquid droplets.} \> Section~\ref{bucket_test_1} \\

Source/dump.f90

@@ -8991,13 +8991,18 @@ REAL(EB) FUNCTION SOLID_PHASE_OUTPUT(INDX,Y_INDEX,Z_INDEX,PART_INDEX,OPT_WALL_IN
 
    CASE(27) ! SOLID DENSITY
       SOLID_PHASE_OUTPUT = 0._EB
-      DO NN=1,ONE_D%N_MATL
-         IF (MATL_INDEX==ONE_D%MATL_INDEX(NN)) THEN
-            SOLID_PHASE_OUTPUT = ONE_D%MATL_COMP(NN)%RHO(I_DEPTH)
-            RETURN
-         ENDIF
-         SOLID_PHASE_OUTPUT = SOLID_PHASE_OUTPUT + ONE_D%MATL_COMP(NN)%RHO(I_DEPTH)
-      ENDDO
+      IF (MATL_INDEX > 0) THEN
+         DO NN=1,ONE_D%N_MATL
+            IF (MATL_INDEX==ONE_D%MATL_INDEX(NN)) THEN
+               SOLID_PHASE_OUTPUT = ONE_D%MATL_COMP(NN)%RHO(I_DEPTH)
+               RETURN
+            ENDIF
+         ENDDO
+      ELSE
+         DO NN=1,ONE_D%N_MATL
+            SOLID_PHASE_OUTPUT = SOLID_PHASE_OUTPUT + ONE_D%MATL_COMP(NN)%RHO(I_DEPTH)
+         ENDDO
+      ENDIF
 
    CASE(28) ! EMISSIVITY
       SOLID_PHASE_OUTPUT = B1%EMISSIVITY

Source/init.f90

@@ -2720,7 +2720,7 @@ SUBROUTINE INITIALIZE_PROFILES(NM)
          ENDIF
       ENDDO
       IF (.NOT. SUCCESS) THEN
-         WRITE(LU_ERR,'(A,I3,5A)') 'ERROR PROF ',N,'. MATL_ID ',TRIM(MATERIAL(PF%MATL_INDEX)%ID),&
+         WRITE(LU_ERR,'(A,I3,5A)') 'ERROR(448): PROF ',N,'. MATL_ID ',TRIM(MATERIAL(PF%MATL_INDEX)%ID),&
                               ' not part of surface type ',TRIM(SF%ID),' at the profile location.'
          STOP_STATUS = SETUP_STOP
          RETURN

Source/part.f90

@@ -1513,7 +1513,6 @@ SUBROUTINE VOLUME_INIT_PARTICLE
             CALL SHUTDOWN(MESSAGE,PROCESS_0_ONLY=.FALSE.)
          ENDIF
          PF%LP_TAG = PARTICLE_TAG
-         PF%PART_CLASS_INDEX = ILPC
          PF%MESH = NM
          PF%X = BC%X
          PF%Y = BC%Y

Source/read.f90

@@ -15304,7 +15304,7 @@ END SUBROUTINE PROC_DEVC
 SUBROUTINE READ_PROF
 
 USE MISC_FUNCTIONS, ONLY: GET_MATL_INDEX
-INTEGER :: N,NM,MESH_NUMBER,NN,N_PROFO,IOR,FORMAT_INDEX,LP_TAG,PART_INDEX,ILPC
+INTEGER :: I,N,NM,MESH_NUMBER,NN,N_PROFO,IOR,FORMAT_INDEX,LP_TAG,PART_INDEX,ILPC
 REAL(EB) :: XYZ(3)
 CHARACTER(LABEL_LENGTH) :: QUANTITY,INIT_ID,MATL_ID,LABEL_DUM(2),PART_ID
 LOGICAL :: CELL_CENTERED
@@ -15381,6 +15381,15 @@ SUBROUTINE READ_PROF
          CALL SHUTDOWN(MESSAGE) ; RETURN
       ENDIF
    ENDIF
+   
+   IF (INIT_ID/='null') THEN
+      INIT_DO: DO I=1,N_INIT
+         IF (INIT_ID==INITIALIZATION(I)%ID) THEN
+            PART_INDEX = INITIALIZATION(I)%PART_INDEX
+            EXIT INIT_DO
+         ENDIF
+      ENDDO INIT_DO
+   ENDIF
 
    MESH_NUMBER = 0
 
@@ -15440,9 +15449,15 @@ SUBROUTINE READ_PROF
                            I_DUM(8),I_DUM(9),'PROF', &
                            PF%QUANTITY,'null','null','null','null','null','null','null',MATL_ID,&
                            -1._EB,I_DUM(10))
-   PF%MATL_INDEX = GET_MATL_INDEX(MATL_ID)
+   IF (MATL_ID/='null') THEN
+      PF%MATL_INDEX = GET_MATL_INDEX(MATL_ID)
+      IF (PF%MATL_INDEX==0) THEN
+         WRITE(MESSAGE,'(A,I0,3A)') 'ERROR(954): PROF ',NN,' MATL_ID ',TRIM(MATL_ID),' not found.'
+         CALL SHUTDOWN(MESSAGE) ; RETURN
+      ENDIF
+   ENDIF
    IF (.NOT. OUTPUT_QUANTITY(PF%QUANTITY_INDEX)%PROF_APPROPRIATE) THEN
-      WRITE(MESSAGE,'(A,I0,A3)') 'ERROR(952): PROF ',NN,' QUANTITY ',TRIM(PF%QUANTITY),' is not valid.'
+      WRITE(MESSAGE,'(A,I0,3A)') 'ERROR(952): PROF ',NN,' QUANTITY ',TRIM(PF%QUANTITY),' is not valid.'
       CALL SHUTDOWN(MESSAGE) ; RETURN
    ENDIF
    PF%X            = XYZ(1)