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

Merge Strategy for the USEPA version and Feng's (cancelled) Pull Request #8

Closed
karrowood opened this issue May 28, 2021 · 2 comments
Closed

Comments

@karrowood
Copy link
Contributor

I have recently worked with the CMake files in Issue #7 (#7) in order to compile and run the USEPA version of the repository which can be found on the epa-upstream-1.1.0 branch.

I then used the same strategy to compile and run the code found in Feng's cancelled pull request. In Feng's version of the code, the reports contain additional water quality information at the bottom of the reports. This information includes the water quality mass balance for different chemicals. It details the Initial Mass, Mass Inflow, Mass Outflow, Mass Reacted, Final Mass, and Mass Ratio.

After successfully running Feng's code, I merged it with the USEPA version and fixed all merge conflicts. I favored Feng's version of the code over the USEPA version with the conflicts to make sure not to mess up any of the additional features. I then made sure it could compile and successfully ran examples.

If wanted, I can create a pull request for this code, including the CMake files and I can create a document with compiling instructions specifically for Windows as I have not had the ability to compile this on Mac or Linux.

@samhatchett
Copy link
Member

Sounds like a good approach. I've re-opened and merged the PR so that Feng's commits remain intact in the git history, so hopefully that doesn't throw a wrench in this plan. If you could open a PR into dev branch that adds CMake files any other diffs from the USEPA distributable code, we will be in good shape for getting community input. I think we will especially want to verify the build tooling on Mac and *nix to make sure the project is nice and clean for anyone who wants to pick it up.

@samhatchett
Copy link
Member

given no other comments (thanks to @rjanke20 for the thumbs-up!), we will consider this resolved. All other comments and questions should go to the PR.

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

No branches or pull requests

2 participants