ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/brains/fSimulation.h
(Generate patch)

Comparing trunk/src/brains/fSimulation.h (file contents):
Revision 2 by gezelter, Fri Sep 24 04:16:43 2004 UTC vs.
Revision 1292 by chuckv, Fri Sep 12 20:51:22 2008 UTC

# Line 1 | Line 1
1 < #ifdef __C
1 > #ifdef __OOPSE_C
2 >
3   #ifndef __FSIMULATION
4 +
5   #define __FSIMULATION
6   /** This header provides dual access for the simulation structure between
7      fortran and C for the simtype structure. NOTE: Sequence of struct
8      components must match between C and fortran and in general be packed
9 <    double,int,char.
9 >    RealType,int,char.
10   */
11   typedef  struct{
10  double dielect;
12    int SIM_uses_PBC;
13 <  int SIM_uses_LJ;
14 <  int SIM_uses_sticky;
15 <  int SIM_uses_charges;
16 <  int SIM_uses_dipoles;
17 <  int SIM_uses_RF;
18 <  int SIM_uses_GB;
13 >  int SIM_uses_DirectionalAtoms;
14 >  int SIM_uses_LennardJones;
15 >  int SIM_uses_Electrostatics;
16 >  int SIM_uses_Charges;
17 >  int SIM_uses_Dipoles;
18 >  int SIM_uses_Sticky;
19 >  int SIM_uses_StickyPower;
20 >  int SIM_uses_GayBerne;
21    int SIM_uses_EAM;
22 +  int SIM_uses_Shapes;
23 +  int SIM_uses_FLARB;
24 +  int SIM_uses_RF;
25 +  int SIM_uses_SF;
26 +  int SIM_uses_SP;
27 +  int SIM_uses_SC;
28 +  int SIM_uses_MNM;
29 +  int SIM_uses_BoxDipole;
30 +  int SIM_uses_AtomicVirial;
31   } simtype;
32 < #endif //__FSIMULATION
33 < #endif //__C
32 > #endif /*__FSIMULATION*/
33 > #endif /*__OOPSE_C*/
34  
35   #ifdef  __FORTRAN90
36  
37 < type, public :: simtype
38 <   PRIVATE
39 <   SEQUENCE
40 <   !! Dielectric Constant for reaction field
41 <   real ( kind = dp ) :: dielect = 0.0_dp
42 <   !! Periodic Boundry Conditions
43 <   logical :: SIM_uses_PBC
44 <   logical :: SIM_uses_LJ
45 <   logical :: SIM_uses_sticky
46 <   logical :: SIM_uses_charges
47 <   logical :: SIM_uses_dipoles
48 <   logical :: SIM_uses_RF
49 <   logical :: SIM_uses_GB
50 <   logical :: SIM_uses_EAM
51 < end type simtype
37 >  type, public :: simtype
38 >    PRIVATE
39 >    SEQUENCE
40 >    !! Periodic Boundry Conditions
41 >    logical :: SIM_uses_PBC
42 >    logical :: SIM_uses_DirectionalAtoms
43 >    logical :: SIM_uses_LennardJones
44 >    logical :: SIM_uses_Electrostatics
45 >    logical :: SIM_uses_Charges
46 >    logical :: SIM_uses_Dipoles
47 >    logical :: SIM_uses_Sticky
48 >    logical :: SIM_uses_StickyPower
49 >    logical :: SIM_uses_GayBerne
50 >    logical :: SIM_uses_EAM
51 >    logical :: SIM_uses_Shapes
52 >    logical :: SIM_uses_FLARB
53 >    logical :: SIM_uses_RF
54 >    logical :: SIM_uses_SF
55 >    logical :: SIM_uses_SP
56 >    logical :: SIM_uses_SC
57 >    logical :: SIM_uses_MNM
58 >    logical :: SIM_uses_BoxDipole
59 >    logical :: SIM_uses_AtomicVirial
60 >  end type simtype
61 >
62   #endif
63 +  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines