cut off halos only when actually output

Author: milankl

src/Output.jl

@@ -88,54 +88,45 @@ function output_nc!(i::Int,
         @unpack f_q,ep,dtint = S.grid
 
         # CUT OFF HALOS
-        # @views u = Prog.u[halo+1:end-halo,halo+1:end-halo]
-        # @views v = Prog.v[halo+1:end-halo,halo+1:end-halo]
-        # @views η = Prog.η[haloη+1:end-haloη,haloη+1:end-haloη]
-        # @views sst = Prog.sst[halosstx+1:end-halosstx,halossty+1:end-halossty]
-        # @views ζ = (dvdx[2:end-1,2:end-1]-dudy[2+ep:end-1,2:end-1])./abs.(f_q)
-        # @views du = Diag.Tendencies.du[halo+1:end-halo,halo+1:end-halo]
-        # @views dv = Diag.Tendencies.dv[halo+1:end-halo,halo+1:end-halo]
-        # @views dη = Diag.Tendencies.dη[haloη+1:end-haloη,haloη+1:end-haloη]
-
         # As output is before copyto!(u,u0), take u0,v0,η0
-        @views u = Float32.(Diag.RungeKutta.u0[halo+1:end-halo,halo+1:end-halo])
-        @views v = Float32.(Diag.RungeKutta.v0[halo+1:end-halo,halo+1:end-halo])
-        @views η = Float32.(Diag.RungeKutta.η0[haloη+1:end-haloη,haloη+1:end-haloη])
-        
-        @views sst = Float32.(Prog.sst[halosstx+1:end-halosstx,halossty+1:end-halossty])
-        @views ζ = Float32.((dvdx[2:end-1,2:end-1]-dudy[2+ep:end-1,2:end-1])./abs.(f_q))
-
         # Tendencies calculate from the last time step, du = u_n+1-u_n etc
-        @views du = u-Float32.(Prog.u[halo+1:end-halo,halo+1:end-halo])
-        @views dv = v-Float32.(Prog.v[halo+1:end-halo,halo+1:end-halo])
-        @views dη = η-Float32.(Prog.η[haloη+1:end-haloη,haloη+1:end-haloη])
-
         # WRITING THE VARIABLES
         if ncs.u != nothing
+            @views u = Float32.(Diag.RungeKutta.u0[halo+1:end-halo,halo+1:end-halo])
             NetCDF.putvar(ncs.u,"u",u,start=[1,1,iout],count=[-1,-1,1])
         end
         if ncs.v != nothing
+            @views v = Float32.(Diag.RungeKutta.v0[halo+1:end-halo,halo+1:end-halo])
             NetCDF.putvar(ncs.v,"v",v,start=[1,1,iout],count=[-1,-1,1])
         end
         if ncs.η != nothing
+            @views η = Float32.(Diag.RungeKutta.η0[haloη+1:end-haloη,haloη+1:end-haloη])
             NetCDF.putvar(ncs.η,"eta",η,start=[1,1,iout],count=[-1,-1,1])
         end
         if ncs.sst != nothing
+            @views sst = Float32.(Prog.sst[halosstx+1:end-halosstx,halossty+1:end-halossty])
             NetCDF.putvar(ncs.sst,"sst",sst,start=[1,1,iout],count=[-1,-1,1])
         end
         if ncs.q != nothing
             NetCDF.putvar(ncs.q,"q",q,start=[1,1,iout],count=[-1,-1,1])
         end
         if ncs.ζ != nothing
+            @views ζ = Float32.((dvdx[2:end-1,2:end-1]-dudy[2+ep:end-1,2:end-1])./abs.(f_q))
             NetCDF.putvar(ncs.ζ,"relvort",ζ,start=[1,1,iout],count=[-1,-1,1])
         end
         if ncs.du != nothing
+            @views u = Float32.(Diag.RungeKutta.u0[halo+1:end-halo,halo+1:end-halo])
+            @views du = u-Float32.(Prog.u[halo+1:end-halo,halo+1:end-halo])
             NetCDF.putvar(ncs.du,"du",du,start=[1,1,iout],count=[-1,-1,1])
         end
         if ncs.dv != nothing
+            @views v = Float32.(Diag.RungeKutta.v0[halo+1:end-halo,halo+1:end-halo])
+            @views dv = v-Float32.(Prog.v[halo+1:end-halo,halo+1:end-halo])
             NetCDF.putvar(ncs.dv,"dv",dv,start=[1,1,iout],count=[-1,-1,1])
         end
         if ncs.dη != nothing
+            @views η = Float32.(Diag.RungeKutta.η0[haloη+1:end-haloη,haloη+1:end-haloη])
+            @views dη = η-Float32.(Prog.η[haloη+1:end-haloη,haloη+1:end-haloη])
             NetCDF.putvar(ncs.dη,"deta",dη,start=[1,1,iout],count=[-1,-1,1])
         end