Update examples in C and Fortran#242
Update examples in C and Fortran#242atztogo merged 24 commits intospglib:developfrom atztogo:examples
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## develop #242 +/- ##
========================================
Coverage 85.69% 85.69%
========================================
Files 23 23
Lines 6069 6069
========================================
Hits 5201 5201
Misses 868 868
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
Since users in C and Fortran may be exclusive, I attempted to change directory structure and the names. Dependency of |
|
It is done except for |
I agree with that, but can it be structured like:
I'll look into that. Just re-request a review to ping me when you want me to look into it. |
|
Almost done. One final thing though, why not the following folder structure:
(/example/c_api, etc.) Top example readme tells about what common minimal example is implemented in all 3 and that a complete one is also provided. |
|
Ok, my final note, fortran files should be |
|
CI fails because |
|
Please rebase onto develop. We cannot merge because of merge conflict. $ git rebase origin/develop
$ git status
Check which files are conflicting and how to resolve it
$ emacs example/c_api/README.md
Command may be different because file was moved
Resolve conflicts by editting the blocks:
<<<<< HEAD
Content from origin/develop
=====
Content from branch examples
>>>>>
$ git rebase --continueI can also recommend gitkraken if you don't feel comfortable with the git cli for this. I will add commit fixes on top of this PR before merging when you feel it is ready. |
Co-authored-by: Cristian Le <github@lecris.me>
Co-authored-by: Cristian Le <github@lecris.me>
Co-authored-by: Cristian Le <github@lecris.me>
Thanks for your detailed instruction. No conflict was found in rebase. |
|
Great. Pre-commit seems to fail Oh, the merge is reporting changes from develop. A rebase would have made it cleaner to review. |
How can I do? |
At this point will have to interactively rebase to drop the merge commit. But basically running I'll handle that later |
I made |
|
Edit the file extension in the cmake files also.
Yes, you can freely force-push in these situations. Just never force-push the |
Yes, I made it. e2a01d5. |
|
Is there anything left to do? |
|
Just to fix git history and cmake. I'll do that tomorrow |
It is clearly difficult for me to do. Thanks @LecrisUT. |
Signed-off-by: Cristian Le <cristian.le@mpsd.mpg.de>
Signed-off-by: Cristian Le <cristian.le@mpsd.mpg.de>
LecrisUT
left a comment
There was a problem hiding this comment.
@atztogo I have refactored your branch and fixed the examples. I have noticed that the python example is not equivalent to the others. Could you make some changes there, and if possible add some words to example/README.md?
You can work on the same branch again by:
$ git fetch
$ git reset --hard origin/examplesOtherwise we can open a new PR for that.
And of course, thanks for all the work on this 😄
|
I have no objection. Please merge if you are ready. |
PR for #236.
example_candexample_fThe examples in C seem not so bad. So I just changed the function names of
test_*toexample_*.The Fortran code of examples in Fortran was very dirty. I made it a little bit cleaner.
Conceptual examples for
spg_get_datasetshould be written inREADME.md.Closes: #236