Merge branch 'develop' into expressions

Author: benflexcompute

.gitignore

@@ -176,6 +176,9 @@ coverage.xml
 .pytest_cache/
 cover/
 
+# Matplotlib testing
+result_images/
+
 # Translations
 *.mo
 *.pot

examples/advanced_simulations/aerodynamics/airfoils/2D_30p30n.py

@@ -26,7 +26,7 @@
     cylinder5 = fl.Cylinder(
         name="cylinder5", axis=[-1, 0, 0], center=[6.5, 0.5, 0], outer_radius=6.5, height=10
     )
-    farfield = fl.AutomatedFarfield(name="farfield", method="quasi-3d")
+    farfield = fl.AutomatedFarfield(method="quasi-3d")
     params = fl.SimulationParams(
         meshing=fl.MeshingParams(
             defaults=fl.MeshingDefaults(
@@ -90,10 +90,9 @@
                 surfaces=[
                     geometry["*"],
                 ],
-                name="wall",
             ),
-            fl.Freestream(surfaces=farfield.farfield, name="Freestream"),
-            fl.SlipWall(surfaces=farfield.symmetry_planes, name="slipwall"),
+            fl.Freestream(surfaces=farfield.farfield),
+            fl.SlipWall(surfaces=farfield.symmetry_planes),
             fl.Fluid(
                 navier_stokes_solver=fl.NavierStokesSolver(
                     absolute_tolerance=1e-11,
@@ -109,7 +108,6 @@
         ],
         outputs=[
             fl.VolumeOutput(
-                name="VolumeOutput",
                 output_fields=[
                     "primitiveVars",
                     "vorticity",
@@ -122,7 +120,6 @@
                 ],
             ),
             fl.SurfaceOutput(
-                name="SurfaceOutput",
                 surfaces=geometry["*"],
                 output_fields=["primitiveVars", "Cp", "Cf", "CfVec", "yPlus"],
             ),

examples/advanced_simulations/aerodynamics/airfoils/2D_crm.py

@@ -26,7 +26,7 @@
     cylinder5 = fl.Cylinder(
         name="cylinder5", axis=[-1, 0, 0], center=[6.5, 0.5, 0], outer_radius=6.5, height=10
     )
-    farfield = fl.AutomatedFarfield(name="farfield", method="quasi-3d")
+    farfield = fl.AutomatedFarfield(method="quasi-3d")
     params = fl.SimulationParams(
         meshing=fl.MeshingParams(
             defaults=fl.MeshingDefaults(
@@ -90,10 +90,9 @@
                 surfaces=[
                     geometry["*"],
                 ],
-                name="wall",
             ),
-            fl.Freestream(surfaces=farfield.farfield, name="Freestream"),
-            fl.SlipWall(surfaces=farfield.symmetry_planes, name="slipwall"),
+            fl.Freestream(surfaces=farfield.farfield),
+            fl.SlipWall(surfaces=farfield.symmetry_planes),
             fl.Fluid(
                 navier_stokes_solver=fl.NavierStokesSolver(
                     absolute_tolerance=1e-11,
@@ -109,7 +108,6 @@
         ],
         outputs=[
             fl.VolumeOutput(
-                name="fl.VolumeOutput",
                 output_fields=[
                     "primitiveVars",
                     "vorticity",
@@ -122,7 +120,6 @@
                 ],
             ),
             fl.SurfaceOutput(
-                name="fl.SurfaceOutput",
                 surfaces=geometry["*"],
                 output_fields=["primitiveVars", "Cp", "Cf", "CfVec", "yPlus"],
             ),

examples/advanced_simulations/aerodynamics/airfoils/2D_gaw2.py

@@ -26,7 +26,7 @@
     cylinder5 = fl.Cylinder(
         name="cylinder5", axis=[-1, 0, 0], center=[6.5, 0.5, 0], outer_radius=6.5, height=10
     )
-    farfield = fl.AutomatedFarfield(name="farfield", method="quasi-3d")
+    farfield = fl.AutomatedFarfield(method="quasi-3d")
     params = fl.SimulationParams(
         meshing=fl.MeshingParams(
             defaults=fl.MeshingDefaults(
@@ -90,10 +90,9 @@
                 surfaces=[
                     geometry["*"],
                 ],
-                name="wall",
             ),
-            fl.Freestream(surfaces=farfield.farfield, name="Freestream"),
-            fl.SlipWall(surfaces=farfield.symmetry_planes, name="slipwall"),
+            fl.Freestream(surfaces=farfield.farfield),
+            fl.SlipWall(surfaces=farfield.symmetry_planes),
             fl.Fluid(
                 navier_stokes_solver=fl.NavierStokesSolver(
                     absolute_tolerance=1e-11,
@@ -109,7 +108,6 @@
         ],
         outputs=[
             fl.VolumeOutput(
-                name="VolumeOutput",
                 output_fields=[
                     "primitiveVars",
                     "vorticity",
@@ -122,7 +120,6 @@
                 ],
             ),
             fl.SurfaceOutput(
-                name="SurfaceOutput",
                 surfaces=geometry["*"],
                 output_fields=["primitiveVars", "Cp", "Cf", "CfVec", "yPlus"],
             ),

examples/advanced_simulations/aerodynamics/dynamic_derivatives/dynamic_derivatives.py

@@ -32,7 +32,7 @@
         entities=cylinder,
         enclosed_entities=geometry["wing"],
     )
-    farfield = fl.AutomatedFarfield(name="farfield")
+    farfield = fl.AutomatedFarfield()
     params = fl.SimulationParams(
         meshing=fl.MeshingParams(
             defaults=fl.MeshingDefaults(
@@ -70,13 +70,11 @@
         ),
         outputs=[
             fl.VolumeOutput(
-                name="VolumeOutput",
                 output_fields=[
                     "Mach",
                 ],
             ),
             fl.SurfaceOutput(
-                name="SurfaceOutput",
                 surfaces=geometry["*"],
                 output_fields=[
                     "Cp",
@@ -89,8 +87,8 @@
                 volumes=cylinder,
                 spec=fl.AngularVelocity(0 * fl.u.rad / fl.u.s),
             ),
-            fl.Freestream(surfaces=farfield.farfield, name="Freestream"),
-            fl.Wall(surfaces=geometry["wing"], name="NoSlipWall"),
+            fl.Freestream(surfaces=farfield.farfield),
+            fl.Wall(surfaces=geometry["wing"]),
             fl.Fluid(
                 navier_stokes_solver=fl.NavierStokesSolver(
                     absolute_tolerance=1e-9,

examples/advanced_simulations/aerodynamics/user_defined_dynamics/udd_alpha_controller.py

@@ -25,9 +25,9 @@
             beta=0 * fl.u.deg,
         ),
         models=[
-            fl.Wall(name="NoSlipWall", surfaces=[volume_mesh["1"]]),
-            fl.SlipWall(name="SlipWall", surfaces=[volume_mesh["2"]]),
-            fl.Freestream(name="Freestream", surfaces=[volume_mesh["3"]]),
+            fl.Wall(surfaces=[volume_mesh["1"]]),
+            fl.SlipWall(surfaces=[volume_mesh["2"]]),
+            fl.Freestream(surfaces=[volume_mesh["3"]]),
         ],
         time_stepping=fl.Steady(
             max_steps=2000,

examples/advanced_simulations/aerodynamics/user_defined_dynamics/udd_forces_and_moments.py

@@ -17,7 +17,7 @@
     box1 = fl.Box(name="box1", size=[2, 6, 3], center=[6.5, 9, 0], axis_of_rotation=[0, 1, 0])
     box2 = fl.Box(name="box2", size=[2, 6, 3], center=[6.5, -9, 0], axis_of_rotation=[0, 1, 0])
     box3 = fl.Box(name="box3", size=[4, 8, 3], center=[12, 0, 2], axis_of_rotation=[0, 1, 0])
-    farfield = fl.AutomatedFarfield(name="farfield")
+    farfield = fl.AutomatedFarfield()
     params = fl.SimulationParams(
         meshing=fl.MeshingParams(
             defaults=fl.MeshingDefaults(
@@ -60,10 +60,9 @@
                 ),
             ),
             fl.Wall(
-                name="NoSlipWall",
                 surfaces=[geometry["*Left"], geometry["*Right"], geometry["fuselage"]],
             ),
-            fl.Freestream(name="Freestream", surfaces=[farfield.farfield]),
+            fl.Freestream(surfaces=[farfield.farfield]),
         ],
         time_stepping=fl.Steady(max_steps=5000),
         outputs=[

examples/advanced_simulations/heat_transfer/cht_solver.py

@@ -62,7 +62,6 @@
         ],
         outputs=[
             fl.VolumeOutput(
-                name="fl.VolumeOutput",
                 output_format="both",
                 output_fields=[
                     "primitiveVars",
@@ -72,7 +71,6 @@
                 ],
             ),
             fl.SurfaceOutput(
-                name="fl.SurfaceOutput",
                 surfaces=volume_mesh["*"],
                 output_format="both",
                 output_fields=["primitiveVars", "T", "Cp", "Cf", "CfVec"],

examples/advanced_simulations/rotorcraft/BET_Disk.py

@@ -14,7 +14,7 @@
 geometry.group_edges_by_tag("edgeName")
 
 
-bet = json.loads(open(TutorialBETDisk.extra["disk0"]).read())
+bet = fl.BETDisk.from_file(TutorialBETDisk.extra["disk0"])
 
 with fl.SI_unit_system:
     cylinder1 = fl.Cylinder(
@@ -33,7 +33,7 @@
         inner_radius=0,
         height=5,
     )
-    farfield = fl.AutomatedFarfield(name="farfield", method="auto")
+    farfield = fl.AutomatedFarfield()
     params = fl.SimulationParams(
         meshing=fl.MeshingParams(
             defaults=fl.MeshingDefaults(
@@ -93,15 +93,13 @@
         ),
         outputs=[
             fl.VolumeOutput(
-                name="VolumeOutput",
                 output_fields=[
                     "primitiveVars",
                     "betMetrics",
                     "qcriterion",
                 ],
             ),
             fl.SurfaceOutput(
-                name="SurfaceOutput",
                 surfaces=geometry["*"],
                 output_fields=[
                     "primitiveVars",
@@ -117,10 +115,9 @@
                     geometry["wing"],
                     geometry["tip"],
                 ],
-                name="wall",
             ),
-            fl.Freestream(surfaces=farfield.farfield, name="Freestream"),
-            fl.SlipWall(surfaces=farfield.symmetry_planes, name="slipwall"),
+            fl.Freestream(surfaces=farfield.farfield),
+            fl.SlipWall(surfaces=farfield.symmetry_planes),
             fl.Fluid(
                 navier_stokes_solver=fl.NavierStokesSolver(
                     absolute_tolerance=1e-12,
@@ -131,7 +128,7 @@
                     equation_evaluation_frequency=1,
                 ),
             ),
-            fl.BETDisk(**bet),
+            bet,
         ],
     )
 

examples/advanced_simulations/rotorcraft/RANS_xv15.py

@@ -31,7 +31,6 @@
         ),
         outputs=[
             fl.VolumeOutput(
-                name="VolumeOutput",
                 output_fields=[
                     "primitiveVars",
                     "T",
@@ -42,7 +41,6 @@
                 ],
             ),
             fl.SurfaceOutput(
-                name="SurfaceOutput",
                 surfaces=volume_mesh["*"],
                 output_fields=[
                     "primitiveVars",
@@ -74,8 +72,8 @@
                 volumes=rotation_zone,
                 spec=fl.AngularVelocity(600 * fl.u.rpm),
             ),
-            fl.Freestream(surfaces=volume_mesh["farField/farField"], name="Freestream"),
-            fl.Wall(surfaces=volume_mesh["innerRotating/blade"], name="NoSlipWall"),
+            fl.Freestream(surfaces=volume_mesh["farField/farField"]),
+            fl.Wall(surfaces=volume_mesh["innerRotating/blade"]),
         ],
     )
 

examples/advanced_simulations/turbomachinery/periodic_BC.py

@@ -92,7 +92,6 @@
         ],
         outputs=[
             fl.VolumeOutput(
-                name="fl.VolumeOutput",
                 output_format="tecplot",
                 output_fields=[
                     "primitiveVars",
@@ -109,7 +108,6 @@
                 ],
             ),
             fl.SurfaceOutput(
-                name="fl.SurfaceOutput",
                 surfaces=volume_mesh["*"],
                 output_format="both",
                 output_fields=[
@@ -122,7 +120,6 @@
                 ],
             ),
             fl.SliceOutput(
-                name="fl.SliceOutput",
                 slices=[slice_inlet, slice_outlet, slice_trailing_edge, slice_wake],
                 output_format="both",
                 output_fields=["Cp", "primitiveVars", "T", "Mach", "gradW"],

examples/basic_simulations/meshing/auto_meshing_internal_flow.py

@@ -13,7 +13,7 @@
 geometry.group_faces_by_tag("faceName")
 
 with fl.SI_unit_system:
-    farfield = fl.AutomatedFarfield(name="farfield")
+    farfield = fl.UserDefinedFarfield()
     params = fl.SimulationParams(
         meshing=fl.MeshingParams(
             defaults=fl.MeshingDefaults(

examples/basic_simulations/steady/steady_3D_cylinder.py

@@ -11,7 +11,7 @@
 geo.group_faces_by_tag("faceId")
 
 with fl.SI_unit_system:
-    farfield = fl.AutomatedFarfield(name="Farfield")
+    farfield = fl.AutomatedFarfield()
     params = fl.SimulationParams(
         meshing=fl.MeshingParams(
             defaults=fl.MeshingDefaults(
@@ -37,20 +37,18 @@
                 turbulence_model_solver=fl.NoneSolver(),
             ),
             fl.Wall(
-                name="NoSlipWall",
                 surfaces=[
                     geo["*"],
                 ],
             ),
-            fl.Freestream(name="Freestream", surfaces=farfield.farfield),
+            fl.Freestream(surfaces=farfield.farfield),
         ],
         outputs=[
             fl.SurfaceOutput(
-                name="SurfaceOutput",
                 output_fields=["Cp", "Cf", "CfVec", "yPlus", "nodeForcesPerUnitArea"],
                 surfaces=[geo["*"]],
             ),
-            fl.VolumeOutput(name="VolumeOutput", output_fields=["primitiveVars", "qcriterion"]),
+            fl.VolumeOutput(output_fields=["primitiveVars", "qcriterion"]),
         ],
     )
 

examples/basic_simulations/unsteady/unsteady_2D_cylinder.py

@@ -26,21 +26,18 @@
                 ),
                 turbulence_model_solver=fl.NoneSolver(),
             ),
-            fl.Wall(name="NoSlipWall", surfaces=[vm["fluid/wall"]]),
-            fl.Freestream(name="Freestream", surfaces=[vm["fluid/farfield"]]),
-            fl.SlipWall(
-                name="SlipWall", surfaces=[vm["fluid/periodic_0_l"], vm["fluid/periodic_0_r"]]
-            ),
+            fl.Wall(surfaces=[vm["fluid/wall"]]),
+            fl.Freestream(surfaces=[vm["fluid/farfield"]]),
+            fl.SlipWall(surfaces=[vm["fluid/periodic_0_l"], vm["fluid/periodic_0_r"]]),
         ],
         time_stepping=fl.Unsteady(
             max_pseudo_steps=40,
             step_size=2,
             steps=20,
         ),
         outputs=[
-            fl.SurfaceOutput(name="SurfaceOutput", output_fields=["Cp"], surfaces=[vm["*"]]),
+            fl.SurfaceOutput(output_fields=["Cp"], surfaces=[vm["*"]]),
             fl.VolumeOutput(
-                name="VolumeOutput",
                 output_fields=[
                     "primitiveVars",
                     "vorticity",

examples/getting_started/quick_start.py

@@ -46,13 +46,11 @@
         models=[
             fl.Wall(
                 surfaces=[geo["*"]],  # Apply wall boundary conditions to all surfaces in geometry
-                name="Wall",
             ),
             fl.Freestream(
                 surfaces=[
                     far_field_zone.farfield
                 ],  # Apply freestream boundary to the far-field zone
-                name="Freestream",
             ),
         ],
         # Define output parameters for the simulation