Skip to content

First merge from develop branch to main #31

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

Draft
wants to merge 144 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
144 commits
Select commit Hold shift + click to select a range
e263975
project layout added
At11011 Jun 22, 2024
bbc317f
Merge pull request #7 from bhargavakula01/restructure
bhargavakula01 Jun 22, 2024
8cf7589
adding block.rs and connector.rs files to the oscps-lib folder
bhargavakula01 Jun 25, 2024
6f8965f
removing unncessary nested modules
bhargavakula01 Jun 25, 2024
79ed645
added structure for modules related to the blocks
bhargavakula01 Jun 25, 2024
6209617
adding some comments to component.rs
bhargavakula01 Jun 25, 2024
31d44b6
comments example
At11011 Jul 14, 2024
0611beb
Working components + test
Jul 27, 2024
d7e5492
deleted extra junk
Jul 27, 2024
d4c9d2f
Merge pull request #9 from bhargavakula01/additional_features
bhargavakula01 Jul 27, 2024
2a0f0a6
uncommenting code and added documentation comments for blocks.rs
bhargavakula01 Aug 9, 2024
2bb01c9
adding test cases for TDD
bhargavakula01 Aug 9, 2024
1f6b4ae
updating blocks.rs test cases with comments
bhargavakula01 Aug 9, 2024
20e1308
updating branch
bhargavakula01 Aug 10, 2024
4113d26
implemented the energy_balance_test method within the EnergyBalance t…
bhargavakula01 Aug 11, 2024
506bc7d
added functionality and test for mass balance and created test module…
bhargavakula01 Aug 11, 2024
032a0e3
updating blocks.rs
bhargavakula01 Aug 11, 2024
16e7a8b
updating repo prior to PR
bhargavakula01 Aug 11, 2024
65547d1
update test functions for block module
bhargavakula01 Aug 11, 2024
0de170f
Merge pull request #10 from bhargavakula01/features/block-module
At11011 Aug 11, 2024
3a174fe
adding the pubchem package from crates.io
bhargavakula01 Aug 16, 2024
4a768d4
adding github workflow to repository
bhargavakula01 Aug 17, 2024
5af9a51
updating workflow code
bhargavakula01 Aug 17, 2024
3d11e36
updating workflow
bhargavakula01 Aug 17, 2024
84ed56a
updating workflow
bhargavakula01 Aug 17, 2024
de2d50d
updating dependencies and workflow code
bhargavakula01 Aug 17, 2024
b301c66
updating workflow
bhargavakula01 Aug 17, 2024
4b3b5b5
making workflow run faster
bhargavakula01 Aug 17, 2024
7340443
implemented basic functionality for the component.rs module using the…
bhargavakula01 Aug 18, 2024
0cee354
updating code for element balance trait
bhargavakula01 Aug 18, 2024
019afad
making changes to the components.rs. Added relevant dependencies to a…
bhargavakula01 Aug 22, 2024
976ece7
updating gitignore file
bhargavakula01 Aug 22, 2024
30fc679
removed tracking for oscps-gui/bun.lockb
bhargavakula01 Aug 22, 2024
d0cc89c
removed tracking for cargo-lock
bhargavakula01 Aug 22, 2024
096567c
updating components.rs. Having some errors with getter functions for …
bhargavakula01 Aug 23, 2024
669c01c
Removed soup2-sys as a dependency
At11011 Aug 23, 2024
3e482fd
Merge pull request #11 from bhargavakula01/git-workflow
bhargavakula01 Aug 23, 2024
878f84f
updating components.rs with ability to get chemcial properties :). St…
bhargavakula01 Aug 24, 2024
59578ed
added test cases for components.rs that test the constructor of the C…
bhargavakula01 Aug 24, 2024
3939119
updating object properties within the blocks module, components modul…
bhargavakula01 Oct 29, 2024
658e685
removed element balance, as it is not needed. I also include private …
bhargavakula01 Oct 29, 2024
c8abf5b
updating Mixer struct to align with uml design
bhargavakula01 Oct 29, 2024
3361b96
added comments to outlet mass flow function
bhargavakula01 Nov 2, 2024
a02fe1c
added function implementation for mixer block to calculate outlet mas…
bhargavakula01 Nov 15, 2024
62a9e58
adding new module that will hold the thermodynamic equations for OSCPS
bhargavakula01 Nov 16, 2024
ae5348f
Merge pull request #12 from OSCPS-Project/features/block-module
At11011 Nov 16, 2024
65db252
adding a 'ThermoState' struct in the thermodynamics module
bhargavakula01 Nov 17, 2024
0be6b2b
added struct for thermo analysis and also updated the 'Chemical' and …
bhargavakula01 Nov 17, 2024
25d84e7
adding a simple ideal gas law function
bhargavakula01 Nov 17, 2024
f0c72a3
removed async from constructor in 'Chemical' struct
bhargavakula01 Nov 18, 2024
403e64b
changing name of test group in components.rs file
bhargavakula01 Nov 18, 2024
7a8186f
including thermodynamic constants
bhargavakula01 Nov 18, 2024
914b195
adding github workflow to check for documentation
bhargavakula01 Nov 18, 2024
f490186
updating github workflow to check on PRs
bhargavakula01 Nov 18, 2024
1d2d10c
updating check-docs github workflow
bhargavakula01 Nov 18, 2024
b2fcd7d
updating check-docs github workflow
bhargavakula01 Nov 18, 2024
1db623f
fixed weird issue where the tests were randomly passing and failing
bhargavakula01 Nov 19, 2024
cd4f4bc
updating check-docs github workflow
bhargavakula01 Nov 19, 2024
a566bfd
updating check-docs github workflow
bhargavakula01 Nov 19, 2024
8eff493
updating check-docs github workflow
bhargavakula01 Nov 19, 2024
1dbdb51
updating check-docs github workflow
bhargavakula01 Nov 19, 2024
551f746
updating check-docs github workflow
bhargavakula01 Nov 19, 2024
46d0305
removing async test cases in thermodynamics.rs
bhargavakula01 Nov 20, 2024
a0fbca7
Merge pull request #13 from OSCPS-Project/integrating_thermodynamic_e…
At11011 Nov 27, 2024
a50df80
Merge pull request #15 from OSCPS-Project/git_workflow_documentation_…
At11011 Nov 27, 2024
92e0a82
removed gui, consider switcthing to Gtk.
At11011 Nov 27, 2024
39ba4d2
fixed warnings
At11011 Nov 27, 2024
d214bc6
Updated documentation
At11011 Nov 27, 2024
418003b
temporarily removed offending test failure code
At11011 Nov 27, 2024
ed1663a
removed offending test code (confirmed)
At11011 Nov 27, 2024
c193cbd
basic example GUI using iced
At11011 Nov 27, 2024
0a4e74e
added iced gui on new branch
At11011 Nov 27, 2024
a5ab8a0
Revert "removed offending test code (confirmed)"
At11011 Nov 27, 2024
f50b72d
Merge pull request #17 from OSCPS-Project/remove-gui
bhargavakula01 Nov 27, 2024
547d82d
Merge pull request #18 from OSCPS-Project/fixed-warnings
bhargavakula01 Nov 29, 2024
4d54c8c
checking documentation for 'blocks.rs' and 'thermodynamics.rs' files
bhargavakula01 Nov 29, 2024
cb6d50d
Merge pull request #22 from OSCPS-Project/style-fix
bhargavakula01 Nov 29, 2024
6b940d8
Merge branch 'develop' into fix-thermo-test-fail
bhargavakula01 Dec 1, 2024
230f394
added potential fix to api error issue within the test cases
bhargavakula01 Dec 2, 2024
c9b8e25
removed unncessary code in components.rs
bhargavakula01 Dec 2, 2024
1841090
Merge pull request #24 from OSCPS-Project/fix-thermo-test-fail
bhargavakula01 Dec 2, 2024
6351977
fixed linter warnings from github workflow
bhargavakula01 Dec 2, 2024
5eb63f9
fixed last linter issue
bhargavakula01 Dec 2, 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
7e9cb15
updating README
bhargavakula01 Dec 2, 2024
5bedfb5
updating README
bhargavakula01 Dec 2, 2024
6acf914
updating README
bhargavakula01 Dec 2, 2024
bb3555f
adding badges to readme
bhargavakula01 Dec 3, 2024
90f4170
adding badges to readme
bhargavakula01 Dec 3, 2024
5467843
updating readme
bhargavakula01 Dec 4, 2024
22aa6a3
Merge pull request #27 from OSCPS-Project/README_update
bhargavakula01 Dec 4, 2024
531c81f
Merge pull request #25 from OSCPS-Project/linter_fix
bhargavakula01 Dec 4, 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
9561b34
Create LICENSE
bhargavakula01 Mar 29, 2025
4ce96c8
adding a manual release github workflow
bhargavakula01 Mar 29, 2025
fc3e1da
Merge pull request #26 from OSCPS-Project/connector_consolidation
At11011 Apr 27, 2025
358c4b0
Merge pull request #33 from OSCPS-Project/adding-GNU-license
At11011 Apr 27, 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
60 changes: 60 additions & 0 deletions .github/workflows/check-docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: Clippy and Documentation Check

on:
pull_request:
branches:
- main
- develop
release:
types: [published]

jobs:
lint:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Cache Cargo registry and git
uses: actions/cache@v3
with:
path: |
~/.cargo/registry
~/.cargo/git
key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-registry-

- name: Cache target directory
uses: actions/cache@v3
with:
path: target
key: ${{ runner.os }}-target-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-target-

- name: Install system dependencies
run: |
sudo apt-get update
sudo apt-get install -y \
build-essential \
curl \
wget \
file \
libssl-dev \
libgtk-3-dev \
libayatana-appindicator3-dev \
librsvg2-dev

- name: Set up Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true

- name: Install Clippy
run: rustup component add clippy

- name: Run Clippy with Documentation Lints
run: cargo clippy -- -D warnings
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 }}

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

on:
pull_request:
branches:
- main
- develop
release:
types: [published]

jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
rust: [stable]

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Cache Cargo registry and git
uses: actions/cache@v3
with:
path: |
~/.cargo/registry
~/.cargo/git
key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-registry-

- name: Cache target directory
uses: actions/cache@v3
with:
path: target
key: ${{ runner.os }}-target-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-target-

- name: Install system dependencies
run: |
sudo apt-get update
sudo apt-get install -y \
build-essential \
curl \
wget \
file \
libssl-dev \
libgtk-3-dev \
libayatana-appindicator3-dev \
librsvg2-dev

- name: Set up Rust
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.rust }}
override: true

- name: Install Rust dependencies
run: cargo build --release

- name: Run tests
run: cargo test --all
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
/target
.DS_Store
oscps-gui/bun.lockb
Cargo.lock
7 changes: 0 additions & 7 deletions Cargo.lock

This file was deleted.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "oscps"
version = "0.1.0"
edition = "2021"
[workspace]
resolver = "2"

[dependencies]
members = [ "oscps-gui",
"oscps-lib",
]
Loading
Loading