Merge pull request #141 from milankl/sherlogs

::DataType in Parameters removed

Author: milankl

src/DefaultParameters.jl

@@ -1,9 +1,9 @@
 @with_kw struct Parameter
 
-    T::DataType=Float32                 # number format
+    T=Float32                 # number format
 
-    Tprog::DataType=T                   # number format for prognostic variables
-    Tcomm::DataType=Tprog               # number format for ghost-point copies
+    Tprog=T                   # number format for prognostic variables
+    Tcomm=Tprog               # number format for ghost-point copies
 
     # DOMAIN RESOLUTION AND RATIO
     nx::Int=100                         # number of grid cells in x-direction

src/Gradients.jl

@@ -32,7 +32,6 @@ function ∇²!(du::Array{T,2},u::Array{T,2}) where {T<:AbstractFloat}
 
     minus_4 = T(-4.0)
 
-    #TODO @simd?
     @inbounds for i ∈ 1:n
         for j ∈ 1:m
             du[j,i] = minus_4*u[j+1,i+1] + u[j,i+1] + u[j+2,i+1] + u[j+1,i] + u[j+1,i+2]
@@ -77,10 +76,10 @@ end
 
 """ ∇² is the 2nd order centred Laplace-operator ∂/∂x^2 + ∂/∂y^2 with grid spacing Δ (default 1)."""
 function ∇²(u::Array{T,2},Δ::Real=1) where {T<:AbstractFloat}
-    
+
     m, n = size(u)
     du = Array{T,2}(undef,m-2,n-2)
-    
+
     minus_4 = T(-4.0)
     one_over_dx² = T(1/Δ^2)
 

src/Output.jl

@@ -84,7 +84,6 @@ function output_nc!(i::Int,
         ncs.iout[1] = iout          # pack
 
         @unpack halo,haloη,halosstx,halossty = S.grid
-        @unpack q,dvdx,dudy = Diag.Vorticity
         @unpack f_q,ep,dtint = S.grid
 
         # CUT OFF HALOS
@@ -108,6 +107,7 @@ function output_nc!(i::Int,
             NetCDF.putvar(ncs.sst,"sst",sst,start=[1,1,iout],count=[-1,-1,1])
         end
         if ncs.q != nothing
+            @views q = Float32.(Diag.Vorticity)
             NetCDF.putvar(ncs.q,"q",q,start=[1,1,iout],count=[-1,-1,1])
         end
         if ncs.ζ != nothing