Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add spatially variable spreading rates at ridges #617

Merged

Conversation

danieldouglas92
Copy link
Contributor

Address Issue #533. Adds spatial variation for spreading centers in the half space temperature feature for oceanic plates. This requires a new parsing function that I called value_at_array that allows worldbuilder to extract an array of size N for a single value. This was done to prepare for new functionality that will be added to address #534. This will allow the user to specify the spreading rate at past times as well as specify spatial variations.

Copy link

codecov bot commented Feb 16, 2024

Codecov Report

Attention: 12 lines in your changes are missing coverage. Please review.

Comparison is base (684b28a) 93.11% compared to head (97ea335) 92.50%.
Report is 23 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #617      +/-   ##
==========================================
- Coverage   93.11%   92.50%   -0.62%     
==========================================
  Files          92       92              
  Lines        6334     6457     +123     
==========================================
+ Hits         5898     5973      +75     
- Misses        436      484      +48     
Files Coverage Δ
source/world_builder/features/continental_plate.cc 100.00% <100.00%> (ø)
...es/continental_plate_models/composition/uniform.cc 100.00% <100.00%> (ø)
...plate_models/grains/random_uniform_distribution.cc 98.63% <100.00%> (ø)
...eatures/continental_plate_models/grains/uniform.cc 98.03% <100.00%> (ø)
.../continental_plate_models/temperature/adiabatic.cc 100.00% <100.00%> (ø)
...res/continental_plate_models/temperature/linear.cc 100.00% <100.00%> (ø)
...es/continental_plate_models/temperature/uniform.cc 100.00% <100.00%> (ø)
source/world_builder/features/mantle_layer.cc 100.00% <100.00%> (ø)
...eatures/mantle_layer_models/composition/uniform.cc 100.00% <100.00%> (ø)
...layer_models/grains/random_uniform_distribution.cc 98.63% <100.00%> (ø)
... and 18 more

... and 3 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 684b28a...97ea335. Read the comment docs.

Copy link

github-actions bot commented Feb 16, 2024

Benchmark Main Feature Difference (99.9% CI)
Slab interpolation simple none 1.011 ± 0.003 (s=438) 1.008 ± 0.004 (s=456) -0.4% .. -0.2%
Slab interpolation curved simple none 1.016 ± 0.004 (s=441) 1.014 ± 0.005 (s=448) -0.3% .. -0.1%
Spherical slab interpolation simple none 1.167 ± 0.008 (s=400) 1.166 ± 0.009 (s=374) -0.2% .. +0.1%
Slab interpolation simple curved CMS 1.055 ± 0.004 (s=421) 1.058 ± 0.004 (s=433) +0.2% .. +0.3%
Spherical slab interpolation simple CMS 1.549 ± 0.009 (s=315) 1.546 ± 0.009 (s=269) -0.4% .. -0.1%
Spherical fault interpolation simple none 1.168 ± 0.006 (s=373) 1.168 ± 0.007 (s=400) -0.2% .. +0.1%
Cartesian min max surface 2.311 ± 0.018 (s=200) 2.307 ± 0.028 (s=192) -0.5% .. +0.2%
Spherical min max surface 7.198 ± 0.022 (s=62) 7.188 ± 0.032 (s=66) -0.4% .. +0.1%

Copy link
Contributor

@tjhei tjhei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your PR contains many different kinds of unrelated changes and also reintroduces typos in a few places. It might make sense to review this PR carefully and maybe split it into several PRs.

@@ -107,7 +107,7 @@ namespace WorldBuilder
T get(const std::string &name);

/**
* A specialized version of get which can return vectors/arrays.
* A specialized verions of get which can return vecors/arrays.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typos

- **maxItems**:2
- **description**:
- **maxItems**:2.0
- **documentation**:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this means that you generated the output with an older version. Can you rebase to the current main and rerun the tests to generate a new version of this file?

@danieldouglas92 danieldouglas92 force-pushed the spatial_spreading_ridges branch from d6854a6 to 6c00e94 Compare February 16, 2024 16:22
@MFraters MFraters merged commit a014591 into GeodynamicWorldBuilder:main Feb 16, 2024
32 of 34 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants