More clean up

lbmpy_tests/test_phase_field_scenarios.py → lbmpy_tests/phasefield/test_phase_field_scenarios.py

@@ -11,6 +11,7 @@ from lbmpy.phasefield.experiments2D import (
     create_two_drops_between_phases, write_phase_field_picture_sequence,
     write_phase_velocity_picture_sequence)
 from lbmpy.phasefield.phasefieldstep import PhaseFieldStep
+from lbmpy.phasefield.scenarios import *
 from pystencils import make_slice
 
 
@@ -47,3 +48,31 @@ def test_falling_drop():
             file_pattern = os.path.join(tmp_dir, "output_%d.png")
             write_phase_velocity_picture_sequence(sc, file_pattern, total_steps=200)
         assert np.isfinite(np.max(sc.phi[:, :, :]))
+
+
+def test_setup():
+    domain_size = (30, 15)
+
+    scenarios = [
+        create_three_phase_model(domain_size=domain_size, include_rho=True),
+        #create_three_phase_model(domain_size=domain_size, include_rho=False),
+        create_n_phase_model_penalty_term(domain_size=domain_size, num_phases=4),
+    ]
+    for i, sc in enumerate(scenarios):
+        print("Testing scenario", i)
+        sc.set_concentration(make_slice[:, :0.5], [1, 0, 0])
+        sc.set_concentration(make_slice[:, 0.5:], [0, 1, 0])
+        sc.set_concentration(make_slice[0.4:0.6, 0.4:0.6], [0, 0, 1])
+        sc.set_pdf_fields_from_macroscopic_values()
+        sc.run(10)
+
+
+def test_fd_cahn_hilliard():
+    sc = create_n_phase_model_penalty_term(domain_size=(100, 50), num_phases=3,
+                                           solve_cahn_hilliard_with_finite_differences=True)
+    sc.set_concentration(make_slice[:, 0.5:], [1, 0, 0])
+    sc.set_concentration(make_slice[:, :0.5], [0, 1, 0])
+    sc.set_concentration(make_slice[0.3:0.7, 0.3:0.7], [0, 0, 1])
+    sc.set_pdf_fields_from_macroscopic_values()
+    sc.run(100)
+    assert np.isfinite(np.max(sc.concentration[:, :]))

lbmpy_tests/test_phasefield_scenarios.py

-from lbmpy.phasefield.scenarios import *
-from pystencils import make_slice
-
-
-def test_setup():
-    domain_size = (30, 15)
-
-    scenarios = [
-        create_three_phase_model(domain_size=domain_size, include_rho=True),
-        #create_three_phase_model(domain_size=domain_size, include_rho=False),
-        create_n_phase_model_penalty_term(domain_size=domain_size, num_phases=4),
-    ]
-    for i, sc in enumerate(scenarios):
-        print("Testing scenario", i)
-        sc.set_concentration(make_slice[:, :0.5], [1, 0, 0])
-        sc.set_concentration(make_slice[:, 0.5:], [0, 1, 0])
-        sc.set_concentration(make_slice[0.4:0.6, 0.4:0.6], [0, 0, 1])
-        sc.set_pdf_fields_from_macroscopic_values()
-        sc.run(10)
-
-
-def test_fd_cahn_hilliard():
-    sc = create_n_phase_model_penalty_term(domain_size=(100, 50), num_phases=3,
-                                           solve_cahn_hilliard_with_finite_differences=True)
-    sc.set_concentration(make_slice[:, 0.5:], [1, 0, 0])
-    sc.set_concentration(make_slice[:, :0.5], [0, 1, 0])
-    sc.set_concentration(make_slice[0.3:0.7, 0.3:0.7], [0, 0, 1])
-    sc.set_pdf_fields_from_macroscopic_values()
-    sc.run(100)
-    assert np.isfinite(np.max(sc.concentration[:, :]))