No commit message

src/pic/run.jl

@@ -93,7 +93,7 @@ function picrun(path; gpuarray=nothing, kw...)
                 frame = frame .>= 0.99maximum(frame)
                 # frame = nothing
                 start = round((bbox[1] - lb) / dl + 1)
-                b = Blob(szd; solid_frac=0.99, morph=false, lsolid=lsolid / dl, lvoid=lvoid / dl, symmetries, F, frame, start)
+                b = Blob(szd; solid_frac=0.99, lsolid=lsolid / dl, lvoid=lvoid / dl, symmetries, F, frame, start)
                 display(heatmap(b.frame))
 
                 if !isnothing(sol) && !restart
@@ -194,7 +194,6 @@ function picrun(path; gpuarray=nothing, kw...)
         open(SOL_PATH, "w") do f
             write(f, json(cpu(sol)))
         end
-        println("Done in $(time() - t0) s (including compilation).")
     elseif study == "inverse_design"
         ENV["autodiff"] = "1"
         if length(lb) == 3

src/pictest.jl

@@ -3,12 +3,16 @@ include("main.jl")
 ENV["JULIA_SSL_CA_ROOTS_PATH"] = ""
 ENV["JULIA_PKG_PRECOMPILE_AUTO"] = 0
 
-# using CUDA
+using CUDA
 # picrun(joinpath("runs", "straight");)# gpuarray=cu)
 # picrun(joinpath("runs", "bend_R5"))
 # picrun(joinpath("runs", "mode_converter"))
 # picrun(joinpath("runs", "demux"))
-picrun(joinpath("runs", "splitter"))
+
+
+# picrun(joinpath("runs", "splitter"); gpuarray=cu)
+# picrun(joinpath("runs", "splitter"))
 
 # using CUDA
-# picrun(joinpath("runs", "tiny"); gpuarray=cu)
+picrun(joinpath("runs", "tiny"))#; gpuarray=cu)
+models[1]()

src/sim/solve.jl

@@ -2,6 +2,9 @@ function tidy(t, dt)
     if round(t) > round(t - dt)
         ENV["autodiff"] == "0" && println("simulation time = $t, took $(timepassed()) seconds")
     end
+    if !haskey(ENV, "t0")
+        ENV["t0"] = time()
+    end
 end
 
 function f1(((u,), p, (dt, field_diffdeltas, field_diffpadvals, source_instances)), t)
@@ -49,7 +52,7 @@ function solve(prob, ;
     init = (us0, p, (dt, field_diffdeltas, field_diffpadvals, source_instances))
 
     ts = 0:dt:T[1]-F(0.001)
-    nt = -1
+    delete!(ENV, "t0")
     if save_memory
         (u,), = adjoint_reduce(f1, ts, init, ulims)
     else
@@ -81,6 +84,10 @@ function solve(prob, ;
     else
         (u, mf), = reduce(f2, ts; init)
     end
+
+    t0 = parse(Float64, ENV["t0"])
+    println("simulation done in $(time() - t0) s.")
+
     # return sum(abs, mf[1][1].Ex + mf[1][1].Ey + mf[1][1].Hz)
     ulims = 0
     # @assert all([all(!isnan, a) for a = u])