ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/brains/SimCreator.cpp
(Generate patch)

Comparing branches/development/src/brains/SimCreator.cpp (file contents):
Revision 1715 by gezelter, Tue May 22 21:55:31 2012 UTC vs.
Revision 1725 by gezelter, Sat May 26 18:13:43 2012 UTC

# Line 56 | Line 56
56   #include "brains/SimCreator.hpp"
57   #include "brains/SimSnapshotManager.hpp"
58   #include "io/DumpReader.hpp"
59 < #include "UseTheForce/ForceFieldFactory.hpp"
59 > #include "brains/ForceField.hpp"
60   #include "utils/simError.h"
61   #include "utils/StringUtils.hpp"
62   #include "math/SeqRandNumGen.hpp"
# Line 371 | Line 371 | namespace OpenMD {
371                                     metaDataBlockStart + 1);
372      
373      //create the force field
374 <    ForceField * ff = ForceFieldFactory::getInstance()->createForceField(simParams->getForceField());
374 >    ForceField * ff = new ForceField(simParams->getForceField());
375  
376      if (ff == NULL) {
377        sprintf(painCave.errMsg,
# Line 751 | Line 751 | namespace OpenMD {
751      if (simParams->getOutputParticlePotential()) {
752        storageLayout |= DataStorage::dslParticlePot;
753      }
754 +
755 +    if (simParams->havePrintHeatFlux()) {
756 +      if (simParams->getPrintHeatFlux()) {
757 +        storageLayout |= DataStorage::dslParticlePot;
758 +      }
759 +    }
760 +
761      if (simParams->getOutputElectricField()) {
762        storageLayout |= DataStorage::dslElectricField;
763      }

Diff Legend

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