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

Gwb grid limit resolution #653

Merged

Conversation

MFraters
Copy link
Member

This adds an option to limit the resolution of gwb-grid, and applies that to the cookbook tester.

@@ -363,7 +366,6 @@ int main(int argc, char **argv)
number_of_threads = Utilities::string_to_unsigned_int(options_vector[i+1]);
options_vector.erase(options_vector.begin()+static_cast<std::vector<std::string>::difference_type>(i));
options_vector.erase(options_vector.begin()+static_cast<std::vector<std::string>::difference_type>(i));
--i;
Copy link
Contributor

Choose a reason for hiding this comment

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

I am no longer convinced this is correct. I am too tired to figure out.

Copy link
Contributor

Choose a reason for hiding this comment

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

I vote for keeping --i;

@@ -256,7 +256,7 @@ file(GLOB_RECURSE COOKBOOK_TEST_SOURCES "${CMAKE_SOURCE_DIR}/cookbooks/*/*.wb")
foreach(test_source ${COOKBOOK_TEST_SOURCES})
get_filename_component(test_name ${test_source} NAME_WE)
get_filename_component(test_dir ${test_source} DIRECTORY)
set(TEST_ARGUMENTS "${test_dir}/${test_name}.wb\;${test_dir}/${test_name}.grid")
set(TEST_ARGUMENTS "${test_dir}/${test_name}.wb\;${test_dir}/${test_name}.grid\;--resolution-limit\;75")
Copy link
Contributor

Choose a reason for hiding this comment

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

20?

Copy link
Member Author

Choose a reason for hiding this comment

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

I am not sure 20 will be enough to ensure hitting any not huge feature in a model. 50?

Copy link
Contributor

Choose a reason for hiding this comment

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

deal.

@MFraters MFraters force-pushed the gwb-grid-limit-resolution branch from 053479b to 5eeb976 Compare February 17, 2024 04:07
Copy link

codecov bot commented Feb 17, 2024

Codecov Report

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

Comparison is base (c455037) 92.63% compared to head (5eeb976) 92.68%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #653      +/-   ##
==========================================
+ Coverage   92.63%   92.68%   +0.04%     
==========================================
  Files          98       98              
  Lines        6882     6888       +6     
==========================================
+ Hits         6375     6384       +9     
+ Misses        507      504       -3     
Files Coverage Δ
source/gwb-grid/main.cc 46.45% <83.33%> (+0.49%) ⬆️

... 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 c455037...5eeb976. Read the comment docs.

Copy link

Benchmark Main Feature Difference (99.9% CI)
Slab interpolation simple none 1.019 ± 0.007 (s=469) 1.017 ± 0.003 (s=418) -0.3% .. -0.1%
Slab interpolation curved simple none 1.014 ± 0.004 (s=446) 1.020 ± 0.006 (s=441) +0.4% .. +0.7%
Spherical slab interpolation simple none 1.166 ± 0.007 (s=386) 1.161 ± 0.006 (s=390) -0.6% .. -0.3%
Slab interpolation simple curved CMS 1.056 ± 0.003 (s=418) 1.058 ± 0.003 (s=436) +0.1% .. +0.2%
Spherical slab interpolation simple CMS 1.547 ± 0.010 (s=292) 1.544 ± 0.008 (s=293) -0.3% .. -0.0%
Spherical fault interpolation simple none 1.171 ± 0.006 (s=381) 1.170 ± 0.006 (s=390) -0.2% .. +0.1%
Cartesian min max surface 2.298 ± 0.033 (s=202) 2.297 ± 0.022 (s=192) -0.5% .. +0.3%
Spherical min max surface 7.220 ± 0.038 (s=63) 7.219 ± 0.034 (s=64) -0.3% .. +0.3%

@MFraters MFraters merged commit d938c3a into GeodynamicWorldBuilder:main Feb 17, 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.

2 participants