Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
87de31d
first geo_data datei
vincmarks Apr 28, 2025
63460d2
first load of topographic data + paraview file for this topographic data
vincmarks Apr 29, 2025
92773d3
add: convert2CartData
vincmarks Apr 30, 2025
d172728
trying to get somewhere
vincmarks May 13, 2025
2d18e13
Merge remote-tracking branch 'upstream/main'
vincmarks May 14, 2025
91d023e
übergabe von geophysicalmodelgenerator.jl an trixibottomtopography.jl…
vincmarks May 14, 2025
b50a36d
produced txt files with modelgenerator
vincmarks May 14, 2025
67d5de0
built in a try-catch function to obtain early if you run into a nexac…
vincmarks May 15, 2025
77cd2c9
text hinzu
vincmarks May 16, 2025
db231b9
text hinzugefügt
vincmarks May 16, 2025
65164d8
updated data
vincmarks May 16, 2025
f5f4b52
formattiert
vincmarks May 18, 2025
2cae6c4
trying to format better
vincmarks May 18, 2025
e1a93bc
try to format
vincmarks May 18, 2025
5bd9e78
smoothing_factor !=0-> then it works
vincmarks May 19, 2025
1301c2c
deletet cairomakie because of error + formatting
vincmarks May 19, 2025
3396908
formatting
vincmarks May 19, 2025
ebcf37d
do the examples with modelgenerator
vincmarks May 19, 2025
a57987c
try to compare the example and the data
vincmarks May 19, 2025
7c2dfc6
automatic changes
vincmarks May 19, 2025
a63dae6
converting the data so everything works properly
vincmarks May 21, 2025
d65a6fb
converting data
vincmarks May 21, 2025
c1bb850
praparations PR
vincmarks May 26, 2025
6404954
Merge remote-tracking branch 'upstream/main'
vincmarks May 26, 2025
8f1a5cd
preparation pr
vincmarks May 26, 2025
c4f6506
formatting
vincmarks May 26, 2025
a522fe5
instantiate auskommentieren
vincmarks May 26, 2025
02522cd
chairomakie auskommentiert
vincmarks May 26, 2025
87b30ac
new chairomakie version
vincmarks May 26, 2025
af361f4
editing
vincmarks May 26, 2025
b72be59
typo in safe_computation
vincmarks May 26, 2025
04c0d8e
updated
vincmarks May 26, 2025
45453e1
try to format
vincmarks May 26, 2025
c237080
try to format
vincmarks May 26, 2025
eeadf7b
auskommentiert
vincmarks May 26, 2025
8135f5b
Delete .DS_Store
vincmarks May 26, 2025
c4bb36c
deleting unnessesarry files
vincmarks May 28, 2025
248618c
Merge remote-tracking branch 'upstream/main'
vincmarks May 29, 2025
ba6d1af
formatted with JuliaFormatter version 1.0.60 + deleted CairoMakie ver…
vincmarks May 29, 2025
494c306
setting GeometryBasics = "0.4.11" so there is no conflict anymore
vincmarks May 29, 2025
c75eee5
GeometryBasics = "0.4.11"
vincmarks May 29, 2025
d26cee8
trying GeometryBasics = "0.4, 0.5"
vincmarks May 29, 2025
652e11a
use CairoMakie = "0.12.18" to handle conflicts
vincmarks May 29, 2025
904fef8
adding Dataframes and GeophysicalModelgenerator to the direct depende…
vincmarks Jun 6, 2025
bd85952
add the compat versions
vincmarks Jun 6, 2025
bc389b4
add deps and compat versions
vincmarks Jun 6, 2025
01f1551
convert functions for geo data to support grids with differnent lengt…
vincmarks Jun 6, 2025
099a85a
format checked
vincmarks Jun 6, 2025
927175e
updated spellcheck
vincmarks Jun 6, 2025
420cdd1
Add functions to create data files from arbitrary bottom topography.
vincmarks Jun 6, 2025
fad992f
include create_geodata.jl + export geo_topo_impression, create_topogr…
vincmarks Jun 6, 2025
ff36d83
formate TrixiBottomTopography.jl
vincmarks Jun 6, 2025
6aeebdd
Demonstrates how to create and convert the desired topography data
vincmarks Jun 6, 2025
f062f02
download as deps
vincmarks Jun 6, 2025
2380920
formatted
vincmarks Jun 6, 2025
b2ed885
created files with create_topography_data
vincmarks Jun 6, 2025
5992b23
deletet gmt and geophysicalmodelgenerator
vincmarks Jun 6, 2025
8a593b6
used GeophysicalModelGenerator as a weakdeps
vincmarks Jun 8, 2025
d47a392
formatted
vincmarks Jun 8, 2025
a6206c8
simulation using the topography data from GeophysicalModelgenerator
vincmarks Jun 23, 2025
b3ceec6
no need to use DataFrames here
vincmarks Jun 23, 2025
bbab85c
added comment for using GMT
vincmarks Jun 23, 2025
4eb36c2
damn break for 2D topography data generated with GeophysicalModelGene…
vincmarks Jun 23, 2025
dd12118
deleting old stuff
vincmarks Jun 23, 2025
09910b0
added GMT in compat
vincmarks Jun 23, 2025
fc70b72
using GMT as weak deps
vincmarks Jun 23, 2025
be312d7
updated version of GeophysicalModelGenerator, GeometryBasics and Cair…
vincmarks Jun 24, 2025
2d66b92
explaining the functions: geo_topo_impression, create_topography_data…
vincmarks Aug 2, 2025
0431f15
not using GMT and GeophysicalModelGenerator as weakdeps anymore
vincmarks Aug 2, 2025
85a3cca
using Trixi2Vtk
vincmarks Aug 2, 2025
c4853cb
fixed typo
vincmarks Aug 2, 2025
aac3526
explain how to use the created topography data for simulations.
vincmarks Aug 2, 2025
4134d81
deleting unnecessary file
vincmarks Aug 2, 2025
31c4b74
fixed typo
vincmarks Aug 2, 2025
2a1b704
formatted and changed name of the animation
vincmarks Aug 2, 2025
e57b43f
using Trixi2Vtk to visualize the animation in Paraview due to using o…
vincmarks Aug 2, 2025
90334ee
Merge remote-tracking branch 'upstream/main'
vincmarks Aug 2, 2025
7eae1bd
formatted
vincmarks Aug 2, 2025
47c94f2
changing paths
vincmarks Aug 2, 2025
b56a75c
changing paths
vincmarks Aug 2, 2025
1a91793
changed pathname
vincmarks Aug 2, 2025
ef3a8ef
allow the geo.xyz file
vincmarks Aug 2, 2025
eac45b8
using Dataframes
vincmarks Aug 2, 2025
4c3334d
file of the topography
vincmarks Aug 2, 2025
ef01553
correcting missing data and variable-scoping
vincmarks Aug 2, 2025
8760c4c
deleting unnecessary stuff
vincmarks Aug 2, 2025
bbf567a
reformulating some stuff
vincmarks Aug 2, 2025
c7a8110
fixed typo
vincmarks Aug 2, 2025
282cc75
corrected errors detected by Spell Check
vincmarks Aug 3, 2025
8c4f131
changed @example blocks with julia
vincmarks Aug 4, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .JuliaFormatter.toml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ solution_*
*.png
*.gif
*.xyz
!examples/data/geo.xyz
docs/build
docs/src/authors.md
docs/src/changelog.md
Expand Down
7 changes: 7 additions & 0 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ authors = ["maxbertrand1996 <[email protected]>", "Andrew R. Winter
version = "0.1.4-DEV"

[deps]
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
GMT = "5752ebe1-31b9-557e-87aa-f909b540aa54"
GeophysicalModelGenerator = "3700c31b-fa53-48a6-808a-ef22d5a84742"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Expand All @@ -13,10 +16,14 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"

[extensions]
TrixiBottomTopographyGeophysicalModelGeneratorExt = "GeophysicalModelGenerator"
TrixiBottomTopographyMakieExt = "Makie"

[compat]
DataFrames = "1.5"
Downloads = "1.6"
GMT = "1.0"
GeophysicalModelGenerator = "0.7.14"
LinearAlgebra = "1"
Makie = "0.21, 0.22"
SparseArrays = "1"
Expand Down
7 changes: 7 additions & 0 deletions docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,22 @@
CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
Changelog = "5217a498-cd5d-4ec6-b8c2-9b85a09b6e3e"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
GMT = "5752ebe1-31b9-557e-87aa-f909b540aa54"
GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
GeophysicalModelGenerator = "3700c31b-fa53-48a6-808a-ef22d5a84742"
Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
OrdinaryDiffEqLowStorageRK = "b0944070-b475-4768-8dec-fb6eb410534d"
Trixi = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb"
Trixi2Vtk = "bc1476a1-1ca6-4cc3-950b-c312b255ff95"
TrixiBottomTopography = "86af9953-43df-404b-8eaa-d20d82623a82"
TrixiShallowWater = "804cb1fc-5b08-4398-a671-a789bfe091b3"

[compat]
CairoMakie = "0.13"
Changelog = "1.1"
Documenter = "1.3"
GeometryBasics = "0.5"
Makie = "0.21, 0.22"
OrdinaryDiffEqLowStorageRK = "1.3"
Trixi = "0.12"
TrixiShallowWater = "0.2"
147 changes: 80 additions & 67 deletions docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,75 +6,80 @@ using Changelog: Changelog
# Copy list of authors to not need to synchronize it manually.
# Since the authors header exists twice we create a unique identifier for the docs section.
authors_text = read(joinpath(dirname(@__DIR__), "AUTHORS.md"), String)
authors_text = replace(authors_text,
"in the [LICENSE.md](LICENSE.md) file" => "under [License](@ref)")
authors_text = replace(authors_text,
"# Authors" => "# [Authors](@id trixi_bt_authors)")
authors_text =
replace(authors_text, "in the [LICENSE.md](LICENSE.md) file" => "under [License](@ref)")
authors_text = replace(authors_text, "# Authors" => "# [Authors](@id trixi_bt_authors)")
write(joinpath(@__DIR__, "src", "authors.md"), authors_text)

# Define module-wide setups such that the respective modules are available in doctests
DocMeta.setdocmeta!(TrixiBottomTopography, :DocTestSetup, :(using TrixiBottomTopography);
recursive = true)
DocMeta.setdocmeta!(
TrixiBottomTopography,
:DocTestSetup,
:(using TrixiBottomTopography);
recursive = true,
)

# Copy some files from the repository root directory to the docs and modify them
# as necessary
# Based on: https://github.com/ranocha/SummationByPartsOperators.jl/blob/0206a74140d5c6eb9921ca5021cb7bf2da1a306d/docs/make.jl#L27-L41
open(joinpath(@__DIR__, "src", "code_of_conduct.md"), "w") do io
# Point to source license file
println(io,
"""
```@meta
EditURL = "https://github.com/trixi-framework/TrixiBottomTopography.jl/blob/main/CODE_OF_CONDUCT.md"
```
""")
println(
io,
"""
```@meta
EditURL = "https://github.com/trixi-framework/TrixiBottomTopography.jl/blob/main/CODE_OF_CONDUCT.md"
```
""",
)
# Write the modified contents
println(io, "# [Code of Conduct](@id code-of-conduct)")
println(io, "")
for line in eachline(joinpath(dirname(@__DIR__), "CODE_OF_CONDUCT.md"))
line = replace(line,
"[AUTHORS.md](AUTHORS.md)" => "[Authors](@ref trixi_bt_authors)")
line =
replace(line, "[AUTHORS.md](AUTHORS.md)" => "[Authors](@ref trixi_bt_authors)")
println(io, "> ", line)
end
end

# Copy contributing information to not need to synchronize it manually
open(joinpath(@__DIR__, "src", "contributing.md"), "w") do io
# Point to source license file
println(io,
"""
```@meta
EditURL = "https://github.com/trixi-framework/TrixiBottomTopography.jl/blob/main/CONTRIBUTING.md"
```
""")
println(
io,
"""
```@meta
EditURL = "https://github.com/trixi-framework/TrixiBottomTopography.jl/blob/main/CONTRIBUTING.md"
```
""",
)
# Write the modified contents
for line in eachline(joinpath(dirname(@__DIR__), "CONTRIBUTING.md"))
line = replace(line, "[LICENSE.md](LICENSE.md)" => "[License](@ref)")
line = replace(line,
"[AUTHORS.md](AUTHORS.md)" => "[Authors](@ref trixi_bt_authors)")
line =
replace(line, "[AUTHORS.md](AUTHORS.md)" => "[Authors](@ref trixi_bt_authors)")
println(io, line)
end
end

# Copy contents form README to the starting page to not need to synchronize it manually
readme_text = read(joinpath(dirname(@__DIR__), "README.md"), String)
readme_text = replace(readme_text,
"[LICENSE.md](LICENSE.md)" => "[License](@ref)")
readme_text = replace(readme_text,
"[AUTHORS.md](AUTHORS.md)" => "[Authors](@ref trixi_bt_authors)")
readme_text = replace(readme_text,
"<p" => "```@raw html\n<p")
readme_text = replace(readme_text,
"p>" => "p>\n```")
readme_text = replace(readme_text,
r"\[comment\].*\n" => "") # remove comments
readme_text = replace(readme_text, "[LICENSE.md](LICENSE.md)" => "[License](@ref)")
readme_text =
replace(readme_text, "[AUTHORS.md](AUTHORS.md)" => "[Authors](@ref trixi_bt_authors)")
readme_text = replace(readme_text, "<p" => "```@raw html\n<p")
readme_text = replace(readme_text, "p>" => "p>\n```")
readme_text = replace(readme_text, r"\[comment\].*\n" => "") # remove comments
write(joinpath(@__DIR__, "src", "index.md"), readme_text)

# Create changelog
Changelog.generate(Changelog.Documenter(), # output type
joinpath(@__DIR__, "..", "NEWS.md"), # input file
joinpath(@__DIR__, "src", "changelog_tmp.md"); # output file
repo = "trixi-framework/TrixiBottomTopography.jl", # default repository for links
branch = "main",)
Changelog.generate(
Changelog.Documenter(), # output type
joinpath(@__DIR__, "..", "NEWS.md"), # input file
joinpath(@__DIR__, "src", "changelog_tmp.md"); # output file
repo = "trixi-framework/TrixiBottomTopography.jl", # default repository for links
branch = "main",
)
# Fix edit URL of changelog
open(joinpath(@__DIR__, "src", "changelog.md"), "w") do io
for line in eachline(joinpath(@__DIR__, "src", "changelog_tmp.md"))
Expand All @@ -89,37 +94,45 @@ rm(joinpath(@__DIR__, "src", "changelog_tmp.md"))

# Make documentation
makedocs(;
modules = [TrixiBottomTopography],
authors = "Andrew R. Winters <[email protected]>, Michael Schlottke-Lakemper <[email protected]>",
sitename = "TrixiBottomTopography.jl",
format = Documenter.HTML(;
# Disable pretty URLs during manual testing
prettyurls = get(ENV, "CI", "false") == "true",
# Set canonical URL to GitHub pages URL
canonical = "https://trixi-framework.github.io/TrixiBottomTopography.jl/stable",
edit_link = "main",
size_threshold_ignore = ["index.md"],),
# Explicitly specify documentation structure
pages = ["Home" => "index.md",
"Overview" => [
"Data conversion" => "conversion.md",
"B-spline structure" => "structure.md",
"B-spline function" => "function.md"
],
"TrixiShallowWater.jl examples" => "trixishallowwater_jl_examples.md",
"Advanced topics & developers" => ["Development" => "development.md",
"Style guide" => "styleguide.md",
"Testing" => "testing.md"],
"Changelog" => "changelog.md",
"Authors" => "authors.md",
"Contributing" => "contributing.md",
"Code of Conduct" => "code_of_conduct.md",
"License" => "license.md",
"Reference" => "reference.md"])
modules = [TrixiBottomTopography],
authors = "Andrew R. Winters <[email protected]>, Michael Schlottke-Lakemper <[email protected]>",
sitename = "TrixiBottomTopography.jl",
format = Documenter.HTML(;
# Disable pretty URLs during manual testing
prettyurls = get(ENV, "CI", "false") == "true",
# Set canonical URL to GitHub pages URL
canonical = "https://trixi-framework.github.io/TrixiBottomTopography.jl/stable",
edit_link = "main",
size_threshold_ignore = ["index.md"],
),
# Explicitly specify documentation structure
pages = [
"Home" => "index.md",
"Overview" => [
"Data conversion" => "conversion.md",
"B-spline structure" => "structure.md",
"B-spline function" => "function.md",
],
"TrixiShallowWater.jl examples" => "trixishallowwater_jl_examples.md",
"Advanced topics & developers" => [
"Development" => "development.md",
"Style guide" => "styleguide.md",
"Testing" => "testing.md",
],
"Changelog" => "changelog.md",
"Authors" => "authors.md",
"Contributing" => "contributing.md",
"Code of Conduct" => "code_of_conduct.md",
"License" => "license.md",
"Reference" => "reference.md",
],
)

# Documenter can also automatically deploy documentation to gh-pages.
# See "Hosting Documentation" and deploydocs() in the Documenter manual
# for more information.
deploydocs(repo = "github.com/trixi-framework/TrixiBottomTopography.jl.git",
devbranch = "main",
push_preview = true)
deploydocs(
repo = "github.com/trixi-framework/TrixiBottomTopography.jl.git",
devbranch = "main",
push_preview = true,
)
Loading
Loading