ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-3.0/src/types/AtomTypeProperties.h
(Generate patch)

Comparing trunk/OOPSE-3.0/src/types/AtomTypeProperties.h (file contents):
Revision 1930 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
Revision 2204 by gezelter, Fri Apr 15 22:04:00 2005 UTC

# Line 1 | Line 1
1 /*
2 * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3 *
4 * The University of Notre Dame grants you ("Licensee") a
5 * non-exclusive, royalty free, license to use, modify and
6 * redistribute this software in source and binary code form, provided
7 * that the following conditions are met:
8 *
9 * 1. Acknowledgement of the program authors must be made in any
10 *    publication of scientific results based in part on use of the
11 *    program.  An acceptable form of acknowledgement is citation of
12 *    the article in which the program was described (Matthew
13 *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 *    Parallel Simulation Engine for Molecular Dynamics,"
16 *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 *
18 * 2. Redistributions of source code must retain the above copyright
19 *    notice, this list of conditions and the following disclaimer.
20 *
21 * 3. Redistributions in binary form must reproduce the above copyright
22 *    notice, this list of conditions and the following disclaimer in the
23 *    documentation and/or other materials provided with the
24 *    distribution.
25 *
26 * This software is provided "AS IS," without a warranty of any
27 * kind. All express or implied conditions, representations and
28 * warranties, including any implied warranty of merchantability,
29 * fitness for a particular purpose or non-infringement, are hereby
30 * excluded.  The University of Notre Dame and its licensors shall not
31 * be liable for any damages suffered by licensee as a result of
32 * using, modifying or distributing the software or its
33 * derivatives. In no event will the University of Notre Dame or its
34 * licensors be liable for any lost revenue, profit or data, or for
35 * direct, indirect, special, consequential, incidental or punitive
36 * damages, however caused and regardless of the theory of liability,
37 * arising out of the use of or inability to use software, even if the
38 * University of Notre Dame has been advised of the possibility of
39 * such damages.
40 */
41
1   #ifdef __C
2   #ifndef TYPES_ATOMTYPEPROPERTIES_H
3   #define TYPES_ATOMTYPEPROPERTIES_H
# Line 54 | Line 13 | typedef  struct{
13    int is_LennardJones;
14    int is_Charge;
15    int is_Dipole;
16 +  int is_SplitDipole;
17    int is_Quadrupole;
18    int is_Sticky;
19    int is_GayBerne;
# Line 66 | Line 26 | type :: AtomTypeProperties
26  
27   #ifdef  __FORTRAN90
28  
29 < type :: AtomTypeProperties
30 <   SEQUENCE
31 <   integer :: ident
32 <   integer :: is_Directional
33 <   integer :: is_LennardJones
34 <   integer :: is_Charge
35 <   integer :: is_Dipole
36 <   integer :: is_Quadrupole
37 <   integer :: is_Sticky
38 <   integer :: is_GayBerne
39 <   integer :: is_EAM
40 <   integer :: is_Shape
41 <   integer :: is_FLARB
42 < end type AtomTypeProperties
29 >  type :: AtomTypeProperties
30 >    SEQUENCE
31 >    integer :: ident
32 >    integer :: is_Directional
33 >    integer :: is_LennardJones
34 >    integer :: is_Charge
35 >    integer :: is_Dipole
36 >    integer :: is_SplitDipole
37 >    integer :: is_Quadrupole
38 >    integer :: is_Sticky
39 >    integer :: is_GayBerne
40 >    integer :: is_EAM
41 >    integer :: is_Shape
42 >    integer :: is_FLARB
43 >  end type AtomTypeProperties
44   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines