Skip to content

Commit

Permalink
Merge pull request #10 from numericalEFT/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
kunyuan authored Dec 21, 2021
2 parents ec9d831 + 001de22 commit f807f3e
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
12 changes: 7 additions & 5 deletions README.org
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
[[https://numericaleft.github.io/CompositeGrids.jl/dev/][https://img.shields.io/badge/docs-dev-blue.svg]]
[[https://github.com/numericaleft/CompositeGrids.jl/actions][https://github.com/numericaleft/CompositeGrids.jl/workflows/CI/badge.svg]]
[[https://codecov.io/gh/numericaleft/CompositeGrids.jl][https://codecov.io/gh/numericalEFT/CompositeGrids.jl/branch/main/graph/badge.svg?token=WN6HO1XASY]]

#+OPTIONS: toc:2

Expand Down Expand Up @@ -33,8 +35,8 @@
:gauss,# The top layer grid is :gauss, optimized for integration. For interpolation use :cheb
[0.0, β],# The grid is defined on [0.0, β]
[0.0, β],# and is densed at 0.0 and β, as given by 2nd and 3rd parameter.
4,# N of log grid
0.001, # niminum interval length of log grid
5,# N of log grid
0.005, # niminum interval length of log grid
5 # N of bottom layer
)
# The grid has 3 layers.
Expand All @@ -59,9 +61,9 @@

#+RESULTS:
: Top layer:[0.0, 5.0, 10.0]
: First subgrid of middle layer:[0.0, 0.001, 0.07071067811865475, 5.0]
: First subgrid of bottom layer:[4.691007703066803e-5, 0.00023076534494715847, 0.0005, 0.0007692346550528415, 0.000953089922969332]
: result=44050.865988011356
: First subgrid of middle layer:[0.0, 0.005000000000000001, 0.05000000000000001, 0.5, 5.0]
: First subgrid of bottom layer:[0.00023455038515334025, 0.0011538267247357924, 0.0025000000000000005, 0.0038461732752642086, 0.004765449614846661]
: result=44050.91248775534
: comparing to:44050.931589613436

* Installation
Expand Down
5 changes: 4 additions & 1 deletion docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ makedocs(;
"Manual" => Any[
],
"Library" => Any[
map(s -> "lib/$(s)", sort(readdir(joinpath(@__DIR__, "src/lib"))))
"lib/simple.md",
"lib/composite.md",
"lib/interpolate.md",
# map(s -> "lib/$(s)", sort(readdir(joinpath(@__DIR__, "src/lib"))))
# "Internals" => map(s -> "lib/$(s)", sort(readdir(joinpath(@__DIR__, "src/lib"))))
]
],
Expand Down
3 changes: 2 additions & 1 deletion src/grid/composite.jl
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,8 @@ function LogDensedGrid(type, bound, dense_at, N, minterval, order, T=Float64)
end

dense_at = sort(dense_at)
@assert bound[1]<=dense_at[1]<dense_at[end]<=bound[2]
@assert bound[1]<=dense_at[1]<=dense_at[end]<=bound[2]

dp = Vector{T}([])
for i in 1:length(dense_at)
if i==1
Expand Down

0 comments on commit f807f3e

Please sign in to comment.