Merge pull request #359 from fusion-energy/animation_improvements

Animation improvements
fusion-energy · Dec 12, 2024 · 5c4db57 · 5c4db57
2 parents fcdbd13 + 33f08cc
commit 5c4db57
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 26 deletions.
diff --git a/docs/_static/spherical_tokamak_animation.mp4 b/docs/_static/spherical_tokamak_animation.mp4
diff --git a/docs/_static/tokamak_animation.mp4 b/docs/_static/tokamak_animation.mp4
diff --git a/examples/spherical_tokamak_from_plasma_animation.py b/examples/spherical_tokamak_from_plasma_animation.py
@@ -1,3 +1,4 @@
+import os
 import paramak
 import cadquery_png_plugin.plugin
 import numpy as np
@@ -123,6 +124,7 @@ def export_reactor_to_png(reactor, file_path):
             "width": int(1280/2),
             "height": int(1024/2),
             "zoom": 1.4,
+            "background_color": (1.0, 1.0, 1.0),
         },
         file_path=file_path
     )
@@ -140,17 +142,6 @@ def export_reactor_to_png(reactor, file_path):
         export_reactor_to_png(reactor, f'spherical_tokamak_frame_{frame:03d}.png')
         frame += 1
 
-for factor in factors:
-    modified_elongation = original_elongation * factor
-    reactor = create_reactor(elongation=modified_elongation)
-    export_reactor_to_png(reactor, f'spherical_tokamak_frame_{frame:03d}.png')
-    frame += 1
-
-for modified_triangularity in [0.55, 0.3667, 0.1833, 0.0, -0.1833, -0.3667, -0.55, -0.3667, -0.1833, 0.0, 0.1833, 0.3667, 0.55]:
-    reactor = create_reactor(triangularity=modified_triangularity)
-    export_reactor_to_png(reactor, f'spherical_tokamak_frame_{frame:03d}.png')
-    frame += 1
-
 for modified_n_tf_coils in [original_n_tf_coils, original_n_tf_coils -1 , original_n_tf_coils -2, original_n_tf_coils-3, original_n_tf_coils-2, original_n_tf_coils-1,original_n_tf_coils]:
     reactor = create_reactor(n_tf_coils=modified_n_tf_coils)
     export_reactor_to_png(reactor, f'spherical_tokamak_frame_{frame:03d}.png')
@@ -166,3 +157,17 @@ def export_reactor_to_png(reactor, file_path):
     reactor = create_reactor(divertor_thickness=modified_divertor_thickness)
     export_reactor_to_png(reactor, f'spherical_tokamak_frame_{frame:03d}.png')
     frame += 1
+
+for factor in factors:
+    modified_elongation = original_elongation * factor
+    reactor = create_reactor(elongation=modified_elongation)
+    export_reactor_to_png(reactor, f'spherical_tokamak_frame_{frame:03d}.png')
+    frame += 1
+
+for modified_triangularity in [0.55, 0.3667, 0.1833, 0.0, -0.1833, -0.3667, -0.55, -0.3667, -0.1833, 0.0, 0.1833, 0.3667, 0.55]:
+    reactor = create_reactor(triangularity=modified_triangularity)
+    export_reactor_to_png(reactor, f'spherical_tokamak_frame_{frame:03d}.png')
+    frame += 1
+
+
+os.system('ffmpeg -r 10 -i spherical_tokamak_frame_%3d.png -c:v libx264 -r 30 -pix_fmt yuv420p spherical_tokamak_animation.mp4')
diff --git a/examples/tokamak_from_plasma_animation.py b/examples/tokamak_from_plasma_animation.py
@@ -1,5 +1,5 @@
 import paramak
-import imageio
+import io
 import cadquery_png_plugin.plugin
 import numpy as np
 import cadquery as cq
@@ -129,6 +129,7 @@ def export_reactor_to_png(reactor, file_path):
             "width": int(1280/2),
             "height": int(1024/2),
             "zoom": 1.25,
+            "background_color": (1.0, 1.0, 1.0),
         },
         file_path=file_path
     )
@@ -147,29 +148,31 @@ def export_reactor_to_png(reactor, file_path):
         export_reactor_to_png(reactor, f'tokamak_frame_{frame:03d}.png')
         frame += 1
 
-for factor in factors:
-    modified_elongation = original_elongation * factor
-    reactor = create_reactor(elongation=modified_elongation)
-    export_reactor_to_png(reactor, f'spherical_tokamak_frame_{frame:03d}.png')
-    frame += 1
-
-for modified_triangularity in [0.55, 0.3667, 0.1833, 0.0, -0.1833, -0.3667, -0.55, -0.3667, -0.1833, 0.0, 0.1833, 0.3667, 0.55]:
-    reactor = create_reactor(triangularity=modified_triangularity)
-    export_reactor_to_png(reactor, f'spherical_tokamak_frame_{frame:03d}.png')
-    frame += 1
-
 for modified_n_tf_coils in [original_n_tf_coils, original_n_tf_coils -1 , original_n_tf_coils -2, original_n_tf_coils-3, original_n_tf_coils-2, original_n_tf_coils-1,original_n_tf_coils]:
     reactor = create_reactor(n_tf_coils=modified_n_tf_coils)
-    export_reactor_to_png(reactor, f'spherical_tokamak_frame_{frame:03d}.png')
+    export_reactor_to_png(reactor, f'tokamak_frame_{frame:03d}.png')
     frame += 1
 
 for modified_coil_height_factor in [1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.4, 1.3, 1.2, 1.1, 1]:
     reactor = create_reactor(coil_height_factor=modified_coil_height_factor)
-    export_reactor_to_png(reactor, f'spherical_tokamak_frame_{frame:03d}.png')
+    export_reactor_to_png(reactor, f'tokamak_frame_{frame:03d}.png')
     frame += 1
 
 for factor in factors:
     modified_divertor_thickness = original_divertor_thickness * factor
     reactor = create_reactor(divertor_thickness=modified_divertor_thickness)
-    export_reactor_to_png(reactor, f'spherical_tokamak_frame_{frame:03d}.png')
+    export_reactor_to_png(reactor, f'tokamak_frame_{frame:03d}.png')
     frame += 1
+
+for factor in factors:
+    modified_elongation = original_elongation * factor[:-2]
+    reactor = create_reactor(elongation=modified_elongation)
+    export_reactor_to_png(reactor, f'tokamak_frame_{frame:03d}.png')
+    frame += 1
+
+for modified_triangularity in [0.55, 0.3667, 0.1833, 0.0, -0.1833, -0.3667, -0.55, -0.3667, -0.1833, 0.0, 0.1833, 0.3667, 0.55]:
+    reactor = create_reactor(triangularity=modified_triangularity)
+    export_reactor_to_png(reactor, f'tokamak_frame_{frame:03d}.png')
+    frame += 1
+
+os.system('ffmpeg -r 10 -i tokamak_frame_%3d.png -c:v libx264 -r 30 -pix_fmt yuv420p tokamak_animation.mp4')