Skip to content

GitLab

Unverified Commit 8f55af1c authored by peastman's avatar peastman Committed by GitHub
Browse files

Minor code cleanup (#2979)

parent 9f9ac8d3
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
serialization/src/SystemProxy.cpp
View file @ 8f55af1c
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Biological Structures at Stanford, funded under the NIH Roadmap for * * Biological Structures at Stanford, funded under the NIH Roadmap for *
* Medical Research, grant U54 GM072970. See https://simtk.org. * * Medical Research, grant U54 GM072970. See https://simtk.org. *
* * * *
* Portions copyright (c) 2010-2017 Stanford University and the Authors. * * Portions copyright (c) 2010-2021 Stanford University and the Authors. *
* Authors: Peter Eastman * * Authors: Peter Eastman *
* Contributors: * * Contributors: *
* * * *
...@@ -129,7 +129,7 @@ void* SystemProxy::deserialize(const SerializationNode& node) const { ...@@ -129,7 +129,7 @@ void* SystemProxy::deserialize(const SerializationNode& node) const {
else if (vsite.getName() == "OutOfPlaneSite") else if (vsite.getName() == "OutOfPlaneSite")
system->setVirtualSite(i, new OutOfPlaneSite(vsite.getIntProperty("p1"), vsite.getIntProperty("p2"), vsite.getIntProperty("p3"), vsite.getDoubleProperty("w12"), vsite.getDoubleProperty("w13"), vsite.getDoubleProperty("wc"))); system->setVirtualSite(i, new OutOfPlaneSite(vsite.getIntProperty("p1"), vsite.getIntProperty("p2"), vsite.getIntProperty("p3"), vsite.getDoubleProperty("w12"), vsite.getDoubleProperty("w13"), vsite.getDoubleProperty("wc")));
else if (vsite.getName() == "LocalCoordinatesSite") { else if (vsite.getName() == "LocalCoordinatesSite") {
vector<int> particles; vector<int> particleIndices;
vector<double> wo, wx, wy; vector<double> wo, wx, wy;
for (int j = 0; ; j++) { for (int j = 0; ; j++) {
stringstream ss; stringstream ss;
...@@ -137,13 +137,13 @@ void* SystemProxy::deserialize(const SerializationNode& node) const { ...@@ -137,13 +137,13 @@ void* SystemProxy::deserialize(const SerializationNode& node) const {
string index = ss.str(); string index = ss.str();
if (!vsite.hasProperty("p"+index)) if (!vsite.hasProperty("p"+index))
break; break;
particles.push_back(vsite.getIntProperty("p"+index)); particleIndices.push_back(vsite.getIntProperty("p"+index));
wo.push_back(vsite.getDoubleProperty("wo"+index)); wo.push_back(vsite.getDoubleProperty("wo"+index));
wx.push_back(vsite.getDoubleProperty("wx"+index)); wx.push_back(vsite.getDoubleProperty("wx"+index));
wy.push_back(vsite.getDoubleProperty("wy"+index)); wy.push_back(vsite.getDoubleProperty("wy"+index));
} }
Vec3 p(vsite.getDoubleProperty("pos1"), vsite.getDoubleProperty("pos2"), vsite.getDoubleProperty("pos3")); Vec3 p(vsite.getDoubleProperty("pos1"), vsite.getDoubleProperty("pos2"), vsite.getDoubleProperty("pos3"));
system->setVirtualSite(i, new LocalCoordinatesSite(particles, wo, wx, wy, p)); system->setVirtualSite(i, new LocalCoordinatesSite(particleIndices, wo, wx, wy, p));
} }
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment