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

move libxdrfile seek functions into separate files #661

Merged
merged 1 commit into from
Jan 27, 2016

Conversation

kain88-de
Copy link
Member

This now puts the functions we have added to enable the calculation of
the byte offsets for xtc/trr trajectories explicitly under the GPL.

Changes to the original libxdrfiles follow the license stated in these
files (a modified BSD). This now includes the missing coordinate/velocity/forces
detection for trr, seek/tell for xdr files and moving function
declarations into header files.

@richardjgowers
Copy link
Member

@mnmelo can you check this is all OK?

@mnmelo
Copy link
Member

mnmelo commented Jan 27, 2016

On it.

double td; /* Current time */
double lambdad; /* Current value of lambda */
} t_trnheader;

/* This function returns the number of atoms in the xtc file in *natoms */
Copy link
Member

Choose a reason for hiding this comment

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

We could take the chance to fix the xtc/trr typo in this comment.

@mnmelo
Copy link
Member

mnmelo commented Jan 27, 2016

Good solution @kain88-de!
Apart from the small cosmetic thing, this looks great (would've fixed it myself but don't have permission on your branch).
I'll wait for you to fix that, and merge anyway in a while if you don't.

@richardjgowers richardjgowers added this to the 0.14 milestone Jan 27, 2016
This now puts the functions we have added to enable the calculation of
the byte offsets for xtc/trr trajectories explicitly under the GPL.

Changes to the original libxdrfiles follow the license stated in that
files. This now includes the missing coordinate/velocity/forces
detection for trr, seek/tell for xdr files and moving function
declarations into header files.
@kain88-de
Copy link
Member Author

@mnmelo I fixed the type. I'm just waiting for travis to finish now.

mnmelo added a commit that referenced this pull request Jan 27, 2016
move libxdrfile seek functions into separate files
@mnmelo mnmelo merged commit 9b70936 into MDAnalysis:develop Jan 27, 2016
@kain88-de kain88-de deleted the xdrlib-reorder branch February 5, 2016 12:58
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.

3 participants