Update app.py

app.py

@@ -1,36 +1,51 @@
 import gradio as gr
 from apdl_generator.apdl_plate import generate_plate_apdl
 from apdl_generator.apdl_beam import generate_beam_apdl
-from simulators.pycalculix_simulation import run_pycalculix_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(use_case, simulator, **kwargs):
+def simulation_workflow(tool_type, use_case, simulator, **kwargs):
+    """
+    Main simulation workflow.
+
+    Parameters:
+        tool_type (str): 'Punch' or 'Die'.
+        use_case (str): 'plate' or 'beam'.
+        simulator (str): 'FEniCS' or 'ANSYS'.
+        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 if needed
     if use_case == "plate":
         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
+        return "Invalid use case selected.", None, None
 
-    if simulator == "PyCalculix":
-        stress, deformation = run_pycalculix_simulation(use_case, **kwargs)
-    elif simulator == "FEniCS":
+    # Run simulation
+    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
+        return "Invalid simulator selected.", None, None
 
+    # Visualize results
     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
+    return f"{tool_type} Simulation\nStress: {stress:.2f} MPa\nDeformation: {deformation:.2f} mm", graph_path, three_d_path
 
 interface = gr.Interface(
     fn=simulation_workflow,
     inputs=[
+        gr.Radio(["Punch", "Die"], label="Select Tool Type"),
         gr.Radio(["plate", "beam"], label="Select Use Case"),
-        gr.Dropdown(["PyCalculix", "FEniCS", "ANSYS"], label="Select Simulator"),
+        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)"),
@@ -43,7 +58,7 @@ interface = gr.Interface(
         gr.Image(label="2D Results Visualization"),
         gr.Image(label="3D Results Visualization")
     ],
-    title="3D Unified Simulation Tool",
+    title="Punch and Die Simulation Tool",
     live=True
 )