tmove misplaced parantheses - Granular.jl - Julia package for granular dynamics… | |
git clone git://src.adamsgaard.dk/Granular.jl | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 896b7f17f413560faa744ddf2367673a91061056 | |
parent 2d6071c73d309415a3db2c1233e47e8280a66cf8 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Mon, 24 Apr 2017 22:12:33 -0400 | |
move misplaced parantheses | |
Diffstat: | |
M src/ocean.jl | 9 ++++++--- | |
1 file changed, 6 insertions(+), 3 deletions(-) | |
--- | |
diff --git a/src/ocean.jl b/src/ocean.jl | |
t@@ -103,9 +103,9 @@ function interpolateOceanState(ocean::Ocean, t::float) | |
end | |
return ocean.u[:,:,:,i]*(1. - rel_time + ocean.u[:,:,:,i+1]*rel_time), | |
- ocean.v[:,:,:,i]*(1. - rel_time + ocean.v[:,:,:,i+1]*rel_time), | |
- ocean.h[:,:,:,i]*(1. - rel_time + ocean.h[:,:,:,i+1]*rel_time), | |
- ocean.e[:,:,:,i]*(1. - rel_time + ocean.e[:,:,:,i+1]*rel_time) | |
+ ocean.v[:,:,:,i]*(1. - rel_time) + ocean.v[:,:,:,i+1]*rel_time, | |
+ ocean.h[:,:,:,i]*(1. - rel_time) + ocean.h[:,:,:,i+1]*rel_time, | |
+ ocean.e[:,:,:,i]*(1. - rel_time) + ocean.e[:,:,:,i+1]*rel_time | |
end | |
""" | |
t@@ -115,4 +115,7 @@ function addOceanDrag!(simulation::Simulation) | |
if !simulation.ocean.id | |
error("no ocean data read") | |
end | |
+ | |
+ u, v, h, e = interpolateOceanState(simulation.ocean, simulation.time) | |
+ | |
end |