"wrappers/vscode:/vscode.git/clone" did not exist on "fb0360604800bba836be24cd6e8adce8b22b258a"
BrookLangevinDynamics.cpp 42.2 KB
Newer Older
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
/* -------------------------------------------------------------------------- *
 *                                   OpenMM                                   *
 * -------------------------------------------------------------------------- *
 * This is part of the OpenMM molecular simulation toolkit originating from   *
 * Simbios, the NIH National Center for Physics-Based Simulation of           *
 * Biological Structures at Stanford, funded under the NIH Roadmap for        *
 * Medical Research, grant U54 GM072970. See https://simtk.org.               *
 *                                                                            *
 * Portions copyright (c) 2008 Stanford University and the Authors.           *
 * Authors: Mark Friedrichs                                                   *
 * Contributors:                                                              *
 *                                                                            *
 * Permission is hereby granted, free of charge, to any person obtaining a    *
 * copy of this software and associated documentation files (the "Software"), *
 * to deal in the Software without restriction, including without limitation  *
 * the rights to use, copy, modify, merge, publish, distribute, sublicense,   *
 * and/or sell copies of the Software, and to permit persons to whom the      *
 * Software is furnished to do so, subject to the following conditions:       *
 *                                                                            *
 * The above copyright notice and this permission notice shall be included in *
 * all copies or substantial portions of the Software.                        *
 *                                                                            *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR *
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   *
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    *
 * THE AUTHORS, CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,    *
 * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR      *
 * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE  *
 * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
 * -------------------------------------------------------------------------- */

#include <sstream>
33
#include "BrookLangevinDynamics.h"
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
34
35
36
#include "BrookPlatform.h"
#include "OpenMMException.h"
#include "BrookStreamImpl.h"
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
37
38
39
#include "gpu/kshakeh.h"
#include "gpu/kupdatesd.h"
#include "gpu/kcommon.h"
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
40
41
42

// use random number generator

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
43
#include "../../reference/src/SimTKUtilities/SimTKOpenMMUtilities.h"
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
44
45
46
47
48

using namespace OpenMM;
using namespace std;

/** 
Mark Friedrichs's avatar
Mark Friedrichs committed
49
 *
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
50
51
52
53
 * Constructor
 * 
 */

54
BrookLangevinDynamics::BrookLangevinDynamics( ){
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
55
56
57

// ---------------------------------------------------------------------------------------

58
   //static const std::string methodName      = "BrookLangevinDynamics::BrookLangevinDynamics";
Mark Friedrichs's avatar
Mark Friedrichs committed
59
60
61
62

   BrookOpenMMFloat zero                    = (BrookOpenMMFloat)  0.0;
   BrookOpenMMFloat one                     = (BrookOpenMMFloat)  1.0;
   BrookOpenMMFloat oneMinus                = (BrookOpenMMFloat) -1.0;
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
63
64
65

// ---------------------------------------------------------------------------------------

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
66
   _numberOfParticles             = -1;
Mark Friedrichs's avatar
Mark Friedrichs committed
67
68
69

   // mark stream dimension variables as unset

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
70
71
72
   _sdParticleStreamWidth         = -1;
   _sdParticleStreamHeight        = -1;
   _sdParticleStreamSize          = -1;
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
73
74
75
76
77

   for( int ii = 0; ii < LastStreamIndex; ii++ ){
      _sdStreams[ii]   = NULL;
   }

Mark Friedrichs's avatar
Mark Friedrichs committed
78
79
   for( int ii = 0; ii < MaxDerivedParameters; ii++ ){
      _derivedParameters[ii]   = oneMinus;
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
80
81
   }

Mark Friedrichs's avatar
Mark Friedrichs committed
82
83
84
   _temperature = oneMinus;
   _stepSize    = oneMinus;
   _tau         = oneMinus;
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
85

Mark Friedrichs's avatar
Mark Friedrichs committed
86
87
88
89
90
91
   // setup inverse sqrt masses

   _inverseSqrtMasses = NULL;

   // set randomNumber seed 

Mark Friedrichs's avatar
Mark Friedrichs committed
92
93
   _randomNumberSeed  = 1393;

Mark Friedrichs's avatar
Mark Friedrichs committed
94
95
   //_randomNumberSeed = randomNumberSeed ? randomNumberSeed : 1393;
   //SimTKOpenMMUtilities::setRandomNumberSeed( randomNumberSeed );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
96
97
98
99
100
101
102
}   
 
/** 
 * Destructor
 * 
 */

103
BrookLangevinDynamics::~BrookLangevinDynamics( ){
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
104
105
106

// ---------------------------------------------------------------------------------------

107
   //static const std::string methodName      = "BrookLangevinDynamics::~BrookLangevinDynamics";
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
108
109
110
111
112
113
114

// ---------------------------------------------------------------------------------------

   for( int ii = 0; ii < LastStreamIndex; ii++ ){
      delete _sdStreams[ii];
   }

Mark Friedrichs's avatar
Mark Friedrichs committed
115
   delete[] _inverseSqrtMasses;
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
116
117
118
119

}

/** 
Mark Friedrichs's avatar
Mark Friedrichs committed
120
 * Get tau
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
121
 * 
Mark Friedrichs's avatar
Mark Friedrichs committed
122
 * @return  tau
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
123
124
125
 *
 */

126
BrookOpenMMFloat BrookLangevinDynamics::getTau( void ) const {
Mark Friedrichs's avatar
Mark Friedrichs committed
127
128
   return _tau;
}
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
129

Mark Friedrichs's avatar
Mark Friedrichs committed
130
131
132
133
134
135
136
/** 
 * Get friction
 * 
 * @return  friction
 *
 */

137
BrookOpenMMFloat BrookLangevinDynamics::getFriction( void ) const {
Mark Friedrichs's avatar
Mark Friedrichs committed
138
139
140
141
142
   static const BrookOpenMMFloat zero = (BrookOpenMMFloat) 0.0; 
   static const BrookOpenMMFloat one  = (BrookOpenMMFloat) 1.0; 
   return ( (_tau == zero) ? zero : (one/_tau) );
}

Mark Friedrichs's avatar
Mark Friedrichs committed
143
144
145
146
147
148
/** 
 * Get temperature
 * 
 * @return  temperature
 *
 */
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
149

150
BrookOpenMMFloat BrookLangevinDynamics::getTemperature( void ) const {
Mark Friedrichs's avatar
Mark Friedrichs committed
151
152
   return _temperature;
}
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
153

Mark Friedrichs's avatar
Mark Friedrichs committed
154
155
156
157
158
159
/** 
 * Get stepSize
 * 
 * @return  stepSize
 *
 */
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
160

161
BrookOpenMMFloat BrookLangevinDynamics::getStepSize( void ) const {
Mark Friedrichs's avatar
Mark Friedrichs committed
162
163
   return _stepSize;
}
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
164

Mark Friedrichs's avatar
Mark Friedrichs committed
165
166
167
168
169
/** 
 * Set tau
 * 
 * @param tau   new tau value
 *
Mark Friedrichs's avatar
Mark Friedrichs committed
170
 * @return      DefaultReturnValue
Mark Friedrichs's avatar
Mark Friedrichs committed
171
172
 *
 */
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
173

174
int BrookLangevinDynamics::_setTau( BrookOpenMMFloat tau ){
Mark Friedrichs's avatar
Mark Friedrichs committed
175
   _tau = tau;
Mark Friedrichs's avatar
Mark Friedrichs committed
176
   return DefaultReturnValue;
Mark Friedrichs's avatar
Mark Friedrichs committed
177
}
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
178

Mark Friedrichs's avatar
Mark Friedrichs committed
179
180
181
182
183
/** 
 * Set friction = 1/tau
 * 
 * @param friction   new friction value
 *
Mark Friedrichs's avatar
Mark Friedrichs committed
184
 * @return      DefaultReturnValue
Mark Friedrichs's avatar
Mark Friedrichs committed
185
186
 *
 */
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
187

188
int BrookLangevinDynamics::_setFriction( BrookOpenMMFloat friction ){
Mark Friedrichs's avatar
Mark Friedrichs committed
189
   _tau   = (BrookOpenMMFloat) ( (friction != 0.0) ? 1.0/friction : 0.0);
Mark Friedrichs's avatar
Mark Friedrichs committed
190
   return DefaultReturnValue;
Mark Friedrichs's avatar
Mark Friedrichs committed
191
}
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
192

Mark Friedrichs's avatar
Mark Friedrichs committed
193
194
195
196
197
/** 
 * Set temperature
 * 
 * @parameter   temperature
 *
Mark Friedrichs's avatar
Mark Friedrichs committed
198
 * @return      DefaultReturnValue
Mark Friedrichs's avatar
Mark Friedrichs committed
199
200
 *
 */
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
201

202
int BrookLangevinDynamics::_setTemperature( BrookOpenMMFloat temperature ){
Mark Friedrichs's avatar
Mark Friedrichs committed
203
   _temperature = temperature;
Mark Friedrichs's avatar
Mark Friedrichs committed
204
   return DefaultReturnValue;
Mark Friedrichs's avatar
Mark Friedrichs committed
205
}
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
206

Mark Friedrichs's avatar
Mark Friedrichs committed
207
208
209
210
211
/** 
 * Set stepSize
 * 
 * @param   stepSize
 *
Mark Friedrichs's avatar
Mark Friedrichs committed
212
 * @return      DefaultReturnValue
Mark Friedrichs's avatar
Mark Friedrichs committed
213
214
 *
 */
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
215

216
int BrookLangevinDynamics::_setStepSize( BrookOpenMMFloat stepSize ){
Mark Friedrichs's avatar
Mark Friedrichs committed
217
   _stepSize = stepSize;
Mark Friedrichs's avatar
Mark Friedrichs committed
218
   return DefaultReturnValue;
Mark Friedrichs's avatar
Mark Friedrichs committed
219
}
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
220
221

/** 
Mark Friedrichs's avatar
Mark Friedrichs committed
222
 * Update derived parameters
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
223
 * 
Mark Friedrichs's avatar
Mark Friedrichs committed
224
 * @return  DefaultReturnValue
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
225
 *
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
226
227
 * @throw   if tau too small
 *
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
228
229
 */

230
int BrookLangevinDynamics::_updateDerivedParameters( void ){
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
231
232
233

   // ---------------------------------------------------------------------------------------

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
234
   static const std::string methodName      = "\nBrookLangevinDynamics::_updateDerivedParameters";
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
235
236
237
238
239
240
241
242

   static const BrookOpenMMFloat zero       =  0.0;
   static const BrookOpenMMFloat one        =  1.0;
   static const BrookOpenMMFloat two        =  2.0;
   static const BrookOpenMMFloat three      =  3.0;
   static const BrookOpenMMFloat four       =  4.0;
   static const BrookOpenMMFloat half       =  0.5;

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
243
244
   float epsilon                            = 1.0e-08f;

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
245
246
   // ---------------------------------------------------------------------------------------

Mark Friedrichs's avatar
Mark Friedrichs committed
247
248
249
250
   BrookOpenMMFloat tau         = getTau();
   BrookOpenMMFloat temperature = getTemperature();
   BrookOpenMMFloat stepSize    = getStepSize();

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
251
252
253
254
255
256
257
   if(  fabsf( float( tau ) ) < epsilon ){
      std::stringstream message;
      message << methodName << " tau=" << tau << " too small.";
      throw OpenMMException( message.str() );
   }   


Mark Friedrichs's avatar
Mark Friedrichs committed
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
   _derivedParameters[GDT]      = stepSize/tau;

   _derivedParameters[EPH]      = EXP(  half*_derivedParameters[GDT] );
   _derivedParameters[EMH]      = EXP( -half*_derivedParameters[GDT] );
   _derivedParameters[EM]       = EXP(      -_derivedParameters[GDT] );
   _derivedParameters[EP]       = EXP(       _derivedParameters[GDT] );

   if( _derivedParameters[GDT] >= (BrookOpenMMFloat) 0.1 ){

      BrookOpenMMFloat term1    = _derivedParameters[EPH] - one;
                 term1         *= term1;
      _derivedParameters[B]     = _derivedParameters[GDT]*(_derivedParameters[EP] - one) - four*term1;

      _derivedParameters[C]     = _derivedParameters[GDT] - three + four*_derivedParameters[EMH] - _derivedParameters[EM];
      _derivedParameters[D]     = two - _derivedParameters[EPH] - _derivedParameters[EMH];

    } else {

      BrookOpenMMFloat term1        = half*_derivedParameters[GDT];
      BrookOpenMMFloat term2        = term1*term1;
      BrookOpenMMFloat term4        = term2*term2;

      BrookOpenMMFloat third        = (BrookOpenMMFloat) ( 1.0/3.0 );
      BrookOpenMMFloat o7_9         = (BrookOpenMMFloat) ( 7.0/9.0 );
      BrookOpenMMFloat o1_12        = (BrookOpenMMFloat) ( 1.0/12.0 );
      BrookOpenMMFloat o17_90       = (BrookOpenMMFloat) ( 17.0/90.0 );
      BrookOpenMMFloat o7_30        = (BrookOpenMMFloat) ( 7.0/30.0 );
      BrookOpenMMFloat o31_1260     = (BrookOpenMMFloat) ( 31.0/1260.0 );
      BrookOpenMMFloat o_360        = (BrookOpenMMFloat) ( 1.0/360.0 );

      _derivedParameters[B]         = term4*( third  + term1*( third + term1*( o17_90 + term1*o7_9 )));
      _derivedParameters[C]         = term2*term1*( two*third + term1*( -half + term1*( o7_30 + term1*(-o1_12 + term1*o31_1260 ))));
      _derivedParameters[D]         = term2*( -one + term2*(-o1_12 - term2*o_360));
   }    

   BrookOpenMMFloat kT        = ((BrookOpenMMFloat) BOLTZ)*temperature;

   _derivedParameters[V]      = SQRT( kT*( one - _derivedParameters[EM]) );
   _derivedParameters[X]      = tau*SQRT( kT*_derivedParameters[C] );
   _derivedParameters[Yv]     = SQRT( kT*_derivedParameters[B]/_derivedParameters[C] );
   _derivedParameters[Yx]     = tau*SQRT( kT*_derivedParameters[B]/(one - _derivedParameters[EM]) );

   _derivedParameters[Sd1pc1] = tau*( one - _derivedParameters[EM] );
   _derivedParameters[Sd1pc2] = tau*( _derivedParameters[EPH] - _derivedParameters[EMH] );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
302
303
304
   if(  fabsf( _derivedParameters[Sd1pc2] ) < 1.0e-06 ){
      _derivedParameters[Sd1pc2] = tau*_derivedParameters[GDT];
   }
Mark Friedrichs's avatar
Mark Friedrichs committed
305
   _derivedParameters[Sd1pc3] = _derivedParameters[D]/(tau*_derivedParameters[C] );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
306
307
308
309
310
311
312
313
314
315
316
317

   // if tau was greater than 20000, then _derivedParameters[Sd1pc2] was zero
   // using tau*_derivedParameters[GDT] as approximation to tau*( _derivedParameters[EPH] - _derivedParameters[EMH] ) for values in this
   // range

   if( fabsf( _derivedParameters[Sd1pc2] ) > 1.0e-10 ){
      _derivedParameters[Sd2pc1] = one/_derivedParameters[Sd1pc2];
   } else {
      std::stringstream message;
      message << methodName << " Sd1pc2=" << _derivedParameters[Sd1pc2] << " is too small (Sd2pc1 is 1/Sd1pc2)";
      throw OpenMMException( message.str() );
   }
Mark Friedrichs's avatar
Mark Friedrichs committed
318
319
   _derivedParameters[Sd2pc2] = tau*_derivedParameters[D]/( _derivedParameters[EM] - one );
       
Mark Friedrichs's avatar
Mark Friedrichs committed
320
   return DefaultReturnValue;
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
321

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
322
}
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
323
324

/** 
Mark Friedrichs's avatar
Mark Friedrichs committed
325
 * Update parameters -- only way parameters can be set
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
326
327
328
 * 
 * @param  temperature     temperature
 * @param  friction        friction
Mark Friedrichs's avatar
Mark Friedrichs committed
329
 * @param  step size       step size
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
330
331
332
333
334
 *
 * @return   solute dielectric
 *
 */

335
int BrookLangevinDynamics::updateParameters( double temperature, double friction, double stepSize ){
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
336
337
338

   // ---------------------------------------------------------------------------------------

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
339
340
341
   static int showUpdate               = 1;
   static int maxShowUpdate            = 3;
   static const std::string methodName = "\nBrookLangevinDynamics::updateParameters";
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
342
343
344

   // ---------------------------------------------------------------------------------------

Mark Friedrichs's avatar
Mark Friedrichs committed
345
346
   _setStepSize(    (BrookOpenMMFloat)  stepSize );
   _setFriction(    (BrookOpenMMFloat)  friction );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
347
   //_setTau(    (BrookOpenMMFloat)  friction );
Mark Friedrichs's avatar
Mark Friedrichs committed
348
   _setTemperature( (BrookOpenMMFloat)  temperature );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
349

Mark Friedrichs's avatar
Mark Friedrichs committed
350
   _updateDerivedParameters( );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
351
352
   _updateSdStreams( );

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
353
354
355
356
   // show update

   if( showUpdate && getLog() && (showUpdate++ < maxShowUpdate) ){
      std::string contents = getContentsString( );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
357
      (void) fprintf( getLog(), "%s contents\n%s", methodName.c_str(), contents.c_str() );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
358
359
360
361
      (void) fflush( getLog() );

   }

Mark Friedrichs's avatar
Mark Friedrichs committed
362
   return DefaultReturnValue;
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
363
364
365

};

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
366
367

/**
Mark Friedrichs's avatar
Mark Friedrichs committed
368
 *
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
369
370
371
 * Get array of derived parameters indexed by 'DerivedParameters' enums
 *
 * @return array
Mark Friedrichs's avatar
Mark Friedrichs committed
372
373
 *
 */
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
374
375
   
const BrookOpenMMFloat* BrookLangevinDynamics::getDerivedParameters( void ) const {
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
376

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
377
   // ---------------------------------------------------------------------------------------
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
378

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
379
   // static const std::string methodName  = "\nBrookLangevinDynamics::getDerivedParameters";
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
380

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
381
   // ---------------------------------------------------------------------------------------
Mark Friedrichs's avatar
Mark Friedrichs committed
382

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
383
384
   return _derivedParameters;
}
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
385

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
386
387
388
389
390
391
/** 
 * Get Particle stream size
 *
 * @return  Particle stream size
 *
 */
392

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
393
394
395
int BrookLangevinDynamics::getLangevinDynamicsParticleStreamSize( void ) const {
   return _sdParticleStreamSize;
}
396

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
397
398
399
400
401
402
/** 
 * Get particle stream width
 *
 * @return  particle stream width
 *
 */
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
403

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
404
405
406
int BrookLangevinDynamics::getLangevinDynamicsParticleStreamWidth( void ) const {
   return _sdParticleStreamWidth;
}
407

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
408
409
410
411
412
/** 
 * Get particle stream height
 *
 * @return particle stream height
 */
413

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
414
415
416
int BrookLangevinDynamics::getLangevinDynamicsParticleStreamHeight( void ) const {
   return _sdParticleStreamHeight;
}
417

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
418
419
420
421
422
423
/** 
 * Get SDPC1 stream 
 *
 * @return  SDPC1 stream
 *
 */
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
424

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
425
426
427
BrookFloatStreamInternal* BrookLangevinDynamics::getSDPC1Stream( void ) const {
   return _sdStreams[SDPC1Stream];
}
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
428

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
429
430
431
432
433
434
/** 
 * Get SDPC2 stream 
 *
 * @return  SDPC2 stream
 *
 */
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
435

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
436
437
438
BrookFloatStreamInternal* BrookLangevinDynamics::getSDPC2Stream( void ) const {
   return _sdStreams[SDPC2Stream];
}
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
439

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
440
441
442
443
444
445
/** 
 * Get SD2X stream 
 *
 * @return  SD2X stream
 *
 */
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
446

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
447
448
449
BrookFloatStreamInternal* BrookLangevinDynamics::getSD2XStream( void ) const {
   return _sdStreams[SD2XStream];
}
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
450

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
451
452
453
454
455
456
/** 
 * Get SD1V stream 
 *
 * @return  SD1V stream
 *
 */
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
457

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
458
459
460
BrookFloatStreamInternal* BrookLangevinDynamics::getSD1VStream( void ) const {
   return _sdStreams[SD1VStream];
}
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
461

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
462
463
464
465
466
467
/** 
 * Get VPrime stream 
 *
 * @return  Vprime stream
 *
 */
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
468

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
469
470
471
BrookFloatStreamInternal* BrookLangevinDynamics::getVPrimeStream( void ) const {
   return _sdStreams[VPrimeStream];
}
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
472

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
473
474
475
476
477
478
/** 
 * Get XPrime stream 
 *
 * @return  Xprime stream
 *
 */
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
479

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
480
481
482
BrookFloatStreamInternal* BrookLangevinDynamics::getXPrimeStream( void ) const {
   return _sdStreams[XPrimeStream];
}
Mark Friedrichs's avatar
Mark Friedrichs committed
483

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
484
485
486
487
488
489
/** 
 * Get InverseMass stream 
 *
 * @return  inverse mass stream
 *
 */
490

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
491
492
493
BrookFloatStreamInternal* BrookLangevinDynamics::getInverseMassStream( void ) const {
   return _sdStreams[InverseMassStream];
}
Mark Friedrichs's avatar
Mark Friedrichs committed
494

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
495
496
497
498
499
500
501
502
503
/** 
 * Initialize stream dimensions
 * 
 * @param numberOfParticles         number of particles
 * @param platform                  platform
 *      
 * @return ErrorReturnValue if error, else DefaultReturnValue
 *
 */
Mark Friedrichs's avatar
Mark Friedrichs committed
504

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
505
int BrookLangevinDynamics::_initializeStreamSizes( int numberOfParticles, const Platform& platform ){
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
506

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
507
// ---------------------------------------------------------------------------------------
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
508

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
509
   //static const std::string methodName      = "BrookLangevinDynamics::_initializeStreamSizes";
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
510

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
511
// ---------------------------------------------------------------------------------------
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
512

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
513
514
515
   _sdParticleStreamSize     = getParticleStreamSize( platform );
   _sdParticleStreamWidth    = getParticleStreamWidth( platform );
   _sdParticleStreamHeight   = getParticleStreamHeight( platform );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
516

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
517
518
   return DefaultReturnValue;
}
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
519

Mark Friedrichs's avatar
Mark Friedrichs committed
520
521
522
/** 
 * Initialize stream dimensions
 * 
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
523
 * @param numberOfParticles         number of particles
Mark Friedrichs's avatar
Mark Friedrichs committed
524
525
526
527
528
529
 * @param platform                  platform
 *
 * @return ErrorReturnValue if error, else DefaultReturnValue
 *
 */

530
531
//std::string BrookLangevinDynamics::_getDerivedParametersString( BrookLangevinDynamics::DerivedParameters  derivedParametersIndex ) const {
std::string BrookLangevinDynamics::_getDerivedParametersString( int derivedParametersIndex ) const {
Mark Friedrichs's avatar
Mark Friedrichs committed
532
533
534

// ---------------------------------------------------------------------------------------

535
   //static const std::string methodName      = "BrookLangevinDynamics::_getDerivedParametersString";
Mark Friedrichs's avatar
Mark Friedrichs committed
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618

// ---------------------------------------------------------------------------------------

   std::string returnString;
 
   switch( derivedParametersIndex ){
 
      case GDT:
         returnString = "GDT";
         break;
 
      case EPH:
         returnString = "EPH";
         break;
 
      case EMH:
         returnString = "EMH";
         break;
 
      case EP:
         returnString = "EP";
         break;
 
      case EM:
         returnString = "EM";
         break;
 
      case B:
         returnString = "B";
         break;
 
      case C:
         returnString = "C";
         break;
 
      case D:
         returnString = "D";
         break;
 
      case V:
         returnString = "V";
         break;
 
      case X:
         returnString = "X";
         break;
 
      case Yv:
         returnString = "Yv";
         break;
 
      case Yx:
         returnString = "Yx";
         break;
 
      case Sd1pc1:
         returnString = "Sd1pc1";
         break;
 
      case Sd1pc2:
         returnString = "Sd1pc2";
         break;
 
      case Sd1pc3:
         returnString = "Sd1pc3";
         break;
 
      case Sd2pc1:
         returnString = "Sd2pc1";
         break;
 
      case Sd2pc2:
         returnString = "Sd2pc2";
         break;
 
      default:
         returnString = "Unknown";
         break;
    }
 
    return returnString;
}

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
/** 
 * Initialize streams
 * 
 * @param platform                  platform
 *
 * @return ErrorReturnValue if error, else DefaultReturnValue
 *
 */

int BrookLangevinDynamics::_initializeStreams( const Platform& platform ){

// ---------------------------------------------------------------------------------------

   //static const std::string methodName      = "BrookLangevinDynamics::_initializeStreams";

   BrookOpenMMFloat dangleValue            = (BrookOpenMMFloat) 0.0;

// ---------------------------------------------------------------------------------------

   int sdParticleStreamSize         = getLangevinDynamicsParticleStreamSize();
   int sdParticleStreamWidth        = getLangevinDynamicsParticleStreamWidth();

    _sdStreams[SDPC1Stream]         = new BrookFloatStreamInternal( BrookCommon::SDPC1Stream,
                                                                    sdParticleStreamSize, sdParticleStreamWidth,
                                                                    BrookStreamInternal::Float2, dangleValue );

    _sdStreams[SDPC2Stream]         = new BrookFloatStreamInternal( BrookCommon::SDPC2Stream,
                                                                    sdParticleStreamSize, sdParticleStreamWidth,
                                                                    BrookStreamInternal::Float2, dangleValue );

    _sdStreams[SD2XStream]          = new BrookFloatStreamInternal( BrookCommon::SD2XStream,
                                                                    sdParticleStreamSize, sdParticleStreamWidth,
                                                                    BrookStreamInternal::Float3, dangleValue );

    _sdStreams[SD1VStream]          = new BrookFloatStreamInternal( BrookCommon::SD1VStream,
                                                                    sdParticleStreamSize, sdParticleStreamWidth,
                                                                    BrookStreamInternal::Float3, dangleValue );

    _sdStreams[VPrimeStream]        = new BrookFloatStreamInternal( BrookCommon::VPrimeStream,
                                                                    sdParticleStreamSize, sdParticleStreamWidth,
                                                                    BrookStreamInternal::Float3, dangleValue );

    _sdStreams[XPrimeStream]        = new BrookFloatStreamInternal( BrookCommon::XPrimeStream,
                                                                    sdParticleStreamSize, sdParticleStreamWidth,
                                                                    BrookStreamInternal::Float3, dangleValue );

    _sdStreams[InverseMassStream]   = new BrookFloatStreamInternal( BrookCommon::InverseMassStream,
                                                                    sdParticleStreamSize, sdParticleStreamWidth,
                                                                    BrookStreamInternal::Float, dangleValue );

   return DefaultReturnValue;
}

/** 
 * Update sd streams -- called after parameters change
 * 
 * @return ErrorReturnValue if error, else DefaultReturnValue
 *
 */

int BrookLangevinDynamics::_updateSdStreams( void ){

// ---------------------------------------------------------------------------------------

   static const std::string methodName       = "BrookLangevinDynamics::_updateSdStreams";

// ---------------------------------------------------------------------------------------

   int sdParticleStreamSize                  = getLangevinDynamicsParticleStreamSize();

   BrookOpenMMFloat* sdpc[2];
   for( int ii = 0; ii < 2; ii++ ){
      sdpc[ii] = new BrookOpenMMFloat[2*sdParticleStreamSize];
      memset( sdpc[ii], 0, 2*sdParticleStreamSize*sizeof( BrookOpenMMFloat ) ); 
   }
   BrookOpenMMFloat* inverseMass = new BrookOpenMMFloat[sdParticleStreamSize];
   memset( inverseMass, 0, sdParticleStreamSize*sizeof( BrookOpenMMFloat ) ); 

   const BrookOpenMMFloat* derivedParameters = getDerivedParameters( );
   int numberOfParticles                         = getNumberOfParticles();
   int index                                 = 0;
   for( int ii = 0; ii < numberOfParticles; ii++, index += 2 ){

      sdpc[0][index]      = _inverseSqrtMasses[ii]*( static_cast<BrookOpenMMFloat> (derivedParameters[Yv]) );
      sdpc[0][index+1]    = _inverseSqrtMasses[ii]*( static_cast<BrookOpenMMFloat> (derivedParameters[V])  );

      sdpc[1][index]      = _inverseSqrtMasses[ii]*( static_cast<BrookOpenMMFloat> (derivedParameters[Yx]) );
      sdpc[1][index+1]    = _inverseSqrtMasses[ii]*( static_cast<BrookOpenMMFloat> (derivedParameters[X])  );

      inverseMass[ii]     = _inverseSqrtMasses[ii]*_inverseSqrtMasses[ii];

   }

   _sdStreams[SDPC1Stream]->loadFromArray( sdpc[0] );
   _sdStreams[SDPC2Stream]->loadFromArray( sdpc[1] );
   _sdStreams[InverseMassStream]->loadFromArray( inverseMass );

   for( int ii = 0; ii < 2; ii++ ){
      delete[] sdpc[ii];
   }
   delete[] inverseMass;

   // initialize SD2X

   BrookOpenMMFloat* sd2x = new BrookOpenMMFloat[3*sdParticleStreamSize];
   //SimTKOpenMMUtilities::setRandomNumberSeed( (uint32_t) getRandomNumberSeed() );

   memset( sd2x, 0, 3*sdParticleStreamSize*sizeof( BrookOpenMMFloat ) ); 

   index = 0;
   for( int ii = 0; ii < numberOfParticles; ii++, index += 3 ){
      sd2x[index]        = _inverseSqrtMasses[ii]*derivedParameters[X]*( static_cast<BrookOpenMMFloat> (SimTKOpenMMUtilities::getNormallyDistributedRandomNumber()) );
      sd2x[index+1]      = _inverseSqrtMasses[ii]*derivedParameters[X]*( static_cast<BrookOpenMMFloat> (SimTKOpenMMUtilities::getNormallyDistributedRandomNumber()) );
      sd2x[index+2]      = _inverseSqrtMasses[ii]*derivedParameters[X]*( static_cast<BrookOpenMMFloat> (SimTKOpenMMUtilities::getNormallyDistributedRandomNumber()) );
   }
   
   _sdStreams[SD2XStream]->loadFromArray( sd2x );

   delete[] sd2x;

   return DefaultReturnValue;

}

/** 
 * Set masses 
 * 
 * @param masses             particle masses
 *
 */

int BrookLangevinDynamics::_setInverseSqrtMasses( const std::vector<double>& masses ){

// ---------------------------------------------------------------------------------------

   //static const std::string methodName      = "BrookLangevinDynamics::_setInverseSqrtMasses";

   BrookOpenMMFloat zero                    = (BrookOpenMMFloat)  0.0;
   BrookOpenMMFloat one                     = (BrookOpenMMFloat)  1.0;

// ---------------------------------------------------------------------------------------

   // setup inverse sqrt masses

   _inverseSqrtMasses = new BrookOpenMMFloat[masses.size()];
   int index          = 0;
   for( std::vector<double>::const_iterator ii = masses.begin(); ii != masses.end(); ii++, index++ ){
      if( *ii != 0.0 ){
         BrookOpenMMFloat value    = static_cast<BrookOpenMMFloat>(*ii);
         _inverseSqrtMasses[index] = ( SQRT( one/value ) );
      } else {
         _inverseSqrtMasses[index] = zero;
      }
   }

   return DefaultReturnValue;
}   
 
/*  
 * Setup of LangevinDynamics parameters
 *
 * @param masses                masses
 * @param platform              Brook platform
 *
 * @return nonzero value if error
 *
 * */
    
int BrookLangevinDynamics::setup( const std::vector<double>& masses, const Platform& platform ){
    
// ---------------------------------------------------------------------------------------

   static const std::string methodName      = "BrookLangevinDynamics::setup";

// ---------------------------------------------------------------------------------------

   const BrookPlatform brookPlatform        = dynamic_cast<const BrookPlatform&> (platform);
   setLog( brookPlatform.getLog() );

   int numberOfParticles  = (int) masses.size();
   setNumberOfParticles( numberOfParticles );

   // set stream sizes and then create streams

   _initializeStreamSizes( numberOfParticles, platform );
   _initializeStreams( platform );

   _setInverseSqrtMasses( masses );

   return DefaultReturnValue;
}

/* 
 * Get contents of object
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
813
 *
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
814
 * @param level   level of dump
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
815
 *
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
816
817
818
 * @return string containing contents
 *
 * */
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
819

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
820
std::string BrookLangevinDynamics::getContentsString( int level ) const {
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
821
822
823

// ---------------------------------------------------------------------------------------

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
824
   static const std::string methodName      = "BrookLangevinDynamics::getContentsString";
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
825

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
826
827
828
829
   static const unsigned int MAX_LINE_CHARS = 256;
   char value[MAX_LINE_CHARS];
   static const char* Set                   = "Set";
   static const char* NotSet                = "Not set";
Mark Friedrichs's avatar
Mark Friedrichs committed
830

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
831
832
// ---------------------------------------------------------------------------------------

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
833
834
   std::stringstream message;
   std::string tab   = "   ";
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
835

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
836
837
838
839
840
#ifdef WIN32
#define LOCAL_SPRINTF(a,b,c) sprintf_s( (a), MAX_LINE_CHARS, (b), (c) );   
#else
#define LOCAL_SPRINTF(a,b,c) sprintf( (a), (b), (c) );   
#endif
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
841

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
842
843
   (void) LOCAL_SPRINTF( value, "%d", getNumberOfParticles() );
   message << _getLine( tab, "Number of particles:", value ); 
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
844

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
845
846
   (void) LOCAL_SPRINTF( value, "%d", getParticleStreamWidth() );
   message << _getLine( tab, "Particle stream width:", value ); 
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
847

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
848
849
   (void) LOCAL_SPRINTF( value, "%d", getParticleStreamHeight() );
   message << _getLine( tab, "Particle stream height:", value ); 
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
850

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
851
852
   (void) LOCAL_SPRINTF( value, "%d", getParticleStreamSize() );
   message << _getLine( tab, "Particle stream size:", value ); 
Mark Friedrichs's avatar
Mark Friedrichs committed
853

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
854
855
   (void) LOCAL_SPRINTF( value, "%.5f", getTau() );
   message << _getLine( tab, "Tau:", value ); 
Mark Friedrichs's avatar
Mark Friedrichs committed
856

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
857
858
   (void) LOCAL_SPRINTF( value, "%.5f", getTemperature() );
   message << _getLine( tab, "Temperature:", value ); 
Mark Friedrichs's avatar
Mark Friedrichs committed
859

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
   (void) LOCAL_SPRINTF( value, "%.5f", getStepSize() );
   message << _getLine( tab, "Step size:", value ); 

   const BrookOpenMMFloat* derivedParameters = getDerivedParameters();
   for( int ii = 0; ii < MaxDerivedParameters; ii++ ){
      (void) LOCAL_SPRINTF( value, "%.5e", derivedParameters[ii] );
      message << _getLine( tab, _getDerivedParametersString( ii ), value ); 
   }

   (void) LOCAL_SPRINTF( value, "%.5f", getTemperature() );
   message << _getLine( tab, "Temperature:", value ); 

   message << _getLine( tab, "Log:",                  (getLog()                ? Set : NotSet) ); 

   message << _getLine( tab, "SDPC1:",                (getSDPC1Stream()        ? Set : NotSet) ); 
   message << _getLine( tab, "SDPC2:",                (getSDPC2Stream()        ? Set : NotSet) ); 
   message << _getLine( tab, "SD2X:",                 (getSD2XStream()         ? Set : NotSet) ); 
   message << _getLine( tab, "SD1V:",                 (getSD1VStream()         ? Set : NotSet) ); 
 
   for( int ii = 0; ii < LastStreamIndex; ii++ ){
      message << std::endl;
      if( _sdStreams[ii] ){
         message << _sdStreams[ii]->getContentsString( );
      }
   }

#undef LOCAL_SPRINTF
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
887

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
888
889
   return message.str();
}
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
890
/** 
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
891
 * Update
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
892
 * 
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
893
894
895
896
897
898
899
 * @param  positions                   particle positions
 * @param  velocities                  particle velocities
 * @param  forces                      particle forces
 * @param  brookShakeAlgorithm         BrookShakeAlgorithm reference
 * @param  brookRandomNumberGenerator  BrookRandomNumberGenerator reference
 *
 * @return  DefaultReturnValue
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
900
901
902
 *
 */

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
903
904
905
906
int BrookLangevinDynamics::update( BrookStreamImpl& positionStream, BrookStreamImpl& velocityStream,
                                   BrookStreamImpl& forceStream,
                                   BrookShakeAlgorithm& brookShakeAlgorithm,
                                   BrookRandomNumberGenerator& brookRandomNumberGenerator ){
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
907
908
909

// ---------------------------------------------------------------------------------------

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
910
911
   static const std::string methodName = "\nBrookLangevinDynamics::update";
   static const int PrintOn            = 0;
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
912
913
914

// ---------------------------------------------------------------------------------------

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
915
   const BrookOpenMMFloat* derivedParameters           = getDerivedParameters();
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
916

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
917
   if( (0 || PrintOn) && getLog() ){
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
918

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
919
      static int showAux = 1;
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
920

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
921
922
923
924
      if( PrintOn ){
         (void) fprintf( getLog(), "%s shake=%d\n", methodName.c_str(), brookShakeAlgorithm.getNumberOfConstraints() );
         (void) fflush( getLog() );
      }
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
925

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
926
927
928
929
      // show update
   
      if( showAux ){
         showAux = 0;
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
930

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
931
932
933
934
935
936
         std::string contents             = brookRandomNumberGenerator.getContentsString( );
         (void) fprintf( getLog(), "%s RNG contents\n%s", methodName.c_str(), contents.c_str() );
         // brookRandomNumberGenerator.getRandomNumberStream( brookRandomNumberGenerator.getRvStreamIndex() )->printToFile( getLog() ); 

         contents             = brookShakeAlgorithm.getContentsString( );
         (void) fprintf( getLog(), "%s Shake contents\n%s", methodName.c_str(), contents.c_str() );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
937

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
938
939
         (void) fflush( getLog() );
      }
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
940
941
   }

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
942
   // first integration step
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
943

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
   kupdate_sd1_fix1(
         (float) getLangevinDynamicsParticleStreamWidth(),
         (float) brookRandomNumberGenerator.getRandomNumberStreamWidth(),
         (float) brookRandomNumberGenerator.getRvStreamOffset(),
         derivedParameters[EM],
         derivedParameters[Sd1pc1],
         derivedParameters[Sd1pc2],
         derivedParameters[Sd1pc3],
         getSDPC1Stream()->getBrookStream(),
         brookRandomNumberGenerator.getRandomNumberStream( brookRandomNumberGenerator.getRvStreamIndex() )->getBrookStream(),
         getSD2XStream()->getBrookStream(),
         positionStream.getBrookStream(),
         forceStream.getBrookStream(),
         velocityStream.getBrookStream(),
         getInverseMassStream()->getBrookStream(),
         getSD1VStream()->getBrookStream(),
         getVPrimeStream()->getBrookStream(),
         getXPrimeStream()->getBrookStream() 
         );
 
   // diagnostics
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
965

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
966
967
968
969
970
971
972
   if( PrintOn ){
      (void) fprintf( getLog(), "\n%s Post kupdate_sd1_fix1: particleStrW=%3d rngStrW=%3d rngOff=%5d "
                                "EM=%12.5e Sd1pc[]=[%12.5e %12.5e %12.5e]", methodName.c_str(),
                                getLangevinDynamicsParticleStreamWidth(),
                                brookRandomNumberGenerator.getRandomNumberStreamWidth(),
                                brookRandomNumberGenerator.getRvStreamOffset(),
                                derivedParameters[EM], derivedParameters[Sd1pc1], derivedParameters[Sd1pc2], derivedParameters[Sd1pc3] );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
973

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
974
975
      (void) fprintf( getLog(), "\nSDPC1Stream\n" );
      getSDPC1Stream()->printToFile( getLog() );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
976

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
977
978
      (void) fprintf( getLog(), "\nSD2XStream\n" );
      getSD2XStream()->printToFile( getLog() );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
979

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
980
981
      (void) fprintf( getLog(), "\nInverseMassStream\n" );
      getInverseMassStream()->printToFile( getLog() );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
982

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
983
984
985
986
987
      //StreamImpl& positionStreamImpl               = positionStream.getImpl();
      //const BrookStreamImpl brookPositions         = dynamic_cast<BrookStreamImpl&> (positionStreamImpl);
      BrookStreamInternal* brookStreamInternalPos  = positionStream.getBrookStreamImpl();
      (void) fprintf( getLog(), "\nPositionStream\n" );
      brookStreamInternalPos->printToFile( getLog() );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
988

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
      (void) fprintf( getLog(), "\nForceStream\n" );
      BrookStreamInternal* brookStreamInternalF   = forceStream.getBrookStreamImpl();
      brookStreamInternalF->printToFile( getLog() );

      BrookStreamInternal* brookStreamInternalV   = velocityStream.getBrookStreamImpl();
      (void) fprintf( getLog(), "\nVelocityStream\n" );
      brookStreamInternalV->printToFile( getLog() );

      (void) fprintf( getLog(), "\nSD1VStream\n" );
      getSD1VStream()->printToFile( getLog() );

      (void) fprintf( getLog(), "\nVPrimeStream\n" );
      getVPrimeStream()->printToFile( getLog() );

      (void) fprintf( getLog(), "\nXPrimeStream\n" );
      getXPrimeStream()->printToFile( getLog() ); 

      (void) fprintf( getLog(), "\nRvStreamIndex=%d\n", brookRandomNumberGenerator.getRvStreamIndex() );
      // brookRandomNumberGenerator.getRandomNumberStream( brookRandomNumberGenerator.getRvStreamIndex() )->printToFile( getLog() ); 
   }   

   // advance random number cursor

   brookRandomNumberGenerator.advanceGVCursor( 2*getNumberOfParticles() );

   // first Shake step

   if( brookShakeAlgorithm.getNumberOfConstraints() > 0 ){

      kshakeh_fix1( 
                    (float) brookShakeAlgorithm.getMaxIterations(),
                    (float) getLangevinDynamicsParticleStreamWidth(),
                    brookShakeAlgorithm.getShakeTolerance(),
                    brookShakeAlgorithm.getShakeParticleIndicesStream()->getBrookStream(),
                    positionStream.getBrookStream(),
                    getXPrimeStream()->getBrookStream(),
                    brookShakeAlgorithm.getShakeParticleParameterStream()->getBrookStream(),
                    brookShakeAlgorithm.getShakeXCons0Stream()->getBrookStream(),
                    brookShakeAlgorithm.getShakeXCons1Stream()->getBrookStream(),
                    brookShakeAlgorithm.getShakeXCons2Stream()->getBrookStream(),
                    brookShakeAlgorithm.getShakeXCons3Stream()->getBrookStream() );
   
      // first Shake gather
   
      kshakeh_update1_fix1(
                    (float) getLangevinDynamicsParticleStreamWidth(),
                    brookShakeAlgorithm.getShakeInverseMapStream()->getBrookStream(),
                    getXPrimeStream()->getBrookStream(),
                    brookShakeAlgorithm.getShakeXCons0Stream()->getBrookStream(),
                    brookShakeAlgorithm.getShakeXCons1Stream()->getBrookStream(),
                    brookShakeAlgorithm.getShakeXCons2Stream()->getBrookStream(),
                    brookShakeAlgorithm.getShakeXCons3Stream()->getBrookStream(),
                    getXPrimeStream()->getBrookStream() );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1042

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1043
      if( ( 0 || PrintOn) && getLog() ){
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1044

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
         (void) fprintf( getLog(), "\n%s Post kshakeh_update2_fix1: particleStrW=%3d",
                                   methodName.c_str(), getLangevinDynamicsParticleStreamWidth() );
   
         (void) fprintf( getLog(), "\nShakeInverseMapStream\n" );
         brookShakeAlgorithm.getShakeInverseMapStream()->printToFile( getLog() );
   
         BrookStreamInternal* brookStreamInternalPos  = positionStream.getBrookStreamImpl();
         (void) fprintf( getLog(), "\nPositionStream\n" );
         brookStreamInternalPos->printToFile( getLog() );
   
         (void) fprintf( getLog(), "\nXPrimeStream\n" );
         getXPrimeStream()->printToFile( getLog() );  
Mark Friedrichs's avatar
Mark Friedrichs committed
1057

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1058
1059
         (void) fprintf( getLog(), "\nShakeXCons0\n" );
         brookShakeAlgorithm.getShakeXCons0Stream()->printToFile( getLog() );  
Mark Friedrichs's avatar
Mark Friedrichs committed
1060

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1061
1062
         (void) fprintf( getLog(), "\nShakeXCons1\n" );
         brookShakeAlgorithm.getShakeXCons1Stream()->printToFile( getLog() );  
Mark Friedrichs's avatar
Mark Friedrichs committed
1063

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1064
1065
         (void) fprintf( getLog(), "\nShakeXCons2\n" );
         brookShakeAlgorithm.getShakeXCons2Stream()->printToFile( getLog() );  
Mark Friedrichs's avatar
Mark Friedrichs committed
1066

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1067
1068
         (void) fprintf( getLog(), "\nShakeXCons3\n" );
         brookShakeAlgorithm.getShakeXCons3Stream()->printToFile( getLog() );  
Mark Friedrichs's avatar
Mark Friedrichs committed
1069

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1070
      }   
Mark Friedrichs's avatar
Mark Friedrichs committed
1071
1072
1073
1074


   }

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1075
   // second integration step
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1076

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
   kupdate_sd2_fix1(
         (float) getLangevinDynamicsParticleStreamWidth(),
         (float) brookRandomNumberGenerator.getRandomNumberStreamWidth(),
         (float) brookRandomNumberGenerator.getRvStreamOffset(),
         derivedParameters[Sd2pc1],
         derivedParameters[Sd2pc2],
         getSDPC2Stream()->getBrookStream(),
         brookRandomNumberGenerator.getRandomNumberStream( brookRandomNumberGenerator.getRvStreamIndex() )->getBrookStream(),
         getSD1VStream()->getBrookStream(),
         positionStream.getBrookStream(),
         getXPrimeStream()->getBrookStream(), 
         getVPrimeStream()->getBrookStream(),
         getSD2XStream()->getBrookStream(),
         velocityStream.getBrookStream(),
         getXPrimeStream()->getBrookStream() 
         );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1093

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1094
   // diagnostics
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1095

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1096
1097
1098
1099
1100
1101
1102
   if( 0 || PrintOn ){
      (void) fprintf( getLog(), "\n%s Post kupdate_sd2_fix1: particleStrW=%3d rngStrW=%3d rngOff=%5d "
                                "Sd2pc[]=[%12.5e %12.5e]", methodName.c_str(),
                                getLangevinDynamicsParticleStreamWidth(),
                                brookRandomNumberGenerator.getRandomNumberStreamWidth(),
                                brookRandomNumberGenerator.getRvStreamOffset(),
                                derivedParameters[Sd2pc1], derivedParameters[Sd2pc2] );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1103

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1104
1105
      (void) fprintf( getLog(), "\nSDPC2Stream\n" );
      getSDPC2Stream()->printToFile( getLog() );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1106

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1107
1108
      (void) fprintf( getLog(), "\nSD2XStream\n" );
      getSD1VStream()->printToFile( getLog() );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1109

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1110
1111
1112
      BrookStreamInternal* brookStreamInternalPos  = positionStream.getBrookStreamImpl();
      (void) fprintf( getLog(), "\nPositionStream\n" );
      brookStreamInternalPos->printToFile( getLog() );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1113

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1114
1115
      (void) fprintf( getLog(), "\nVPrimeStream\n" );
      getVPrimeStream()->printToFile( getLog() );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1116

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1117
1118
      (void) fprintf( getLog(), "\nXPrimeStream\n" );
      getXPrimeStream()->printToFile( getLog() ); 
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1119

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1120
1121
      (void) fprintf( getLog(), "\ngetSD2XStream\n" );
      getSD2XStream()->printToFile( getLog() );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1122

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1123
1124
1125
      BrookStreamInternal* brookStreamInternalVel  = velocityStream.getBrookStreamImpl();
      (void) fprintf( getLog(), "\nVelocityStream\n" );
      brookStreamInternalVel->printToFile( getLog() );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1126

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1127
1128
1129
      (void) fprintf( getLog(), "\nRvStreamIndex=%d\n", brookRandomNumberGenerator.getRvStreamIndex() );
//      brookRandomNumberGenerator.getRandomNumberStream( brookRandomNumberGenerator.getRvStreamIndex() )->printToFile( getLog() ); 
   }   
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1130

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1131
   // advance random number cursor
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1132

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1133
   brookRandomNumberGenerator.advanceGVCursor( 2*getNumberOfParticles() );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1134

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1135
   // second Shake step
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1136

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1137
   if( brookShakeAlgorithm.getNumberOfConstraints() > 0 ){
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1138

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
      kshakeh_fix1( 
                    (float) brookShakeAlgorithm.getMaxIterations(),
                    (float) getLangevinDynamicsParticleStreamWidth(),
                    brookShakeAlgorithm.getShakeTolerance(),
                    brookShakeAlgorithm.getShakeParticleIndicesStream()->getBrookStream(),
                    positionStream.getBrookStream(),
                    getXPrimeStream()->getBrookStream(),
                    brookShakeAlgorithm.getShakeParticleParameterStream()->getBrookStream(),
                    brookShakeAlgorithm.getShakeXCons0Stream()->getBrookStream(),
                    brookShakeAlgorithm.getShakeXCons1Stream()->getBrookStream(),
                    brookShakeAlgorithm.getShakeXCons2Stream()->getBrookStream(),
                    brookShakeAlgorithm.getShakeXCons3Stream()->getBrookStream() );
   
      // second Shake gather
   
      kshakeh_update2_fix1( 
                    (float) getLangevinDynamicsParticleStreamWidth(),
                    brookShakeAlgorithm.getShakeInverseMapStream()->getBrookStream(),
                    positionStream.getBrookStream(),
                    getXPrimeStream()->getBrookStream(),
                    brookShakeAlgorithm.getShakeXCons0Stream()->getBrookStream(),
                    brookShakeAlgorithm.getShakeXCons1Stream()->getBrookStream(),
                    brookShakeAlgorithm.getShakeXCons2Stream()->getBrookStream(),
                    brookShakeAlgorithm.getShakeXCons3Stream()->getBrookStream(),
                    positionStream.getBrookStream() );
   
      // diagnostics
   
      if( PrintOn ){
         (void) fprintf( getLog(), "\n%s Post kshakeh_update2_fix1: particleStrW=%3d rngStrW=%3d rngOff=%5d "
                                   "Sd2pc[]=[%12.5e %12.5e]", methodName.c_str(),
                                   getLangevinDynamicsParticleStreamWidth(),
                                   brookRandomNumberGenerator.getRandomNumberStreamWidth(),
                                   brookRandomNumberGenerator.getRvStreamOffset(),
                                   derivedParameters[Sd2pc1], derivedParameters[Sd2pc2] );
   
         BrookStreamInternal* brookStreamInternalPos  = positionStream.getBrookStreamImpl();
         (void) fprintf( getLog(), "\nPositionStream\n" );
         brookStreamInternalPos->printToFile( getLog() );
   
         brookStreamInternalPos  = velocityStream.getBrookStreamImpl();
         (void) fprintf( getLog(), "\nVelocityStream\n" );
         brookStreamInternalPos->printToFile( getLog() );
   
         (void) fprintf( getLog(), "\nXPrimeStream\n" );
         getXPrimeStream()->printToFile( getLog() ); 
   
   
//      brookRandomNumberGenerator.getRandomNumberStream( brookRandomNumberGenerator.getRvStreamIndex() )->printToFile( getLog() ); 
      }   
Mark Friedrichs's avatar
Mark Friedrichs committed
1189

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1190
   } else {
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1191

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1192
      // no constraints
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1193

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1194
1195
1196
1197
1198
1199
1200
1201
1202
      if( PrintOn ){
         (void) fprintf( getLog(), "\n%s Pre ksetStr3 (no constraints)", methodName.c_str() );
//         (void) fprintf( getLog(), "\nXPrimeStream\n" );
//         getXPrimeStream()->printToFile( getLog() );
   
         BrookStreamInternal* brookStreamInternalPos  = positionStream.getBrookStreamImpl();
         (void) fprintf( getLog(), "\nPositionStream\n" );
         brookStreamInternalPos->printToFile( getLog() );
      }
Mark Friedrichs's avatar
Mark Friedrichs committed
1203

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1204
1205
      kadd3( getXPrimeStream()->getBrookStream(), positionStream.getBrookStream(), positionStream.getBrookStream() );
      //ksetStr3( getXPrimeStream()->getBrookStream(), positionStream.getBrookStream() );
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1206

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1207
1208
1209
1210
      // diagnostics
   
      if( PrintOn ){
         (void) fprintf( getLog(), "\n%s Post ksetStr3 (no constraints)", methodName.c_str() );
Mark Friedrichs's avatar
Mark Friedrichs committed
1211

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1212
1213
1214
1215
1216
1217
1218
1219
1220
         (void) fprintf( getLog(), "\nXPrimeStream\n" );
         getXPrimeStream()->printToFile( getLog() );
   
         BrookStreamInternal* brookStreamInternalPos  = positionStream.getBrookStreamImpl();
         (void) fprintf( getLog(), "\nPositionStream\n" );
         brookStreamInternalPos->printToFile( getLog() );
   
//      brookRandomNumberGenerator.getRandomNumberStream( brookRandomNumberGenerator.getRvStreamIndex() )->printToFile( getLog() ); 
      }   
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1221
1222
   }

Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1223
   return DefaultReturnValue;
Mark Friedrichs's avatar
Mods  
Mark Friedrichs committed
1224
1225

}