Skip to content
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

To merge med_ahp files to main #11

Merged
merged 44 commits into from
Dec 21, 2024
Merged

To merge med_ahp files to main #11

merged 44 commits into from
Dec 21, 2024

Conversation

nazia-ga
Copy link
Collaborator

No description provided.

placeholder file added to create new folder
added model, property package, documentation, test files, and config files
…efined_enrtl/placeholder.py

deleted empty placeholder file
added refined enrtl files same as Pengfei latest version in mvc folder
Pengfei-Xu-1993 and others added 17 commits December 19, 2024 10:02
updated figure name that is called
updated to ensure it runs optimally for the different enrtl conditions in the different version of watertap
…efined_enrtl/3MED_AHP_eNRTL.py

updated version is present
Updated import statement for rENRTL
…efined_enrtl/refined_enrtl_multi.py

Delete duplicate file
Updated import statement
…efined_enrtl/refined_enrtl.py

Delete duplicate file
Updated import statement for rENRTL
…efined_enrtl/Test_3MED_AHP_eNRTL.py

Will be replaced with updated test file
Updated test file
Updated name of file that is imported
@Pengfei-Xu-1993
Copy link
Contributor

The latest two commits are totally waste of time. I just change it back to the status when aaf9a9d uploaded so did the med only branch

@Pengfei-Xu-1993 Pengfei-Xu-1993 merged commit a1619ae into main Dec 21, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants