Merge pull request #15035 from mcgratta/master

FDS Source: Fix bug in mesh alignment check

Author: mcgratta

Source/main.f90

@@ -179,7 +179,7 @@ PROGRAM FDS
 
 DO NM=LOWER_MESH_INDEX,UPPER_MESH_INDEX
    CALL INITIALIZE_ATMOSPHERE(NM)
-   IF (.NOT.SETUP_ONLY) CALL INITIALIZE_WALL_ARRAY(NM)
+   IF (.NOT.SETUP_ONLY .OR. CHECK_MESH_ALIGNMENT) CALL INITIALIZE_WALL_ARRAY(NM)
 ENDDO
 IF (MY_RANK==0 .AND. VERBOSE) CALL VERBOSE_PRINTOUT('Completed INITIALIZE_WALL_ARRAY')
 
@@ -191,10 +191,9 @@ PROGRAM FDS
 
 ! Stop all the processes if this is just a set-up run
 
-IF (SETUP_ONLY .OR. CHECK_MESH_ALIGNMENT) THEN
+IF (SETUP_ONLY .OR. CHECK_MESH_ALIGNMENT .OR. STOP_STATUS/=0) THEN
    IF (MY_RANK==0) CALL INITIALIZE_DIAGNOSTIC_FILE(DT)
-   STOP_STATUS = SETUP_ONLY_STOP
-   IF (MY_RANK==0) WRITE(LU_ERR,'(A)') ' Checking mesh alignment. This could take a few tens of seconds...'
+   IF (STOP_STATUS==0) STOP_STATUS = SETUP_ONLY_STOP
    CALL STOP_CHECK(1)
 ENDIF