diff --git a/Source/dump.f90 b/Source/dump.f90 index 02977d0fcee..5e7a0c4c374 100644 --- a/Source/dump.f90 +++ b/Source/dump.f90 @@ -5342,9 +5342,9 @@ SUBROUTINE DUMP_SLICE_GEOM_DATA(FUNIT_DATA,CC_INTERP2FACES,CC_CELL_CENTERED,SLIC VAL_MAX = MAX(VAL_MAX,VALS(I)) ENDDO ELSE - WRITE(FUNIT_DATA) (REAL(100*NM,FB),I=1,NVALS) - VAL_MIN = REAL(100*NM,FB) - VAL_MAX = REAL(100*NM,FB) + WRITE(FUNIT_DATA) (REAL(T+100*NM,FB),I=1,NVALS) + VAL_MIN = REAL(T+100*NM,FB) + VAL_MAX = REAL(T+100*NM,FB) ENDIF SLICE_MIN = VAL_MIN SLICE_MAX = VAL_MAX @@ -5634,6 +5634,7 @@ SUBROUTINE DUMP_SLCF(T,DT,NM,IFRMT) INTEGER :: IFACT, JFACT, KFACT REAL(FB), ALLOCATABLE, DIMENSION(:) :: QQ_PACK REAL(FB) :: UVEL, VVEL, WVEL, VEL, PLOT3D_MIN, PLOT3D_MAX +INTEGER :: DEBUG INTEGER :: IERROR ! Return if there are no slices to process and this is not a Plot3D dump @@ -5768,6 +5769,8 @@ SUBROUTINE DUMP_SLCF(T,DT,NM,IFRMT) J2 = SL%J2 K1 = SL%K1 K2 = SL%K2 + DEBUG = 0 + IF(SL%DEBUG)DEBUG = 1 AGL_TERRAIN_SLICE = SL%TERRAIN_SLICE CC_CELL_CENTERED = SL%CELL_CENTERED CC_INTERP2FACES = .FALSE. @@ -6002,7 +6005,7 @@ SUBROUTINE DUMP_SLCF(T,DT,NM,IFRMT) OPEN(LU_SLCF(IQ,NM),FILE=FN_SLCF(IQ,NM),FORM='UNFORMATTED',STATUS='REPLACE') CALL DUMP_SLICE_GEOM_DATA(LU_SLCF(IQ,NM),CC_INTERP2FACES,SL%CELL_CENTERED,SL%SLICETYPE, & - 1,STIME,I1,I2,J1,J2,K1,K2,0,& + 1,STIME,I1,I2,J1,J2,K1,K2,DEBUG,& IND,IND2,Y_INDEX,Z_INDEX,PART_INDEX,VELO_INDEX,0,PROP_INDEX,REAC_INDEX,MATL_INDEX,T,DT,NM, & SLICE_MIN, SLICE_MAX) SLICE_MIN_BOUND = SLICE_MIN @@ -6012,7 +6015,7 @@ SUBROUTINE DUMP_SLCF(T,DT,NM,IFRMT) ! data file at subsequent time steps OPEN(LU_SLCF(IQ,NM),FILE=FN_SLCF(IQ,NM),FORM='UNFORMATTED',STATUS='OLD',POSITION='APPEND') CALL DUMP_SLICE_GEOM_DATA(LU_SLCF(IQ,NM),CC_INTERP2FACES,SL%CELL_CENTERED,SL%SLICETYPE, & - 0,STIME,I1,I2,J1,J2,K1,K2,0,& + 0,STIME,I1,I2,J1,J2,K1,K2,DEBUG,& IND,IND2,Y_INDEX,Z_INDEX,PART_INDEX,VELO_INDEX,0,PROP_INDEX,REAC_INDEX,MATL_INDEX,T,DT,NM, & SLICE_MIN, SLICE_MAX) OPEN(LU_SLCF(IQ2,NM),FILE=FN_SLCF(IQ2,NM),ACTION='READ') diff --git a/Verification/FDS_Pictures.sh b/Verification/FDS_Pictures.sh index e1038818f15..29e0a6f820f 100755 --- a/Verification/FDS_Pictures.sh +++ b/Verification/FDS_Pictures.sh @@ -1,5 +1,5 @@ -$RUNSMV -d Adaptive_Mesh_Refinement random_meshes -$RUNSMV -d Aerosols propane_flame_deposition +$RUNSMV -d Adaptive_Mesh_Refinement random_meshes.fds +$RUNSMV -d Aerosols propane_flame_deposition.fds $RUNSMV -d Complex_Geometry geom_simple.fds #$RUNSMV -d Complex_Geometry geom_azim.fds #$RUNSMV -d Complex_Geometry geom_elev.fds @@ -25,27 +25,27 @@ $RUNSMV -d Complex_Geometry geom_texture3a.fds $RUNSMV -d Complex_Geometry geom_texture3b.fds $RUNSMV -d Complex_Geometry geom_texture4a.fds $RUNSMV -d Complex_Geometry geom_texture4b.fds -$RUNSMV -d Complex_Geometry sphere_radiate +$RUNSMV -d Complex_Geometry sphere_radiate.fds $RUNSMV -d Complex_Geometry sphere_helium_conserve_3meshes -$RUNSMV -d Complex_Geometry cone_1mesh -$RUNSMV -d Controls activate_vents -$RUNSMV -d Detectors beam_detector -$RUNSMV -d Detectors objects_static -$RUNSMV -d Detectors objects_dynamic -$RUNSMV -d Fires couch -$RUNSMV -d Flowfields helium_2d_isothermal -$RUNSMV -d Flowfields symmetry_test -$RUNSMV -d Flowfields symmetry_test_2 -$RUNSMV -d Flowfields symmetry_test_mpi -$RUNSMV -d Flowfields jet_fan -$RUNSMV -d Flowfields velocity_bc_test -$RUNSMV -d Heat_Transfer checkerboard -$RUNSMV -d Heat_Transfer ht3d_demo -$RUNSMV -d Heat_Transfer ht3d_ibeam -$RUNSMV -d Heat_Transfer ht3d_network -$RUNSMV -d HVAC HVAC_mass_conservation -$RUNSMV -d HVAC HVAC_energy_pressure -$RUNSMV -d HVAC leak_test_2 +$RUNSMV -d Complex_Geometry cone_1mesh.fds +$RUNSMV -d Controls activate_vents.fds +$RUNSMV -d Detectors beam_detector.fds +$RUNSMV -d Detectors objects_static.fds +$RUNSMV -d Detectors objects_dynamic.fds +$RUNSMV -d Fires couch.fds +$RUNSMV -d Flowfields helium_2d_isothermal.fds +$RUNSMV -d Flowfields symmetry_test.fds +$RUNSMV -d Flowfields symmetry_test_2.fds +$RUNSMV -d Flowfields symmetry_test_mpi.fds +$RUNSMV -d Flowfields jet_fan.fds +$RUNSMV -d Flowfields velocity_bc_test.fds +$RUNSMV -p 4 -d Heat_Transfer checkerboard.fds +$RUNSMV -p 8 -d Heat_Transfer ht3d_demo.fds +$RUNSMV -d Heat_Transfer ht3d_ibeam.fds +$RUNSMV -p 2 -d Heat_Transfer ht3d_network.fds +$RUNSMV -d HVAC HVAC_mass_conservation.fds +$RUNSMV -d HVAC HVAC_energy_pressure.fds +$RUNSMV -d HVAC leak_test_2.fds # $RUNSMV -d Immersed_Boundary_Method tri_cube_cut_cell_test_01 # $RUNSMV -d Immersed_Boundary_Method tri_cube_cut_cell_test_02 # $RUNSMV -d Immersed_Boundary_Method tri_cube_cut_cell_test_03 @@ -58,22 +58,22 @@ $RUNSMV -d HVAC leak_test_2 # $RUNSMV -d Immersed_Boundary_Method tri_cube_cut_cell_test_10 # $RUNSMV -d Immersed_Boundary_Method tri_cube_cut_cell_test_11 # $RUNSMV -d Immersed_Boundary_Method tri_cube_cut_cell_test_12 -$RUNSMV -d Miscellaneous pyramid -$RUNSMV -d Miscellaneous obst_sphere -$RUNSMV -d Miscellaneous obst_cylinder -$RUNSMV -d Miscellaneous obst_cone -$RUNSMV -d Miscellaneous obst_rotbox -$RUNSMV -d NS_Analytical_Solution ns2d_64 -$RUNSMV -d Pressure_Effects pressure_boundary -$RUNSMV -d Pressure_Solver dancing_eddies_tight -$RUNSMV -d Scalar_Analytical_Solution move_slug -$RUNSMV -d Scalar_Analytical_Solution move_slug_fl1 -$RUNSMV -d Scalar_Analytical_Solution shunn3_256 -$RUNSMV -d Scalar_Analytical_Solution soborot_charm_square_wave_64 -$RUNSMV -d Sprinklers_and_Sprays cascade -$RUNSMV -d Turbulence csmag_64 -$RUNSMV -d Turbulence dsmag_64 -$RUNSMV -d WUI Bova_1a -$RUNSMV -d WUI Bova_1b -$RUNSMV -d WUI Bova_4a -$RUNSMV -d WUI level_set_fuel_model_1 +$RUNSMV -d Miscellaneous pyramid.fds +$RUNSMV -d Miscellaneous obst_sphere.fds +$RUNSMV -d Miscellaneous obst_cylinder.fds +$RUNSMV -d Miscellaneous obst_cone.fds +$RUNSMV -d Miscellaneous obst_rotbox.fds +$RUNSMV -d NS_Analytical_Solution ns2d_64.fds +$RUNSMV -d Pressure_Effects pressure_boundary.fds +$RUNSMV -d Pressure_Solver dancing_eddies_tight.fds +$RUNSMV -d Scalar_Analytical_Solution move_slug.fds +$RUNSMV -d Scalar_Analytical_Solution move_slug_fl1.fds +$RUNSMV -d Scalar_Analytical_Solution shunn3_256.fds +$RUNSMV -d Scalar_Analytical_Solution soborot_charm_square_wave_64.fds +$RUNSMV -d Sprinklers_and_Sprays cascade.fds +$RUNSMV -d Turbulence csmag_64.fds +$RUNSMV -d Turbulence dsmag_64.fds +$RUNSMV -d WUI Bova_1a.fds +$RUNSMV -d WUI Bova_1b.fds +$RUNSMV -d WUI Bova_4a.fds +$RUNSMV -d WUI level_set_fuel_model_1.fds diff --git a/Verification/scripts/Run_FDS_Cases.sh b/Verification/scripts/Run_FDS_Cases.sh index 04a60e262d6..b19a5ab8a13 100755 --- a/Verification/scripts/Run_FDS_Cases.sh +++ b/Verification/scripts/Run_FDS_Cases.sh @@ -50,6 +50,7 @@ echo "-J - use Intel MPI version of FDS" echo "-m max_iterations - stop FDS runs after a specifed number of iterations (delayed stop)" echo " example: an option of 10 would cause FDS to stop after 10 iterations" echo "-O - use OpenMPI version of FDS" +echo "-p - run picture cases" echo "-q queue_name - run cases using the queue queue_name [default: batch]" echo "-r - run restart test cases" echo "-s - stop FDS runs" @@ -95,8 +96,9 @@ export SVNROOT=`pwd`/../.. cd $SVNROOT export SVNROOT=`pwd` cd $CURDIR +RUN_PICTURES= -while getopts 'Cdhj:Jm:Oq:rsW' OPTION +while getopts 'Cdhj:Jm:Opq:rsW' OPTION do case $OPTION in C) @@ -123,11 +125,16 @@ case $OPTION in INTEL=o INTEL2= ;; + p) + RUN_PICTURES=1 + RESTART= + ;; q) QUEUE="$OPTARG" ;; r) RESTART=1 + RUN_PICTURES= ;; s) export STOPFDS=1 @@ -164,17 +171,26 @@ fi cd $CURDIR cd .. -if [ "$RESTART" == "" ]; then + +if [[ "$RESTART" == "" ]] && [[ "$MAKE_PICTURES" == "" ]]; then ./FDS_Cases.sh if [ "$CHECKCASES" == "" ]; then echo Cases in FDS_Cases.sh submitted fi -else +fi +if [[ "$RESTART" != "" ]] && [[ "$MAKE_PICTURES" == "" ]]; then ./FDS_RESTART_Cases.sh if [ "$CHECKCASES" == "" ]; then echo Cases in FDS_RESTART_Cases.sh submitted fi fi +if [[ "$MAKE_PICTURES" != "" ]]; then + export RUNSMV=$QFDS + ./FDS_Pictures.sh + if [ "$CHECKCASES" == "" ]; then + echo Cases in FDS_Pictures.sh submitted + fi +fi cd $CURDIR cd ..