From 808c8af3aa21e097829eb919f40c33f3aeb19114 Mon Sep 17 00:00:00 2001 From: MFraters Date: Thu, 22 Feb 2024 15:17:20 -0500 Subject: [PATCH 1/3] Change misspelled anullus to annulus in gwb-grid. --- source/gwb-grid/main.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/gwb-grid/main.cc b/source/gwb-grid/main.cc index 184d5e252..8af0022df 100644 --- a/source/gwb-grid/main.cc +++ b/source/gwb-grid/main.cc @@ -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); From d860b6859d99d8805250c2d29c3734458c44efce Mon Sep 17 00:00:00 2001 From: MFraters Date: Thu, 22 Feb 2024 15:20:48 -0500 Subject: [PATCH 2/3] Add changelog entry for name change of annulus in gwb-grid. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f608406e..2aa9236ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 From c6db3a8b65665ee4d2e6df53fb0eef0775a4387c Mon Sep 17 00:00:00 2001 From: MFraters Date: Thu, 22 Feb 2024 20:34:57 -0500 Subject: [PATCH 3/3] Update documentation on change of anullus to annulus. --- .../user_manual/how_to_use_the_applications/gwb-grid_app.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sphinx/user_manual/how_to_use_the_applications/gwb-grid_app.md b/doc/sphinx/user_manual/how_to_use_the_applications/gwb-grid_app.md index cab6c62c0..de96f9da2 100644 --- a/doc/sphinx/user_manual/how_to_use_the_applications/gwb-grid_app.md +++ b/doc/sphinx/user_manual/how_to_use_the_applications/gwb-grid_app.md @@ -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.