Skip to content

Commit

Permalink
Merge branch 'main' into multi_ion_mhd
Browse files Browse the repository at this point in the history
  • Loading branch information
amrueda authored Dec 16, 2024
2 parents 2ce007b + d01e4a7 commit 474fa8c
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/equations/shallow_water_1d.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#! format: noindent

@doc raw"""
ShallowWaterEquations1D(; gravity, H0 = 0)
ShallowWaterEquations1D(; gravity_constant, H0 = 0)
Shallow water equations (SWE) in one space dimension. The equations are given by
```math
Expand Down
2 changes: 1 addition & 1 deletion src/equations/shallow_water_2d.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#! format: noindent

@doc raw"""
ShallowWaterEquations2D(; gravity, H0 = 0)
ShallowWaterEquations2D(; gravity_constant, H0 = 0)
Shallow water equations (SWE) in two space dimensions. The equations are given by
```math
Expand Down
2 changes: 1 addition & 1 deletion src/equations/shallow_water_quasi_1d.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#! format: noindent

@doc raw"""
ShallowWaterEquationsQuasi1D(; gravity, H0 = 0, threshold_limiter = nothing threshold_wet = nothing)
ShallowWaterEquationsQuasi1D(; gravity_constant, H0 = 0)
The quasi-1D shallow water equations (SWE). The equations are given by
```math
Expand Down
23 changes: 15 additions & 8 deletions src/meshes/structured_mesh.jl
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ end

"""
StructuredMesh(cells_per_dimension, mapping;
RealT=Float64,
unsaved_changes=true,
mapping_as_string=mapping2string(mapping, length(cells_per_dimension), RealT=RealT))
RealT = Float64,
periodicity = true,
unsaved_changes = true,
mapping_as_string = mapping2string(mapping, length(cells_per_dimension), RealT=RealT))
Create a StructuredMesh of the given size and shape that uses `RealT` as coordinate type.
Expand All @@ -46,8 +47,10 @@ Create a StructuredMesh of the given size and shape that uses `RealT` as coordin
The code string must define the mapping function with the name `mapping`.
This will be changed in the future, see [https://github.com/trixi-framework/Trixi.jl/issues/541](https://github.com/trixi-framework/Trixi.jl/issues/541).
"""
function StructuredMesh(cells_per_dimension, mapping; RealT = Float64,
periodicity = true, unsaved_changes = true,
function StructuredMesh(cells_per_dimension, mapping;
RealT = Float64,
periodicity = true,
unsaved_changes = true,
mapping_as_string = mapping2string(mapping,
length(cells_per_dimension),
RealT))
Expand All @@ -71,7 +74,9 @@ function StructuredMesh(cells_per_dimension, mapping; RealT = Float64,
end

"""
StructuredMesh(cells_per_dimension, faces; RealT=Float64, unsaved_changes=true, faces_as_string=faces2string(faces))
StructuredMesh(cells_per_dimension, faces;
RealT = Float64,
periodicity = true)
Create a StructuredMesh of the given size and shape that uses `RealT` as coordinate type.
Expand All @@ -89,7 +94,8 @@ Create a StructuredMesh of the given size and shape that uses `RealT` as coordin
- `periodicity`: either a `Bool` deciding if all of the boundaries are periodic or an `NTuple{NDIMS, Bool}` deciding for
each dimension if the boundaries in this dimension are periodic.
"""
function StructuredMesh(cells_per_dimension, faces::Tuple; RealT = Float64,
function StructuredMesh(cells_per_dimension, faces::Tuple;
RealT = Float64,
periodicity = true)
NDIMS = length(cells_per_dimension)

Expand Down Expand Up @@ -118,7 +124,8 @@ function StructuredMesh(cells_per_dimension, faces::Tuple; RealT = Float64,
end

"""
StructuredMesh(cells_per_dimension, coordinates_min, coordinates_max; periodicity=true)
StructuredMesh(cells_per_dimension, coordinates_min, coordinates_max;
periodicity = true)
Create a StructuredMesh that represents a uncurved structured mesh with a rectangular domain.
Expand Down

0 comments on commit 474fa8c

Please sign in to comment.