diff --git a/src/YM/YMflow.jl b/src/YM/YMflow.jl index 62eec71..72cf762 100644 --- a/src/YM/YMflow.jl +++ b/src/YM/YMflow.jl @@ -217,7 +217,7 @@ flw_adapt(U, int::FlowIntr{NI,T}, tend::T, gp::GaugeParm, lp::SpaceParm, ymws::Y Measure the action density `E(t)` using the plaquette discretization. If the argument `Eslc` the contribution for each Euclidean time slice and plane are returned. """ -function Eoft_plaq(Eslc, U, gp::GaugeParm{T}, lp::SpaceParm{N,M,B,D}, ymws::YMworkspace) where {T,N,M,B,D} +function Eoft_plaq(Eslc, U, gp::GaugeParm{T,G,NN}, lp::SpaceParm{N,M,B,D}, ymws::YMworkspace) where {T,G,NN,N,M,B,D} @timeit "E(t) plaquette measurement" begin @@ -256,7 +256,7 @@ function Eoft_plaq(Eslc, U, gp::GaugeParm{T}, lp::SpaceParm{N,M,B,D}, ymws::YMwo return sum(Eslc)/lp.iL[end] end -Eoft_plaq(U, gp::GaugeParm{T}, lp::SpaceParm{N,M,B,D}, ymws::YMworkspace) where {T,N,M,B,D} = Eoft_plaq(zeros(T,lp.iL[end],M), U, gp, lp, ymws) +Eoft_plaq(U, gp::GaugeParm{T,G,NN}, lp::SpaceParm{N,M,B,D}, ymws::YMworkspace) where {T,G,NN,N,M,B,D} = Eoft_plaq(zeros(T,lp.iL[end],M), U, gp, lp, ymws) function krnl_plaq_pln!(plx, U::AbstractArray{T}, Ubnd, ztw, ipl, lp::SpaceParm{N,M,B,D}) where {T,N,M,B,D} diff --git a/src/YM/YMhmc.jl b/src/YM/YMhmc.jl index 8d3fb45..c3c878a 100644 --- a/src/YM/YMhmc.jl +++ b/src/YM/YMhmc.jl @@ -15,7 +15,7 @@ Returns the value of the gauge plaquette action for the configuration U. The parameters `\beta` and `c0` are taken from the `gp` structure. """ -function gauge_action(U, lp::SpaceParm, gp::GaugeParm{T}, ymws::YMworkspace{T}) where T <: AbstractFloat +function gauge_action(U, lp::SpaceParm, gp::GaugeParm, ymws::YMworkspace{T}) where T <: AbstractFloat ztw = ztwist(gp, lp) if abs(gp.c0-1) < 1.0E-10 @@ -92,7 +92,7 @@ function HMC!(U, int::IntrScheme, lp::SpaceParm, gp::GaugeParm, ymws::YMworkspac end HMC!(U, eps, ns, lp::SpaceParm, gp::GaugeParm, ymws::YMworkspace{T}; noacc=false) where T = HMC!(U, omf4(T, eps, ns), lp, gp, ymws; noacc=noacc) -function MD!(mom, U, int::IntrScheme{NI, T}, lp::SpaceParm, gp::GaugeParm{T}, ymws::YMworkspace{T}) where {NI, T <: AbstractFloat} +function MD!(mom, U, int::IntrScheme{NI, T}, lp::SpaceParm, gp::GaugeParm, ymws::YMworkspace{T}) where {NI, T <: AbstractFloat} @timeit "MD evolution" begin diff --git a/src/main/times.jl b/src/main/times.jl index 7743fab..12a4d39 100644 --- a/src/main/times.jl +++ b/src/main/times.jl @@ -41,7 +41,7 @@ println("Time to take the configuration to memory: ") # Set gauge parameters # FIRST SET: Wilson action/flow println("\n## WILSON ACTION/FLOW TIMES") -gp = GaugeParm{PREC}(GRP{PREC}, 6.0, 1.0, (0.5,0.5)) +gp = GaugeParm{PREC}(GRP{PREC}, 6.0, 1.0) println("Gauge Parameters: ", gp) flwint = wfl_rk3(PREC, 0.005, 1.0E-6) @@ -85,7 +85,7 @@ println("## END Wilson action/flow measurements") # Set gauge parameters # SECOND SET: Improved action/flow println("\n## IMPROVED ACTION/FLOW TIMES") -gp = GaugeParm{PREC}(GRP{PREC}, 6.0, 5/6, (0.5,0.5)) +gp = GaugeParm{PREC}(GRP{PREC}, 6.0, 5/6) println("Gauge Parameters: ", gp) flwint = zfl_rk3(PREC, 0.01, 1.0E-6)