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 only files to main branch #10

Merged
merged 56 commits into from
Dec 21, 2024
Merged

To merge MED only files to main branch #10

merged 56 commits into from
Dec 21, 2024

Conversation

nazia-ga
Copy link
Collaborator

No description provided.

renamed directory folder from med to med_with_refined_enrtl
adding test file for med
…ed_enrtl/3MED_Only.png

removed wrong png file
…ed_enrtl/3MED_eNRTL_test.py

removed test file
added a placeholder file to create a new folder. Will delete when not needed
added model, documentation, config, and test file
…ed_enrtl/placeholder file.py

delete placeholder file that was created to make a new folder
added the refined-enrtl files, same as Pengfei's
created placeholder file to create new folder
Added refined-enrtl files. Same as Pengfei's latest version in the mvc folder
…efined_enrtl/placeholder.py

deleted placeholder file as it was added to create a folder
added model, property package for LiBr, test file, config files, and documentation
…efined_enrtl directory

deleted directory because 2 separate pull requests are required. These files will be added to a different branch
Pengfei-Xu-1993 and others added 3 commits December 13, 2024 16:25
renamed file to get try to get test file to work
changed name of imported file name
nazia-ga and others added 28 commits December 17, 2024 19:37
added fixture for test
Corrected typo in fixture statement
fixed fixture statement
renamed file for consistency with files in main branch
renamed file for consistency with names of other files in main branch
Updated to ensure optimal initialization and solution with different version of WaterTAP
Updated figure name that is called
…ed_enrtl/Test_MED_eNRTL.py

will replace this with updated test file
Updated test file
Updated file name that is imported on line 82
…ed_enrtl/MED_eNRTL.py

removing this duplicated file. Revised version is already present
updated import statement for rENRTL
Updated import statement fro rENRTL
…ed_enrtl/refined_enrtl.py

delete duplicate file
…ed_enrtl/refined_enrtl_multi.py

Delete duplicate file
removed comment
@Pengfei-Xu-1993 Pengfei-Xu-1993 merged commit 3e14e54 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