Merge remote-tracking branch 'firemodels/master' into ht3d

Source/dump.f90

@@ -4110,6 +4110,7 @@ SUBROUTINE DUMP_SMOKE3D(T,DT,NM)
 REAL(FB) :: DXX,STIME
 REAL(EB), POINTER, DIMENSION(:,:,:) :: FF
 REAL(FB), ALLOCATABLE, DIMENSION(:) :: QQ_PACK
+REAL(EB) :: FR_C
 TYPE(SMOKE3D_TYPE), POINTER :: S3
 
 CALL POINT_TO_MESH(NM)
@@ -4136,6 +4137,13 @@ SUBROUTINE DUMP_SMOKE3D(T,DT,NM)
       ENDDO
    ENDDO
 
+   ! Adjust the temperature as it is used in the expression for the radiation source term
+
+   IF (S3%DISPLAY_TYPE=='TEMPERATURE' .AND. RTE_SOURCE_CORRECTION) THEN
+      FR_C = RTE_SOURCE_CORRECTION_FACTOR**0.25_EB
+      WHERE (CHI_R*Q>QR_CLIP) FF = (FF+TMPM)*FR_C - TMPM
+   ENDIF
+
    ! Interpolate data to cell nodes
 
    DO K=0,KBAR

Source/pres.f90

@@ -2967,10 +2967,6 @@ SUBROUTINE GLMAT_SOLVER(T,DT)
 
    IF (ZSL%NUNKH_TOTAL==0) CYCLE
 
-   ! Dump local low an high rows assembled by this process in IPARM:
-   IPARM(41) = ZSL%LOWER_ROW
-   IPARM(42) = ZSL%UPPER_ROW
-
    ! Define rhs F_H, here we use Source and BCs populated on PRESSURE_SOLVER:
    ZSL%F_H = 0._EB
    ZSL%X_H = 0._EB
@@ -3026,6 +3022,9 @@ SUBROUTINE GLMAT_SOLVER(T,DT)
    ! WRITE(LU_ERR,*) 'SUM_FH=',SUM(F_H),H_MATRIX_INDEFINITE
 
 #ifdef WITH_MKL
+   ! Dump local low an high rows assembled by this process in IPARM:
+   IPARM(41) = ZSL%LOWER_ROW
+   IPARM(42) = ZSL%UPPER_ROW
    !.. Back substitution and iterative refinement
    IPARM(8) =  0 ! max numbers of iterative refinement steps
    PHASE    = 33 ! only solving
@@ -3719,9 +3718,9 @@ END SUBROUTINE COPY_CCVAR_IN_HS
 ! ------------------------------- GET_H_MATRIX_LUDCMP -------------------------------
 
 SUBROUTINE GET_H_MATRIX_LUDCMP
-
+#ifdef WITH_MKL
 USE MPI_F08
-
+#endif
 ! Local Variables:
 INTEGER :: INNZ, IROW, JCOL
 #ifdef WITH_MKL