Purge final

Author: georgebisbas

fdm-devito-notebooks/01_vib/slides-vib/vib_undamped.do.txt

@@ -235,7 +235,6 @@ Generates frames `tmp_vib%04d.png` in files. Can make movie:
 !bc sys
 Terminal> ffmpeg -r 12 -i tmp_vib%04d.png -c:v flv movie.flv
 !ec
-Can use `avconv` instead of `ffmpeg`.
 
 |---------------------------------------|
 | Format | Codec and filename           |

fdm-devito-notebooks/01_vib/src-vib/comparison_movies.py

@@ -1,7 +1,7 @@
 """
 Compare four simulations with different time step in the
 same movie.
-Problem: ffmpeg/avconv will only make a movie of the first
+Problem: ffmpeg will only make a movie of the first
 8 periods. scitools movie can make html player that plays
 all 30 periods.
 """

fdm-devito-notebooks/01_vib/vib_undamped.ipynb

@@ -1216,9 +1216,6 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "The `ffmpeg` program can be replaced by the `avconv` program in\n",
-    "the above command if desired (but at the time of this writing it seems\n",
-    "to be more momentum in the `ffmpeg` project).\n",
     "The `-r` option should come first and\n",
     "describes the number of frames per second in the movie (even if we\n",
     "would like to have slow movies, keep this number as large as 25,\n",
@@ -8663,4 +8660,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}

fdm-devito-notebooks/03_diffu/slides-diffu/diffu_fd1.do.txt

@@ -276,10 +276,10 @@ How to make movie file in modern formats:
 !bc sys
 Terminal> name=tmp_frame%04d.png
 Terminal> fps=8  # frames per second in movie
-Terminal> avconv -r $fps -i $name -vcodec flv       movie.flv
-Terminal> avconv -r $fps -i $name -vcodec libx64    movie.mp4
-Terminal> avconv -r $fps -i $name -vcodec libvpx    movie.webm
-Terminal> avconv -r $fps -i $name -vcodec libtheora movie.ogg
+Terminal> ffmpeg -r $fps -i $name -vcodec flv       movie.flv
+Terminal> ffmpeg -r $fps -i $name -vcodec libx64    movie.mp4
+Terminal> ffmpeg -r $fps -i $name -vcodec libvpx    movie.webm
+Terminal> ffmpeg -r $fps -i $name -vcodec libtheora movie.ogg
 !ec
 
 !split

gitstatus.py

@@ -1,12 +1,13 @@
 """List files that should be in repo. Must be run from root dir."""
 
-import commands, os
+import subprocess
+import os
 # Get all files not in repo
-failure, output = commands.getstatusoutput('git status')
+failure, output = subprocess.getstatusoutput('git status')
 
 # Find the relevant files
 src_extensions_fig = ['.pdf', '.png']
-src_extensions_src = ['.py', '.f', '.c', '.cpp', '.pyx',]
+src_extensions_src = ['.py', '.f', '.c', '.cpp', '.pyx', ]
 src_extensions_txt = ['.do.txt', '.dict4spell.txt']
 src_extensions = src_extensions_fig + src_extensions_src + \
                  src_extensions_txt
@@ -32,4 +33,4 @@
 
 # git add doc/pub is never wrong...
 
-print '\n'.join(files)
+print('\n'.join(files))

src/diffu/demo_osc.py

@@ -122,9 +122,9 @@ def make_movie(self):
         """Go to plot directory and make movie files."""
         orig_dir = os.getcwd()
         os.chdir(self.plotdir)
-        cmd = 'avconv -r 1 -i frame_%04d.png -vcodec libvpx movie.webm'
-        cmd = 'avconv -r 1 -i frame_%04d.png -vcodec flv movie.flv'
-        cmd = 'avconv -r 1 -i frame_%04d.png -vcodec libtheora movie.ogg'
+        cmd = 'ffmpeg -r 1 -i frame_%04d.png -vcodec libvpx movie.webm'
+        cmd = 'ffmpeg -r 1 -i frame_%04d.png -vcodec flv movie.flv'
+        cmd = 'ffmpeg -r 1 -i frame_%04d.png -vcodec libtheora movie.ogg'
         os.system(cmd)
         cmd = 'scitools movie output_file=index.html frame*.png'
         os.system(cmd)

src/vib/comparison_movies.py

@@ -1,7 +1,7 @@
 """
 Compare four simulations with different time step in the
 same movie.
-Problem: ffmpeg/avconv will only make a movie of the first
+Problem: ffmpeg will only make a movie of the first
 8 periods. scitools movie can make html player that plays
 all 30 periods.
 """

src/wave/wave1D/wave1D_dn.py

@@ -223,7 +223,7 @@ def plot_u(u, x, t, n):
                          libtheora='ogg')
         fps = 6
         filespec = 'frame_%04d.png'
-        movie_program = 'ffmpeg'  # or 'avconv'
+        movie_program = 'ffmpeg'
         for codec in codec2ext:
             ext = codec2ext[codec]
             cmd = '%(movie_program)s -r %(fps)d -i %(filespec)s '\

src/wave/wave1D/wave1D_dn_vc.py

@@ -432,7 +432,7 @@ def make_movie_file(self):
         codec2ext = dict(flv='flv', libx264='mp4', libvpx='webm',
                          libtheora='ogg')
         filespec = 'frame_%04d.png'
-        movie_program = 'ffmpeg'  # or 'avconv'
+        movie_program = 'ffmpeg'
         for codec in codec2ext:
             ext = codec2ext[codec]
             cmd = '%(movie_program)s -r %(fps)d -i %(filespec)s '\

src/wave/wave1D/wave1D_u0.py

@@ -185,7 +185,7 @@ def __call__(self, u, x, t, n):
     codec2ext = dict(flv='flv', libx264='mp4', libvpx='webm',
                      libtheora='ogg')  # video formats
     filespec = 'tmp_%04d.png'
-    movie_program = 'ffmpeg'  # or 'avconv'
+    movie_program = 'ffmpeg'
     for codec in codec2ext:
         ext = codec2ext[codec]
         cmd = '%(movie_program)s -r %(fps)d -i %(filespec)s '\