Skip to content

consolidated streams into 1 struct #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 51 commits into from
Apr 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
0a4e74e
added iced gui on new branch
At11011 Nov 27, 2024
d6f46b0
consolidated streams into 1 struct
bhargavakula01 Dec 2, 2024
b53ff9b
updating blocks and thermodynamics modules with changes in the connec…
bhargavakula01 Dec 2, 2024
876a473
resolving git conflict
bhargavakula01 Dec 5, 2024
415c8c2
updating readme file
bhargavakula01 Dec 5, 2024
c5648b6
adding documentation comments and implemented total_mass function in …
bhargavakula01 Dec 6, 2024
205f01e
copied bezier example from iced repo. Will modify.
At11011 Dec 14, 2024
74c3ea3
added more output for understanding
At11011 Dec 14, 2024
a8c80f2
added a test button
At11011 Dec 15, 2024
9cbc539
primitive example
At11011 Dec 17, 2024
b7a17f8
added squares partially
At11011 Dec 18, 2024
4ae142b
working square placement
At11011 Dec 18, 2024
f92cfe5
functioning connectors
At11011 Dec 23, 2024
8c0f5a9
removed warnings
At11011 Dec 23, 2024
0222e7b
Merge pull request #28 from OSCPS-Project/iced-gui
bhargavakula01 Jan 11, 2025
103197f
fixed bugs in blocks.rs after consolidating the mass and energy strea…
bhargavakula01 Jan 11, 2025
c28fb6f
updating branch with minor modification with naming convention in the…
bhargavakula01 Jan 11, 2025
dac5151
modified comments
At11011 Jan 12, 2025
c213ed6
updating branch
bhargavakula01 Jan 14, 2025
8acbae2
added enthalpy function into the thermodynamics module
bhargavakula01 Feb 22, 2025
5c12001
minor changes to the enthalpy function
bhargavakula01 Feb 23, 2025
cc7be31
Added ThermoPackage trait
bhargavakula01 Mar 15, 2025
558c5bf
Added enthalpy and pressure calculation methods to the IdealGasPackage
bhargavakula01 Mar 15, 2025
d51e5ea
Added property within 'ThermoState' struct to hold the thermodynamics…
bhargavakula01 Mar 16, 2025
8d6286e
Fixed errors within blocks.rs file
bhargavakula01 Mar 16, 2025
c7c1d90
updated readme document
bhargavakula01 Mar 16, 2025
f233ed2
fixing github workflow for rust-tests
bhargavakula01 Mar 16, 2025
84952d1
fixing github workflow for rust-tests
bhargavakula01 Mar 16, 2025
e4f159a
removing 'libwebkit2gtk-4.0-dev/' the check-docs workflow to help it …
bhargavakula01 Mar 16, 2025
eb931ff
Reorganizing library files for thermo package
bhargavakula01 Mar 17, 2025
d6cfd75
Added entropy equation for ideal gas package
bhargavakula01 Mar 18, 2025
9fbb081
updated chemical properties struct and the thermostate struct to star…
bhargavakula01 Mar 20, 2025
b04bf9c
made some changes to the IdealGasPackage struct
bhargavakula01 Mar 20, 2025
d6649ca
removed 'volume' and 'calculate_moles' functions from ThermoPackage t…
bhargavakula01 Mar 24, 2025
de4da46
updated the enthalpy and entropy equations
bhargavakula01 Mar 24, 2025
ff32e7d
moved total volume calculation to thermoPackage due to differences in…
bhargavakula01 Mar 26, 2025
a84e943
added vapor fraction function for ideal gas package
bhargavakula01 Mar 26, 2025
ea87c95
added the vapor_fraction function to the thermoPackage trait
bhargavakula01 Mar 26, 2025
35c6c23
fixed units within ideal_gas_package
bhargavakula01 Mar 28, 2025
0e27b7f
updated import statements within ideal_gas_package
bhargavakula01 Mar 28, 2025
8c83cd1
updated whitespace
bhargavakula01 Mar 28, 2025
f12d3aa
updating the functions for the ideal_gas_package
bhargavakula01 Mar 28, 2025
77ea14e
completed implementation of the ideal_gas_package
bhargavakula01 Mar 28, 2025
42e29a2
imported changes to blocks.rs from 'add-simulation' branch
bhargavakula01 Mar 29, 2025
ccbd3a6
adding doc strings
bhargavakula01 Mar 29, 2025
aa932ae
adding srk_package
bhargavakula01 Mar 29, 2025
a1d3e86
updating doc-strings within the thermodynamics.rs file
bhargavakula01 Mar 29, 2025
6bbde75
testing new git config
bhargavakula01 Mar 29, 2025
dd4e0c2
updating the github workflows so that workflow is initiated when PRs …
bhargavakula01 Mar 29, 2025
eaf6813
simple update to readme document
bhargavakula01 Mar 29, 2025
4ce96c8
adding a manual release github workflow
bhargavakula01 Mar 29, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .github/workflows/check-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ on:
branches:
- main
- develop
push:
branches:
- main
- develop
release:
types: [published]

jobs:
lint:
Expand Down Expand Up @@ -40,7 +38,6 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y \
libwebkit2gtk-4.0-dev \
build-essential \
curl \
wget \
Expand Down
35 changes: 35 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: OSCPS_Release_Workflow

on:
workflow_dispatch: # Enables manual triggering from GitHub Actions UI

jobs:
build:
name: Build and Release
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Install Rust
uses: dtolnay/rust-toolchain@stable

- name: Build release binary
run: cargo build --release

- name: Compress binary
run: |
mkdir -p release
cp target/release/your-binary-name release/
cd release
tar -czvf your-binary-name-linux.tar.gz your-binary-name
shell: bash

- name: Create GitHub Release and Upload Binary
uses: softprops/action-gh-release@v2
with:
files: release/your-binary-name-linux.tar.gz
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

5 changes: 0 additions & 5 deletions .github/workflows/rust-tests.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: Rust Tests

on:
push:
branches:
- main
- develop
pull_request:
branches:
- main
Expand Down Expand Up @@ -45,7 +41,6 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y \
libwebkit2gtk-4.0-dev \
build-essential \
curl \
wget \
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[workspace]
resolver = "2"

members = [
members = [ "oscps-gui",
"oscps-lib",
]
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# OSCPS (Open Sourced Chemical Engineering Process Simulator)
# OSCPS (Open Source Chemical Process Simulator)

![Rust Tests](https://github.com/OSCPS-Project/OSCPS/actions/workflows/rust-tests.yml/badge.svg)
![Documentation](https://github.com/OSCPS-Project/OSCPS/actions/workflows/check-docs.yml/badge.svg)
![Rust Tests](https://github.com/OSCPS-Project/OSCPS/actions/workflows/rust-tests.yml/badge.svg?branch=develop)
![Documentation](https://github.com/OSCPS-Project/OSCPS/actions/workflows/check-docs.yml/badge.svg?branch=develop)

Developing a dynamic & steady-state chemical process simulator using a Rust backend and a iced-rs frontend. This project aims to create a much better version of ASPEN that will also be open-sourced.
Developing a dynamic & steady-state chemical process simulator using a Rust-based backend and frontend. This project aims to create a much better version of ASPEN that will also be open-sourced.

## Authors

Expand Down
5 changes: 4 additions & 1 deletion oscps-gui/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
[package]
name = "oscps-gui"
version = "0.1.0"
authors = ["Nathaniel Thomas <nathaniel@swbell.net>", "Bhargav Akula <bhargavakula01>"]
edition = "2021"

[dependencies]
iced = "0.13.1"
env_logger = "0.11.6"
iced = {version = "0.13.1", features = ["canvas", "debug", "lazy"]}
log = "0.4"
Loading
Loading