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

Issue78 optimize integrals #90

Merged
merged 17 commits into from
May 20, 2021
Merged

Conversation

MassimoCimmino
Copy link
Owner

This closes #78.

@MassimoCimmino MassimoCimmino marked this pull request as draft April 14, 2021 14:09
@MassimoCimmino MassimoCimmino changed the base branch from master to issue33_CommongFunctionInterface April 14, 2021 14:09
@MassimoCimmino MassimoCimmino force-pushed the issue33_CommongFunctionInterface branch 2 times, most recently from 502f64a to aad279c Compare April 17, 2021 01:49
@MassimoCimmino MassimoCimmino force-pushed the issue78_optimizeIntegrals branch 2 times, most recently from 061ed54 to 3d64c27 Compare April 26, 2021 16:50
@MassimoCimmino
Copy link
Owner Author

MassimoCimmino commented Apr 26, 2021

This is also ready for review. The new implementations can be tested in issue78-compare_detailed and issue78-compare_similarities. These to files will be removed before merge.

Before merge:

  • Merge Issue33 commong function interface #84
  • Remove issue78-compare_detailed and issue78-compare_similarities
  • Overwrite old solvers with new solvers
  • Update changelog
  • Compile and check documentation

@MassimoCimmino MassimoCimmino force-pushed the issue78_optimizeIntegrals branch 2 times, most recently from 6486f6a to de898fa Compare May 6, 2021 14:35
@MassimoCimmino MassimoCimmino force-pushed the issue33_CommongFunctionInterface branch from 08975c0 to 916c658 Compare May 15, 2021 21:02
@MassimoCimmino MassimoCimmino force-pushed the issue78_optimizeIntegrals branch 2 times, most recently from a00ef83 to f2c63cc Compare May 18, 2021 14:42
@MassimoCimmino MassimoCimmino changed the base branch from issue33_CommongFunctionInterface to master May 18, 2021 14:46
@MassimoCimmino MassimoCimmino force-pushed the issue78_optimizeIntegrals branch from f2c63cc to f5ac538 Compare May 18, 2021 16:52
The optimized solver introduces an intermediate step in the identification
of similarities. Similarities between boreholes are checked first (we
assume that only similar pairs of boreholes contain similar pairs of
segments.

The integral in the finite line source (FLS) solution is now calculated
using `scipy.integrate.quad_vec` to speed up calculations. FLS solutions
at `r=r_b` is calculated separately from other distances because the
integrand functions have shapes that are too dissimilar (calculation time
increases if they are computed at the same time).
@MassimoCimmino MassimoCimmino force-pushed the issue78_optimizeIntegrals branch 2 times, most recently from ce8a471 to da85074 Compare May 19, 2021 16:30
finite_line_source() and finite_line_source_vectorized are now more
flexible with regards to their acceptable inputs. This makes their use
more readable in the code. It will be useful in the future if other
solutions (e.g. inclined boreholes, groundwater flow) or special cases
(e.g. steady-state) are added.
The algorithm now makes proper use of quad_vec
@MassimoCimmino MassimoCimmino force-pushed the issue78_optimizeIntegrals branch from da85074 to 841e011 Compare May 19, 2021 19:34
@MassimoCimmino MassimoCimmino marked this pull request as ready for review May 20, 2021 12:19
@MassimoCimmino MassimoCimmino force-pushed the issue78_optimizeIntegrals branch 2 times, most recently from 7d8561c to 979209d Compare May 20, 2021 17:42
@MassimoCimmino MassimoCimmino force-pushed the issue78_optimizeIntegrals branch from 979209d to fc6a817 Compare May 20, 2021 17:50
@MassimoCimmino
Copy link
Owner Author

This is ready to merge. Benchmarks and validation are in #78.

@MassimoCimmino MassimoCimmino merged commit 127e52b into master May 20, 2021
@MassimoCimmino MassimoCimmino deleted the issue78_optimizeIntegrals branch November 12, 2021 21:03
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.

Optimize the calculation of integrals and similarities
1 participant