diff --git a/Source/fire.f90 b/Source/fire.f90 index 5d5bc2dd32b..cc06a770495 100644 --- a/Source/fire.f90 +++ b/Source/fire.f90 @@ -1288,10 +1288,12 @@ SUBROUTINE DUMP_CVODE_WARNING_SUMMARY(NCHEM_ACTIVE_CELLS_AND_CC) INTEGER, INTENT(IN) :: NCHEM_ACTIVE_CELLS_AND_CC INTEGER :: NCHEM_ACTIVE_CELLS_AND_CC_GLOBAL,IERR, CVODE_ERR_CODE, TOT_WARN_CELLS - REAL(EB) :: PCNT + REAL(EB) :: PCNT,TNOW CHARACTER(LEN=16) :: CELL_STR, PCNT_STR CHARACTER(LEN=40) :: CELL_INFO + TNOW = CURRENT_TIME() + IF (N_MPI_PROCESSES > 1) THEN CALL MPI_ALLREDUCE(MPI_IN_PLACE, CVODE_WARNING_CELLS, SIZE(CVODE_WARNING_CELLS), & MPI_INTEGER, MPI_SUM, MPI_COMM_WORLD, IERR) @@ -1333,6 +1335,7 @@ SUBROUTINE DUMP_CVODE_WARNING_SUMMARY(NCHEM_ACTIVE_CELLS_AND_CC) WRITE(LU_ERR, '(A)') '------------------------------------------------------' END IF + T_CHEM_COMM = T_CHEM_COMM+CURRENT_TIME() - TNOW END SUBROUTINE DUMP_CVODE_WARNING_SUMMARY diff --git a/Utilities/Python/scripts/make_smv_images.py b/Utilities/Python/scripts/make_smv_images.py index 7054142fefb..7cbdaecd3da 100644 --- a/Utilities/Python/scripts/make_smv_images.py +++ b/Utilities/Python/scripts/make_smv_images.py @@ -39,8 +39,8 @@ print('generating smokeview image ' + case[i]) os.chdir(outdir + folder[i]) if os_name == "Linux": - subprocess.run(['xvfb-run','-a',smokeview_path,'-runscript',case[i]], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + subprocess.run(['xvfb-run','-w 10 -s "-fp /usr/share/X11/fonts/misc -screen 0 1280x1024x24" -a',smokeview_path,'-bindir ../../../smv/Build/for_bundle -runscript',case[i]], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) else: - subprocess.run([smokeview_path,'-runscript',case[i]], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + subprocess.run([smokeview_path,'-bindir ../../../smv/Build/for_bundle -runscript',case[i]], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) os.chdir(original_dir) diff --git a/Verification/scripts/Outfiles/.gitignore b/Verification/scripts/Outfiles/.gitignore deleted file mode 100644 index e69de29bb2d..00000000000