Update app.py

app.py

@@ -1,11 +1,14 @@
 import gradio as gr
+import subprocess
 from apdl_generator.apdl_plate import generate_plate_apdl
-from apdl_generator.apdl_beam import generate_beam_apdl  # Corrected import
+from apdl_generator.apdl_beam import generate_beam_apdl
 from simulators.fenics_simulation import run_fenics_simulation
+from simulators.pycalculix_simulation import run_pycalculix_simulation
 from simulators.ansys_simulation import run_ansys_simulation
 from visualization import visualize_results
 
 def simulation_workflow(use_case, simulator, **kwargs):
+    # Generate APDL script based on user inputs
     if use_case == "plate":
         apdl_path = generate_plate_apdl(kwargs["thickness"], kwargs["length"], kwargs["width"], kwargs["hole_diameter"], kwargs["force"])
     elif use_case == "beam":
@@ -13,39 +16,42 @@ def simulation_workflow(use_case, simulator, **kwargs):
     else:
         return "Invalid use case selected.", None, None
 
-    if simulator == "FEniCS":
-        result = subprocess.run(["docker", "run", "--rm", "fenics_simulation"], capture_output=True, text=True)
+    # Run the selected simulator
+    if simulator == "PyCalculix":
+        stress, deformation = run_pycalculix_simulation(use_case, **kwargs)
+    elif simulator == "FEniCS":
+        stress, deformation = run_fenics_simulation(use_case, **kwargs)
     elif simulator == "ANSYS":
-        result = subprocess.run(["docker", "run", "--rm", "-v", f"{apdl_path}:/app/input.inp", "ansys_simulation"], capture_output=True, text=True)
+        stress, deformation = run_ansys_simulation(apdl_path)
     else:
         return "Invalid simulator selected.", None, None
 
-    if result.returncode != 0:
-        return f"Simulation failed: {result.stderr}", None, None
-
-    stress, deformation = map(float, result.stdout.split())
+    # Visualize results (both 2D and 3D)
     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
 
+# Define Gradio interface
 interface = gr.Interface(
     fn=simulation_workflow,
     inputs=[
-        gr.Radio(["plate", "beam"], label="Select Use Case"),
-        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)", optional=True),
-        gr.Slider(1000, 10000, step=500, label="Force (N)", optional=True),
-        gr.Slider(1000, 20000, step=1000, label="Load (N)", optional=True)
+        gr.Radio(["plate", "beam"], label="Select Use Case"),  # Choose plate or beam simulation
+        gr.Dropdown(["PyCalculix", "FEniCS", "ANSYS"], label="Select Simulator"),  # Choose simulator
+        gr.Slider(10, 50, step=1, label="Thickness (mm)"),  # Input: Thickness
+        gr.Slider(100, 500, step=10, label="Length (mm)"),  # Input: Length
+        gr.Slider(50, 200, step=10, label="Width (mm)"),  # Input: Width
+        gr.Slider(5, 25, step=1, label="Hole Diameter (mm)", optional=True),  # Input: Hole Diameter (for plate)
+        gr.Slider(1000, 10000, step=500, label="Force (N)", optional=True),  # Input: Force (for plate)
+        gr.Slider(1000, 20000, step=1000, label="Load (N)", optional=True)  # Input: Load (for beam)
     ],
     outputs=[
-        gr.Textbox(label="Simulation Results"),
-        gr.Image(label="2D Results Visualization"),
-        gr.Image(label="3D Results Visualization")
+        gr.Textbox(label="Simulation Results"),  # Output: Simulation text results
+        gr.Image(label="2D Results Visualization"),  # Output: 2D plot (stress and deformation)
+        gr.Image(label="3D Results Visualization")  # Output: 3D plot (stress distribution)
     ],
-    title="Dockerized Simulation Tool",
+    title="Unified Simulation Tool",
     live=True
 )
 
+# Launch Gradio interface
 interface.launch()
+