Reg stablize #312
Open
Reg stablize #312
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… match NJOY2016 main
Merge Pat's Sync base branch in
Updates Dec2021
- moved current outputs to new names for regression diff - moved current output Tape files to new names for regression diff - removed *.out and *.log from regression directories - added git ignore exemptions for testing files to avoid repopulation
Merge Pat's new regression tests
Repo reconfigure
|
@pjgriff Did you mean to pull your changes into the NJOY2016 repo? This is probably not what you wanted to do. That being said, we should talk at some point to integrate some of your work into regular NJOY2016. I've been wanting to do that for some time - although my busy schedule has prevented me from doing that so far. |
|
Wim,You are correct - I did not intend to check these in to your repository. I was trying to check them into the Sandia repository that had branched from yours and maintains the ability to apply your changes on top of our modifications.Sorry about that. I guess I am not that GitHub competent.I will try to have Matt Sternat and Jesse Jones clarify for me where I went wrong.And, yes, I am still interested in merging our repositories so I do not need a separate branch to support the additions I have made. I will work with Jesse Jones here and try to set up a meeting with you to discuss the changes.Sent from my iPadOn Oct 10, 2023, at 11:34, Wim Haeck ***@***.***> wrote:
@pjgriff Did you mean to pull your changes into the NJOY2016 repo? This is probably not what you wanted to do.
That being said, we should talk at some point to integrate some of your work into regular NJOY2016. I've been wanting to do that for some time - although my busy schedule has prevented me from doing that so far.
—Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you were mentioned.Message ID: ***@***.***>
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Not sure what is hjappening here. I published a reg_stabilize update to NJOY2016 and added a file.