vor as unicodeplot, days/day speed shown

src/feedback.jl

@@ -2,7 +2,7 @@ mutable struct Feedback
     # PROGRESS
     progress_meter::ProgressMeter.Progress  # struct containing everything progress related
     progress_txt::Union{IOStream,Nothing}   # txt is a Nothing in case of no output
-    
+
     # OUTPUT
     verbose::Bool                           # print stuff to REPL?
     output::Bool                            # output to netCDF?
@@ -16,6 +16,7 @@ mutable struct Feedback
     nans_detected::Bool                     # did NaNs occur in the simulation?
 end
 
+
 """Initialises the progress txt file."""
 function initialize_feedback(M::ModelSetup)
     @unpack verbose, output = M.parameters
@@ -53,6 +54,8 @@ function initialize_feedback(M::ModelSetup)
     nans_detected = false           # currently not used
 
     # PROGRESSMETER
+    dt_in_sec[1] = M.constants.Δt_sec       # hack: redefine element in global constant dt_in_sec
+                                            # used to pass on the time step to ProgressMeter.speedstring
     desc = "Weather is speedy$(output ? " run $run_id: " : ": ")"
     progress_meter = ProgressMeter.Progress(n_timesteps,enabled=verbose,showspeed=true;desc)
 
@@ -64,8 +67,8 @@ end
 
 """Calls the progress meter and writes every 5% progress increase to txt."""
 function progress!(F::Feedback)
-    ProgressMeter.next!(F.progress_meter)           # update progress meter
-    @unpack counter,n = F.progress_meter
+    ProgressMeter.next!(F.progress_meter) # update progress meter
+    @unpack counter,n = F.progress_meter            # unpack counter after update
 
     # write progress to txt file too
     if (counter/n*100 % 1) > ((counter+1)/n*100 % 1)  

src/pretty_printing.jl

@@ -1,25 +1,48 @@
 function Base.show(io::IO, P::PrognosticVariables)
 
     lf = 1                      # first leapfrog index
-    lev = size(P.temp)[end]     # surface level
-    temp = view(P.temp,:,:,lf,lev)
+    lev = size(P.vor)[end]      # surface level
+    ζ = view(P.vor,:,:,lf,lev)  # create a view on vorticity
 
-    temp_surf_grid_degC = gridded(temp)     # to grid space
-    temp_surf_grid_degC .-= 273.15          # and ˚C
-    temp_surf_grid_degC = temp_surf_grid_degC[:,end:-1:1]       # flip latitudes
+    ζ_grid = gridded(ζ)         # to grid space
+    ζ_grid = ζ_grid[:,end:-1:1] # flip latitudes
 
-    nlon,nlat = size(temp_surf_grid_degC)
+    nlon,nlat = size(ζ_grid)
 
     plot_kwargs = pairs((   xlabel="˚E",
                             xfact=360/(nlon-1),
                             ylabel="˚N",
                             yfact=180/(nlat-1),
                             yoffset=-90,
-                            zlabel="˚C",
-                            title="Surface temperature",
-                            colormap=:plasma))
+                            title="Surface relative vorticity",
+                            colormap=:viridis,
+                            compact=true,
+                            colorbar=false,
+                            width=60,
+                            height=30))
 
-    print(io,UnicodePlots.heatmap(temp_surf_grid_degC';plot_kwargs...))
+    print(io,UnicodePlots.heatmap(ζ_grid';plot_kwargs...))
 end
-
-
+
+# hack: define global constant whose element will be changed in initialize_feedback
+# used to pass on the time step to ProgressMeter.speedstring via calling this
+# constant from the ProgressMeter module
+const dt_in_sec = [1800]
+
+function ProgressMeter.speedstring(sec_per_iter,dt_in_sec=SpeedyWeather.dt_in_sec)
+    if sec_per_iter == Inf
+        return "  N/A  days/day"
+    end
+
+    sim_time_per_time = dt_in_sec[1]/sec_per_iter
+
+    for (divideby, unit) in (   (365*1_000, "millenia"),
+                                (365, "years"),
+                                (1, "days"),
+                                (1/24, "hours"))    
+        if (sim_time_per_time / divideby) > 2
+            return @sprintf "%5.2f %2s/day" (sim_time_per_time / divideby) unit
+        end
+    end
+    return " <2 hours/days"
+end