| 144 |
|
} |
| 145 |
|
|
| 146 |
|
SimInfo::~SimInfo() { |
| 147 |
< |
//MemoryUtils::deleteVectorOfPointer(molecules_); |
| 148 |
< |
|
| 149 |
< |
MemoryUtils::deleteVectorOfPointer(moleculeStamps_); |
| 147 |
> |
std::map<int, Molecule*>::iterator i; |
| 148 |
> |
for (i = molecules_.begin(); i != molecules_.end(); ++i) { |
| 149 |
> |
delete i->second; |
| 150 |
> |
} |
| 151 |
> |
molecules_.clear(); |
| 152 |
|
|
| 153 |
+ |
MemoryUtils::deletePointers(moleculeStamps_); |
| 154 |
+ |
|
| 155 |
|
delete sman_; |
| 156 |
|
delete simParams_; |
| 157 |
|
delete forceField_; |
| 839 |
|
} |
| 840 |
|
|
| 841 |
|
void SimInfo::setSnapshotManager(SnapshotManager* sman) { |
| 842 |
+ |
//if (sman_ == sman_) { |
| 843 |
+ |
// return; |
| 844 |
+ |
//} |
| 845 |
+ |
|
| 846 |
+ |
//delete sman_; |
| 847 |
|
sman_ = sman; |
| 848 |
|
|
| 849 |
|
Molecule* mol; |
