Skip to content

Commit

Permalink
update after MeshArrays.jl
Browse files Browse the repository at this point in the history
  • Loading branch information
gaelforget committed Dec 18, 2021
1 parent b01e9f1 commit 6e8342e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions examples/jupyter/flow_fields.jl
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ function global_ocean_circulation(;k=1,ny=2)
Γ=GridLoad(γ;option="full")
Γ=merge(Γ,MeshArrays.NeighborTileIndices_cs(Γ))

func=(u -> update_location_llc!(u,𝐷))
func=(u -> MeshArrays.update_location_llc!(u,𝐷))
Γ=merge(Γ,(; update_location! = func))

#initialize u0,u1 etc
Expand All @@ -97,7 +97,7 @@ function OCCA_FlowFields(;backward_in_time::Bool=false,nmax=Inf)
isfinite(nmax) ? n=min(n,Int(nmax)) : nothing

g=Γ.XC.grid
func=(u -> IndividualDisplacements.update_location_dpdo!(u,g))
func=(u -> MeshArrays.update_location_dpdo!(u,g))

jj=[:hFacC, :hFacW, :hFacS, :DXG, :DYG, :RAC, :RAZ, :RAS]
ii=findall([!in(i,jj) for i in keys(Γ)])
Expand Down Expand Up @@ -242,7 +242,7 @@ function test2_periodic_domain(np = 12, nq = 12)
v = 0.3 ./ Γ.DYC
(u, v) = exchange(u, v, 1)

f = (u -> IndividualDisplacements.update_location_dpdo!(u,Γ.XC.grid))
f = (u -> MeshArrays.update_location_dpdo!(u,Γ.XC.grid))
𝑃=FlowFields(u,u,v,v,[0.0,400.0],f)

#initial conditions
Expand Down
2 changes: 1 addition & 1 deletion src/data_wrangling.jl
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function convert_to_FlowFields(U::Array{T,2},V::Array{T,2},t1::T) where T
u=MeshArray(g,[U])
v=MeshArray(g,[V])
(u,v)=exchange(u,v,1)
func=(u -> IndividualDisplacements.update_location_dpdo!(u,g))
func=(u -> MeshArrays.update_location_dpdo!(u,g))

𝐹_MeshArray2D{eltype(u)}(u,u,v,v,[0,t1],func)
end
Expand Down

0 comments on commit 6e8342e

Please sign in to comment.