Skip to content

Commit

Permalink
Merge pull request #13 from mberto79/dev-0.3-main
Browse files Browse the repository at this point in the history
fix diplay error when moving mesh to GPU and make `main` the development branch
  • Loading branch information
mberto79 authored Oct 14, 2024
2 parents 061dc52 + 2c2d821 commit 158151a
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Documentation
on:
push:
branches:
- dev-0.3-main # update to match your development branch (master, main, etc.)
- main # update to match your development branch (master, main, etc.)
tags: '*'
pull_request:

Expand Down
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Version [v0.3.1] - 2024-10-18

### Added
* Vastly improved documentation with new examples provided
* Vastly improved documentation with new examples provided [#12]
* Changelog added to record changes more clearly. Record kept in [Release notes](@ref)

### Fixed
* The calculation of gradients can be limited for stability. This functionality can be activated by passing the key work argument `limit_gradient` to the `run!` function. The implementation has been improved for robustness.
* The calculation of gradients can be limited for stability. This functionality can be activated by passing the key work argument `limit_gradient` to the `run!` function. The implementation has been improved for robustness [#12]
* Removed face information being printed when `Mesh` objects are created to stop printing a `ERROR: Scalar indexing is disallowed` message [#13]

### Changed
* Master branch protected and requires PRs to push changes
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "XCALibre"
uuid = "cf91e36b-bd94-493a-8848-32508a10963c"
authors = ["Humberto <h.medina@aerofluids.org>"]
version = "0.3.0"
version = "0.3.1"

[deps]
Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"
Expand Down
2 changes: 1 addition & 1 deletion docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ deploydocs(
repo = "github.com/mberto79/XCALibre.jl.git",
devurl = "dev",
versions = ["stable" => "v^", "dev" => "dev"],
devbranch = "dev-0.3-main"
devbranch = "main"
)
4 changes: 2 additions & 2 deletions examples/2D_BFS.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using XCALibre
# using CUDA
using CUDA

# backwardFacingStep_2mm, backwardFacingStep_10mm
grids_dir = pkgdir(XCALibre, "examples/0_GRIDS")
Expand All @@ -8,7 +8,7 @@ mesh_file = joinpath(grids_dir, grid)

mesh = UNV2D_mesh(mesh_file, scale=0.001)

# mesh_dev = adapt(CUDABackend(), mesh)
mesh_dev = adapt(CUDABackend(), mesh)
mesh_dev = mesh

velocity = [1.5, 0.0, 0.0]
Expand Down
20 changes: 6 additions & 14 deletions src/Mesh/Mesh_0_types.jl
Original file line number Diff line number Diff line change
Expand Up @@ -188,19 +188,11 @@ Base.show(io::IO, mesh::AbstractMesh) = begin
meshType = "3D"
end

boundaries = IOBuffer()
for boundary mesh.boundaries
println(boundaries, "-> $(boundary.name) (faces: $(boundary.IDs_range))")
end


output = """
$meshType Mesh
-> $(length(mesh.cells)) cells
-> $(length(mesh.faces)) faces
-> $(length(mesh.nodes)) nodes
Boundaries
$(String(take!(boundaries)))"""
output =
"""
$meshType Mesh with:
-> $(length(mesh.cells)) cells
-> $(length(mesh.faces)) faces
-> $(length(mesh.nodes)) nodes"""
print(io, output)
end

0 comments on commit 158151a

Please sign in to comment.