Skip to content

Commit

Permalink
Merge pull request #666 from MFraters/rename_anullus_to_annulus
Browse files Browse the repository at this point in the history
Rename anullus to annulus
  • Loading branch information
MFraters authored Feb 23, 2024
2 parents cd65ac1 + c6db3a8 commit eed7e5d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- Fixed an issue where the ridge feature in spherical geometries for both the half space cooling and plate cooling models gave a discontinuous spreading center when crossing longitudes at intervals of 90 degrees. \[Daniel Douglas; 2024-01-22; [#520](github.com/GeodynamicWorldBuilder/WorldBuilder/pull/520),[#518](github.com/GeodynamicWorldBuilder/WorldBuilder/issues/518)\]
- In some cases the bezier curve closest_point_on_curve_segment function would include a half circle around the end point(s) as part of a slab/fault. \[Menno Fraters, reported by Daniel Douglas;2023-12-07; [#522](https://github.com/GeodynamicWorldBuilder/WorldBuilder/issues/522) and [#523](https://github.com/GeodynamicWorldBuilder/WorldBuilder/pull/523)\]
- In some cases the fault feature would not recognize points as inside the fault if they were exactly on the fault line. This is fixed now. \[Rene Gassmoeller; 2024-02-16; [#640](https://github.com/GeodynamicWorldBuilder/WorldBuilder/pull/640)\]
- The input name for the annulus was misspelled as `anullus`. This is now fixed. \[Menno Fraters and Juliane Dannberg; 2024-02-22; [#539](https://github.com/GeodynamicWorldBuilder/WorldBuilder/issues/539) and [#666](https://github.com/GeodynamicWorldBuilder/WorldBuilder/issues/666)]

## [0.5.0]
### Added
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ While the `gwb-dat` app is great at providing individual points, providing gridd

A grid file consists of a number of parameters. Each parameter should start with a name (no spaces) followed by an equal sign, followed by the value. The available parameters are:

1. `grid_type`: Options are `cartesian`, `sphere`, `chunk` and `anullus`.
1. `grid_type`: Options are `cartesian`, `sphere`, `chunk` and `annulus`.
2. `dim`: dimension, either 2 or 3.
3. `composition`: how many compositions
4. `vtu_output_format`: Either `ASCII` for readable output or `RawBinaryCompressed` for compressed output.
Expand Down
2 changes: 1 addition & 1 deletion source/gwb-grid/main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ int main(int argc, char **argv)

if (grid_type == "spherical" ||
grid_type == "chunk" ||
grid_type == "anullus")
grid_type == "annulus")
{
x_min *= (Consts::PI/180);
x_max *= (Consts::PI/180);
Expand Down

0 comments on commit eed7e5d

Please sign in to comment.