ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/trunk/src/rnemd/RNEMD.cpp

Comparing trunk/src/rnemd/RNEMD.cpp (file contents):
Revision 1804 by gezelter, Wed Oct 17 19:04:44 2012 UTC vs.
Revision 1946 by gezelter, Tue Nov 12 02:18:35 2013 UTC

#	Line 35 | Line 35
35		*
36		* [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).
37		* [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).
38	<	* [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).
38	>	* [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).
39		* [4]  Vardeman & Gezelter, in progress (2009).
40		*/
41	+	#ifdef IS_MPI
42	+	#include <mpi.h>
43	+	#endif
44
45		#include <cmath>
46	+	#include <sstream>
47	+	#include <string>
48	+
49		#include "rnemd/RNEMD.hpp"
50		#include "math/Vector3.hpp"
51		#include "math/Vector.hpp"
#	Line 49 | Line 55
55		#include "primitives/StuntDouble.hpp"
56		#include "utils/PhysicalConstants.hpp"
57		#include "utils/Tuple.hpp"
58	<	#ifdef IS_MPI
59	<	#include <mpi.h>
54	<	#endif
58	>	#include "brains/Thermo.hpp"
59	>	#include "math/ConvexHull.hpp"
60
61		#ifdef _MSC_VER
62		#define isnan(x) _isnan((x))
#	Line 64 | Line 69 | namespace OpenMD {
69		namespace OpenMD {
70
71		RNEMD::RNEMD(SimInfo* info) : info_(info), evaluator_(info), seleMan_(info),
72	+	evaluatorA_(info), seleManA_(info),
73	+	commonA_(info), evaluatorB_(info),
74	+	seleManB_(info), commonB_(info),
75	+	hasData_(false), hasDividingArea_(false),
76		usePeriodicBoundaryConditions_(info->getSimParams()->getUsePeriodicBoundaryConditions()) {
77
78		trialCount_ = 0;
79		failTrialCount_ = 0;
80		failRootCount_ = 0;
81
82	<	Globals * simParams = info->getSimParams();
82	>	Globals* simParams = info->getSimParams();
83		RNEMDParameters* rnemdParams = simParams->getRNEMDParameters();
84
85		doRNEMD_ = rnemdParams->getUseRNEMD();
#	Line 85 | Line 94 | namespace OpenMD {
94		stringToFluxType_["Py"]  = rnemdPy;
95		stringToFluxType_["Pz"]  = rnemdPz;
96		stringToFluxType_["Pvector"]  = rnemdPvector;
97	+	stringToFluxType_["Lx"]  = rnemdLx;
98	+	stringToFluxType_["Ly"]  = rnemdLy;
99	+	stringToFluxType_["Lz"]  = rnemdLz;
100	+	stringToFluxType_["Lvector"]  = rnemdLvector;
101		stringToFluxType_["KE+Px"]  = rnemdKePx;
102		stringToFluxType_["KE+Py"]  = rnemdKePy;
103		stringToFluxType_["KE+Pvector"]  = rnemdKePvector;
104	+	stringToFluxType_["KE+Lx"]  = rnemdKeLx;
105	+	stringToFluxType_["KE+Ly"]  = rnemdKeLy;
106	+	stringToFluxType_["KE+Lz"]  = rnemdKeLz;
107	+	stringToFluxType_["KE+Lvector"]  = rnemdKeLvector;
108
109		runTime_ = simParams->getRunTime();
110		statusTime_ = simParams->getStatusTime();
111
95	–	rnemdObjectSelection_ = rnemdParams->getObjectSelection();
96	–	evaluator_.loadScriptString(rnemdObjectSelection_);
97	–	seleMan_.setSelectionSet(evaluator_.evaluate());
98	–
112		const string methStr = rnemdParams->getMethod();
113		bool hasFluxType = rnemdParams->haveFluxType();
114
115	+	rnemdObjectSelection_ = rnemdParams->getObjectSelection();
116	+
117		string fluxStr;
118		if (hasFluxType) {
119		fluxStr = rnemdParams->getFluxType();
#	Line 106 | Line 121 | namespace OpenMD {
121		sprintf(painCave.errMsg,
122		"RNEMD: No fluxType was set in the md file.  This parameter,\n"
123		"\twhich must be one of the following values:\n"
124	<	"\tKE, Px, Py, Pz, Pvector, KE+Px, KE+Py, KE+Pvector\n"
124	>	"\tKE, Px, Py, Pz, Pvector, Lx, Ly, Lz, Lvector,\n"
125	>	"\tKE+Px, KE+Py, KE+Pvector, KE+Lx, KE+Ly, KE+Lz, KE+Lvector\n"
126		"\tmust be set to use RNEMD\n");
127		painCave.isFatal = 1;
128		painCave.severity = OPENMD_ERROR;
#	Line 116 | Line 132 | namespace OpenMD {
132		bool hasKineticFlux = rnemdParams->haveKineticFlux();
133		bool hasMomentumFlux = rnemdParams->haveMomentumFlux();
134		bool hasMomentumFluxVector = rnemdParams->haveMomentumFluxVector();
135	+	bool hasAngularMomentumFlux = rnemdParams->haveAngularMomentumFlux();
136	+	bool hasAngularMomentumFluxVector = rnemdParams->haveAngularMomentumFluxVector();
137	+	hasSelectionA_ = rnemdParams->haveSelectionA();
138	+	hasSelectionB_ = rnemdParams->haveSelectionB();
139		bool hasSlabWidth = rnemdParams->haveSlabWidth();
140		bool hasSlabACenter = rnemdParams->haveSlabACenter();
141		bool hasSlabBCenter = rnemdParams->haveSlabBCenter();
142	+	bool hasSphereARadius = rnemdParams->haveSphereARadius();
143	+	hasSphereBRadius_ = rnemdParams->haveSphereBRadius();
144	+	bool hasCoordinateOrigin = rnemdParams->haveCoordinateOrigin();
145		bool hasOutputFileName = rnemdParams->haveOutputFileName();
146		bool hasOutputFields = rnemdParams->haveOutputFields();
147
#	Line 203 | Line 226 | namespace OpenMD {
226		case rnemdPz:
227		hasCorrectFlux = hasMomentumFlux;
228		break;
229	+	case rnemdLx:
230	+	case rnemdLy:
231	+	case rnemdLz:
232	+	hasCorrectFlux = hasAngularMomentumFlux;
233	+	break;
234		case rnemdPvector:
235		hasCorrectFlux = hasMomentumFluxVector;
236		break;
237	+	case rnemdLvector:
238	+	hasCorrectFlux = hasAngularMomentumFluxVector;
239	+	break;
240		case rnemdKePx:
241		case rnemdKePy:
242		hasCorrectFlux = hasMomentumFlux && hasKineticFlux;
243		break;
244	+	case rnemdKeLx:
245	+	case rnemdKeLy:
246	+	case rnemdKeLz:
247	+	hasCorrectFlux = hasAngularMomentumFlux && hasKineticFlux;
248	+	break;
249		case rnemdKePvector:
250		hasCorrectFlux = hasMomentumFluxVector && hasKineticFlux;
251		break;
252	+	case rnemdKeLvector:
253	+	hasCorrectFlux = hasAngularMomentumFluxVector && hasKineticFlux;
254	+	break;
255		default:
256		methodFluxMismatch = true;
257		break;
#	Line 235 | Line 274 | namespace OpenMD {
274		sprintf(painCave.errMsg,
275		"RNEMD: The current method, %s, and flux type, %s,\n"
276		"\tdid not have the correct flux value specified. Options\n"
277	<	"\tinclude: kineticFlux, momentumFlux, and momentumFluxVector\n",
277	>	"\tinclude: kineticFlux, momentumFlux, angularMomentumFlux,\n"
278	>	"\tmomentumFluxVector, and angularMomentumFluxVector.\n",
279		methStr.c_str(), fluxStr.c_str());
280		painCave.isFatal = 1;
281		painCave.severity = OPENMD_ERROR;
#	Line 275 | Line 315 | namespace OpenMD {
315		default:
316		break;
317		}
318	<	}
319	<	}
318	>	}
319	>	if (hasAngularMomentumFluxVector) {
320	>	angularMomentumFluxVector_ = rnemdParams->getAngularMomentumFluxVector();
321	>	} else {
322	>	angularMomentumFluxVector_ = V3Zero;
323	>	if (hasAngularMomentumFlux) {
324	>	RealType angularMomentumFlux = rnemdParams->getAngularMomentumFlux();
325	>	switch (rnemdFluxType_) {
326	>	case rnemdLx:
327	>	angularMomentumFluxVector_.x() = angularMomentumFlux;
328	>	break;
329	>	case rnemdLy:
330	>	angularMomentumFluxVector_.y() = angularMomentumFlux;
331	>	break;
332	>	case rnemdLz:
333	>	angularMomentumFluxVector_.z() = angularMomentumFlux;
334	>	break;
335	>	case rnemdKeLx:
336	>	angularMomentumFluxVector_.x() = angularMomentumFlux;
337	>	break;
338	>	case rnemdKeLy:
339	>	angularMomentumFluxVector_.y() = angularMomentumFlux;
340	>	break;
341	>	case rnemdKeLz:
342	>	angularMomentumFluxVector_.z() = angularMomentumFlux;
343	>	break;
344	>	default:
345	>	break;
346	>	}
347	>	}
348	>	}
349
350	<	// do some sanity checking
350	>	if (hasCoordinateOrigin) {
351	>	coordinateOrigin_ = rnemdParams->getCoordinateOrigin();
352	>	} else {
353	>	coordinateOrigin_ = V3Zero;
354	>	}
355
356	<	int selectionCount = seleMan_.getSelectionCount();
356	>	// do some sanity checking
357
358	<	int nIntegrable = info->getNGlobalIntegrableObjects();
358	>	int selectionCount = seleMan_.getSelectionCount();
359
360	<	if (selectionCount > nIntegrable) {
288	<	sprintf(painCave.errMsg,
289	<	"RNEMD: The current objectSelection,\n"
290	<	"\t\t%s\n"
291	<	"\thas resulted in %d selected objects.  However,\n"
292	<	"\tthe total number of integrable objects in the system\n"
293	<	"\tis only %d.  This is almost certainly not what you want\n"
294	<	"\tto do.  A likely cause of this is forgetting the _RB_0\n"
295	<	"\tselector in the selection script!\n",
296	<	rnemdObjectSelection_.c_str(),
297	<	selectionCount, nIntegrable);
298	<	painCave.isFatal = 0;
299	<	painCave.severity = OPENMD_WARNING;
300	<	simError();
301	<	}
360	>	int nIntegrable = info->getNGlobalIntegrableObjects();
361
362	<	areaAccumulator_ = new Accumulator();
362	>	if (selectionCount > nIntegrable) {
363	>	sprintf(painCave.errMsg,
364	>	"RNEMD: The current objectSelection,\n"
365	>	"\t\t%s\n"
366	>	"\thas resulted in %d selected objects.  However,\n"
367	>	"\tthe total number of integrable objects in the system\n"
368	>	"\tis only %d.  This is almost certainly not what you want\n"
369	>	"\tto do.  A likely cause of this is forgetting the _RB_0\n"
370	>	"\tselector in the selection script!\n",
371	>	rnemdObjectSelection_.c_str(),
372	>	selectionCount, nIntegrable);
373	>	painCave.isFatal = 0;
374	>	painCave.severity = OPENMD_WARNING;
375	>	simError();
376	>	}
377
378	<	nBins_ = rnemdParams->getOutputBins();
378	>	areaAccumulator_ = new Accumulator();
379
380	<	data_.resize(RNEMD::ENDINDEX);
381	<	OutputData z;
309	<	z.units =  "Angstroms";
310	<	z.title =  "Z";
311	<	z.dataType = "RealType";
312	<	z.accumulator.reserve(nBins_);
313	<	for (int i = 0; i < nBins_; i++)
314	<	z.accumulator.push_back( new Accumulator() );
315	<	data_[Z] = z;
316	<	outputMap_["Z"] =  Z;
380	>	nBins_ = rnemdParams->getOutputBins();
381	>	binWidth_ = rnemdParams->getOutputBinWidth();
382
383	<	OutputData temperature;
384	<	temperature.units =  "K";
385	<	temperature.title =  "Temperature";
386	<	temperature.dataType = "RealType";
387	<	temperature.accumulator.reserve(nBins_);
388	<	for (int i = 0; i < nBins_; i++)
389	<	temperature.accumulator.push_back( new Accumulator() );
390	<	data_[TEMPERATURE] = temperature;
391	<	outputMap_["TEMPERATURE"] =  TEMPERATURE;
383	>	data_.resize(RNEMD::ENDINDEX);
384	>	OutputData z;
385	>	z.units =  "Angstroms";
386	>	z.title =  "Z";
387	>	z.dataType = "RealType";
388	>	z.accumulator.reserve(nBins_);
389	>	for (int i = 0; i < nBins_; i++)
390	>	z.accumulator.push_back( new Accumulator() );
391	>	data_[Z] = z;
392	>	outputMap_["Z"] =  Z;
393
394	<	OutputData velocity;
395	<	velocity.units = "angstroms/fs";
396	<	velocity.title =  "Velocity";
397	<	velocity.dataType = "Vector3d";
398	<	velocity.accumulator.reserve(nBins_);
399	<	for (int i = 0; i < nBins_; i++)
400	<	velocity.accumulator.push_back( new VectorAccumulator() );
401	<	data_[VELOCITY] = velocity;
402	<	outputMap_["VELOCITY"] = VELOCITY;
394	>	OutputData r;
395	>	r.units =  "Angstroms";
396	>	r.title =  "R";
397	>	r.dataType = "RealType";
398	>	r.accumulator.reserve(nBins_);
399	>	for (int i = 0; i < nBins_; i++)
400	>	r.accumulator.push_back( new Accumulator() );
401	>	data_[R] = r;
402	>	outputMap_["R"] =  R;
403
404	<	OutputData density;
405	<	density.units =  "g cm^-3";
406	<	density.title =  "Density";
407	<	density.dataType = "RealType";
408	<	density.accumulator.reserve(nBins_);
409	<	for (int i = 0; i < nBins_; i++)
410	<	density.accumulator.push_back( new Accumulator() );
411	<	data_[DENSITY] = density;
412	<	outputMap_["DENSITY"] =  DENSITY;
404	>	OutputData temperature;
405	>	temperature.units =  "K";
406	>	temperature.title =  "Temperature";
407	>	temperature.dataType = "RealType";
408	>	temperature.accumulator.reserve(nBins_);
409	>	for (int i = 0; i < nBins_; i++)
410	>	temperature.accumulator.push_back( new Accumulator() );
411	>	data_[TEMPERATURE] = temperature;
412	>	outputMap_["TEMPERATURE"] =  TEMPERATURE;
413
414	<	if (hasOutputFields) {
415	<	parseOutputFileFormat(rnemdParams->getOutputFields());
416	<	} else {
417	<	outputMask_.set(Z);
418	<	switch (rnemdFluxType_) {
419	<	case rnemdKE:
420	<	case rnemdRotKE:
421	<	case rnemdFullKE:
422	<	outputMask_.set(TEMPERATURE);
357	<	break;
358	<	case rnemdPx:
359	<	case rnemdPy:
360	<	outputMask_.set(VELOCITY);
361	<	break;
362	<	case rnemdPz:
363	<	case rnemdPvector:
364	<	outputMask_.set(VELOCITY);
365	<	outputMask_.set(DENSITY);
366	<	break;
367	<	case rnemdKePx:
368	<	case rnemdKePy:
369	<	outputMask_.set(TEMPERATURE);
370	<	outputMask_.set(VELOCITY);
371	<	break;
372	<	case rnemdKePvector:
373	<	outputMask_.set(TEMPERATURE);
374	<	outputMask_.set(VELOCITY);
375	<	outputMask_.set(DENSITY);
376	<	break;
377	<	default:
378	<	break;
379	<	}
380	<	}
381	<
382	<	if (hasOutputFileName) {
383	<	rnemdFileName_ = rnemdParams->getOutputFileName();
384	<	} else {
385	<	rnemdFileName_ = getPrefix(info->getFinalConfigFileName()) + ".rnemd";
386	<	}
414	>	OutputData velocity;
415	>	velocity.units = "angstroms/fs";
416	>	velocity.title =  "Velocity";
417	>	velocity.dataType = "Vector3d";
418	>	velocity.accumulator.reserve(nBins_);
419	>	for (int i = 0; i < nBins_; i++)
420	>	velocity.accumulator.push_back( new VectorAccumulator() );
421	>	data_[VELOCITY] = velocity;
422	>	outputMap_["VELOCITY"] = VELOCITY;
423
424	<	exchangeTime_ = rnemdParams->getExchangeTime();
424	>	OutputData angularVelocity;
425	>	angularVelocity.units = "angstroms^2/fs";
426	>	angularVelocity.title =  "AngularVelocity";
427	>	angularVelocity.dataType = "Vector3d";
428	>	angularVelocity.accumulator.reserve(nBins_);
429	>	for (int i = 0; i < nBins_; i++)
430	>	angularVelocity.accumulator.push_back( new VectorAccumulator() );
431	>	data_[ANGULARVELOCITY] = angularVelocity;
432	>	outputMap_["ANGULARVELOCITY"] = ANGULARVELOCITY;
433
434	<	Snapshot* currentSnap_ = info->getSnapshotManager()->getCurrentSnapshot();
435	<	Mat3x3d hmat = currentSnap_->getHmat();
436	<
437	<	// Target exchange quantities (in each exchange) =  2 Lx Ly dt flux
438	<	// Lx, Ly = box dimensions in x & y
439	<	// dt = exchange time interval
440	<	// flux = target flux
434	>	OutputData density;
435	>	density.units =  "g cm^-3";
436	>	density.title =  "Density";
437	>	density.dataType = "RealType";
438	>	density.accumulator.reserve(nBins_);
439	>	for (int i = 0; i < nBins_; i++)
440	>	density.accumulator.push_back( new Accumulator() );
441	>	data_[DENSITY] = density;
442	>	outputMap_["DENSITY"] =  DENSITY;
443
444	<	RealType area = currentSnap_->getXYarea();
445	<	kineticTarget_ = 2.0 * kineticFlux_ * exchangeTime_ * area;
446	<	momentumTarget_ = 2.0 * momentumFluxVector_ * exchangeTime_ * area;
444	>	if (hasOutputFields) {
445	>	parseOutputFileFormat(rnemdParams->getOutputFields());
446	>	} else {
447	>	if (usePeriodicBoundaryConditions_)
448	>	outputMask_.set(Z);
449	>	else
450	>	outputMask_.set(R);
451	>	switch (rnemdFluxType_) {
452	>	case rnemdKE:
453	>	case rnemdRotKE:
454	>	case rnemdFullKE:
455	>	outputMask_.set(TEMPERATURE);
456	>	break;
457	>	case rnemdPx:
458	>	case rnemdPy:
459	>	outputMask_.set(VELOCITY);
460	>	break;
461	>	case rnemdPz:
462	>	case rnemdPvector:
463	>	outputMask_.set(VELOCITY);
464	>	outputMask_.set(DENSITY);
465	>	break;
466	>	case rnemdLx:
467	>	case rnemdLy:
468	>	case rnemdLz:
469	>	case rnemdLvector:
470	>	outputMask_.set(ANGULARVELOCITY);
471	>	break;
472	>	case rnemdKeLx:
473	>	case rnemdKeLy:
474	>	case rnemdKeLz:
475	>	case rnemdKeLvector:
476	>	outputMask_.set(TEMPERATURE);
477	>	outputMask_.set(ANGULARVELOCITY);
478	>	break;
479	>	case rnemdKePx:
480	>	case rnemdKePy:
481	>	outputMask_.set(TEMPERATURE);
482	>	outputMask_.set(VELOCITY);
483	>	break;
484	>	case rnemdKePvector:
485	>	outputMask_.set(TEMPERATURE);
486	>	outputMask_.set(VELOCITY);
487	>	outputMask_.set(DENSITY);
488	>	break;
489	>	default:
490	>	break;
491	>	}
492	>	}
493	>
494	>	if (hasOutputFileName) {
495	>	rnemdFileName_ = rnemdParams->getOutputFileName();
496	>	} else {
497	>	rnemdFileName_ = getPrefix(info->getFinalConfigFileName()) + ".rnemd";
498	>	}
499
500	<	// total exchange sums are zeroed out at the beginning:
500	>	exchangeTime_ = rnemdParams->getExchangeTime();
501
502	<	kineticExchange_ = 0.0;
503	<	momentumExchange_ = V3Zero;
502	>	Snapshot* currentSnap_ = info->getSnapshotManager()->getCurrentSnapshot();
503	>	// total exchange sums are zeroed out at the beginning:
504
505	<	if (hasSlabWidth)
506	<	slabWidth_ = rnemdParams->getSlabWidth();
507	<	else
508	<	slabWidth_ = hmat(2,2) / 10.0;
509	<
510	<	if (hasSlabACenter)
413	<	slabACenter_ = rnemdParams->getSlabACenter();
414	<	else
415	<	slabACenter_ = 0.0;
505	>	kineticExchange_ = 0.0;
506	>	momentumExchange_ = V3Zero;
507	>	angularMomentumExchange_ = V3Zero;
508	>
509	>	std::ostringstream selectionAstream;
510	>	std::ostringstream selectionBstream;
511
512	<	if (hasSlabBCenter)
513	<	slabBCenter_ = rnemdParams->getSlabBCenter();
514	<	else
515	<	slabBCenter_ = hmat(2,2) / 2.0;
512	>	if (hasSelectionA_) {
513	>	selectionA_ = rnemdParams->getSelectionA();
514	>	} else {
515	>	if (usePeriodicBoundaryConditions_) {
516	>	Mat3x3d hmat = currentSnap_->getHmat();
517	>
518	>	if (hasSlabWidth)
519	>	slabWidth_ = rnemdParams->getSlabWidth();
520	>	else
521	>	slabWidth_ = hmat(2,2) / 10.0;
522	>
523	>	if (hasSlabACenter)
524	>	slabACenter_ = rnemdParams->getSlabACenter();
525	>	else
526	>	slabACenter_ = 0.0;
527	>
528	>	selectionAstream << "select wrappedz > "
529	>	<< slabACenter_ - 0.5*slabWidth_
530	>	<<  " && wrappedz < "
531	>	<< slabACenter_ + 0.5*slabWidth_;
532	>	selectionA_ = selectionAstream.str();
533	>	} else {
534	>	if (hasSphereARadius)
535	>	sphereARadius_ = rnemdParams->getSphereARadius();
536	>	else {
537	>	// use an initial guess to the size of the inner slab to be 1/10 the
538	>	// radius of an approximately spherical hull:
539	>	Thermo thermo(info);
540	>	RealType hVol = thermo.getHullVolume();
541	>	sphereARadius_ = 0.1 * pow((3.0 * hVol / (4.0 * M_PI)), 1.0/3.0);
542	>	}
543	>	selectionAstream << "select r < " << sphereARadius_;
544	>	selectionA_ = selectionAstream.str();
545	>	}
546	>	}
547
548	+	if (hasSelectionB_) {
549	+	selectionB_ = rnemdParams->getSelectionB();
550	+
551	+	} else {
552	+	if (usePeriodicBoundaryConditions_) {
553	+	Mat3x3d hmat = currentSnap_->getHmat();
554	+
555	+	if (hasSlabWidth)
556	+	slabWidth_ = rnemdParams->getSlabWidth();
557	+	else
558	+	slabWidth_ = hmat(2,2) / 10.0;
559	+
560	+	if (hasSlabBCenter)
561	+	slabBCenter_ = rnemdParams->getSlabBCenter();
562	+	else
563	+	slabBCenter_ = hmat(2,2) / 2.0;
564	+
565	+	selectionBstream << "select wrappedz > "
566	+	<< slabBCenter_ - 0.5*slabWidth_
567	+	<<  " && wrappedz < "
568	+	<< slabBCenter_ + 0.5*slabWidth_;
569	+	selectionB_ = selectionBstream.str();
570	+	} else {
571	+	if (hasSphereBRadius_) {
572	+	sphereBRadius_ = rnemdParams->getSphereBRadius();
573	+	selectionBstream << "select r > " << sphereBRadius_;
574	+	selectionB_ = selectionBstream.str();
575	+	} else {
576	+	selectionB_ = "select hull";
577	+	BisHull_ = true;
578	+	hasSelectionB_ = true;
579	+	}
580	+	}
581	+	}
582	+	}
583	+
584	+	// object evaluator:
585	+	evaluator_.loadScriptString(rnemdObjectSelection_);
586	+	seleMan_.setSelectionSet(evaluator_.evaluate());
587	+	evaluatorA_.loadScriptString(selectionA_);
588	+	evaluatorB_.loadScriptString(selectionB_);
589	+	seleManA_.setSelectionSet(evaluatorA_.evaluate());
590	+	seleManB_.setSelectionSet(evaluatorB_.evaluate());
591	+	commonA_ = seleManA_ & seleMan_;
592	+	commonB_ = seleManB_ & seleMan_;
593		}
594	<
594	>
595	>
596		RNEMD::~RNEMD() {
597		if (!doRNEMD_) return;
598		#ifdef IS_MPI
#	Line 434 | Line 606 | namespace OpenMD {
606		#ifdef IS_MPI
607		}
608		#endif
609	+
610	+	// delete all of the objects we created:
611	+	delete areaAccumulator_;
612	+	data_.clear();
613		}
614
615	<	bool RNEMD::inSlabA(Vector3d pos) {
440	<	return (abs(pos.z() - slabACenter_) < 0.5*slabWidth_);
441	<	}
442	<	bool RNEMD::inSlabB(Vector3d pos) {
443	<	return (abs(pos.z() - slabBCenter_) < 0.5*slabWidth_);
444	<	}
445	<
446	<	void RNEMD::doSwap() {
615	>	void RNEMD::doSwap(SelectionManager& smanA, SelectionManager& smanB) {
616		if (!doRNEMD_) return;
617	+	int selei;
618	+	int selej;
619	+
620		Snapshot* currentSnap_ = info_->getSnapshotManager()->getCurrentSnapshot();
621		Mat3x3d hmat = currentSnap_->getHmat();
622
451	–	seleMan_.setSelectionSet(evaluator_.evaluate());
452	–
453	–	int selei;
623		StuntDouble* sd;
624
625		RealType min_val;
#	Line 461 | Line 630 | namespace OpenMD {
630		bool max_found = false;
631		StuntDouble* max_sd;
632
633	<	for (sd = seleMan_.beginSelected(selei); sd != NULL;
634	<	sd = seleMan_.nextSelected(selei)) {
633	>	for (sd = seleManA_.beginSelected(selei); sd != NULL;
634	>	sd = seleManA_.nextSelected(selei)) {
635
636		Vector3d pos = sd->getPos();
637	<
637	>
638		// wrap the stuntdouble's position back into the box:
639	<
639	>
640		if (usePeriodicBoundaryConditions_)
641		currentSnap_->wrapVector(pos);
642	<	bool inA = inSlabA(pos);
643	<	bool inB = inSlabB(pos);
644	<
645	<	if (inA || inB) {
642	>
643	>	RealType mass = sd->getMass();
644	>	Vector3d vel = sd->getVel();
645	>	RealType value;
646	>
647	>	switch(rnemdFluxType_) {
648	>	case rnemdKE :
649
650	<	RealType mass = sd->getMass();
651	<	Vector3d vel = sd->getVel();
652	<	RealType value;
653	<
654	<	switch(rnemdFluxType_) {
483	<	case rnemdKE :
650	>	value = mass * vel.lengthSquare();
651	>
652	>	if (sd->isDirectional()) {
653	>	Vector3d angMom = sd->getJ();
654	>	Mat3x3d I = sd->getI();
655
656	<	value = mass * vel.lengthSquare();
657	<
658	<	if (sd->isDirectional()) {
659	<	Vector3d angMom = sd->getJ();
660	<	Mat3x3d I = sd->getI();
661	<
662	<	if (sd->isLinear()) {
663	<	int i = sd->linearAxis();
664	<	int j = (i + 1) % 3;
665	<	int k = (i + 2) % 3;
666	<	value += angMom[j] * angMom[j] / I(j, j) +
667	<	angMom[k] * angMom[k] / I(k, k);
668	<	} else {
669	<	value += angMom[0]*angMom[0]/I(0, 0)
670	<	+ angMom[1]*angMom[1]/I(1, 1)
671	<	+ angMom[2]*angMom[2]/I(2, 2);
672	<	}
673	<	} //angular momenta exchange enabled
674	<	value *= 0.5;
675	<	break;
676	<	case rnemdPx :
677	<	value = mass * vel[0];
678	<	break;
679	<	case rnemdPy :
680	<	value = mass * vel[1];
681	<	break;
682	<	case rnemdPz :
683	<	value = mass * vel[2];
684	<	break;
685	<	default :
686	<	break;
656	>	if (sd->isLinear()) {
657	>	int i = sd->linearAxis();
658	>	int j = (i + 1) % 3;
659	>	int k = (i + 2) % 3;
660	>	value += angMom[j] * angMom[j] / I(j, j) +
661	>	angMom[k] * angMom[k] / I(k, k);
662	>	} else {
663	>	value += angMom[0]*angMom[0]/I(0, 0)
664	>	+ angMom[1]*angMom[1]/I(1, 1)
665	>	+ angMom[2]*angMom[2]/I(2, 2);
666	>	}
667	>	} //angular momenta exchange enabled
668	>	value *= 0.5;
669	>	break;
670	>	case rnemdPx :
671	>	value = mass * vel[0];
672	>	break;
673	>	case rnemdPy :
674	>	value = mass * vel[1];
675	>	break;
676	>	case rnemdPz :
677	>	value = mass * vel[2];
678	>	break;
679	>	default :
680	>	break;
681	>	}
682	>	if (!max_found) {
683	>	max_val = value;
684	>	max_sd = sd;
685	>	max_found = true;
686	>	} else {
687	>	if (max_val < value) {
688	>	max_val = value;
689	>	max_sd = sd;
690		}
691	+	}
692	+	}
693
694	<	if (inA == 0) {
695	<	if (!min_found) {
696	<	min_val = value;
697	<	min_sd = sd;
698	<	min_found = true;
699	<	} else {
700	<	if (min_val > value) {
701	<	min_val = value;
702	<	min_sd = sd;
703	<	}
704	<	}
705	<	} else {
706	<	if (!max_found) {
707	<	max_val = value;
708	<	max_sd = sd;
709	<	max_found = true;
710	<	} else {
711	<	if (max_val < value) {
712	<	max_val = value;
713	<	max_sd = sd;
714	<	}
715	<	}
716	<	}
694	>	for (sd = seleManB_.beginSelected(selej); sd != NULL;
695	>	sd = seleManB_.nextSelected(selej)) {
696	>
697	>	Vector3d pos = sd->getPos();
698	>
699	>	// wrap the stuntdouble's position back into the box:
700	>
701	>	if (usePeriodicBoundaryConditions_)
702	>	currentSnap_->wrapVector(pos);
703	>
704	>	RealType mass = sd->getMass();
705	>	Vector3d vel = sd->getVel();
706	>	RealType value;
707	>
708	>	switch(rnemdFluxType_) {
709	>	case rnemdKE :
710	>
711	>	value = mass * vel.lengthSquare();
712	>
713	>	if (sd->isDirectional()) {
714	>	Vector3d angMom = sd->getJ();
715	>	Mat3x3d I = sd->getI();
716	>
717	>	if (sd->isLinear()) {
718	>	int i = sd->linearAxis();
719	>	int j = (i + 1) % 3;
720	>	int k = (i + 2) % 3;
721	>	value += angMom[j] * angMom[j] / I(j, j) +
722	>	angMom[k] * angMom[k] / I(k, k);
723	>	} else {
724	>	value += angMom[0]*angMom[0]/I(0, 0)
725	>	+ angMom[1]*angMom[1]/I(1, 1)
726	>	+ angMom[2]*angMom[2]/I(2, 2);
727	>	}
728	>	} //angular momenta exchange enabled
729	>	value *= 0.5;
730	>	break;
731	>	case rnemdPx :
732	>	value = mass * vel[0];
733	>	break;
734	>	case rnemdPy :
735	>	value = mass * vel[1];
736	>	break;
737	>	case rnemdPz :
738	>	value = mass * vel[2];
739	>	break;
740	>	default :
741	>	break;
742		}
743	+
744	+	if (!min_found) {
745	+	min_val = value;
746	+	min_sd = sd;
747	+	min_found = true;
748	+	} else {
749	+	if (min_val > value) {
750	+	min_val = value;
751	+	min_sd = sd;
752	+	}
753	+	}
754		}
755
756		#ifdef IS_MPI
#	Line 767 | Line 979 | namespace OpenMD {
979		}
980		}
981
982	<	void RNEMD::doNIVS() {
982	>	void RNEMD::doNIVS(SelectionManager& smanA, SelectionManager& smanB) {
983		if (!doRNEMD_) return;
984	+	int selei;
985	+	int selej;
986	+
987		Snapshot* currentSnap_ = info_->getSnapshotManager()->getCurrentSnapshot();
988	+	RealType time = currentSnap_->getTime();
989		Mat3x3d hmat = currentSnap_->getHmat();
990
775	–	seleMan_.setSelectionSet(evaluator_.evaluate());
776	–
777	–	int selei;
991		StuntDouble* sd;
992
993		vector<StuntDouble*> hotBin, coldBin;
#	Line 794 | Line 1007 | namespace OpenMD {
1007		RealType Kcz = 0.0;
1008		RealType Kcw = 0.0;
1009
1010	<	for (sd = seleMan_.beginSelected(selei); sd != NULL;
1011	<	sd = seleMan_.nextSelected(selei)) {
1010	>	for (sd = smanA.beginSelected(selei); sd != NULL;
1011	>	sd = smanA.nextSelected(selei)) {
1012
1013		Vector3d pos = sd->getPos();
1014	<
1014	>
1015		// wrap the stuntdouble's position back into the box:
1016	<
1016	>
1017		if (usePeriodicBoundaryConditions_)
1018		currentSnap_->wrapVector(pos);
1019	<
1020	<	// which bin is this stuntdouble in?
1021	<	bool inA = inSlabA(pos);
1022	<	bool inB = inSlabB(pos);
1019	>
1020	>
1021	>	RealType mass = sd->getMass();
1022	>	Vector3d vel = sd->getVel();
1023	>
1024	>	hotBin.push_back(sd);
1025	>	Phx += mass * vel.x();
1026	>	Phy += mass * vel.y();
1027	>	Phz += mass * vel.z();
1028	>	Khx += mass * vel.x() * vel.x();
1029	>	Khy += mass * vel.y() * vel.y();
1030	>	Khz += mass * vel.z() * vel.z();
1031	>	if (sd->isDirectional()) {
1032	>	Vector3d angMom = sd->getJ();
1033	>	Mat3x3d I = sd->getI();
1034	>	if (sd->isLinear()) {
1035	>	int i = sd->linearAxis();
1036	>	int j = (i + 1) % 3;
1037	>	int k = (i + 2) % 3;
1038	>	Khw += angMom[j] * angMom[j] / I(j, j) +
1039	>	angMom[k] * angMom[k] / I(k, k);
1040	>	} else {
1041	>	Khw += angMom[0]*angMom[0]/I(0, 0)
1042	>	+ angMom[1]*angMom[1]/I(1, 1)
1043	>	+ angMom[2]*angMom[2]/I(2, 2);
1044	>	}
1045	>	}
1046	>	}
1047	>	for (sd = smanB.beginSelected(selej); sd != NULL;
1048	>	sd = smanB.nextSelected(selej)) {
1049	>	Vector3d pos = sd->getPos();
1050	>
1051	>	// wrap the stuntdouble's position back into the box:
1052	>
1053	>	if (usePeriodicBoundaryConditions_)
1054	>	currentSnap_->wrapVector(pos);
1055	>
1056	>	RealType mass = sd->getMass();
1057	>	Vector3d vel = sd->getVel();
1058
1059	<	if (inA || inB) {
1060	<
1061	<	RealType mass = sd->getMass();
1062	<	Vector3d vel = sd->getVel();
1063	<
1064	<	if (inA) {
1065	<	hotBin.push_back(sd);
1066	<	Phx += mass * vel.x();
1067	<	Phy += mass * vel.y();
1068	<	Phz += mass * vel.z();
1069	<	Khx += mass * vel.x() * vel.x();
1070	<	Khy += mass * vel.y() * vel.y();
1071	<	Khz += mass * vel.z() * vel.z();
1072	<	if (sd->isDirectional()) {
1073	<	Vector3d angMom = sd->getJ();
1074	<	Mat3x3d I = sd->getI();
1075	<	if (sd->isLinear()) {
1076	<	int i = sd->linearAxis();
1077	<	int j = (i + 1) % 3;
1078	<	int k = (i + 2) % 3;
1079	<	Khw += angMom[j] * angMom[j] / I(j, j) +
832	<	angMom[k] * angMom[k] / I(k, k);
833	<	} else {
834	<	Khw += angMom[0]*angMom[0]/I(0, 0)
835	<	+ angMom[1]*angMom[1]/I(1, 1)
836	<	+ angMom[2]*angMom[2]/I(2, 2);
837	<	}
838	<	}
839	<	} else {
840	<	coldBin.push_back(sd);
841	<	Pcx += mass * vel.x();
842	<	Pcy += mass * vel.y();
843	<	Pcz += mass * vel.z();
844	<	Kcx += mass * vel.x() * vel.x();
845	<	Kcy += mass * vel.y() * vel.y();
846	<	Kcz += mass * vel.z() * vel.z();
847	<	if (sd->isDirectional()) {
848	<	Vector3d angMom = sd->getJ();
849	<	Mat3x3d I = sd->getI();
850	<	if (sd->isLinear()) {
851	<	int i = sd->linearAxis();
852	<	int j = (i + 1) % 3;
853	<	int k = (i + 2) % 3;
854	<	Kcw += angMom[j] * angMom[j] / I(j, j) +
855	<	angMom[k] * angMom[k] / I(k, k);
856	<	} else {
857	<	Kcw += angMom[0]*angMom[0]/I(0, 0)
858	<	+ angMom[1]*angMom[1]/I(1, 1)
859	<	+ angMom[2]*angMom[2]/I(2, 2);
860	<	}
861	<	}
862	<	}
1059	>	coldBin.push_back(sd);
1060	>	Pcx += mass * vel.x();
1061	>	Pcy += mass * vel.y();
1062	>	Pcz += mass * vel.z();
1063	>	Kcx += mass * vel.x() * vel.x();
1064	>	Kcy += mass * vel.y() * vel.y();
1065	>	Kcz += mass * vel.z() * vel.z();
1066	>	if (sd->isDirectional()) {
1067	>	Vector3d angMom = sd->getJ();
1068	>	Mat3x3d I = sd->getI();
1069	>	if (sd->isLinear()) {
1070	>	int i = sd->linearAxis();
1071	>	int j = (i + 1) % 3;
1072	>	int k = (i + 2) % 3;
1073	>	Kcw += angMom[j] * angMom[j] / I(j, j) +
1074	>	angMom[k] * angMom[k] / I(k, k);
1075	>	} else {
1076	>	Kcw += angMom[0]*angMom[0]/I(0, 0)
1077	>	+ angMom[1]*angMom[1]/I(1, 1)
1078	>	+ angMom[2]*angMom[2]/I(2, 2);
1079	>	}
1080		}
1081		}
1082
#	Line 936 | Line 1153 | namespace OpenMD {
1153		//if w is in the right range, so should be x, y, z.
1154		vector<StuntDouble*>::iterator sdi;
1155		Vector3d vel;
1156	<	for (sdi = coldBin.begin(); sdi != coldBin.end(); sdi++) {
1156	>	for (sdi = coldBin.begin(); sdi != coldBin.end(); ++sdi) {
1157		if (rnemdFluxType_ == rnemdFullKE) {
1158		vel = (*sdi)->getVel() * c;
1159		(*sdi)->setVel(vel);
#	Line 947 | Line 1164 | namespace OpenMD {
1164		}
1165		}
1166		w = sqrt(w);
1167	<	for (sdi = hotBin.begin(); sdi != hotBin.end(); sdi++) {
1167	>	for (sdi = hotBin.begin(); sdi != hotBin.end(); ++sdi) {
1168		if (rnemdFluxType_ == rnemdFullKE) {
1169		vel = (*sdi)->getVel();
1170		vel.x() *= x;
#	Line 1066 | Line 1283 | namespace OpenMD {
1283		vector<RealType>::iterator ri;
1284		RealType r1, r2, alpha0;
1285		vector<pair<RealType,RealType> > rps;
1286	<	for (ri = realRoots.begin(); ri !=realRoots.end(); ri++) {
1286	>	for (ri = realRoots.begin(); ri !=realRoots.end(); ++ri) {
1287		r2 = *ri;
1288		//check if FindRealRoots() give the right answer
1289		if ( fabs(u0 + r2 * (u1 + r2 * (u2 + r2 * (u3 + r2 * u4)))) > 1e-6 ) {
#	Line 1098 | Line 1315 | namespace OpenMD {
1315		RealType diff;
1316		pair<RealType,RealType> bestPair = make_pair(1.0, 1.0);
1317		vector<pair<RealType,RealType> >::iterator rpi;
1318	<	for (rpi = rps.begin(); rpi != rps.end(); rpi++) {
1318	>	for (rpi = rps.begin(); rpi != rps.end(); ++rpi) {
1319		r1 = (*rpi).first;
1320		r2 = (*rpi).second;
1321		switch(rnemdFluxType_) {
#	Line 1165 | Line 1382 | namespace OpenMD {
1382		}
1383		vector<StuntDouble*>::iterator sdi;
1384		Vector3d vel;
1385	<	for (sdi = coldBin.begin(); sdi != coldBin.end(); sdi++) {
1385	>	for (sdi = coldBin.begin(); sdi != coldBin.end(); ++sdi) {
1386		vel = (*sdi)->getVel();
1387		vel.x() *= x;
1388		vel.y() *= y;
#	Line 1176 | Line 1393 | namespace OpenMD {
1393		x = 1.0 + px * (1.0 - x);
1394		y = 1.0 + py * (1.0 - y);
1395		z = 1.0 + pz * (1.0 - z);
1396	<	for (sdi = hotBin.begin(); sdi != hotBin.end(); sdi++) {
1396	>	for (sdi = hotBin.begin(); sdi != hotBin.end(); ++sdi) {
1397		vel = (*sdi)->getVel();
1398		vel.x() *= x;
1399		vel.y() *= y;
#	Line 1209 | Line 1426 | namespace OpenMD {
1426		failTrialCount_++;
1427		}
1428		}
1429	<
1430	<	void RNEMD::doVSS() {
1429	>
1430	>	void RNEMD::doVSS(SelectionManager& smanA, SelectionManager& smanB) {
1431		if (!doRNEMD_) return;
1432	+	int selei;
1433	+	int selej;
1434	+
1435		Snapshot* currentSnap_ = info_->getSnapshotManager()->getCurrentSnapshot();
1436		RealType time = currentSnap_->getTime();
1437		Mat3x3d hmat = currentSnap_->getHmat();
1438
1219	–	seleMan_.setSelectionSet(evaluator_.evaluate());
1220	–
1221	–	int selei;
1439		StuntDouble* sd;
1440
1441		vector<StuntDouble*> hotBin, coldBin;
1442
1443		Vector3d Ph(V3Zero);
1444	+	Vector3d Lh(V3Zero);
1445		RealType Mh = 0.0;
1446	+	Mat3x3d Ih(0.0);
1447		RealType Kh = 0.0;
1448		Vector3d Pc(V3Zero);
1449	+	Vector3d Lc(V3Zero);
1450		RealType Mc = 0.0;
1451	+	Mat3x3d Ic(0.0);
1452		RealType Kc = 0.0;
1232	–
1453
1454	<	for (sd = seleMan_.beginSelected(selei); sd != NULL;
1455	<	sd = seleMan_.nextSelected(selei)) {
1454	>	// Constraints can be on only the linear or angular momentum, but
1455	>	// not both.  Usually, the user will specify which they want, but
1456	>	// in case they don't, the use of periodic boundaries should make
1457	>	// the choice for us.
1458	>	bool doLinearPart = false;
1459	>	bool doAngularPart = false;
1460
1461	+	switch (rnemdFluxType_) {
1462	+	case rnemdPx:
1463	+	case rnemdPy:
1464	+	case rnemdPz:
1465	+	case rnemdPvector:
1466	+	case rnemdKePx:
1467	+	case rnemdKePy:
1468	+	case rnemdKePvector:
1469	+	doLinearPart = true;
1470	+	break;
1471	+	case rnemdLx:
1472	+	case rnemdLy:
1473	+	case rnemdLz:
1474	+	case rnemdLvector:
1475	+	case rnemdKeLx:
1476	+	case rnemdKeLy:
1477	+	case rnemdKeLz:
1478	+	case rnemdKeLvector:
1479	+	doAngularPart = true;
1480	+	break;
1481	+	case rnemdKE:
1482	+	case rnemdRotKE:
1483	+	case rnemdFullKE:
1484	+	default:
1485	+	if (usePeriodicBoundaryConditions_)
1486	+	doLinearPart = true;
1487	+	else
1488	+	doAngularPart = true;
1489	+	break;
1490	+	}
1491	+
1492	+	for (sd = smanA.beginSelected(selei); sd != NULL;
1493	+	sd = smanA.nextSelected(selei)) {
1494	+
1495		Vector3d pos = sd->getPos();
1496
1497		// wrap the stuntdouble's position back into the box:
1498	+
1499	+	if (usePeriodicBoundaryConditions_)
1500	+	currentSnap_->wrapVector(pos);
1501	+
1502	+	RealType mass = sd->getMass();
1503	+	Vector3d vel = sd->getVel();
1504	+	Vector3d rPos = sd->getPos() - coordinateOrigin_;
1505	+	RealType r2;
1506	+
1507	+	hotBin.push_back(sd);
1508	+	Ph += mass * vel;
1509	+	Mh += mass;
1510	+	Kh += mass * vel.lengthSquare();
1511	+	Lh += mass * cross(rPos, vel);
1512	+	Ih -= outProduct(rPos, rPos) * mass;
1513	+	r2 = rPos.lengthSquare();
1514	+	Ih(0, 0) += mass * r2;
1515	+	Ih(1, 1) += mass * r2;
1516	+	Ih(2, 2) += mass * r2;
1517	+
1518	+	if (rnemdFluxType_ == rnemdFullKE) {
1519	+	if (sd->isDirectional()) {
1520	+	Vector3d angMom = sd->getJ();
1521	+	Mat3x3d I = sd->getI();
1522	+	if (sd->isLinear()) {
1523	+	int i = sd->linearAxis();
1524	+	int j = (i + 1) % 3;
1525	+	int k = (i + 2) % 3;
1526	+	Kh += angMom[j] * angMom[j] / I(j, j) +
1527	+	angMom[k] * angMom[k] / I(k, k);
1528	+	} else {
1529	+	Kh += angMom[0] * angMom[0] / I(0, 0) +
1530	+	angMom[1] * angMom[1] / I(1, 1) +
1531	+	angMom[2] * angMom[2] / I(2, 2);
1532	+	}
1533	+	}
1534	+	}
1535	+	}
1536	+	for (sd = smanB.beginSelected(selej); sd != NULL;
1537	+	sd = smanB.nextSelected(selej)) {
1538
1539	+	Vector3d pos = sd->getPos();
1540	+
1541	+	// wrap the stuntdouble's position back into the box:
1542	+
1543		if (usePeriodicBoundaryConditions_)
1544		currentSnap_->wrapVector(pos);
1545	+
1546	+	RealType mass = sd->getMass();
1547	+	Vector3d vel = sd->getVel();
1548	+	Vector3d rPos = sd->getPos() - coordinateOrigin_;
1549	+	RealType r2;
1550
1551	<	// which bin is this stuntdouble in?
1552	<	bool inA = inSlabA(pos);
1553	<	bool inB = inSlabB(pos);
1551	>	coldBin.push_back(sd);
1552	>	Pc += mass * vel;
1553	>	Mc += mass;
1554	>	Kc += mass * vel.lengthSquare();
1555	>	Lc += mass * cross(rPos, vel);
1556	>	Ic -= outProduct(rPos, rPos) * mass;
1557	>	r2 = rPos.lengthSquare();
1558	>	Ic(0, 0) += mass * r2;
1559	>	Ic(1, 1) += mass * r2;
1560	>	Ic(2, 2) += mass * r2;
1561
1562	<	if (inA || inB) {
1563	<
1564	<	RealType mass = sd->getMass();
1565	<	Vector3d vel = sd->getVel();
1566	<
1567	<	if (inA) {
1568	<	hotBin.push_back(sd);
1569	<	Ph += mass * vel;
1570	<	Mh += mass;
1571	<	Kh += mass * vel.lengthSquare();
1572	<	if (rnemdFluxType_ == rnemdFullKE) {
1573	<	if (sd->isDirectional()) {
1574	<	Vector3d angMom = sd->getJ();
1575	<	Mat3x3d I = sd->getI();
1576	<	if (sd->isLinear()) {
1577	<	int i = sd->linearAxis();
1264	<	int j = (i + 1) % 3;
1265	<	int k = (i + 2) % 3;
1266	<	Kh += angMom[j] * angMom[j] / I(j, j) +
1267	<	angMom[k] * angMom[k] / I(k, k);
1268	<	} else {
1269	<	Kh += angMom[0] * angMom[0] / I(0, 0) +
1270	<	angMom[1] * angMom[1] / I(1, 1) +
1271	<	angMom[2] * angMom[2] / I(2, 2);
1272	<	}
1273	<	}
1274	<	}
1275	<	} else { //midBin_
1276	<	coldBin.push_back(sd);
1277	<	Pc += mass * vel;
1278	<	Mc += mass;
1279	<	Kc += mass * vel.lengthSquare();
1280	<	if (rnemdFluxType_ == rnemdFullKE) {
1281	<	if (sd->isDirectional()) {
1282	<	Vector3d angMom = sd->getJ();
1283	<	Mat3x3d I = sd->getI();
1284	<	if (sd->isLinear()) {
1285	<	int i = sd->linearAxis();
1286	<	int j = (i + 1) % 3;
1287	<	int k = (i + 2) % 3;
1288	<	Kc += angMom[j] * angMom[j] / I(j, j) +
1289	<	angMom[k] * angMom[k] / I(k, k);
1290	<	} else {
1291	<	Kc += angMom[0] * angMom[0] / I(0, 0) +
1292	<	angMom[1] * angMom[1] / I(1, 1) +
1293	<	angMom[2] * angMom[2] / I(2, 2);
1294	<	}
1295	<	}
1296	<	}
1297	<	}
1562	>	if (rnemdFluxType_ == rnemdFullKE) {
1563	>	if (sd->isDirectional()) {
1564	>	Vector3d angMom = sd->getJ();
1565	>	Mat3x3d I = sd->getI();
1566	>	if (sd->isLinear()) {
1567	>	int i = sd->linearAxis();
1568	>	int j = (i + 1) % 3;
1569	>	int k = (i + 2) % 3;
1570	>	Kc += angMom[j] * angMom[j] / I(j, j) +
1571	>	angMom[k] * angMom[k] / I(k, k);
1572	>	} else {
1573	>	Kc += angMom[0] * angMom[0] / I(0, 0) +
1574	>	angMom[1] * angMom[1] / I(1, 1) +
1575	>	angMom[2] * angMom[2] / I(2, 2);
1576	>	}
1577	>	}
1578		}
1579		}
1580
#	Line 1304 | Line 1584 | namespace OpenMD {
1584		#ifdef IS_MPI
1585		MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &Ph[0], 3, MPI::REALTYPE, MPI::SUM);
1586		MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &Pc[0], 3, MPI::REALTYPE, MPI::SUM);
1587	+	MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &Lh[0], 3, MPI::REALTYPE, MPI::SUM);
1588	+	MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &Lc[0], 3, MPI::REALTYPE, MPI::SUM);
1589		MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &Mh, 1, MPI::REALTYPE, MPI::SUM);
1590		MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &Kh, 1, MPI::REALTYPE, MPI::SUM);
1591		MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &Mc, 1, MPI::REALTYPE, MPI::SUM);
1592		MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &Kc, 1, MPI::REALTYPE, MPI::SUM);
1593	+	MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, Ih.getArrayPointer(), 9,
1594	+	MPI::REALTYPE, MPI::SUM);
1595	+	MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, Ic.getArrayPointer(), 9,
1596	+	MPI::REALTYPE, MPI::SUM);
1597		#endif
1598	+
1599
1600	+	Vector3d ac, acrec, bc, bcrec;
1601	+	Vector3d ah, ahrec, bh, bhrec;
1602	+
1603		bool successfulExchange = false;
1604		if ((Mh > 0.0) && (Mc > 0.0)) {//both slabs are not empty
1605		Vector3d vc = Pc / Mc;
1606	<	Vector3d ac = -momentumTarget_ / Mc + vc;
1607	<	Vector3d acrec = -momentumTarget_ / Mc;
1608	<	RealType cNumerator = Kc - kineticTarget_ - 0.5 * Mc * ac.lengthSquare();
1606	>	ac = -momentumTarget_ / Mc + vc;
1607	>	acrec = -momentumTarget_ / Mc;
1608	>
1609	>	// We now need the inverse of the inertia tensor to calculate the
1610	>	// angular velocity of the cold slab;
1611	>	Mat3x3d Ici = Ic.inverse();
1612	>	Vector3d omegac = Ici * Lc;
1613	>	bc  = -(Ici * angularMomentumTarget_) + omegac;
1614	>	bcrec = bc - omegac;
1615	>
1616	>	RealType cNumerator = Kc - kineticTarget_;
1617	>	if (doLinearPart)
1618	>	cNumerator -= 0.5 * Mc * ac.lengthSquare();
1619	>
1620	>	if (doAngularPart)
1621	>	cNumerator -= 0.5 * ( dot(bc, Ic * bc));
1622	>
1623		if (cNumerator > 0.0) {
1624	<	RealType cDenominator = Kc - 0.5 * Mc * vc.lengthSquare();
1624	>
1625	>	RealType cDenominator = Kc;
1626	>
1627	>	if (doLinearPart)
1628	>	cDenominator -= 0.5 * Mc * vc.lengthSquare();
1629	>
1630	>	if (doAngularPart)
1631	>	cDenominator -= 0.5*(dot(omegac, Ic * omegac));
1632	>
1633		if (cDenominator > 0.0) {
1634		RealType c = sqrt(cNumerator / cDenominator);
1635		if ((c > 0.9) && (c < 1.1)) {//restrict scaling coefficients
1636	+
1637		Vector3d vh = Ph / Mh;
1638	<	Vector3d ah = momentumTarget_ / Mh + vh;
1639	<	Vector3d ahrec = momentumTarget_ / Mh;
1640	<	RealType hNumerator = Kh + kineticTarget_
1641	<	- 0.5 * Mh * ah.lengthSquare();
1642	<	if (hNumerator > 0.0) {
1643	<	RealType hDenominator = Kh - 0.5 * Mh * vh.lengthSquare();
1638	>	ah = momentumTarget_ / Mh + vh;
1639	>	ahrec = momentumTarget_ / Mh;
1640	>
1641	>	// We now need the inverse of the inertia tensor to
1642	>	// calculate the angular velocity of the hot slab;
1643	>	Mat3x3d Ihi = Ih.inverse();
1644	>	Vector3d omegah = Ihi * Lh;
1645	>	bh  = (Ihi * angularMomentumTarget_) + omegah;
1646	>	bhrec = bh - omegah;
1647	>
1648	>	RealType hNumerator = Kh + kineticTarget_;
1649	>	if (doLinearPart)
1650	>	hNumerator -= 0.5 * Mh * ah.lengthSquare();
1651	>
1652	>	if (doAngularPart)
1653	>	hNumerator -= 0.5 * ( dot(bh, Ih * bh));
1654	>
1655	>	if (hNumerator > 0.0) {
1656	>
1657	>	RealType hDenominator = Kh;
1658	>	if (doLinearPart)
1659	>	hDenominator -= 0.5 * Mh * vh.lengthSquare();
1660	>	if (doAngularPart)
1661	>	hDenominator -= 0.5*(dot(omegah, Ih * omegah));
1662	>
1663		if (hDenominator > 0.0) {
1664		RealType h = sqrt(hNumerator / hDenominator);
1665		if ((h > 0.9) && (h < 1.1)) {
1666	<
1666	>
1667		vector<StuntDouble*>::iterator sdi;
1668		Vector3d vel;
1669	<	for (sdi = coldBin.begin(); sdi != coldBin.end(); sdi++) {
1669	>	Vector3d rPos;
1670	>
1671	>	for (sdi = coldBin.begin(); sdi != coldBin.end(); ++sdi) {
1672		//vel = (*sdi)->getVel();
1673	<	vel = ((*sdi)->getVel() - vc) * c + ac;
1673	>	rPos = (*sdi)->getPos() - coordinateOrigin_;
1674	>	if (doLinearPart)
1675	>	vel = ((*sdi)->getVel() - vc) * c + ac;
1676	>	if (doAngularPart)
1677	>	vel = ((*sdi)->getVel() - cross(omegac, rPos)) * c + cross(bc, rPos);
1678	>
1679		(*sdi)->setVel(vel);
1680		if (rnemdFluxType_ == rnemdFullKE) {
1681		if ((*sdi)->isDirectional()) {
#	Line 1345 | Line 1684 | namespace OpenMD {
1684		}
1685		}
1686		}
1687	<	for (sdi = hotBin.begin(); sdi != hotBin.end(); sdi++) {
1687	>	for (sdi = hotBin.begin(); sdi != hotBin.end(); ++sdi) {
1688		//vel = (*sdi)->getVel();
1689	<	vel = ((*sdi)->getVel() - vh) * h + ah;
1689	>	rPos = (*sdi)->getPos() - coordinateOrigin_;
1690	>	if (doLinearPart)
1691	>	vel = ((*sdi)->getVel() - vh) * h + ah;
1692	>	if (doAngularPart)
1693	>	vel = ((*sdi)->getVel() - cross(omegah, rPos)) * h + cross(bh, rPos);
1694	>
1695		(*sdi)->setVel(vel);
1696		if (rnemdFluxType_ == rnemdFullKE) {
1697		if ((*sdi)->isDirectional()) {
#	Line 1359 | Line 1703 | namespace OpenMD {
1703		successfulExchange = true;
1704		kineticExchange_ += kineticTarget_;
1705		momentumExchange_ += momentumTarget_;
1706	+	angularMomentumExchange_ += angularMomentumTarget_;
1707		}
1708		}
1709		}
#	Line 1378 | Line 1723 | namespace OpenMD {
1723		}
1724		}
1725
1726	+	RealType RNEMD::getDividingArea() {
1727	+
1728	+	if (hasDividingArea_) return dividingArea_;
1729	+
1730	+	RealType areaA, areaB;
1731	+	Snapshot* snap = info_->getSnapshotManager()->getCurrentSnapshot();
1732	+
1733	+	if (hasSelectionA_) {
1734	+
1735	+	if (evaluatorA_.hasSurfaceArea())
1736	+	areaA = evaluatorA_.getSurfaceArea();
1737	+	else {
1738	+
1739	+	cerr << "selection A did not have surface area, recomputing\n";
1740	+	int isd;
1741	+	StuntDouble* sd;
1742	+	vector<StuntDouble*> aSites;
1743	+	seleManA_.setSelectionSet(evaluatorA_.evaluate());
1744	+	for (sd = seleManA_.beginSelected(isd); sd != NULL;
1745	+	sd = seleManA_.nextSelected(isd)) {
1746	+	aSites.push_back(sd);
1747	+	}
1748	+	#if defined(HAVE_QHULL)
1749	+	ConvexHull* surfaceMeshA = new ConvexHull();
1750	+	surfaceMeshA->computeHull(aSites);
1751	+	areaA = surfaceMeshA->getArea();
1752	+	delete surfaceMeshA;
1753	+	#else
1754	+	sprintf( painCave.errMsg,
1755	+	"RNEMD::getDividingArea : Hull calculation is not possible\n"
1756	+	"\twithout libqhull. Please rebuild OpenMD with qhull enabled.");
1757	+	painCave.severity = OPENMD_ERROR;
1758	+	painCave.isFatal = 1;
1759	+	simError();
1760	+	#endif
1761	+	}
1762	+
1763	+	} else {
1764	+	if (usePeriodicBoundaryConditions_) {
1765	+	// in periodic boundaries, the surface area is twice the x-y
1766	+	// area of the current box:
1767	+	areaA = 2.0 * snap->getXYarea();
1768	+	} else {
1769	+	// in non-periodic simulations, without explicitly setting
1770	+	// selections, the sphere radius sets the surface area of the
1771	+	// dividing surface:
1772	+	areaA = 4.0 * M_PI * pow(sphereARadius_, 2);
1773	+	}
1774	+	}
1775	+
1776	+	if (hasSelectionB_) {
1777	+	if (evaluatorB_.hasSurfaceArea())
1778	+	areaB = evaluatorB_.getSurfaceArea();
1779	+	else {
1780	+	cerr << "selection B did not have surface area, recomputing\n";
1781	+
1782	+	int isd;
1783	+	StuntDouble* sd;
1784	+	vector<StuntDouble*> bSites;
1785	+	seleManB_.setSelectionSet(evaluatorB_.evaluate());
1786	+	for (sd = seleManB_.beginSelected(isd); sd != NULL;
1787	+	sd = seleManB_.nextSelected(isd)) {
1788	+	bSites.push_back(sd);
1789	+	}
1790	+
1791	+	#if defined(HAVE_QHULL)
1792	+	ConvexHull* surfaceMeshB = new ConvexHull();
1793	+	surfaceMeshB->computeHull(bSites);
1794	+	areaB = surfaceMeshB->getArea();
1795	+	delete surfaceMeshB;
1796	+	#else
1797	+	sprintf( painCave.errMsg,
1798	+	"RNEMD::getDividingArea : Hull calculation is not possible\n"
1799	+	"\twithout libqhull. Please rebuild OpenMD with qhull enabled.");
1800	+	painCave.severity = OPENMD_ERROR;
1801	+	painCave.isFatal = 1;
1802	+	simError();
1803	+	#endif
1804	+	}
1805	+
1806	+	} else {
1807	+	if (usePeriodicBoundaryConditions_) {
1808	+	// in periodic boundaries, the surface area is twice the x-y
1809	+	// area of the current box:
1810	+	areaB = 2.0 * snap->getXYarea();
1811	+	} else {
1812	+	// in non-periodic simulations, without explicitly setting
1813	+	// selections, but if a sphereBradius has been set, just use that:
1814	+	areaB = 4.0 * M_PI * pow(sphereBRadius_, 2);
1815	+	}
1816	+	}
1817	+
1818	+	dividingArea_ = min(areaA, areaB);
1819	+	hasDividingArea_ = true;
1820	+	return dividingArea_;
1821	+	}
1822	+
1823		void RNEMD::doRNEMD() {
1824		if (!doRNEMD_) return;
1825		trialCount_++;
1826	+
1827	+	// object evaluator:
1828	+	evaluator_.loadScriptString(rnemdObjectSelection_);
1829	+	seleMan_.setSelectionSet(evaluator_.evaluate());
1830	+
1831	+	evaluatorA_.loadScriptString(selectionA_);
1832	+	evaluatorB_.loadScriptString(selectionB_);
1833	+
1834	+	seleManA_.setSelectionSet(evaluatorA_.evaluate());
1835	+	seleManB_.setSelectionSet(evaluatorB_.evaluate());
1836	+
1837	+	commonA_ = seleManA_ & seleMan_;
1838	+	commonB_ = seleManB_ & seleMan_;
1839	+
1840	+	// Target exchange quantities (in each exchange) = dividingArea * dt * flux
1841	+	// dt = exchange time interval
1842	+	// flux = target flux
1843	+	// dividingArea = smallest dividing surface between the two regions
1844	+
1845	+	hasDividingArea_ = false;
1846	+	RealType area = getDividingArea();
1847	+
1848	+	kineticTarget_ = kineticFlux_ * exchangeTime_ * area;
1849	+	momentumTarget_ = momentumFluxVector_ * exchangeTime_ * area;
1850	+	angularMomentumTarget_ = angularMomentumFluxVector_ * exchangeTime_ * area;
1851	+
1852		switch(rnemdMethod_) {
1853		case rnemdSwap:
1854	<	doSwap();
1854	>	doSwap(commonA_, commonB_);
1855		break;
1856		case rnemdNIVS:
1857	<	doNIVS();
1857	>	doNIVS(commonA_, commonB_);
1858		break;
1859		case rnemdVSS:
1860	<	doVSS();
1860	>	doVSS(commonA_, commonB_);
1861		break;
1862		case rnemdUnkownMethod:
1863		default :
#	Line 1400 | Line 1868 | namespace OpenMD {
1868		void RNEMD::collectData() {
1869		if (!doRNEMD_) return;
1870		Snapshot* currentSnap_ = info_->getSnapshotManager()->getCurrentSnapshot();
1871	+
1872	+	// collectData can be called more frequently than the doRNEMD, so use the
1873	+	// computed area from the last exchange time:
1874	+	RealType area = getDividingArea();
1875	+	areaAccumulator_->add(area);
1876		Mat3x3d hmat = currentSnap_->getHmat();
1877	+	Vector3d u = angularMomentumFluxVector_;
1878	+	u.normalize();
1879
1405	–	areaAccumulator_->add(currentSnap_->getXYarea());
1406	–
1880		seleMan_.setSelectionSet(evaluator_.evaluate());
1881
1882		int selei(0);
1883		StuntDouble* sd;
1884	+	int binNo;
1885	+	RealType mass;
1886	+	Vector3d vel;
1887	+	Vector3d rPos;
1888	+	RealType KE;
1889	+	Vector3d L;
1890	+	Mat3x3d I;
1891	+	RealType r2;
1892
1893		vector<RealType> binMass(nBins_, 0.0);
1894	<	vector<RealType> binPx(nBins_, 0.0);
1895	<	vector<RealType> binPy(nBins_, 0.0);
1896	<	vector<RealType> binPz(nBins_, 0.0);
1894	>	vector<Vector3d> binP(nBins_, V3Zero);
1895	>	vector<RealType> binOmega(nBins_, 0.0);
1896	>	vector<Vector3d> binL(nBins_, V3Zero);
1897	>	vector<Mat3x3d>  binI(nBins_);
1898		vector<RealType> binKE(nBins_, 0.0);
1899		vector<int> binDOF(nBins_, 0);
1900		vector<int> binCount(nBins_, 0);
#	Line 1420 | Line 1902 | namespace OpenMD {
1902		// alternative approach, track all molecules instead of only those
1903		// selected for scaling/swapping:
1904		/*
1905	<	SimInfo::MoleculeIterator miter;
1906	<	vector<StuntDouble*>::iterator iiter;
1907	<	Molecule* mol;
1908	<	StuntDouble* sd;
1909	<	for (mol = info_->beginMolecule(miter); mol != NULL;
1905	>	SimInfo::MoleculeIterator miter;
1906	>	vector<StuntDouble*>::iterator iiter;
1907	>	Molecule* mol;
1908	>	StuntDouble* sd;
1909	>	for (mol = info_->beginMolecule(miter); mol != NULL;
1910		mol = info_->nextMolecule(miter))
1911		sd is essentially sd
1912	<	for (sd = mol->beginIntegrableObject(iiter);
1913	<	sd != NULL;
1914	<	sd = mol->nextIntegrableObject(iiter))
1912	>	for (sd = mol->beginIntegrableObject(iiter);
1913	>	sd != NULL;
1914	>	sd = mol->nextIntegrableObject(iiter))
1915		*/
1916
1917		for (sd = seleMan_.beginSelected(selei); sd != NULL;
#	Line 1439 | Line 1921 | namespace OpenMD {
1921
1922		// wrap the stuntdouble's position back into the box:
1923
1924	<	if (usePeriodicBoundaryConditions_)
1924	>	if (usePeriodicBoundaryConditions_) {
1925		currentSnap_->wrapVector(pos);
1926	+	// which bin is this stuntdouble in?
1927	+	// wrapped positions are in the range [-0.5*hmat(2,2), +0.5*hmat(2,2)]
1928	+	// Shift molecules by half a box to have bins start at 0
1929	+	// The modulo operator is used to wrap the case when we are
1930	+	// beyond the end of the bins back to the beginning.
1931	+	binNo = int(nBins_ * (pos.z() / hmat(2,2) + 0.5)) % nBins_;
1932	+	} else {
1933	+	Vector3d rPos = pos - coordinateOrigin_;
1934	+	binNo = int(rPos.length() / binWidth_);
1935	+	}
1936
1937	+	mass = sd->getMass();
1938	+	vel = sd->getVel();
1939	+	rPos = sd->getPos() - coordinateOrigin_;
1940	+	KE = 0.5 * mass * vel.lengthSquare();
1941	+	L = mass * cross(rPos, vel);
1942	+	I = outProduct(rPos, rPos) * mass;
1943	+	r2 = rPos.lengthSquare();
1944	+	I(0, 0) += mass * r2;
1945	+	I(1, 1) += mass * r2;
1946	+	I(2, 2) += mass * r2;
1947
1948	<	// which bin is this stuntdouble in?
1949	<	// wrapped positions are in the range [-0.5*hmat(2,2), +0.5*hmat(2,2)]
1950	<	// Shift molecules by half a box to have bins start at 0
1951	<	// The modulo operator is used to wrap the case when we are
1952	<	// beyond the end of the bins back to the beginning.
1953	<	int binNo = int(nBins_ * (pos.z() / hmat(2,2) + 0.5)) % nBins_;
1948	>	// Project the relative position onto a plane perpendicular to
1949	>	// the angularMomentumFluxVector:
1950	>	// Vector3d rProj = rPos - dot(rPos, u) * u;
1951	>	// Project the velocity onto a plane perpendicular to the
1952	>	// angularMomentumFluxVector:
1953	>	// Vector3d vProj = vel  - dot(vel, u) * u;
1954	>	// Compute angular velocity vector (should be nearly parallel to
1955	>	// angularMomentumFluxVector
1956	>	// Vector3d aVel = cross(rProj, vProj);
1957
1958	<	RealType mass = sd->getMass();
1959	<	Vector3d vel = sd->getVel();
1960	<
1961	<	binCount[binNo]++;
1962	<	binMass[binNo] += mass;
1963	<	binPx[binNo] += mass*vel.x();
1964	<	binPy[binNo] += mass*vel.y();
1965	<	binPz[binNo] += mass*vel.z();
1966	<	binKE[binNo] += 0.5 * (mass * vel.lengthSquare());
1967	<	binDOF[binNo] += 3;
1968	<
1969	<	if (sd->isDirectional()) {
1970	<	Vector3d angMom = sd->getJ();
1971	<	Mat3x3d I = sd->getI();
1972	<	if (sd->isLinear()) {
1973	<	int i = sd->linearAxis();
1974	<	int j = (i + 1) % 3;
1975	<	int k = (i + 2) % 3;
1976	<	binKE[binNo] += 0.5 * (angMom[j] * angMom[j] / I(j, j) +
1977	<	angMom[k] * angMom[k] / I(k, k));
1978	<	binDOF[binNo] += 2;
1979	<	} else {
1980	<	binKE[binNo] += 0.5 * (angMom[0] * angMom[0] / I(0, 0) +
1981	<	angMom[1] * angMom[1] / I(1, 1) +
1982	<	angMom[2] * angMom[2] / I(2, 2));
1478	<	binDOF[binNo] += 3;
1958	>	if (binNo >= 0 && binNo < nBins_)  {
1959	>	binCount[binNo]++;
1960	>	binMass[binNo] += mass;
1961	>	binP[binNo] += mass*vel;
1962	>	binKE[binNo] += KE;
1963	>	binI[binNo] += I;
1964	>	binL[binNo] += L;
1965	>	binDOF[binNo] += 3;
1966	>
1967	>	if (sd->isDirectional()) {
1968	>	Vector3d angMom = sd->getJ();
1969	>	Mat3x3d Ia = sd->getI();
1970	>	if (sd->isLinear()) {
1971	>	int i = sd->linearAxis();
1972	>	int j = (i + 1) % 3;
1973	>	int k = (i + 2) % 3;
1974	>	binKE[binNo] += 0.5 * (angMom[j] * angMom[j] / Ia(j, j) +
1975	>	angMom[k] * angMom[k] / Ia(k, k));
1976	>	binDOF[binNo] += 2;
1977	>	} else {
1978	>	binKE[binNo] += 0.5 * (angMom[0] * angMom[0] / Ia(0, 0) +
1979	>	angMom[1] * angMom[1] / Ia(1, 1) +
1980	>	angMom[2] * angMom[2] / Ia(2, 2));
1981	>	binDOF[binNo] += 3;
1982	>	}
1983		}
1984		}
1985		}
1986
1987		#ifdef IS_MPI
1988	<	MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &binCount[0],
1989	<	nBins_, MPI::INT, MPI::SUM);
1990	<	MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &binMass[0],
1991	<	nBins_, MPI::REALTYPE, MPI::SUM);
1992	<	MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &binPx[0],
1993	<	nBins_, MPI::REALTYPE, MPI::SUM);
1994	<	MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &binPy[0],
1995	<	nBins_, MPI::REALTYPE, MPI::SUM);
1996	<	MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &binPz[0],
1997	<	nBins_, MPI::REALTYPE, MPI::SUM);
1998	<	MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &binKE[0],
1999	<	nBins_, MPI::REALTYPE, MPI::SUM);
2000	<	MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &binDOF[0],
2001	<	nBins_, MPI::INT, MPI::SUM);
1988	>
1989	>	for (int i = 0; i < nBins_; i++) {
1990	>
1991	>	MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &binCount[i],
1992	>	1, MPI::INT, MPI::SUM);
1993	>	MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &binMass[i],
1994	>	1, MPI::REALTYPE, MPI::SUM);
1995	>	MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &binP[i],
1996	>	3, MPI::REALTYPE, MPI::SUM);
1997	>	MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &binL[i],
1998	>	3, MPI::REALTYPE, MPI::SUM);
1999	>	MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &binI[i],
2000	>	9, MPI::REALTYPE, MPI::SUM);
2001	>	MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &binKE[i],
2002	>	1, MPI::REALTYPE, MPI::SUM);
2003	>	MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &binDOF[i],
2004	>	1, MPI::INT, MPI::SUM);
2005	>	//MPI::COMM_WORLD.Allreduce(MPI::IN_PLACE, &binOmega[i],
2006	>	//                          1, MPI::REALTYPE, MPI::SUM);
2007	>	}
2008	>
2009		#endif
2010
2011	<	Vector3d vel;
2011	>	Vector3d omega;
2012		RealType den;
2013		RealType temp;
2014		RealType z;
2015	+	RealType r;
2016		for (int i = 0; i < nBins_; i++) {
2017	<	z = (((RealType)i + 0.5) / (RealType)nBins_) * hmat(2,2);
2018	<	vel.x() = binPx[i] / binMass[i];
2019	<	vel.y() = binPy[i] / binMass[i];
2020	<	vel.z() = binPz[i] / binMass[i];
2017	>	if (usePeriodicBoundaryConditions_) {
2018	>	z = (((RealType)i + 0.5) / (RealType)nBins_) * hmat(2,2);
2019	>	den = binMass[i] * nBins_ * PhysicalConstants::densityConvert
2020	>	/ currentSnap_->getVolume() ;
2021	>	} else {
2022	>	r = (((RealType)i + 0.5) * binWidth_);
2023	>	RealType rinner = (RealType)i * binWidth_;
2024	>	RealType router = (RealType)(i+1) * binWidth_;
2025	>	den = binMass[i] * 3.0 * PhysicalConstants::densityConvert
2026	>	/ (4.0 * M_PI * (pow(router,3) - pow(rinner,3)));
2027	>	}
2028	>	vel = binP[i] / binMass[i];
2029
2030	<	den = binMass[i] * nBins_ * PhysicalConstants::densityConvert
1511	<	/ currentSnap_->getVolume() ;
2030	>	omega = binI[i].inverse() * binL[i];
2031
2032	+	// omega = binOmega[i] / binCount[i];
2033	+
2034		if (binCount[i] > 0) {
2035		// only add values if there are things to add
2036		temp = 2.0 * binKE[i] / (binDOF[i] * PhysicalConstants::kb *
#	Line 1521 | Line 2042 | namespace OpenMD {
2042		case Z:
2043		dynamic_cast<Accumulator *>(data_[j].accumulator[i])->add(z);
2044		break;
2045	+	case R:
2046	+	dynamic_cast<Accumulator *>(data_[j].accumulator[i])->add(r);
2047	+	break;
2048		case TEMPERATURE:
2049		dynamic_cast<Accumulator *>(data_[j].accumulator[i])->add(temp);
2050		break;
2051		case VELOCITY:
2052		dynamic_cast<VectorAccumulator *>(data_[j].accumulator[i])->add(vel);
2053		break;
2054	+	case ANGULARVELOCITY:
2055	+	dynamic_cast<VectorAccumulator *>(data_[j].accumulator[i])->add(omega);
2056	+	break;
2057		case DENSITY:
2058		dynamic_cast<Accumulator *>(data_[j].accumulator[i])->add(den);
2059		break;
#	Line 1535 | Line 2062 | namespace OpenMD {
2062		}
2063		}
2064		}
2065	+	hasData_ = true;
2066		}
2067
2068		void RNEMD::getStarted() {
2069		if (!doRNEMD_) return;
2070	+	hasDividingArea_ = false;
2071		collectData();
2072		writeOutputFile();
2073		}
#	Line 1566 | Line 2095 | namespace OpenMD {
2095
2096		void RNEMD::writeOutputFile() {
2097		if (!doRNEMD_) return;
2098	+	if (!hasData_) return;
2099
2100		#ifdef IS_MPI
2101		// If we're the root node, should we print out the results
#	Line 1587 | Line 2117 | namespace OpenMD {
2117		RealType time = currentSnap_->getTime();
2118		RealType avgArea;
2119		areaAccumulator_->getAverage(avgArea);
1590	–	RealType Jz = kineticExchange_ / (2.0 * time * avgArea)
1591	–	/ PhysicalConstants::energyConvert;
1592	–	Vector3d JzP = momentumExchange_ / (2.0 * time * avgArea);
2120
2121	+	RealType Jz(0.0);
2122	+	Vector3d JzP(V3Zero);
2123	+	Vector3d JzL(V3Zero);
2124	+	if (time >= info_->getSimParams()->getDt()) {
2125	+	Jz = kineticExchange_ / (time * avgArea)
2126	+	/ PhysicalConstants::energyConvert;
2127	+	JzP = momentumExchange_ / (time * avgArea);
2128	+	JzL = angularMomentumExchange_ / (time * avgArea);
2129	+	}
2130	+
2131		rnemdFile_ << "#######################################################\n";
2132		rnemdFile_ << "# RNEMD {\n";
2133
#	Line 1609 | Line 2146 | namespace OpenMD {
2146
2147		rnemdFile_ << "#    objectSelection = \""
2148		<< rnemdObjectSelection_ << "\";\n";
2149	<	rnemdFile_ << "#    slabWidth = " << slabWidth_ << ";\n";
2150	<	rnemdFile_ << "#    slabAcenter = " << slabACenter_ << ";\n";
1614	<	rnemdFile_ << "#    slabBcenter = " << slabBCenter_ << ";\n";
2149	>	rnemdFile_ << "#    selectionA = \"" << selectionA_ << "\";\n";
2150	>	rnemdFile_ << "#    selectionB = \"" << selectionB_ << "\";\n";
2151		rnemdFile_ << "# }\n";
2152		rnemdFile_ << "#######################################################\n";
2153		rnemdFile_ << "# RNEMD report:\n";
2154	<	rnemdFile_ << "#     running time = " << time << " fs\n";
2155	<	rnemdFile_ << "#     target flux:\n";
2156	<	rnemdFile_ << "#         kinetic = "
2154	>	rnemdFile_ << "#      running time = " << time << " fs\n";
2155	>	rnemdFile_ << "# Target flux:\n";
2156	>	rnemdFile_ << "#           kinetic = "
2157		<< kineticFlux_ / PhysicalConstants::energyConvert
2158		<< " (kcal/mol/A^2/fs)\n";
2159	<	rnemdFile_ << "#         momentum = " << momentumFluxVector_
2159	>	rnemdFile_ << "#          momentum = " << momentumFluxVector_
2160		<< " (amu/A/fs^2)\n";
2161	<	rnemdFile_ << "#     target one-time exchanges:\n";
2162	<	rnemdFile_ << "#         kinetic = "
2161	>	rnemdFile_ << "#  angular momentum = " << angularMomentumFluxVector_
2162	>	<< " (amu/A^2/fs^2)\n";
2163	>	rnemdFile_ << "# Target one-time exchanges:\n";
2164	>	rnemdFile_ << "#          kinetic = "
2165		<< kineticTarget_ / PhysicalConstants::energyConvert
2166		<< " (kcal/mol)\n";
2167	<	rnemdFile_ << "#         momentum = " << momentumTarget_
2167	>	rnemdFile_ << "#          momentum = " << momentumTarget_
2168		<< " (amu*A/fs)\n";
2169	<	rnemdFile_ << "#     actual exchange totals:\n";
2170	<	rnemdFile_ << "#         kinetic = "
2169	>	rnemdFile_ << "#  angular momentum = " << angularMomentumTarget_
2170	>	<< " (amu*A^2/fs)\n";
2171	>	rnemdFile_ << "# Actual exchange totals:\n";
2172	>	rnemdFile_ << "#          kinetic = "
2173		<< kineticExchange_ / PhysicalConstants::energyConvert
2174		<< " (kcal/mol)\n";
2175	<	rnemdFile_ << "#         momentum = " << momentumExchange_
2175	>	rnemdFile_ << "#          momentum = " << momentumExchange_
2176		<< " (amu*A/fs)\n";
2177	<	rnemdFile_ << "#     actual flux:\n";
2178	<	rnemdFile_ << "#         kinetic = " << Jz
2177	>	rnemdFile_ << "#  angular momentum = " << angularMomentumExchange_
2178	>	<< " (amu*A^2/fs)\n";
2179	>	rnemdFile_ << "# Actual flux:\n";
2180	>	rnemdFile_ << "#          kinetic = " << Jz
2181		<< " (kcal/mol/A^2/fs)\n";
2182	<	rnemdFile_ << "#         momentum = " << JzP
2182	>	rnemdFile_ << "#          momentum = " << JzP
2183		<< " (amu/A/fs^2)\n";
2184	<	rnemdFile_ << "#     exchange statistics:\n";
2185	<	rnemdFile_ << "#         attempted = " << trialCount_ << "\n";
2186	<	rnemdFile_ << "#         failed = " << failTrialCount_ << "\n";
2184	>	rnemdFile_ << "#  angular momentum = " << JzL
2185	>	<< " (amu/A^2/fs^2)\n";
2186	>	rnemdFile_ << "# Exchange statistics:\n";
2187	>	rnemdFile_ << "#               attempted = " << trialCount_ << "\n";
2188	>	rnemdFile_ << "#                  failed = " << failTrialCount_ << "\n";
2189		if (rnemdMethod_ == rnemdNIVS) {
2190	<	rnemdFile_ << "#         NIVS root-check errors = "
2190	>	rnemdFile_ << "#  NIVS root-check errors = "
2191		<< failRootCount_ << "\n";
2192		}
2193		rnemdFile_ << "#######################################################\n";
#	Line 1670 | Line 2214 | namespace OpenMD {
2214		if (outputMask_[i]) {
2215		if (data_[i].dataType == "RealType")
2216		writeReal(i,j);
2217	<	else if (data_[i].dataType == "Vector3d")
2217	>	else if (data_[i].dataType == "Vector3d")
2218		writeVector(i,j);
2219		else {
2220		sprintf( painCave.errMsg,
#	Line 1723 | Line 2267 | namespace OpenMD {
2267		void RNEMD::writeReal(int index, unsigned int bin) {
2268		if (!doRNEMD_) return;
2269		assert(index >=0 && index < ENDINDEX);
2270	<	assert(bin < nBins_);
2270	>	assert(int(bin) < nBins_);
2271		RealType s;
2272	+	int count;
2273
2274	+	count = data_[index].accumulator[bin]->count();
2275	+	if (count == 0) return;
2276	+
2277		dynamic_cast<Accumulator *>(data_[index].accumulator[bin])->getAverage(s);
2278
2279		if (! isinf(s) && ! isnan(s)) {
2280		rnemdFile_ << "\t" << s;
2281		} else{
2282		sprintf( painCave.errMsg,
2283	<	"RNEMD detected a numerical error writing: %s for bin %d",
2283	>	"RNEMD detected a numerical error writing: %s for bin %u",
2284		data_[index].title.c_str(), bin);
2285		painCave.isFatal = 1;
2286		simError();
#	Line 1742 | Line 2290 | namespace OpenMD {
2290		void RNEMD::writeVector(int index, unsigned int bin) {
2291		if (!doRNEMD_) return;
2292		assert(index >=0 && index < ENDINDEX);
2293	<	assert(bin < nBins_);
2293	>	assert(int(bin) < nBins_);
2294		Vector3d s;
2295	+	int count;
2296	+
2297	+	count = data_[index].accumulator[bin]->count();
2298	+
2299	+	if (count == 0) return;
2300	+
2301		dynamic_cast<VectorAccumulator*>(data_[index].accumulator[bin])->getAverage(s);
2302		if (isinf(s[0]) || isnan(s[0]) ||
2303		isinf(s[1]) || isnan(s[1]) ||
2304		isinf(s[2]) || isnan(s[2]) ) {
2305		sprintf( painCave.errMsg,
2306	<	"RNEMD detected a numerical error writing: %s for bin %d",
2306	>	"RNEMD detected a numerical error writing: %s for bin %u",
2307		data_[index].title.c_str(), bin);
2308		painCave.isFatal = 1;
2309		simError();
#	Line 1761 | Line 2315 | namespace OpenMD {
2315		void RNEMD::writeRealStdDev(int index, unsigned int bin) {
2316		if (!doRNEMD_) return;
2317		assert(index >=0 && index < ENDINDEX);
2318	<	assert(bin < nBins_);
2318	>	assert(int(bin) < nBins_);
2319		RealType s;
2320	+	int count;
2321
2322	+	count = data_[index].accumulator[bin]->count();
2323	+	if (count == 0) return;
2324	+
2325		dynamic_cast<Accumulator *>(data_[index].accumulator[bin])->getStdDev(s);
2326
2327		if (! isinf(s) && ! isnan(s)) {
2328		rnemdFile_ << "\t" << s;
2329		} else{
2330		sprintf( painCave.errMsg,
2331	<	"RNEMD detected a numerical error writing: %s std. dev. for bin %d",
2331	>	"RNEMD detected a numerical error writing: %s std. dev. for bin %u",
2332		data_[index].title.c_str(), bin);
2333		painCave.isFatal = 1;
2334		simError();
#	Line 1780 | Line 2338 | namespace OpenMD {
2338		void RNEMD::writeVectorStdDev(int index, unsigned int bin) {
2339		if (!doRNEMD_) return;
2340		assert(index >=0 && index < ENDINDEX);
2341	<	assert(bin < nBins_);
2341	>	assert(int(bin) < nBins_);
2342		Vector3d s;
2343	+	int count;
2344	+
2345	+	count = data_[index].accumulator[bin]->count();
2346	+	if (count == 0) return;
2347	+
2348		dynamic_cast<VectorAccumulator*>(data_[index].accumulator[bin])->getStdDev(s);
2349		if (isinf(s[0]) || isnan(s[0]) ||
2350		isinf(s[1]) || isnan(s[1]) ||
2351		isinf(s[2]) || isnan(s[2]) ) {
2352		sprintf( painCave.errMsg,
2353	<	"RNEMD detected a numerical error writing: %s std. dev. for bin %d",
2353	>	"RNEMD detected a numerical error writing: %s std. dev. for bin %u",
2354		data_[index].title.c_str(), bin);
2355		painCave.isFatal = 1;
2356		simError();

Diff Legend

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