7 |
|
#include "SimInfo.hpp" |
8 |
|
#include "Thermo.hpp" |
9 |
|
#include "ReadWrite.hpp" |
10 |
+ |
#include "ExtendedSystem.hpp" |
11 |
|
|
12 |
|
extern "C"{ |
13 |
|
|
30 |
|
} |
31 |
|
|
32 |
|
|
33 |
< |
Verlet::Verlet( SimInfo &info, ForceFields* the_ff ){ |
33 |
> |
Verlet::Verlet( SimInfo &info, ForceFields* the_ff, ExtendedSystem* the_es ){ |
34 |
|
|
35 |
|
// get what information we need from the SimInfo object |
36 |
|
|
37 |
|
entry_plug = &info; |
38 |
|
myFF = the_ff; |
39 |
< |
|
40 |
< |
|
39 |
> |
myES = the_es; |
40 |
> |
|
41 |
|
c_natoms = info.n_atoms; |
42 |
|
c_atoms = info.atoms; |
43 |
< |
c_sr_interactions = info.sr_interactions; |
44 |
< |
c_n_SRI = info.n_SRI; |
43 |
> |
nMols = info.n_mol; |
44 |
> |
molecules = info.molecules; |
45 |
|
c_is_constrained = 0; |
46 |
|
c_box_x = info.box_x; |
47 |
|
c_box_y = info.box_y; |
68 |
|
|
69 |
|
Constraint *temp_con; |
70 |
|
Constraint *dummy_plug; |
71 |
< |
temp_con = new Constraint[c_n_SRI]; |
71 |
> |
temp_con = new Constraint[info.n_SRI]; |
72 |
|
|
73 |
|
c_n_constrained = 0; |
74 |
|
int constrained = 0; |
75 |
< |
|
76 |
< |
for(int i = 0; i < c_n_SRI; i++){ |
75 |
> |
SRI** theArray; |
76 |
> |
for(int i = 0; i < nMols; i++){ |
77 |
|
|
78 |
< |
constrained = c_sr_interactions[i]->is_constrained(); |
78 |
> |
theArray = (SRI**) molecules[i].getMyBonds(); |
79 |
> |
for(int j=0; j<molecules[i].getNBonds(); j++){ |
80 |
> |
|
81 |
> |
constrained = theArray[j]->is_constrained(); |
82 |
> |
|
83 |
> |
if(constrained){ |
84 |
> |
|
85 |
> |
dummy_plug = theArray[j]->get_constraint(); |
86 |
> |
temp_con[c_n_constrained].set_a( dummy_plug->get_a() ); |
87 |
> |
temp_con[c_n_constrained].set_b( dummy_plug->get_b() ); |
88 |
> |
temp_con[c_n_constrained].set_dsqr( dummy_plug->get_dsqr() ); |
89 |
> |
|
90 |
> |
c_n_constrained++; |
91 |
> |
constrained = 0; |
92 |
> |
} |
93 |
> |
} |
94 |
|
|
95 |
< |
if(constrained){ |
95 |
> |
theArray = (SRI**) molecules[i].getMyBends(); |
96 |
> |
for(int j=0; j<molecules[i].getNBends(); j++){ |
97 |
|
|
98 |
< |
dummy_plug = c_sr_interactions[i]->get_constraint(); |
99 |
< |
temp_con[c_n_constrained].set_a( dummy_plug->get_a() ); |
100 |
< |
temp_con[c_n_constrained].set_b( dummy_plug->get_b() ); |
101 |
< |
temp_con[c_n_constrained].set_dsqr( dummy_plug->get_dsqr() ); |
98 |
> |
constrained = theArray[j]->is_constrained(); |
99 |
> |
|
100 |
> |
if(constrained){ |
101 |
> |
|
102 |
> |
dummy_plug = theArray[j]->get_constraint(); |
103 |
> |
temp_con[c_n_constrained].set_a( dummy_plug->get_a() ); |
104 |
> |
temp_con[c_n_constrained].set_b( dummy_plug->get_b() ); |
105 |
> |
temp_con[c_n_constrained].set_dsqr( dummy_plug->get_dsqr() ); |
106 |
> |
|
107 |
> |
c_n_constrained++; |
108 |
> |
constrained = 0; |
109 |
> |
} |
110 |
> |
} |
111 |
|
|
112 |
< |
c_n_constrained++; |
113 |
< |
constrained = 0; |
112 |
> |
theArray = (SRI**) molecules[i].getMyTorsions(); |
113 |
> |
for(int j=0; j<molecules[i].getNTorsions(); j++){ |
114 |
> |
|
115 |
> |
constrained = theArray[j]->is_constrained(); |
116 |
> |
|
117 |
> |
if(constrained){ |
118 |
> |
|
119 |
> |
dummy_plug = theArray[j]->get_constraint(); |
120 |
> |
temp_con[c_n_constrained].set_a( dummy_plug->get_a() ); |
121 |
> |
temp_con[c_n_constrained].set_b( dummy_plug->get_b() ); |
122 |
> |
temp_con[c_n_constrained].set_dsqr( dummy_plug->get_dsqr() ); |
123 |
> |
|
124 |
> |
c_n_constrained++; |
125 |
> |
constrained = 0; |
126 |
> |
} |
127 |
|
} |
128 |
+ |
|
129 |
+ |
|
130 |
|
} |
131 |
|
|
132 |
|
if(c_n_constrained > 0){ |
135 |
|
c_constrained_i = new int[c_n_constrained]; |
136 |
|
c_constrained_j = new int[c_n_constrained]; |
137 |
|
c_constrained_dsqr = new double[c_n_constrained]; |
138 |
< |
|
138 |
> |
|
139 |
|
for( int i = 0; i < c_n_constrained; i++){ |
140 |
|
|
141 |
|
/* add 1 to the index for the fortran arrays. */ |
142 |
< |
|
142 |
> |
|
143 |
|
c_constrained_i[i] = temp_con[i].get_a() + 1; |
144 |
|
c_constrained_j[i] = temp_con[i].get_b() + 1; |
145 |
|
c_constrained_dsqr[i] = temp_con[i].get_dsqr(); |