fix keyword arguments for other time evolution solvers

Author: ytdHuang

benchmarks/timeevolution.jl

@@ -50,7 +50,7 @@ function benchmark_timeevolution!(SUITE)
         ntraj = 100,
         e_ops = $e_ops,
         progress_bar = Val(false),
-        ensemble_method = EnsembleSerial(),
+        ensemblealg = EnsembleSerial(),
     )
     SUITE["Time Evolution"]["time-independent"]["mcsolve"]["Multithreaded"] = @benchmarkable mcsolve(
         $H,
@@ -60,7 +60,7 @@ function benchmark_timeevolution!(SUITE)
         ntraj = 100,
         e_ops = $e_ops,
         progress_bar = Val(false),
-        ensemble_method = EnsembleThreads(),
+        ensemblealg = EnsembleThreads(),
     )
 
     return nothing

src/time_evolution/time_evolution.jl

@@ -308,7 +308,7 @@ end
 function _ensemble_dispatch_solve(
     ens_prob_mc::TimeEvolutionProblem,
     alg::Union{<:OrdinaryDiffEqAlgorithm,<:StochasticDiffEqAlgorithm},
-    ensemble_method::ET,
+    ensemblealg::ET,
     ntraj::Int,
 ) where {ET<:Union{EnsembleSplitThreads,EnsembleDistributed}}
     sol = nothing
@@ -319,7 +319,7 @@ function _ensemble_dispatch_solve(
         end
 
         @async begin
-            sol = solve(ens_prob_mc.prob, alg, ensemble_method, trajectories = ntraj)
+            sol = solve(ens_prob_mc.prob, alg, ensemblealg, trajectories = ntraj)
             put!(ens_prob_mc.kwargs.channel, false)
         end
     end
@@ -329,10 +329,10 @@ end
 function _ensemble_dispatch_solve(
     ens_prob_mc::TimeEvolutionProblem,
     alg::Union{<:OrdinaryDiffEqAlgorithm,<:StochasticDiffEqAlgorithm},
-    ensemble_method,
+    ensemblealg,
     ntraj::Int,
 )
-    sol = solve(ens_prob_mc.prob, alg, ensemble_method, trajectories = ntraj)
+    sol = solve(ens_prob_mc.prob, alg, ensemblealg, trajectories = ntraj)
     return sol
 end
 

src/time_evolution/time_evolution_dynamical.jl

@@ -607,8 +607,8 @@ function dsf_mcsolveEnsembleProblem(
     dsf_params::NamedTuple = NamedTuple();
     e_ops::Function = (op_list, p) -> (),
     params::NamedTuple = NamedTuple(),
-    ntraj::Int = 1,
-    ensemble_method = EnsembleThreads(),
+    ntraj::Int = 500,
+    ensemblealg::EnsembleAlgorithm = EnsembleThreads(),
     δα_list::Vector{<:Real} = fill(0.2, length(op_list)),
     jump_callback::TJC = ContinuousLindbladJumpCallback(),
     krylov_dim::Int = min(5, cld(length(ψ0.data), 3)),
@@ -660,7 +660,7 @@ function dsf_mcsolveEnsembleProblem(
         e_ops = e_ops₀,
         params = params2,
         ntraj = ntraj,
-        ensemble_method = ensemble_method,
+        ensemblealg = ensemblealg,
         jump_callback = jump_callback,
         prob_func = _dsf_mcsolve_prob_func,
         progress_bar = progress_bar,
@@ -679,8 +679,8 @@ end
         e_ops::Function=(op_list,p) -> Vector{TOl}([]),
         params::NamedTuple=NamedTuple(),
         δα_list::Vector{<:Real}=fill(0.2, length(op_list)),
-        ntraj::Int=1,
-        ensemble_method=EnsembleThreads(),
+        ntraj::Int=500,
+        ensemblealg::EnsembleAlgorithm=EnsembleThreads(),
         jump_callback::LindbladJumpCallbackType=ContinuousLindbladJumpCallback(),
         krylov_dim::Int=max(6, min(10, cld(length(ket2dm(ψ0).data), 4))),
         progress_bar::Union{Bool,Val} = Val(true)
@@ -704,8 +704,8 @@ function dsf_mcsolve(
     e_ops::Function = (op_list, p) -> (),
     params::NamedTuple = NamedTuple(),
     δα_list::Vector{<:Real} = fill(0.2, length(op_list)),
-    ntraj::Int = 1,
-    ensemble_method = EnsembleThreads(),
+    ntraj::Int = 500,
+    ensemblealg::EnsembleAlgorithm = EnsembleThreads(),
     jump_callback::TJC = ContinuousLindbladJumpCallback(),
     krylov_dim::Int = min(5, cld(length(ψ0.data), 3)),
     progress_bar::Union{Bool,Val} = Val(true),
@@ -723,13 +723,13 @@ function dsf_mcsolve(
         e_ops = e_ops,
         params = params,
         ntraj = ntraj,
-        ensemble_method = ensemble_method,
+        ensemblealg = ensemblealg,
         δα_list = δα_list,
         jump_callback = jump_callback,
         krylov_dim = krylov_dim,
         progress_bar = progress_bar,
         kwargs...,
     )
 
-    return mcsolve(ens_prob_mc, alg, ntraj, ensemble_method)
+    return mcsolve(ens_prob_mc, alg, ntraj, ensemblealg)
 end

test/core-test/dynamical-shifted-fock.jl

@@ -59,8 +59,7 @@
         α0_l,
         dsf_params,
         e_ops = e_ops_dsf,
-        progress_bar = Val(false),
-        ntraj = 500,
+        progress_bar = Val(false)
     )
     val_ss = abs2(sol0.expect[1, end])
     @test sum(abs2.(sol0.expect[1, :] .- sol_dsf_me.expect[1, :])) / (val_ss * length(tlist)) < 0.1
@@ -139,8 +138,7 @@
         α0_l,
         dsf_params,
         e_ops = e_ops_dsf2,
-        progress_bar = Val(false),
-        ntraj = 500,
+        progress_bar = Val(false)
     )
 
     val_ss = abs2(sol0.expect[1, end])