Update app.py

app.py

@@ -34,7 +34,17 @@ def calculate_hydraulic_parameters(displacement, pressure, rpm, torque, flow_rat
     power_torque = (torque_nm * rpm) / 9549 if torque_nm and rpm else None
     power_flow_rate = (flow_rate_lpm * pressure_bar) / 600.0 if flow_rate_lpm and pressure_bar else None
 
-    return displacement_cc, pressure_bar, rpm, torque_nm, flow_rate_lpm, power_displacement, power_torque, power_flow_rate
+    # Convert results to all available units
+    results = {
+        "displacement": {unit: displacement_cc / factor for unit, factor in UNIT_CONVERSIONS["Displacement"].items()} if displacement_cc else {},
+        "pressure": {unit: pressure_bar / factor for unit, factor in UNIT_CONVERSIONS["Pressure"].items()} if pressure_bar else {},
+        "torque": {unit: torque_nm / factor for unit, factor in UNIT_CONVERSIONS["Torque"].items()} if torque_nm else {},
+        "flow_rate": {unit: flow_rate_lpm / factor for unit, factor in UNIT_CONVERSIONS["Flow Rate"].items()} if flow_rate_lpm else {},
+        "power_displacement": power_displacement,
+        "power_torque": power_torque,
+        "power_flow_rate": power_flow_rate
+    }
+    return results, displacement_cc, pressure_bar, torque_nm, flow_rate_lpm
 
 # Streamlit App
 st.title("Hydraulic Pump Power Calculator")
@@ -49,27 +59,78 @@ flow_rate_unit = st.sidebar.selectbox("Flow Rate Unit:", ["L/min", "m^3/h", "GPM
 st.sidebar.header("Input Parameters")
 
 # User inputs
-displacement = st.sidebar.number_input("Pump Displacement (cc/rev, in^3/rev, or liters/rev):", min_value=0.0, step=0.1)
-pressure = st.sidebar.number_input("Working Pressure (bar, MPa, PSI, kPa, or atm):", min_value=0.0, step=0.1)
-rpm = st.sidebar.number_input("Pump RPM:", min_value=0.0, step=1.0)
-torque = st.sidebar.number_input("Torque (Nm or lb-ft):", min_value=0.0, step=0.1)
-flow_rate = st.sidebar.number_input("Flow Rate (L/min, m^3/h, GPM (US), or GPM (UK)):", min_value=0.0, step=0.1)
+displacement = st.sidebar.number_input("Pump Displacement (cc/rev, in^3/rev, or liters/rev):", value=None, step=0.1, format="%.2f")
+pressure = st.sidebar.number_input("Working Pressure (bar, MPa, PSI, kPa, or atm):", value=None, step=0.1, format="%.2f")
+rpm = st.sidebar.number_input("Pump RPM:", value=None, step=1.0, format="%.0f")
+torque = st.sidebar.number_input("Torque (Nm or lb-ft):", value=None, step=0.1, format="%.2f")
+flow_rate = st.sidebar.number_input("Flow Rate (L/min, m^3/h, GPM (US), or GPM (UK)):", value=None, step=0.1, format="%.2f")
 
 # Calculate parameters and power
 if st.sidebar.button("Calculate"):
-    displacement_cc, pressure_bar, rpm, torque_nm, flow_rate_lpm, power_displacement, power_torque, power_flow_rate = calculate_hydraulic_parameters(
+    results, displacement_cc, pressure_bar, torque_nm, flow_rate_lpm = calculate_hydraulic_parameters(
         displacement, pressure, rpm, torque, flow_rate,
         displacement_unit, pressure_unit, torque_unit, flow_rate_unit
     )
 
     st.subheader("Results")
-    st.write(f"Pump Displacement: {displacement_cc:.2f} cc/rev" if displacement_cc else "Pump Displacement: Not provided or calculable.")
-    st.write(f"Working Pressure: {pressure_bar:.2f} bar" if pressure_bar else "Working Pressure: Not provided or calculable.")
-    st.write(f"Torque: {torque_nm:.2f} Nm" if torque_nm else "Torque: Not provided or calculable.")
-    st.write(f"Flow Rate: {flow_rate_lpm:.2f} L/min" if flow_rate_lpm else "Flow Rate: Not provided or calculable.")
-    st.write(f"Hydraulic Power based on Displacement: {power_displacement:.2f} kW" if power_displacement else "Power based on Displacement: Not calculable.")
-    st.write(f"Hydraulic Power based on Torque: {power_torque:.2f} kW" if power_torque else "Power based on Torque: Not calculable.")
-    st.write(f"Hydraulic Power based on Flow Rate: {power_flow_rate:.2f} kW" if power_flow_rate else "Power based on Flow Rate: Not calculable.")
+
+    # Display formulas
+    st.write("### Formulas Used:")
+    if displacement_cc and pressure_bar and rpm:
+        st.write("Power based on Displacement: Power (kW) = (Displacement (cc/rev) × Pressure (bar) × RPM) / 600")
+    if torque_nm and rpm:
+        st.write("Power based on Torque: Power (kW) = (Torque (Nm) × RPM) / 9549")
+    if flow_rate_lpm and pressure_bar:
+        st.write("Power based on Flow Rate: Power (kW) = (Flow Rate (L/min) × Pressure (bar)) / 600")
+
+    # Display input conversions
+    st.write("### Converted Input Parameters:")
+    if displacement_cc:
+        st.write(f"Displacement: {displacement_cc:.2f} cc/rev")
+    if pressure_bar:
+        st.write(f"Pressure: {pressure_bar:.2f} bar")
+    if torque_nm:
+        st.write(f"Torque: {torque_nm:.2f} Nm")
+    if flow_rate_lpm:
+        st.write(f"Flow Rate: {flow_rate_lpm:.2f} L/min")
+
+    # Display results for all units
+    if results["displacement"]:
+        st.write("### Pump Displacement:")
+        for unit, value in results["displacement"].items():
+            st.write(f"{value:.2f} {unit}")
+
+    if results["pressure"]:
+        st.write("### Working Pressure:")
+        for unit, value in results["pressure"].items():
+            st.write(f"{value:.2f} {unit}")
+
+    if results["torque"]:
+        st.write("### Torque:")
+        for unit, value in results["torque"].items():
+            st.write(f"{value:.2f} {unit}")
+
+    if results["flow_rate"]:
+        st.write("### Flow Rate:")
+        for unit, value in results["flow_rate"].items():
+            st.write(f"{value:.2f} {unit}")
+
+    # Power results
+    st.write("### Hydraulic Power:")
+    if results['power_displacement']:
+        st.write(f"Based on Displacement: {results['power_displacement']:.2f} kW / {(results['power_displacement'] * 1.34102):.2f} HP")
+    else:
+        st.write("Power based on Displacement: Not calculable.")
+
+    if results['power_torque']:
+        st.write(f"Based on Torque: {results['power_torque']:.2f} kW / {(results['power_torque'] * 1.34102):.2f} HP")
+    else:
+        st.write("Power based on Torque: Not calculable.")
+
+    if results['power_flow_rate']:
+        st.write(f"Based on Flow Rate: {results['power_flow_rate']:.2f} kW / {(results['power_flow_rate'] * 1.34102):.2f} HP")
+    else:
+        st.write("Power based on Flow Rate: Not calculable.")
 
 # Hugging Face Space Deployment Notice
 st.sidebar.markdown("---")