Update app.py

app.py

@@ -1,52 +1,37 @@
-# main.py
 import gradio as gr
 from apdl_generator.apdl_plate import generate_plate_apdl
 from apdl_generator.apdl_beam import generate_beam_apdl
-from simulators.python_simulation import run_python_simulation
+from simulators.fenics_simulation import run_fenics_simulation
+from simulators.ansys_simulation import run_ansys_simulation
 from visualization import visualize_results
 
-def simulation_workflow(tool_type, use_case, include_hole, **kwargs):
-    """
-    Main simulation workflow.
-
-    Parameters:
-        tool_type (str): 'Punch' or 'Die'.
-        use_case (str): 'plate' or 'beam'.
-        include_hole (bool): Whether to include a hole in the plate simulation.
-        kwargs: Input parameters for the simulation.
-
-    Returns:
-        results (str): Text result summarizing stress and deformation.
-        graph_path (str): Path to 2D visualization.
-        three_d_path (str): Path to 3D visualization.
-    """
-    # Generate APDL script dynamically
+def simulation_workflow(use_case, simulator, **kwargs):
     if use_case == "plate":
-        hole_diameter = kwargs["hole_diameter"] if include_hole else 0
-        apdl_path = generate_plate_apdl(kwargs["thickness"], kwargs["length"], kwargs["width"], hole_diameter, kwargs["force"])
+        apdl_path = generate_plate_apdl(kwargs["thickness"], kwargs["length"], kwargs["width"], kwargs["hole_diameter"], kwargs["force"])
     elif use_case == "beam":
         apdl_path = generate_beam_apdl(kwargs["length"], kwargs["width"], kwargs["thickness"], kwargs["load"])
     else:
         return "Invalid use case selected.", None, None
 
-    # Run simulation using Python-based solver
-    stress, deformation = run_python_simulation(apdl_path, use_case, **kwargs)
+    if simulator == "FEniCS":
+        stress, deformation = run_fenics_simulation(use_case, **kwargs)
+    elif simulator == "ANSYS":
+        stress, deformation = run_ansys_simulation(apdl_path)
+    else:
+        return "Invalid simulator selected.", None, None
 
-    # Visualize results
-    graph_path, three_d_path = visualize_results("Python-Based Solver", kwargs["length"], kwargs["width"], kwargs["thickness"], stress, deformation)
-    return f"{tool_type} Simulation\nStress: {stress:.2f} MPa\nDeformation: {deformation:.2f} mm", graph_path, three_d_path
+    graph_path, three_d_path = visualize_results(simulator, kwargs["length"], kwargs["width"], kwargs["thickness"], stress, deformation)
+    return f"Stress: {stress:.2f} MPa, Deformation: {deformation:.2f} mm", graph_path, three_d_path
 
-# Gradio Interface
 interface = gr.Interface(
     fn=simulation_workflow,
     inputs=[
-        gr.Radio(["Punch", "Die"], label="Select Tool Type"),
         gr.Radio(["plate", "beam"], label="Select Use Case"),
-        gr.Checkbox(label="Include Hole for Plate Simulation"),  # Checkbox for optional hole
+        gr.Dropdown(["FEniCS", "ANSYS"], label="Select Simulator"),
         gr.Slider(10, 50, step=1, label="Thickness (mm)"),
         gr.Slider(100, 500, step=10, label="Length (mm)"),
         gr.Slider(50, 200, step=10, label="Width (mm)"),
-        gr.Slider(5, 25, step=1, label="Hole Diameter (mm)"),  # Always active but controlled by checkbox
+        gr.Slider(5, 25, step=1, label="Hole Diameter (mm)", optional=True),
         gr.Slider(1000, 10000, step=500, label="Force (N)", optional=True),
         gr.Slider(1000, 20000, step=1000, label="Load (N)", optional=True)
     ],
@@ -55,7 +40,7 @@ interface = gr.Interface(
         gr.Image(label="2D Results Visualization"),
         gr.Image(label="3D Results Visualization")
     ],
-    title="Punch and Die Simulation Tool (Python-Based)",
+    title="Simulation Tool Without PyCalculix",
     live=True
 )