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

Comparing trunk/OOPSE-3.0/src/brains/fSimulation.h (file contents):
Revision 1490 by gezelter, Fri Sep 24 04:16:43 2004 UTC vs.
Revision 2204 by gezelter, Fri Apr 15 22:04:00 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_GayBerne;
21    int SIM_uses_EAM;
22 +  int SIM_uses_Shapes;
23 +  int SIM_uses_FLARB;
24 +  int SIM_uses_RF;
25   } simtype;
26   #endif //__FSIMULATION
27   #endif //__C
28  
29   #ifdef  __FORTRAN90
30  
31 < type, public :: simtype
32 <   PRIVATE
33 <   SEQUENCE
34 <   !! Dielectric Constant for reaction field
35 <   real ( kind = dp ) :: dielect = 0.0_dp
36 <   !! Periodic Boundry Conditions
37 <   logical :: SIM_uses_PBC
38 <   logical :: SIM_uses_LJ
39 <   logical :: SIM_uses_sticky
40 <   logical :: SIM_uses_charges
41 <   logical :: SIM_uses_dipoles
42 <   logical :: SIM_uses_RF
43 <   logical :: SIM_uses_GB
44 <   logical :: SIM_uses_EAM
45 < end type simtype
31 >  type, public :: simtype
32 >    PRIVATE
33 >    SEQUENCE
34 >    !! Dielectric Constant for reaction field
35 >    real ( kind = dp ) :: dielect = 0.0_dp
36 >    !! Periodic Boundry Conditions
37 >    logical :: SIM_uses_PBC
38 >    logical :: SIM_uses_DirectionalAtoms
39 >    logical :: SIM_uses_LennardJones
40 >    logical :: SIM_uses_Electrostatics
41 >    logical :: SIM_uses_Charges
42 >    logical :: SIM_uses_Dipoles
43 >    logical :: SIM_uses_Sticky
44 >    logical :: SIM_uses_GayBerne
45 >    logical :: SIM_uses_EAM
46 >    logical :: SIM_uses_Shapes
47 >    logical :: SIM_uses_FLARB
48 >    logical :: SIM_uses_RF
49 >  end type simtype
50 >
51   #endif
52 +  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines