diff options
| author | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-11-04 13:41:42 (GMT) |
|---|---|---|
| committer | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-11-04 13:41:42 (GMT) |
| commit | 65443992d81a8845ba3597620d84e8652e83a254 (patch) | |
| tree | f1a1c084c156210925d8009138a070d1cfb75366 | |
| parent | 0f1d005a2a7123f4077dbe3ff446ced8f240f1f8 (diff) | |
Changed from LGPL 2.1 license to the Revised BSD license.
44 files changed, 124 insertions, 663 deletions
@@ -6,4 +6,6 @@ Rossen Apostolov <rossen@kth.se> The API is implemented mainly by: -Magnus Lundborg
\ No newline at end of file +Magnus Lundborg +Daniel Spångberg (TNG-MF1 compression) +Anders Gärdenäs (C++ wrapper)
\ No newline at end of file @@ -1,502 +1,25 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! +Copyright (c) 2012-2013, The GROMACS development team, +check out http://www.gromacs.org for more information. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of the GROMACS development team nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file @@ -7,8 +7,10 @@ make Test by running: bin/tng_testing -No system wide installations are made yet (no 'make install'), which means that -programs using the library must specify explicitly where to look for it. +Make a system-wide installation by: +make install +(this will require administrative privileges on most systems, i.e. 'sudo make install' +on a Unix like system with a sudoers file) Useful cmake flags: diff --git a/include/compression/bwlzh.h b/include/compression/bwlzh.h index 3e58d2d..70d586a 100644 --- a/include/compression/bwlzh.h +++ b/include/compression/bwlzh.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ @@ -32,7 +30,7 @@ void DECLSPECDLLEXPORT bwlzh_decompress(unsigned char *input, int nvals, /* The routines below are mostly useful for testing, and for internal - use by the library. */ + use by the library. */ void DECLSPECDLLEXPORT bwlzh_compress_verbose(unsigned int *vals, int nvals, unsigned char *output, int *output_len); diff --git a/include/compression/bwt.h b/include/compression/bwt.h index e95f7ee..9f927f8 100644 --- a/include/compression/bwt.h +++ b/include/compression/bwt.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/include/compression/coder.h b/include/compression/coder.h index 570bc6d..34b56c1 100644 --- a/include/compression/coder.h +++ b/include/compression/coder.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ #ifndef CODER_H diff --git a/include/compression/dict.h b/include/compression/dict.h index e29b17f..d66dd23 100644 --- a/include/compression/dict.h +++ b/include/compression/dict.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/include/compression/fixpoint.h b/include/compression/fixpoint.h index b1e7130..f448dbf 100644 --- a/include/compression/fixpoint.h +++ b/include/compression/fixpoint.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ #ifndef FIXPOINT_H diff --git a/include/compression/huffman.h b/include/compression/huffman.h index c36e94d..49347de 100644 --- a/include/compression/huffman.h +++ b/include/compression/huffman.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/include/compression/lz77.h b/include/compression/lz77.h index e811256..ad37e5b 100644 --- a/include/compression/lz77.h +++ b/include/compression/lz77.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/include/compression/merge_sort.h b/include/compression/merge_sort.h index 970d5ee..48ab410 100644 --- a/include/compression/merge_sort.h +++ b/include/compression/merge_sort.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/include/compression/mtf.h b/include/compression/mtf.h index 9c5e175..bc4b2c8 100644 --- a/include/compression/mtf.h +++ b/include/compression/mtf.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/include/compression/my64bit.h b/include/compression/my64bit.h index f88c797..2959a8d 100644 --- a/include/compression/my64bit.h +++ b/include/compression/my64bit.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ #ifndef MY64BIT_H diff --git a/include/compression/rle.h b/include/compression/rle.h index 3adf8dc..c6d4706 100644 --- a/include/compression/rle.h +++ b/include/compression/rle.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ @@ -18,7 +16,7 @@ void Ptngc_comp_conv_to_rle(unsigned int *vals, int nvals, unsigned int *rle, int *nrle, int min_rle); -void Ptngc_comp_conv_from_rle(unsigned int *rle, +void Ptngc_comp_conv_from_rle(unsigned int *rle, unsigned int *vals, int nvals); #endif diff --git a/include/compression/tng_compress.h b/include/compression/tng_compress.h index 51597be..c8b8db1 100644 --- a/include/compression/tng_compress.h +++ b/include/compression/tng_compress.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ #ifndef TNG_COMPRESS_H @@ -41,27 +39,27 @@ ] desired_precision what to round the numbers to, i.e. integers will be created as: round(pos[]/desired_precision). - + algo should first be determined by calling tng_compress_pos_find_algo - + The compressed data is returned in a malloced pointer (so free can be called to free the memory), the number of chars in the compressed data is put into *nitems. If too large values are input (compared to the precision), NULL is returned. */ - + char DECLSPECDLLEXPORT *tng_compress_pos(double *pos, int natoms, int nframes, - double desired_precision, + double desired_precision, int speed, int *algo, int *nitems); char DECLSPECDLLEXPORT *tng_compress_pos_float(float *pos, int natoms, int nframes, - float desired_precision, + float desired_precision, int speed, int *algo, int *nitems); - + char DECLSPECDLLEXPORT *tng_compress_pos_int(int *pos, int natoms, int nframes, unsigned long prec_hi, unsigned long prec_lo, int speed,int *algo, @@ -78,13 +76,13 @@ char DECLSPECDLLEXPORT *tng_compress_pos_int(int *pos, int natoms, int nframes, speed=3: Same as 2 and also includes the XTC3 algorithm which will use BWLZH compression when it seems likely to give better compression. Also includes the interframe BWLZH algorithm for - coordinates and velocities. + coordinates and velocities. speed=4: Enable the inter frame BWLZH algorithm for the coordinates. The one-to-one BWLZH algorithm is enabled for velocities. speed=5: Enable the LZ77 part of the BWLZH algorithm. speed=6: Enable the intra frame BWLZH algorithm for the coordinates. Always try the BWLZH compression in the XTC3 algorithm. - + Set speed=0 to allow tng_compression to set the default speed (which is currently 2). For very good compression it makes sense to choose speed=4 or speed=5 @@ -108,7 +106,7 @@ char DECLSPECDLLEXPORT *tng_compress_pos_int_find_algo(int *pos, int natoms, int unsigned long prec_hi, unsigned long prec_lo, int speed,int *algo, int *nitems); - + /* This returns the number of integers required for the storage of the algorithm with the best compression ratio. */ int DECLSPECDLLEXPORT tng_compress_nalgo(void); @@ -132,7 +130,7 @@ char DECLSPECDLLEXPORT *tng_compress_vel_int(int *vel, int natoms, int nframes, unsigned long prec_hi, unsigned long prec_lo, int speed, int *algo, int *nitems); - + char DECLSPECDLLEXPORT *tng_compress_vel_find_algo(double *vel, int natoms, int nframes, double desired_precision, int speed, @@ -152,9 +150,9 @@ char DECLSPECDLLEXPORT *tng_compress_vel_int_find_algo(int *vel, int natoms, int int *nitems); /* From a compressed block, obtain information about - whether it is a position or velocity block: + whether it is a position or velocity block: *vel=1 means velocity block, *vel=0 means position block. - It also gives info about the number of atoms, + It also gives info about the number of atoms, frames, and the precision used to compress the block, and the algorithms used to compress the block. The return value=0 if the block looks like a tng compressed block, and 1 otherwise. If the return value is 1 no information is returned. */ @@ -184,7 +182,7 @@ void DECLSPECDLLEXPORT tng_compress_int_to_float(int *posvel_int,unsigned long p /* Compression algorithms (matching the original trajng assignments) The compression backends require that some of the algorithms must have the same value. */ - + #define TNG_COMPRESS_ALGO_STOPBIT 1 #define TNG_COMPRESS_ALGO_TRIPLET 2 #define TNG_COMPRESS_ALGO_BWLZH1 8 diff --git a/include/compression/vals16.h b/include/compression/vals16.h index a8acdf4..4585755 100644 --- a/include/compression/vals16.h +++ b/include/compression/vals16.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/include/compression/warnmalloc.h b/include/compression/warnmalloc.h index 945afbe..46e7d52 100644 --- a/include/compression/warnmalloc.h +++ b/include/compression/warnmalloc.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/include/compression/widemuldiv.h b/include/compression/widemuldiv.h index b7574fa..8ca24ee 100644 --- a/include/compression/widemuldiv.h +++ b/include/compression/widemuldiv.h @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/include/md5.h b/include/md5.h index 5776af8..80fbf6c 100644 --- a/include/md5.h +++ b/include/md5.h @@ -54,8 +54,6 @@ # define md5_INCLUDED -/* The comment below does not apply to the version included in the TNG - * library. */ /* * This package supports both compile-time and run-time determination of CPU * byte order. If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be diff --git a/include/tng_io.h b/include/tng_io.h index 08eb0cb..f13563b 100644 --- a/include/tng_io.h +++ b/include/tng_io.h @@ -3,14 +3,12 @@ * VERSION 1.4 * * Written by Magnus Lundborg - * Copyright (c) 2012, The GROMACS development team. + * Copyright (c) 2012-2013, The GROMACS development team. * Check out http://www.gromacs.org for more information. * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ /** @file tng_io.h @@ -51,8 +49,8 @@ * Copyright (c) 2012, The GROMACS development team. * check out http://www.gromacs.org for more information. * - * The TNG API is released under LGPL 2.1 and is free to redistribute according - * to that license (or a later version of the LGPL license). + * The TNG API is released under the Revised BSD License and is free to + * redistribute according to that license. * * A license file (named COPYING) should be included with each copy of the API. * @@ -76,7 +74,8 @@ * * Revisions * - * v. 1.4 - More flexible support for digital signatures in header. + * v. 1.4 - Changed from LGPL to the Revised BSD License. + * - More flexible support for digital signatures in header. * - Block ID numbers changed. * * v. 1.3 - Second stable release of the API. diff --git a/include/tng_io.hpp b/include/tng_io.hpp index a4247d5..202f9db 100644 --- a/include/tng_io.hpp +++ b/include/tng_io.hpp @@ -1,3 +1,16 @@ +/* This code is part of the tng binary trajectory format. + * + * VERSION 1.4 + * + * Written by Anders Gärdenäs + * Copyright (c) 2012-2013, The GROMACS development team. + * Check out http://www.gromacs.org for more information. + * + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the Revised BSD License. + */ + #ifndef TNG_IO_HPP #define TNG_IO_HPP @@ -102,7 +115,7 @@ public: { return status = tng_output_file_set(traj, file_name); } - + /** * @brief Get the endianness of the output file. * current output file. @@ -429,8 +442,8 @@ public: { return status = tng_time_per_frame_get(traj, time); } - - + + /** * @brief Set the time per frame of the trajectory. * @param len is the new time per frame. @@ -442,7 +455,7 @@ public: return status = tng_time_per_frame_set(traj, time); } - + /** * @brief Get the length of the input file. * @param len is pointing to a value set to the file length. @@ -834,7 +847,7 @@ public: return status = tng_frame_set_new(traj, first_frame, n_frames); } - + /** * @brief Create and initialise a frame set with the time of the first frame * specified. @@ -864,7 +877,7 @@ public: tng_function_status setTimeOfFirstFrameOfFrameSet (const double first_frame_time) { - return status = tng_frame_set_first_frame_time_set(traj, + return status = tng_frame_set_first_frame_time_set(traj, first_frame_time); } @@ -1121,7 +1134,7 @@ public: n_values_per_frame, type); } - + /** * @brief Read and retrieve a vector (1D array) of non-particle data, * in a specific interval. @@ -1233,7 +1246,7 @@ public: return status = tng_particle_data_vector_get(traj, block_id, values, n_frames, stride_length, - n_particles, + n_particles, n_values_per_frame, type); } @@ -1277,7 +1290,7 @@ public: type)); } - + /** * @brief Read and retrieve a vector (1D array) particle data, in a * specific interval. @@ -1442,7 +1455,7 @@ tng_function_status Trajectory::findMolecule int64_t id, Molecule_t molecule) { - return status = tng_molecule_find(traj, name, id, + return status = tng_molecule_find(traj, name, id, &molecule->mol); } @@ -1545,7 +1558,7 @@ public: atom_type, &atom->atom); } - + /** * @brief Add an atom with a specific ID to a residue. * @param atom_name is a string containing the name of the atom. @@ -1636,7 +1649,7 @@ public: return status = tng_chain_residue_add(traj->traj, chain, name, &residue->residue); } - + /** * @brief Add a residue with a specific ID to a chain. * @param name is a string containing the name of the residue. @@ -1684,7 +1697,7 @@ tng_function_status Molecule::findChain int64_t id, Chain *chain) { - return status = tng_molecule_chain_find(traj->traj, mol, name, id, + return status = tng_molecule_chain_find(traj->traj, mol, name, id, &chain->chain); } diff --git a/src/compression/bwlzh.c b/src/compression/bwlzh.c index c9ab553..517828c 100644 --- a/src/compression/bwlzh.c +++ b/src/compression/bwlzh.c @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/src/compression/bwt.c b/src/compression/bwt.c index 182cd07..88eb444 100644 --- a/src/compression/bwt.c +++ b/src/compression/bwt.c @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/src/compression/coder.c b/src/compression/coder.c index 9e3c880..905e45d 100644 --- a/src/compression/coder.c +++ b/src/compression/coder.c @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/src/compression/dict.c b/src/compression/dict.c index 4744949..5fb3c01 100644 --- a/src/compression/dict.c +++ b/src/compression/dict.c @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/src/compression/fixpoint.c b/src/compression/fixpoint.c index ec48204..696cf48 100644 --- a/src/compression/fixpoint.c +++ b/src/compression/fixpoint.c @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ #include <stdio.h> diff --git a/src/compression/huffman.c b/src/compression/huffman.c index 26dc347..bda2126 100644 --- a/src/compression/huffman.c +++ b/src/compression/huffman.c @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/src/compression/huffmem.c b/src/compression/huffmem.c index dec6837..249fa54 100644 --- a/src/compression/huffmem.c +++ b/src/compression/huffmem.c @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/src/compression/lz77.c b/src/compression/lz77.c index dba6400..51dd301 100644 --- a/src/compression/lz77.c +++ b/src/compression/lz77.c @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/src/compression/merge_sort.c b/src/compression/merge_sort.c index 1d49903..04c20ad 100644 --- a/src/compression/merge_sort.c +++ b/src/compression/merge_sort.c @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/src/compression/mtf.c b/src/compression/mtf.c index 1d74af3..5f96d62 100644 --- a/src/compression/mtf.c +++ b/src/compression/mtf.c @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/src/compression/rle.c b/src/compression/rle.c index ee708ed..9663534 100644 --- a/src/compression/rle.c +++ b/src/compression/rle.c @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/src/compression/tng_compress.c b/src/compression/tng_compress.c index 62c6326..3a378d1 100644 --- a/src/compression/tng_compress.c +++ b/src/compression/tng_compress.c @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ #include <stdlib.h> diff --git a/src/compression/vals16.c b/src/compression/vals16.c index 10a1cd8..ab65953 100644 --- a/src/compression/vals16.c +++ b/src/compression/vals16.c @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/src/compression/warnmalloc.c b/src/compression/warnmalloc.c index 7eaad8f..c05be20 100644 --- a/src/compression/warnmalloc.c +++ b/src/compression/warnmalloc.c @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/src/compression/widemuldiv.c b/src/compression/widemuldiv.c index 44d4adb..3c2ac79 100644 --- a/src/compression/widemuldiv.c +++ b/src/compression/widemuldiv.c @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ diff --git a/src/compression/xtc2.c b/src/compression/xtc2.c index d0e0c09..b39db79 100644 --- a/src/compression/xtc2.c +++ b/src/compression/xtc2.c @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ /* This code is heavily influenced by diff --git a/src/compression/xtc3.c b/src/compression/xtc3.c index edeb93d..942839d 100644 --- a/src/compression/xtc3.c +++ b/src/compression/xtc3.c @@ -5,9 +5,7 @@ * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ /* This code is heavily influenced by diff --git a/src/lib/tng_io.c b/src/lib/tng_io.c index 720110a..383b414 100644 --- a/src/lib/tng_io.c +++ b/src/lib/tng_io.c @@ -3,14 +3,12 @@ * VERSION 1.4 * * Written by Magnus Lundborg - * Copyright (c) 2012, The GROMACS development team. + * Copyright (c) 2012-2013, The GROMACS development team. * Check out http://www.gromacs.org for more information. * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ #ifdef USE_STD_INTTYPES_H diff --git a/src/lib/tng_io_fortran.c b/src/lib/tng_io_fortran.c index 5c7bbb7..9c3e551 100644 --- a/src/lib/tng_io_fortran.c +++ b/src/lib/tng_io_fortran.c @@ -3,14 +3,12 @@ * VERSION 1.4 * * Written by Magnus Lundborg - * Copyright (c) 2012, The GROMACS development team. + * Copyright (c) 2012-2013, The GROMACS development team. * Check out http://www.gromacs.org for more information. * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ #include "tng_io.h" diff --git a/src/tests/tng_io_read_pos.c b/src/tests/tng_io_read_pos.c index 118ccef..3ff7660 100644 --- a/src/tests/tng_io_read_pos.c +++ b/src/tests/tng_io_read_pos.c @@ -3,14 +3,12 @@ * VERSION 1.0 * * Written by Magnus Lundborg - * Copyright (c) 2012, The GROMACS development team. + * Copyright (c) 2012-2013, The GROMACS development team. * check out http://www.gromacs.org for more information. * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ #ifdef USE_STD_INTTYPES_H diff --git a/src/tests/tng_io_read_pos_util.c b/src/tests/tng_io_read_pos_util.c index 8d240e3..6dd6524 100644 --- a/src/tests/tng_io_read_pos_util.c +++ b/src/tests/tng_io_read_pos_util.c @@ -5,14 +5,12 @@ * VERSION 1.0 * * Written by Magnus Lundborg - * Copyright (c) 2012, The GROMACS development team. - * check out http://www.gromacs.org for more information. + * Copyright (c) 2012-2013, The GROMACS development team. + * Check out http://www.gromacs.org for more information. * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ #ifdef USE_STD_INTTYPES_H diff --git a/src/tests/tng_io_testing.c b/src/tests/tng_io_testing.c index 158bcfa..a37710f 100644 --- a/src/tests/tng_io_testing.c +++ b/src/tests/tng_io_testing.c @@ -3,14 +3,12 @@ * VERSION 1.0 * * Written by Magnus Lundborg - * Copyright (c) 2012, The GROMACS development team. + * Copyright (c) 2012-2013, The GROMACS development team. * Check out http://www.gromacs.org for more information. * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ #ifdef USE_STD_INTTYPES_H diff --git a/src/tests/tng_parallel_read.c b/src/tests/tng_parallel_read.c index a55a006..598d42a 100644 --- a/src/tests/tng_parallel_read.c +++ b/src/tests/tng_parallel_read.c @@ -5,14 +5,12 @@ * VERSION 1.0 * * Written by Magnus Lundborg - * Copyright (c) 2012, The GROMACS development team. + * Copyright (c) 2012-2013, The GROMACS development team. * Check out http://www.gromacs.org for more information. * * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. + * modify it under the terms of the Revised BSD License. */ #include <stdlib.h> |