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 963 by tim, Wed May 17 21:51:42 2006 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  
# Line 9 | Line 9 | typedef  struct{
9      RealType,int,char.
10   */
11   typedef  struct{
12 –  RealType dielect;
12    int SIM_uses_PBC;
13    int SIM_uses_DirectionalAtoms;
14    int SIM_uses_LennardJones;
# Line 24 | Line 23 | typedef  struct{
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_MEAM;
28 >  int SIM_uses_MNM;
29 >  int SIM_uses_BoxDipole;
30 >  int SIM_uses_AtomicVirial;
31   } simtype;
32   #endif /*__FSIMULATION*/
33 < #endif /*__C*/
33 > #endif /*__OOPSE_C*/
34  
35   #ifdef  __FORTRAN90
36  
37    type, public :: simtype
38      PRIVATE
39      SEQUENCE
38 –    !! Dielectric Constant for reaction field
39 –    real ( kind = dp ) :: dielect = 0.0_dp
40      !! Periodic Boundry Conditions
41      logical :: SIM_uses_PBC
42      logical :: SIM_uses_DirectionalAtoms
# Line 52 | Line 52 | typedef  struct{
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_MEAM
57 >    logical :: SIM_uses_MNM
58 >    logical :: SIM_uses_BoxDipole
59 >    logical :: SIM_uses_AtomicVirial
60    end type simtype
61  
62   #endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines