Skip to content

Correct description of simulator m option#1671

Open
evgaster wants to merge 9 commits intoc3d:stablefrom
evgaster:stable
Open

Correct description of simulator m option#1671
evgaster wants to merge 9 commits intoc3d:stablefrom
evgaster:stable

Conversation

@evgaster
Copy link
Copy Markdown

No description provided.

While investigating issue c3d#1574
it appeared the definitions of re and rp contained errors.
The definition of rp was missing its label.
The definition of σe had an incorrect unit in its label.
Above errors are corrected.

Unfotunately this doesn't solve the issue.

A Signed-off-by: Ed@vanGasteren.net
The test for the Proton charge radius tested for a wrong value.
The value was corrected previously, but not the test.
The value tested for is corrected.

Signed-off-by: Ed@vanGasteren.net
In c3d#1574 (comment)
a better value is proposed.
Left out calls to UVAL. It is not needed.

Signed-off-by: Ed@vanGasteren.net
@evgaster
Copy link
Copy Markdown
Author

Sorry again about the non related commits that keep popping up. I wish I could get rid of them ... for good.

@ppigazzini
Copy link
Copy Markdown

Sorry again about the non related commits that keep popping up. I wish I could get rid of them ... for good.

You can fix in this way:

git switch stable
# make a new branch as backup
git switch -c stable_bkp
git switch stable
# I suppose that you have create the upstream with
# git remote add upstream https://github.com/c3d/db48x.git
git fetch -p upstream
git reset --hard upstream/stable
git cherry-pick c5abb63
git push -f origin HEAD

# if something should go wrong you can restore with
git switch stable_bkp
git push -f origin HEAD:stable

Next time it's better to open a PR using a different branch name wrt "stable" (your local and origin "stable" should be simply track the upstream one).

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.

2 participants