Merge pull request #14203 from marcosvanella/master

FDS Source : test for linking on both normal directions for small cut…

Author: marcosvanella

Source/ccib.f90

@@ -6365,31 +6365,14 @@ SUBROUTINE GET_MUDNS_CFACE(MU_WALL,IND1,IND2)
 INTEGER, INTENT(IN) :: IND1,IND2
 
 ! Local Variables:
-INTEGER :: VIND, EP, INT_NPE_LO, INT_NPE_HI, INPE, ICC, IIG, JJG, KKG
-REAL(EB):: MU_DNS_EP, TMP_EP, ZZ_GET(1:N_TRACKED_SPECIES)
+INTEGER :: ICC, IIG, JJG, KKG
 
-! Cell-centered variables:
-VIND=0;  EP  =1
-INT_NPE_LO  = CUT_FACE(IND1)%INT_NPE( LOW_IND,VIND,EP,IND2)
-INT_NPE_HI  = CUT_FACE(IND1)%INT_NPE(HIGH_IND,VIND,EP,IND2)
-IF (INT_NPE_HI > 0) THEN
-   MU_WALL=0._EB
-   DO INPE=INT_NPE_LO+1,INT_NPE_LO+INT_NPE_HI
-      ! Compute MU_DNS for INPE:
-      ZZ_GET(1:N_TRACKED_SPECIES) = CUT_FACE(IND1)%INT_CVARS(INT_P_IND+1:INT_P_IND+N_TRACKED_SPECIES,INPE)
-      TMP_EP = CUT_FACE(IND1)%INT_CVARS( INT_TMP_IND,INPE)
-      CALL GET_VISCOSITY(ZZ_GET,MU_DNS_EP,TMP_EP)
-      ! Add to MU_WALL:
-      MU_WALL = MU_WALL + CUT_FACE(IND1)%INT_COEF(INPE)*MU_DNS_EP
-   ENDDO
-ELSE
-   ! Underlying cell approximate value:
-   ICC = CUT_FACE(IND1)%CELL_LIST(2,LOW_IND,IND2)
-   IIG = CUT_CELL(ICC)%IJK(1)
-   JJG = CUT_CELL(ICC)%IJK(2)
-   KKG = CUT_CELL(ICC)%IJK(3)
-   MU_WALL = MU_DNS(IIG,JJG,KKG)
-ENDIF
+! Underlying cell value:
+ICC = CUT_FACE(IND1)%CELL_LIST(2,LOW_IND,IND2)
+IIG = CUT_CELL(ICC)%IJK(1)
+JJG = CUT_CELL(ICC)%IJK(2)
+KKG = CUT_CELL(ICC)%IJK(3)
+MU_WALL = MU_DNS(IIG,JJG,KKG)
 
 RETURN
 END SUBROUTINE GET_MUDNS_CFACE
@@ -22037,7 +22020,8 @@ SUBROUTINE GET_LINKED_FACE_INDEXES_F
                   IF(M%FCVAR(I-1,J,K,CC_UNKF,IAXIS)<1)THEN; M%NUNK_F=M%NUNK_F+1; M%FCVAR(I-1,J,K,CC_UNKF,IAXIS)=M%NUNK_F; ENDIF
                   CF%UNKF(JCF)=M%FCVAR(I-1,J,K,CC_UNKF,IAXIS); CYCLE
                ENDIF
-            ELSEIF(I<M%IBAR) THEN
+            ENDIF
+            IF(.NOT.ASSOCIATED(CF2) .AND. I<M%IBAR) THEN
                IF(M%FCVAR(I+1,J,K,CC_IDCF,IAXIS)>0) THEN
                   CF2=>M%CUT_FACE(M%FCVAR(I+1,J,K,CC_IDCF,IAXIS))
                ELSEIF(M%FCVAR(I+1,J,K,CC_FGSC,IAXIS)==CC_GASPHASE) THEN
@@ -22053,7 +22037,8 @@ SUBROUTINE GET_LINKED_FACE_INDEXES_F
                   IF(M%FCVAR(I,J-1,K,CC_UNKF,JAXIS)<1)THEN; M%NUNK_F=M%NUNK_F+1; M%FCVAR(I,J-1,K,CC_UNKF,JAXIS)=M%NUNK_F; ENDIF
                   CF%UNKF(JCF)=M%FCVAR(I,J-1,K,CC_UNKF,JAXIS); CYCLE
                ENDIF
-            ELSEIF(J<M%JBAR) THEN
+            ENDIF
+            IF(.NOT.ASSOCIATED(CF2) .AND. J<M%JBAR) THEN
                IF(M%FCVAR(I,J+1,K,CC_IDCF,JAXIS)>0) THEN
                   CF2=>M%CUT_FACE(M%FCVAR(I,J+1,K,CC_IDCF,JAXIS))
                ELSEIF(M%FCVAR(I,J+1,K,CC_FGSC,JAXIS)==CC_GASPHASE) THEN
@@ -22069,7 +22054,8 @@ SUBROUTINE GET_LINKED_FACE_INDEXES_F
                   IF(M%FCVAR(I,J,K-1,CC_UNKF,KAXIS)<1)THEN; M%NUNK_F=M%NUNK_F+1; M%FCVAR(I,J,K-1,CC_UNKF,KAXIS)=M%NUNK_F; ENDIF
                   CF%UNKF(JCF)=M%FCVAR(I,J,K-1,CC_UNKF,KAXIS); CYCLE
                ENDIF
-            ELSEIF(K<M%KBAR) THEN
+            ENDIF
+            IF(.NOT.ASSOCIATED(CF2) .AND. K<M%KBAR) THEN
                IF(M%FCVAR(I,J,K+1,CC_IDCF,KAXIS)>0) THEN
                   CF2=>M%CUT_FACE(M%FCVAR(I,J,K+1,CC_IDCF,KAXIS))
                ELSEIF(M%FCVAR(I,J,K+1,CC_FGSC,KAXIS)==CC_GASPHASE) THEN