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

Reconciling Electrochem Branch with main #2598

Draft
wants to merge 147 commits into
base: main
Choose a base branch
from
Draft

Conversation

JacksonBurns
Copy link
Contributor

This PR is related to #2316, which is very out of date with main (especially since #2380).

I have already made on branch off electrochem and rebased it onto main. While doing so, I kept all of the testing files in their old format, as edited during the development on electrochem. I will start by opening this PR against main to get the tests fixed and the branch 'merge-able', and then I will change this PR to be against electrochem. We can then review to ensure that the rebase and testing changes are correct, merge into electrochem, and then electrochem can finish development and be merged.

@JacksonBurns JacksonBurns self-assigned this Feb 1, 2024
@JacksonBurns JacksonBurns changed the base branch from main to electrochem February 2, 2024 02:48
@JacksonBurns
Copy link
Contributor Author

JacksonBurns commented Feb 2, 2024

@rwest @mjohnson541 the remaining unit test failures (here: https://github.com/ReactionMechanismGenerator/RMG-Py/actions/runs/7750195947/job/21136056656#step:10:2072) seem related to the echem work, and not anything in this PR. Unfortunately (see below) we may have to move electrochem development to this branch (and change base back to main), or else reset electrochem to the latest commit on this branch so it looks like the rebase was done on electrochem directly?

Unfortunately it seems that I have yet again misunderstood how on earth git works. I think if I had merged main into this branch, we could have then merged this branch into the electrochem branch, and then the electrochem branch into main. The way I have done it here has basically stacked all the commits to main from before the last time electrochem was rebased, and then the commits on electrochem, and then my commits to make the tests work. I guess the history would look wacky if I did it not this way?

@mjohnson541
Copy link
Contributor

Thanks @JacksonBurns! This is great! I should be able to consolidate this with the last parts of echem development I have locally soon and then it should be all together for review.

@rwest rwest mentioned this pull request Mar 8, 2024
@rwest rwest changed the base branch from electrochem to main March 8, 2024 20:44
@rwest
Copy link
Member

rwest commented Mar 8, 2024

I rebased this onto the latest main, and changed the base (target) for the PR back to main. Also rebased the lithium branch in the RMG-database which this refers to. Let's see how the tests do...

@@ -219,6 +219,30 @@ def get_sticking_coefficient(self, T):

return False

def apply_solvent_correction(self, solvent):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Has all of this solvent corrections to kinetics been done on a different branch (and reviewed independently?) or is it all blurred in with the electrochemistry stuff?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I had a solvation correction system I built for the electrochemistry work. Yunsie was also working on solvation corrections and had her own dataset and a system that was similar, but also a bit different. So I modified my system to merge the two systems and handle both my dataset and her dataset.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did hers never make it into RMG then? this is the [only] chance to review both?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is all only here.

@mjohnson541
Copy link
Contributor

I just added the additional changes on top of this branch.

@mjohnson541
Copy link
Contributor

I have also updated the database branch.

@rwest
Copy link
Member

rwest commented Apr 1, 2024

I just rebased it, did a bunch of interactive rebasing to rationalize things, group together commits that are related, and in some cases squash them.

I notice that commit 655e8de "add Li adsorption to test data" (May 9, 2023) adds data to rmgpy/data/test_data which has now (as of #2644) been removed, so that commit (and maybe others that look for that data) will need editing.

JacksonBurns and others added 29 commits May 3, 2024 13:41
remove this commit before merging
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.

None yet

5 participants