Merge pull request #114 from milankl/mixprec

Mixprec

Author: Milan K

src/Preallocate.jl

@@ -447,7 +447,7 @@ struct DiagnosticVars{T,Tprog}
     Laplace::LaplaceVars{T}
     Smagorinsky::SmagorinskyVars{T}
     SemiLagrange::SemiLagrangeVars{T}
-    PrognosticRHS::PrognosticVars{T}        # low precision version
+    PrognosticVarsRHS::PrognosticVars{T}        # low precision version
 end
 
 """Preallocate the diagnostic variables and return them as matrices in structs."""

src/TestJuls.jl

@@ -1,3 +1,13 @@
 include("Juls.jl")
 using .Juls
-RunJuls()
+using BFloat16s
+
+Base.round(x::BFloat16, r::RoundingMode{:Up}) = BFloat16(ceil(Float32(x)))
+Base.round(x::BFloat16, r::RoundingMode{:Down}) = BFloat16(floor(Float32(x)))
+Base.round(x::BFloat16, r::RoundingMode{:Nearest}) = BFloat16(round(Float32(x)))
+
+a = BFloat16(1.2)
+floor(a)
+
+#RunJuls(BFloat16,Tprog=Float32)
+#RunJuls(BFloat16,Tprog=Float32,output=true,nx=200,Ndays=100,initial_cond="ncfile",sst_initial="rect",sst_rect_coords=[0.,0.5,0.,1.0],outpath="/local/home/kloewer/julsdata/mixedprec")

src/TimeIntegration.jl

@@ -47,12 +47,12 @@ function time_integration(  Prog::PrognosticVars{Tprog},
             end
 
             # type conversion for mixed precision
-            u1rhs = convert(Diag.PrognosticRHS.u,u1)
-            v1rhs = convert(Diag.PrognosticRHS.v,v1)
-            η1rhs = convert(Diag.PrognosticRHS.η,η1)
+            u1rhs = convert(Diag.PrognosticVarsRHS.u,u1)
+            v1rhs = convert(Diag.PrognosticVarsRHS.v,v1)
+            η1rhs = convert(Diag.PrognosticVarsRHS.η,η1)
 
             rhs!(u1rhs,v1rhs,η1rhs,Diag,S,t)
-            
+
             if rki < RKo
                 caxb!(u1,u,RKbΔt[rki],du)   #u1 .= u .+ RKb[rki]*Δt*du
                 caxb!(v1,v,RKbΔt[rki],dv)   #v1 .= v .+ RKb[rki]*Δt*dv
@@ -68,9 +68,9 @@ function time_integration(  Prog::PrognosticVars{Tprog},
         ghost_points!(u0,v0,η0,S)
 
         # type conversion for mixed precision
-        u0rhs = convert(Diag.PrognosticRHS.u,u0)
-        v0rhs = convert(Diag.PrognosticRHS.v,v0)
-        η0rhs = convert(Diag.PrognosticRHS.η,η0)
+        u0rhs = convert(Diag.PrognosticVarsRHS.u,u0)
+        v0rhs = convert(Diag.PrognosticVarsRHS.v,v0)
+        η0rhs = convert(Diag.PrognosticVarsRHS.η,η0)
 
         # ADVECTION and CORIOLIS TERMS
         # although included in the tendency of every RK substep,

src/TracerAdvection.jl

@@ -22,7 +22,7 @@ function tracer!(   i::Integer,
         @unpack ssti = Diag.SemiLagrange
 
         # convert to type T for mixed precision
-        sstrhs = convert(Diag.PrognosticRHS.sst,sst)
+        sstrhs = convert(Diag.PrognosticVarsRHS.sst,sst)
 
         departure!(u,v,Diag,S)
         adv_sst!(sstrhs,Diag,S)