Update app.py

app.py

@@ -2,9 +2,9 @@ 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 visualization import visualize_results, visualize_end_product
+from visualization import visualize_results
 
-def simulation_workflow(tool_type, use_case, include_hole, include_force, include_load, thickness, length, width, hole_diameter, force, load, elastic_modulus):
+def simulation_workflow(tool_type, use_case, include_hole, include_force, include_load, thickness, length, width, hole_diameter, force, load):
     """
     Main simulation workflow.
 
@@ -20,13 +20,10 @@ def simulation_workflow(tool_type, use_case, include_hole, include_force, includ
         hole_diameter (float): Diameter of the hole (optional).
         force (float): Applied force (optional).
         load (float): Applied load (optional).
-        elastic_modulus (float): Elastic modulus of the material (Pa).
 
     Returns:
         results (str): Text result summarizing stress and deformation.
         graph_path (str): Path to the 2D visualization.
-        product_path (str): Path to the end-product visualization.
-        apdl_program (str): The generated APDL program.
     """
     # Handle optional parameters
     force = force if include_force else 0
@@ -39,33 +36,14 @@ def simulation_workflow(tool_type, use_case, include_hole, include_force, includ
     elif use_case == "beam":
         apdl_path = generate_beam_apdl(length, width, thickness, load)
     else:
-        return "Invalid use case selected.", None, None, None
-
-    # Read the generated APDL program
-    with open(apdl_path, "r") as file:
-        apdl_program = file.read()
+        return "Invalid use case selected.", None
 
     # Run simulation using Python-based solver
-    stress, deformation = run_python_simulation(apdl_path, use_case, thickness, length, width, force, load, elastic_modulus)
-
-    # Explanation for negligible deformation
-    if deformation < 1e-6:
-        deformation_note = "\nNote: Deformation is negligible due to the high rigidity of the material."
-    else:
-        deformation_note = ""
+    stress, deformation = run_python_simulation(apdl_path, use_case, thickness=thickness, length=length, width=width, force=force, load=load)
 
-    # Generate 2D simulation visualization
+    # Generate 2D visualization
     graph_path, _ = visualize_results("Python-Based Solver", length, width, thickness, stress, deformation)
-    
-    # Generate end-product visualization
-    product_path = visualize_end_product(use_case, length, width, thickness, deformation)
-
-    return (
-        f"{tool_type} Simulation\nStress: {stress:.2f} MPa\nDeformation: {deformation:.6f} mm{deformation_note}",
-        graph_path,
-        product_path,
-        apdl_program
-    )
+    return f"{tool_type} Simulation\nStress: {stress:.2f} MPa\nDeformation: {deformation:.2f} mm", graph_path
 
 interface = gr.Interface(
     fn=simulation_workflow,
@@ -81,15 +59,12 @@ interface = gr.Interface(
         gr.Slider(5, 25, step=1, label="Hole Diameter (mm)"),  # Controlled by "Include Hole"
         gr.Slider(1000, 10000, step=500, label="Force (N)"),  # Controlled by "Include Force"
         gr.Slider(1000, 20000, step=1000, label="Load (N)"),  # Controlled by "Include Load"
-        gr.Slider(5e10, 3e11, step=1e10, label="Elastic Modulus (Pa)")  # Slider for Elastic Modulus
     ],
     outputs=[
         gr.Textbox(label="Simulation Results"),
-        gr.Image(label="2D Simulation Visualization"),
-        gr.Image(label="End Product Visualization"),
-        gr.Code(language="plaintext", label="Generated APDL Program")  # Display APDL program
+        gr.Image(label="2D Results Visualization")
     ],
-    title="Punch and Die Simulation Tool with End Product Visualization and APDL",
+    title="Punch and Die Simulation Tool (Python-Based)",
     live=True
 )