Merge pull request #6 from jbisits/joe-seticsbetter

Better method for setting TS staircase

Author: jbisits

Project.toml

@@ -1,7 +1,7 @@
 name = "StaircaseShenanigans"
 uuid = "c2bb06a8-94f3-4279-b990-30bf3ab8ba6f"
 authors = ["Josef Bisits <jbisits@gmail.com>"]
-version = "0.0.1"
+version = "0.1.0"
 
 [deps]
 GibbsSeaWater = "9a22fb26-0b63-4589-b28e-8f9d0b5c3d05"

src/set_staircase_initial_conditions.jl

@@ -5,19 +5,30 @@ Set initial salinity and temperature staircases in `model`.
 function set_staircase_initial_conditions!(model, ics::StepInitialConditions)
 
     depth_of_steps = ics.depth_of_steps
+    z = znodes(model.grid, Center())
     S = ics.salinity_values
     T = ics.temperature_values
-    initial_S_steps(x, y, z) = set_steps(z, S, depth_of_steps)
-    initial_T_steps(x, y, z) = set_steps(z, T, depth_of_steps)
 
-    set!(model, S = initial_S_steps, T = initial_T_steps)
+    S₀ = similar(interior(model.tracers.S, :, :, :))
+    T₀ = similar(interior(model.tracers.T, :, :, :))
+    S₀[:, :, z .> depth_of_steps[1]] .= S[1]
+    T₀[:, :, z .> depth_of_steps[1]] .= T[1]
+    for i ∈ 1:length(depth_of_steps)-1
+        S₀[:, :, depth_of_steps[i+1] .≤ z .< depth_of_steps[i]] .= S[i]
+        T₀[:, :, depth_of_steps[i+1] .≤ z .< depth_of_steps[i]] .= T[i]
+    end
+    S₀[:, :, z .< depth_of_steps[end]] .= S[end]
+    T₀[:, :, z .< depth_of_steps[end]] .= T[end]
+
+    set!(model, S = S₀, T = T₀)
 
     return nothing
 end
 function set_staircase_initial_conditions!(model, ics::SmoothStepInitialConditions)
 
     # TODO: write methods to set smooth changes using the function provied in
-    # `ics::SmoothStepInitialConditions`.
+    # `ics::SmoothStepInitialConditions`. I can use something like the above
+    # normalise then set with the smoothing function
     #set!(model, S = initial_S_steps, T = initial_T_steps)
 
     return nothing

src/staircase_initial_conditions.jl

@@ -34,6 +34,8 @@ set in the ranges:
 - z ∈ [depth_of_steps[1], 0)
 - z ∈ [depth_of_steps[i], depth_of_steps[i-1]) for i = 2:number_of_steps-1
 - z ∈ [-Lz, depth_of_steps[1]).
+
+**Not currently in use and will remove if not needed.**
 """
 function set_steps(z, C, depth_of_steps)