tMerge branch 'master' of github.com:anders-dc/SeaIce.jl - Granular.jl - Julia package for granular dynamics simulation
(HTM) git clone git://src.adamsgaard.dk/Granular.jl
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 658ed3ba46e5edb826199940faac655578b85ca0
(DIR) parent c81d2057e7d0229eb3a75196b722922fb6afca35
(HTM) Author: Anders Damsgaard <andersd@riseup.net>
Date: Thu, 27 Apr 2017 11:09:51 -0400
Merge branch 'master' of github.com:anders-dc/SeaIce.jl
Diffstat:
M src/grid.jl | 47 ++++++++++++++++++-------------
M test/grid.jl | 16 ++++++++++++++++
2 files changed, 43 insertions(+), 20 deletions(-)
---
(DIR) diff --git a/src/grid.jl b/src/grid.jl
t@@ -1,4 +1,3 @@
-
"""
Use bilinear interpolation to interpolate a staggered grid to an arbitrary
position in a cell. Assumes north-east convention, i.e. (i,j) is located at the
t@@ -6,29 +5,27 @@ north-east corner.
# Arguments
* `field::Array{Float64, 4}`: a scalar field to interpolate from
-* `xi::float`: relative x position in cell [-], must be in `[0., 1.]`
-* `yj::float`: relative y position in cell [-], must be in `[0., 1.]`
+* `p::float`: point position
* `i::Int`: i-index of cell containing point
-* `j::Int`: j-index of cell containing point
-* `grid_type::String="Arakawa A"`: grid system for `field`
+* `j::Int`: j-index of scalar field to interpolate from
+* `it::Int`: time step from scalar field to interpolate from
"""
function bilinearInterpolation(field::Array{Float64, 4},
- xi::float,
- yj::float,
+ x_tilde::Float64,
+ y_tilde::Float64,
i::Int,
- j::Int;
- grid_type::String="Arakawa A")
+ j::Int,
+ k::Int,
+ it::Int)
- if xi < 0. || xi > 1. || yj < 0. || yj > 1.
- error("relative coordinates outside bounds ($(xi), $(yj))")
+ if x_tilde < 0. || x_tilde > 1. || y_tilde < 0. || y_tilde > 1.
+ error("relative coordinates outside bounds ($(x_tilde), $(y_tilde))")
end
- if grid_type == "Arakawa A"
- return (field[i,j]*xi + field[i-1,j]*(1. - xi))*yi +
- (field[i,j-1]*xi + field[i-1,j-1]*(1. - xi))*(1. - yi)
- else
- error("grid type not understood.")
- end
+ return (field[i, j, k, it]*x_tilde +
+ field[i-1, j, k, it]*(1. - x_tilde))*y_tilde +
+ (field[i, j-1, k, it]*x_tilde +
+ field[i-1, j-1, k, it]*(1. - x_tilde))*(1. - y_tilde)
end
"""
t@@ -55,10 +52,20 @@ end
"""
Returns the `i`, `j` index of the ocean grid cell containing the `point`.
"""
-function findCellContainingPoint(ocean::Ocean, i::Int, j::Int,
- point::Array{float, 2})
-
+function findCellContainingPoint(ocean::Ocean, point::Array{float, 1})
+ found = false
+ for i=2:(size(ocean.h)[1] + 1)
+ for j=2:(size(ocean.h)[2] + 1)
+ if isPointInCell(ocean, i, j, point)
+ return i, j
+ end
+ end
+ end
+ if !found
+ # throw an error for now, maybe remove ice floe later on
+ error("point not found in grid")
+ end
return i, j
end
(DIR) diff --git a/test/grid.jl b/test/grid.jl
t@@ -56,3 +56,19 @@ info("Checking cell content using conformal mapping methods")
method="Conformal") == false
@test SeaIce.isPointInCell(ocean, 2, 2, [0.0, 53.5],
method="Conformal") == false
+
+info("Testing bilinear interpolation scheme on conformal mapping")
+ocean.u[1, 1, 1, 1] = 1.0
+ocean.u[2, 1, 1, 1] = 1.0
+ocean.u[2, 2, 1, 1] = 0.0
+ocean.u[1, 2, 1, 1] = 0.0
+@test SeaIce.bilinearInterpolation(ocean.u, .5, .5, 2, 2, 1, 1) ≈ .5
+@test SeaIce.bilinearInterpolation(ocean.u, 1., 1., 2, 2, 1, 1) ≈ .0
+@test SeaIce.bilinearInterpolation(ocean.u, 0., 0., 2, 2, 1, 1) ≈ 1.
+@test SeaIce.bilinearInterpolation(ocean.u, .25, .25, 2, 2, 1, 1) ≈ .75
+@test SeaIce.bilinearInterpolation(ocean.u, .75, .75, 2, 2, 1, 1) ≈ .25
+
+info("Testing cell binning")
+@test SeaIce.findCellContainingPoint(ocean, [6.2, 53.4]) == (2, 2)
+@test SeaIce.findCellContainingPoint(ocean, [7.2, 53.4]) == (3, 2)
+@test_throws ErrorException SeaIce.findCellContainingPoint(ocean, [0.2, 53.4])