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 1634 by gezelter, Fri Oct 22 21:21:02 2004 UTC vs.
Revision 2419 by chrisfen, Tue Nov 8 13:32:06 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 15 | Line 17 | typedef  struct{
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 +  int SIM_uses_SF;
27   } simtype;
28 < #endif //__FSIMULATION
29 < #endif //__C
28 > #endif /*__FSIMULATION*/
29 > #endif /*__C*/
30  
31   #ifdef  __FORTRAN90
32  
33 < type, public :: simtype
34 <   PRIVATE
35 <   SEQUENCE
36 <   !! Dielectric Constant for reaction field
37 <   real ( kind = dp ) :: dielect = 0.0_dp
38 <   !! Periodic Boundry Conditions
39 <   logical :: SIM_uses_PBC
40 <   logical :: SIM_uses_DirectionalAtoms
41 <   logical :: SIM_uses_LennardJones
42 <   logical :: SIM_uses_Electrostatics
43 <   logical :: SIM_uses_Charges
44 <   logical :: SIM_uses_Dipoles
45 <   logical :: SIM_uses_Sticky
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
33 >  type, public :: simtype
34 >    PRIVATE
35 >    SEQUENCE
36 >    !! Dielectric Constant for reaction field
37 >    real ( kind = dp ) :: dielect = 0.0_dp
38 >    !! Periodic Boundry Conditions
39 >    logical :: SIM_uses_PBC
40 >    logical :: SIM_uses_DirectionalAtoms
41 >    logical :: SIM_uses_LennardJones
42 >    logical :: SIM_uses_Electrostatics
43 >    logical :: SIM_uses_Charges
44 >    logical :: SIM_uses_Dipoles
45 >    logical :: SIM_uses_Sticky
46 >    logical :: SIM_uses_StickyPower
47 >    logical :: SIM_uses_GayBerne
48 >    logical :: SIM_uses_EAM
49 >    logical :: SIM_uses_Shapes
50 >    logical :: SIM_uses_FLARB
51 >    logical :: SIM_uses_RF
52 >    logical :: SIM_uses_SF
53 >  end type simtype
54 >
55   #endif
56 +  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines