@@ -5860,7 +5860,8 @@ END SUBROUTINE GET_GEOMINFO
58605860
58615861SUBROUTINE GET_GEOMVALS (CC_INTERP2FACES ,CC_CELL_CENTERED ,SLICETYPE ,&
58625862 I1 ,I2 ,J1 ,J2 ,K1 ,K2 ,NFACES ,NFACES_CUTCELLS ,VALS ,&
5863- IND ,IND2 ,Y_INDEX ,Z_INDEX ,PART_INDEX ,VELO_INDEX ,PIPE_INDEX ,PROP_INDEX ,REAC_INDEX ,MATL_INDEX ,T ,DT ,NM )
5863+ IND ,IND2 ,Y_INDEX ,Z_INDEX ,PART_INDEX ,VELO_INDEX ,&
5864+ PIPE_INDEX ,PROP_INDEX ,REAC_INDEX ,MATL_INDEX ,T ,DT ,NM ,OPT_BNDF_INDEX )
58645865
58655866USE PHYSICAL_FUNCTIONS, ONLY: GET_MASS_FRACTION
58665867
@@ -5869,6 +5870,7 @@ SUBROUTINE GET_GEOMVALS(CC_INTERP2FACES,CC_CELL_CENTERED,SLICETYPE,&
58695870REAL (EB), INTENT (IN ) :: T,DT
58705871INTEGER , INTENT (IN ) :: I1,I2,J1,J2,K1,K2,NFACES,NFACES_CUTCELLS,&
58715872 IND,IND2,Y_INDEX,Z_INDEX,PART_INDEX,VELO_INDEX,PIPE_INDEX,PROP_INDEX,REAC_INDEX,MATL_INDEX,NM
5873+ INTEGER , OPTIONAL ,INTENT (IN ) :: OPT_BNDF_INDEX
58725874CHARACTER (* ), INTENT (IN ) :: SLICETYPE
58735875LOGICAL , INTENT (IN ) :: CC_INTERP2FACES,CC_CELL_CENTERED
58745876REAL (FB), INTENT (OUT ), DIMENSION (NFACES) :: VALS
@@ -6098,7 +6100,7 @@ SUBROUTINE GET_GEOMVALS(CC_INTERP2FACES,CC_CELL_CENTERED,SLICETYPE,&
60986100 IF (CCVAR(I,J,K,CC_IDCF) > 0 ) THEN
60996101 ICF = CCVAR(I,J,K,CC_IDCF)
61006102 DO IFACECF= 1 ,CUT_FACE(ICF)% NFACE
6101- VAL_CF = SOLID_PHASE_OUTPUT(ABS (IND),Y_INDEX,Z_INDEX,PART_INDEX, &
6103+ VAL_CF = SOLID_PHASE_OUTPUT(ABS (IND),Y_INDEX,Z_INDEX,PART_INDEX,OPT_BNDF_INDEX = OPT_BNDF_INDEX, &
61026104 OPT_CFACE_INDEX= CUT_FACE(ICF)% CFACE_INDEX(IFACECF))
61036105 NVF= CUT_FACE(ICF)% CFELEM(1 ,IFACECF)
61046106 DO IVCF = 1 , NVF-2 ! face is convex
@@ -6301,11 +6303,12 @@ END SUBROUTINE DUMP_CFACES_GEOM
63016303SUBROUTINE DUMP_SLICE_GEOM_DATA (FUNIT_DATA ,CC_INTERP2FACES ,CC_CELL_CENTERED ,SLICETYPE , &
63026304 HEADER ,STIME ,I1 ,I2 ,J1 ,J2 ,K1 ,K2 ,DEBUG ,&
63036305 IND ,IND2 ,Y_INDEX ,Z_INDEX ,PART_INDEX ,VELO_INDEX ,PIPE_INDEX ,PROP_INDEX ,REAC_INDEX ,MATL_INDEX ,T , &
6304- DT ,NM ,SLICE_MIN , SLICE_MAX )
6306+ DT ,NM ,SLICE_MIN , SLICE_MAX , OPT_BNDF_INDEX )
63056307REAL (EB), INTENT (IN ) :: T,DT
63066308CHARACTER (* ), INTENT (IN ) :: SLICETYPE
63076309INTEGER , INTENT (IN ) :: FUNIT_DATA,HEADER,I1,I2,J1,J2,K1,K2,DEBUG, &
63086310 IND,IND2,Y_INDEX,Z_INDEX,PART_INDEX,VELO_INDEX,PIPE_INDEX,PROP_INDEX,REAC_INDEX,MATL_INDEX,NM
6311+ INTEGER , OPTIONAL ,INTENT (IN ) :: OPT_BNDF_INDEX
63096312REAL (FB), INTENT (IN ):: STIME
63106313LOGICAL , INTENT (IN ) :: CC_INTERP2FACES,CC_CELL_CENTERED
63116314REAL (FB), INTENT (OUT ) :: SLICE_MIN, SLICE_MAX
@@ -6327,7 +6330,8 @@ SUBROUTINE DUMP_SLICE_GEOM_DATA(FUNIT_DATA,CC_INTERP2FACES,CC_CELL_CENTERED,SLIC
63276330! get values at geometry faces
63286331 CALL GET_GEOMVALS(CC_INTERP2FACES,CC_CELL_CENTERED,SLICETYPE,&
63296332 I1,I2,J1,J2,K1,K2,NFACES,NFACES_CUTCELLS,VALS,&
6330- IND,IND2,Y_INDEX,Z_INDEX,PART_INDEX,VELO_INDEX,PIPE_INDEX,PROP_INDEX,REAC_INDEX,MATL_INDEX,T,DT,NM)
6333+ IND,IND2,Y_INDEX,Z_INDEX,PART_INDEX,VELO_INDEX,&
6334+ PIPE_INDEX,PROP_INDEX,REAC_INDEX,MATL_INDEX,T,DT,NM,OPT_BNDF_INDEX)
63316335 ELSE
63326336 NVALS = NVERTS
63336337 ALLOCATE (VALS(MAX (NVERTS,NFACES)))
@@ -6341,7 +6345,8 @@ SUBROUTINE DUMP_SLICE_GEOM_DATA(FUNIT_DATA,CC_INTERP2FACES,CC_CELL_CENTERED,SLIC
63416345
63426346 CALL GET_GEOMVALS(CC_INTERP2FACES,CC_CELL_CENTERED,SLICETYPE,&
63436347 I1,I2,J1,J2,K1,K2,NFACES,NFACES_CUTCELLS,VALS,&
6344- IND,IND2,Y_INDEX,Z_INDEX,PART_INDEX,VELO_INDEX,PIPE_INDEX,PROP_INDEX,REAC_INDEX,MATL_INDEX,T,DT,NM)
6348+ IND,IND2,Y_INDEX,Z_INDEX,PART_INDEX,VELO_INDEX,&
6349+ PIPE_INDEX,PROP_INDEX,REAC_INDEX,MATL_INDEX,T,DT,NM,OPT_BNDF_INDEX)
63456350
63466351! these two routines need to be moved and called only once
63476352 CALL GET_GEOMINFO(SLICETYPE,I1,I2,J1,J2,K1,K2,NVERTS,NVERTS_CUTCELLS,NFACES,NFACES_CUTCELLS,VERTS,FACES,LOCATIONS)
@@ -9089,6 +9094,7 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z
90899094 ELSE
90909095 PROBE_DELTA_P = (VEL* FAC)** 2 * RHO(II,JJ,KK)* 0.5_EB
90919096 ! LJ AIR viscosity fit 100 K to 5000 K
9097+ PROBE_TMP = MIN (5000._EB ,MAX (100._EB ,PROBE_TMP))
90929098 MU_G = 1.5205E-22_EB * PROBE_TMP** 5 - 2.1417E-18_EB * PROBE_TMP** 4 + 1.1402E-14_EB * PROBE_TMP** 3 - &
90939099 2.9846E-11_EB * PROBE_TMP** 2 + 5.9898E-8_EB * PROBE_TMP + 0.000002352_EB
90949100 JJJ = 1
@@ -9986,6 +9992,7 @@ REAL(EB) FUNCTION SOLID_PHASE_OUTPUT(INDX,Y_INDEX,Z_INDEX,PART_INDEX,OPT_WALL_IN
99869992
99879993ENDIF
99889994
9995+ MATL_INDEX = 0
99899996IF (PRESENT (OPT_DEVC_INDEX)) MATL_INDEX = DEVICE(OPT_DEVC_INDEX)% MATL_INDEX
99909997IF (PRESENT (OPT_BNDF_INDEX)) MATL_INDEX = BOUNDARY_FILE(OPT_BNDF_INDEX)% MATL_INDEX
99919998IF (PRESENT (OPT_PROF_INDEX)) MATL_INDEX = PROFILE(OPT_PROF_INDEX)% MATL_INDEX
@@ -11903,7 +11910,7 @@ SUBROUTINE DUMP_BNDF(T,DT,NM)
1190311910 CALL DUMP_SLICE_GEOM_DATA(LU_BNDG(NF,NM), &
1190411911 .FALSE. ,.TRUE. ," INBOUND_FACES" ,1 ,STIME,I1,I2,J1,J2,K1,K2,BF% DEBUG, &
1190511912 IND,0 ,BF% Y_INDEX,BF% Z_INDEX,BF% PART_INDEX,0 ,0 ,BF% PROP_INDEX,0 ,0 ,T,DT,NM, &
11906- BOUND_MIN, BOUND_MAX)
11913+ BOUND_MIN, BOUND_MAX, OPT_BNDF_INDEX = NF )
1190711914 BNDF_VAL_MIN = BOUND_MIN
1190811915 BNDF_VAL_MAX = BOUND_MAX
1190911916 CHANGE_BOUND = 1
@@ -11913,7 +11920,7 @@ SUBROUTINE DUMP_BNDF(T,DT,NM)
1191311920 CALL DUMP_SLICE_GEOM_DATA(LU_BNDG(NF,NM), &
1191411921 .FALSE. ,.TRUE. ," INBOUND_FACES" ,0 ,STIME,I1,I2,J1,J2,K1,K2,BF% DEBUG, &
1191511922 IND,0 ,BF% Y_INDEX,BF% Z_INDEX,BF% PART_INDEX,0 ,0 ,BF% PROP_INDEX,0 ,0 ,T,DT,NM, &
11916- BOUND_MIN, BOUND_MAX)
11923+ BOUND_MIN, BOUND_MAX, OPT_BNDF_INDEX = NF )
1191711924 OPEN (LU_BNDG(NF+ N_BNDF,NM),FILE= FN_BNDG(NF+ N_BNDF,NM), ACTION= ' READ' )
1191811925 READ (LU_BNDG(NF+ N_BNDF,NM),FMT=* ,IOSTAT= IERROR)BNDF_TIME, BNDF_VAL_MIN, BNDF_VAL_MAX
1191911926 CLOSE (LU_BNDG(NF+ N_BNDF,NM))
0 commit comments