Merge pull request firemodels#12299 from mcgratta/master

FDS Source: Remove unused variable
mcgratta · Dec 18, 2023 · a0a223c · a0a223c
2 parents 3d7f907 + 54ac991
commit a0a223c
Showing 1 changed file with 26 additions and 27 deletions.
diff --git a/Source/init.f90 b/Source/init.f90
@@ -1208,26 +1208,26 @@ SUBROUTINE INITIALIZE_EDGES
 
 DO K=0,M%KBAR
    DO J=0,M%JBAR
-      IF (J>0) CALL DEFINE_EDGE(     0,J,K, 1,2,NM,0,IERR)
-      IF (J>0) CALL DEFINE_EDGE(M%IBAR,J,K,-1,2,NM,0,IERR)
-      IF (K>0) CALL DEFINE_EDGE(     0,J,K, 1,3,NM,0,IERR)
-      IF (K>0) CALL DEFINE_EDGE(M%IBAR,J,K,-1,3,NM,0,IERR)
+      IF (J>0) CALL DEFINE_EDGE(     0,J,K, 1,2,NM,0)
+      IF (J>0) CALL DEFINE_EDGE(M%IBAR,J,K,-1,2,NM,0)
+      IF (K>0) CALL DEFINE_EDGE(     0,J,K, 1,3,NM,0)
+      IF (K>0) CALL DEFINE_EDGE(M%IBAR,J,K,-1,3,NM,0)
    ENDDO
 ENDDO
 DO K=0,M%KBAR
    DO I=0,M%IBAR
-      IF (I>0) CALL DEFINE_EDGE(I,     0,K, 2,1,NM,0,IERR)
-      IF (I>0) CALL DEFINE_EDGE(I,M%JBAR,K,-2,1,NM,0,IERR)
-      IF (K>0) CALL DEFINE_EDGE(I,     0,K, 2,3,NM,0,IERR)
-      IF (K>0) CALL DEFINE_EDGE(I,M%JBAR,K,-2,3,NM,0,IERR)
+      IF (I>0) CALL DEFINE_EDGE(I,     0,K, 2,1,NM,0)
+      IF (I>0) CALL DEFINE_EDGE(I,M%JBAR,K,-2,1,NM,0)
+      IF (K>0) CALL DEFINE_EDGE(I,     0,K, 2,3,NM,0)
+      IF (K>0) CALL DEFINE_EDGE(I,M%JBAR,K,-2,3,NM,0)
    ENDDO
 ENDDO
 DO J=0,M%JBAR
    DO I=0,M%IBAR
-      IF (I>0) CALL DEFINE_EDGE(I,J,     0, 3,1,NM,0,IERR)
-      IF (I>0) CALL DEFINE_EDGE(I,J,M%KBAR,-3,1,NM,0,IERR)
-      IF (J>0) CALL DEFINE_EDGE(I,J,     0, 3,2,NM,0,IERR)
-      IF (J>0) CALL DEFINE_EDGE(I,J,M%KBAR,-3,2,NM,0,IERR)
+      IF (I>0) CALL DEFINE_EDGE(I,J,     0, 3,1,NM,0)
+      IF (I>0) CALL DEFINE_EDGE(I,J,M%KBAR,-3,1,NM,0)
+      IF (J>0) CALL DEFINE_EDGE(I,J,     0, 3,2,NM,0)
+      IF (J>0) CALL DEFINE_EDGE(I,J,M%KBAR,-3,2,NM,0)
    ENDDO
 ENDDO
 
@@ -1237,26 +1237,26 @@ SUBROUTINE INITIALIZE_EDGES
    OB => M%OBSTRUCTION(N)
    DO K=OB%K1,OB%K2
       DO J=OB%J1,OB%J2
-         IF (J>OB%J1) CALL DEFINE_EDGE(OB%I1,J,K,-1,2,NM,N,IERR)
-         IF (J>OB%J1) CALL DEFINE_EDGE(OB%I2,J,K, 1,2,NM,N,IERR)
-         IF (K>OB%K1) CALL DEFINE_EDGE(OB%I1,J,K,-1,3,NM,N,IERR)
-         IF (K>OB%K1) CALL DEFINE_EDGE(OB%I2,J,K, 1,3,NM,N,IERR)
+         IF (J>OB%J1) CALL DEFINE_EDGE(OB%I1,J,K,-1,2,NM,N)
+         IF (J>OB%J1) CALL DEFINE_EDGE(OB%I2,J,K, 1,2,NM,N)
+         IF (K>OB%K1) CALL DEFINE_EDGE(OB%I1,J,K,-1,3,NM,N)
+         IF (K>OB%K1) CALL DEFINE_EDGE(OB%I2,J,K, 1,3,NM,N)
       ENDDO
    ENDDO
    DO K=OB%K1,OB%K2
       DO I=OB%I1,OB%I2
-         IF (I>OB%I1) CALL DEFINE_EDGE(I,OB%J1,K,-2,1,NM,N,IERR)
-         IF (I>OB%I1) CALL DEFINE_EDGE(I,OB%J2,K, 2,1,NM,N,IERR)
-         IF (K>OB%K1) CALL DEFINE_EDGE(I,OB%J1,K,-2,3,NM,N,IERR)
-         IF (K>OB%K1) CALL DEFINE_EDGE(I,OB%J2,K, 2,3,NM,N,IERR)
+         IF (I>OB%I1) CALL DEFINE_EDGE(I,OB%J1,K,-2,1,NM,N)
+         IF (I>OB%I1) CALL DEFINE_EDGE(I,OB%J2,K, 2,1,NM,N)
+         IF (K>OB%K1) CALL DEFINE_EDGE(I,OB%J1,K,-2,3,NM,N)
+         IF (K>OB%K1) CALL DEFINE_EDGE(I,OB%J2,K, 2,3,NM,N)
       ENDDO
    ENDDO
    DO J=OB%J1,OB%J2
       DO I=OB%I1,OB%I2
-         IF (I>OB%I1) CALL DEFINE_EDGE(I,J,OB%K1,-3,1,NM,N,IERR)
-         IF (I>OB%I1) CALL DEFINE_EDGE(I,J,OB%K2, 3,1,NM,N,IERR)
-         IF (J>OB%J1) CALL DEFINE_EDGE(I,J,OB%K1,-3,2,NM,N,IERR)
-         IF (J>OB%J1) CALL DEFINE_EDGE(I,J,OB%K2, 3,2,NM,N,IERR)
+         IF (I>OB%I1) CALL DEFINE_EDGE(I,J,OB%K1,-3,1,NM,N)
+         IF (I>OB%I1) CALL DEFINE_EDGE(I,J,OB%K2, 3,1,NM,N)
+         IF (J>OB%J1) CALL DEFINE_EDGE(I,J,OB%K1,-3,2,NM,N)
+         IF (J>OB%J1) CALL DEFINE_EDGE(I,J,OB%K2, 3,2,NM,N)
       ENDDO
    ENDDO
 ENDDO OBST_LOOP_3
@@ -1272,12 +1272,11 @@ END SUBROUTINE INITIALIZE_EDGES
 !> \param IEC Orientation of edge; 1=x direction; 2=y; 3=z
 !> \param NM Mesh number
 !> \param OBST_INDEX Obstruction index of edge
-!> \param IERR Error indicator
 
-SUBROUTINE DEFINE_EDGE(II,JJ,KK,IOR,IEC,NM,OBST_INDEX,IERR)
+SUBROUTINE DEFINE_EDGE(II,JJ,KK,IOR,IEC,NM,OBST_INDEX)
 
 INTEGER, INTENT(IN) :: II,JJ,KK,IOR,IEC,NM
-INTEGER :: NOM,ICMM,ICMP,ICPM,ICPP,OBST_INDEX,IE,IW,IIO,JJO,KKO,IW1,IW2,IERR
+INTEGER :: NOM,ICMM,ICMP,ICPM,ICPP,OBST_INDEX,IE,IW,IIO,JJO,KKO,IW1,IW2
 REAL(EB) :: XI,YJ,ZK
 TYPE (MESH_TYPE), POINTER :: MM
 TYPE (EDGE_TYPE), POINTER :: ED