Merge pull request #16408 from johodges/FireX

FDS Source: fix minor merge issues with vtk in firex

Author: marcosvanella

Source/dump.f90

@@ -5077,7 +5077,7 @@ SUBROUTINE GET_SMOKE3D_QQ(S3,T,DT,NM,FF,QQ)
 DO K=0,KBP1
    DO J=0,JBP1
       DO I=0,IBP1
-         FF(I,J,K)=GAS_PHASE_OUTPUT(T,DT,NM,I,J,K,S3%QUANTITY_INDEX,0,S3%Y_INDEX,0,S3%Z_INDEX,0,0,0,0,0,0)
+         FF(I,J,K)=GAS_PHASE_OUTPUT(T,DT,NM,I,J,K,S3%QUANTITY_INDEX,Y_INDEX=S3%Y_INDEX,Z_INDEX=S3%Z_INDEX)
       ENDDO
    ENDDO
 ENDDO
@@ -7478,8 +7478,8 @@ SUBROUTINE DUMP_SLCF_VTK(T,DT,NM,IFRMT,FAKEWRITE)
          DO K=KK1,KK2
             DO J=JJ1,JJ2
                DO I=II1,II2
-                  QUANTITY(I,J,K) = GAS_PHASE_OUTPUT(T,DT,NM,I,J,K,IND,IND2,Y_INDEX,Z_INDEX,0,PART_INDEX,VELO_INDEX,0,&
-                                                     PROP_INDEX,REAC_INDEX,MATL_INDEX)
+                  QUANTITY(I,J,K1) = GAS_PHASE_OUTPUT(T,DT,NM,I,J,KTS,IND,Y_INDEX=Y_INDEX,Z_INDEX=Z_INDEX,PART_INDEX=PART_INDEX,&
+                                                VELO_INDEX=VELO_INDEX)
                ENDDO
             ENDDO
          ENDDO
@@ -7488,7 +7488,8 @@ SUBROUTINE DUMP_SLCF_VTK(T,DT,NM,IFRMT,FAKEWRITE)
          DO I=II1,II2
             DO J=JJ1,JJ2
                KTS = K_AGL_SLICE(I,J,NTSL)
-               QUANTITY(I,J,K1) = GAS_PHASE_OUTPUT(T,DT,NM,I,J,KTS,IND,IND2,Y_INDEX,Z_INDEX,0,PART_INDEX,VELO_INDEX,0,0,0,0)
+               QUANTITY(I,J,K1) = GAS_PHASE_OUTPUT(T,DT,NM,I,J,KTS,IND,Y_INDEX=Y_INDEX,Z_INDEX=Z_INDEX,PART_INDEX=PART_INDEX,&
+                                                VELO_INDEX=VELO_INDEX)
             ENDDO
          ENDDO
       ENDIF

Source/read.f90

@@ -2635,6 +2635,27 @@ SUBROUTINE READ_DUMP
    ENDIF
 ENDIF
 
+! Track working directory for use when using paraview as a remot server
+IF (MY_RANK==0) THEN
+#ifdef _WIN32
+   CALL EXECUTE_COMMAND_LINE('cd > workingdir.txt')
+#else
+   CALL EXECUTE_COMMAND_LINE('pwd > workingdir.txt')
+#endif
+   OPEN(LU_WDIR, FILE="workingdir.txt", STATUS="OLD", ACTION="READ")
+   READ(LU_WDIR, '(A)') WORKING_DIR
+   CLOSE(LU_WDIR)
+   INQUIRE(FILE='workingdir.txt',EXIST=EX)
+   IF (.NOT.EX) THEN
+      CALL SHUTDOWN('FAILED TO IDENTIFY WORKING DIRECTORY.')
+   ENDIF
+#ifdef _WIN32
+   CALL EXECUTE_COMMAND_LINE('del workingdir.txt')
+#else
+   CALL EXECUTE_COMMAND_LINE('rm workingdir.txt')
+#endif
+ENDIF
+
 
 END SUBROUTINE READ_DUMP