diff options
| author | jacob1 <jfu614@gmail.com> | 2012-12-06 16:01:46 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2012-12-06 16:01:46 (GMT) |
| commit | 122599763ef9827d7aadc0fe0295c2fbc96e82ab (patch) | |
| tree | dcf0a21b20cd38a12dee93d9db6115da6c0fdb35 /src/simulation/elements/CLST.cpp | |
| parent | 2d7ac84c1dca8521f41cf023774b7a90e300b3bf (diff) | |
| parent | 9bf5eeeef919260458637e84f3388b4d7d8204c5 (diff) | |
| download | powder-122599763ef9827d7aadc0fe0295c2fbc96e82ab.zip powder-122599763ef9827d7aadc0fe0295c2fbc96e82ab.tar.gz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/simulation/elements/CLST.cpp')
| -rw-r--r-- | src/simulation/elements/CLST.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/simulation/elements/CLST.cpp b/src/simulation/elements/CLST.cpp index 3cab1f7..ab62acb 100644 --- a/src/simulation/elements/CLST.cpp +++ b/src/simulation/elements/CLST.cpp @@ -50,7 +50,7 @@ Element_CLST::Element_CLST() int Element_CLST::update(UPDATE_FUNC_ARGS) { int r, rx, ry; - float cxy; + float cxy = 0; for (rx=-2; rx<3; rx++) for (ry=-2; ry<3; ry++) if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) @@ -76,7 +76,7 @@ int Element_CLST::update(UPDATE_FUNC_ARGS) cxy = 0.015; if(parts[i].temp >= 295 && parts[i].temp <350) cxy = 0.01; - if(parts[i].temp > 350) + if(parts[i].temp >= 350) cxy = 0.005; parts[i].vx += cxy*rx; parts[i].vy += cxy*ry;//These two can be set not to calculate over 350 later. They do virtually nothing over 0.005. |