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

Comparing trunk/OOPSE-2.0/src/brains/fSimulation.h (file contents):
Revision 1490 by gezelter, Fri Sep 24 04:16:43 2004 UTC vs.
Revision 2220 by chrisfen, Thu May 5 14:47:35 2005 UTC

# Line 1 | Line 1
1   #ifdef __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
# Line 9 | Line 11 | typedef  struct{
11   typedef  struct{
12    double dielect;
13    int SIM_uses_PBC;
14 <  int SIM_uses_LJ;
15 <  int SIM_uses_sticky;
16 <  int SIM_uses_charges;
17 <  int SIM_uses_dipoles;
18 <  int SIM_uses_RF;
19 <  int SIM_uses_GB;
14 >  int SIM_uses_DirectionalAtoms;
15 >  int SIM_uses_LennardJones;
16 >  int SIM_uses_Electrostatics;
17 >  int SIM_uses_Charges;
18 >  int SIM_uses_Dipoles;
19 >  int SIM_uses_Sticky;
20 >  int SIM_uses_StickyPower;
21 >  int SIM_uses_GayBerne;
22    int SIM_uses_EAM;
23 +  int SIM_uses_Shapes;
24 +  int SIM_uses_FLARB;
25 +  int SIM_uses_RF;
26   } simtype;
27   #endif //__FSIMULATION
28   #endif //__C
29  
30   #ifdef  __FORTRAN90
31  
32 < type, public :: simtype
33 <   PRIVATE
34 <   SEQUENCE
35 <   !! Dielectric Constant for reaction field
36 <   real ( kind = dp ) :: dielect = 0.0_dp
37 <   !! Periodic Boundry Conditions
38 <   logical :: SIM_uses_PBC
39 <   logical :: SIM_uses_LJ
40 <   logical :: SIM_uses_sticky
41 <   logical :: SIM_uses_charges
42 <   logical :: SIM_uses_dipoles
43 <   logical :: SIM_uses_RF
44 <   logical :: SIM_uses_GB
45 <   logical :: SIM_uses_EAM
46 < end type simtype
32 >  type, public :: simtype
33 >    PRIVATE
34 >    SEQUENCE
35 >    !! Dielectric Constant for reaction field
36 >    real ( kind = dp ) :: dielect = 0.0_dp
37 >    !! Periodic Boundry Conditions
38 >    logical :: SIM_uses_PBC
39 >    logical :: SIM_uses_DirectionalAtoms
40 >    logical :: SIM_uses_LennardJones
41 >    logical :: SIM_uses_Electrostatics
42 >    logical :: SIM_uses_Charges
43 >    logical :: SIM_uses_Dipoles
44 >    logical :: SIM_uses_Sticky
45 >    logical :: SIM_uses_StickyPower
46 >    logical :: SIM_uses_GayBerne
47 >    logical :: SIM_uses_EAM
48 >    logical :: SIM_uses_Shapes
49 >    logical :: SIM_uses_FLARB
50 >    logical :: SIM_uses_RF
51 >  end type simtype
52 >
53   #endif
54 +  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines