Add equatorial compression option for spherical torus map #6263
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wthrowe
requested changes
Sep 3, 2024
| const auto theta = | ||
| M_PI_2 - (pi_over_2_minus_theta_min_ * get<1>(source_coords)); | ||
| // intermediate variable for equatorial compression | ||
| const auto intermediate_val = cubic_compression(get<1>(source_coords)); |
Member
There was a problem hiding this comment.
Having a variable called intermediate_val that's only used once isn't adding clarity. Just call the function in the expression on the next line.
| auto& sin_theta = get<2, 1>(jacobian); | ||
| auto& cos_theta = get<2, 0>(jacobian); | ||
| // intermediate variable for equatorial compression | ||
| get<2, 2>(jacobian) = cubic_compression(get<1>(source_coords)); |
| auto& sin_theta = get<1, 2>(inv_jacobian); | ||
| auto& cos_theta = get<0, 2>(inv_jacobian); | ||
| // intermediate variable for equatorial compression | ||
| get<2, 2>(inv_jacobian) = cubic_compression(get<1>(source_coords)); |
Member
There was a problem hiding this comment.
Again. Go through and find all cases of this.
| // using p.228 of Numerical Recipe (cubic equation) | ||
| const double Q = (compression_level_ - 1.0) / (3.0 * compression_level_); | ||
| const double R = -0.5 * x / (compression_level_); | ||
| const double A = |
| return compression_level_ * pow<3>(x) + (1.0 - compression_level_) * x; | ||
| } | ||
|
|
||
| double SphericalTorus::cubic_inversion(const double& x) const { |
Member
There was a problem hiding this comment.
Take double by value, not reference.
| const auto numerical_hessian = numerical_derivative( | ||
| [&i, &j, &partial_torus](const std::array<double, 3>& y) { | ||
| const auto y_tnsr = a2t(y); | ||
| CAPTURE(y); |
Member
There was a problem hiding this comment.
This doesn't do anything. There are no checks before it goes out of scope.
wthrowe
requested changes
Sep 4, 2024
| cubic_compression(get<1>(source_coords))); | ||
| const T compressed_coord = cubic_compression(get<1>(source_coords)); | ||
| const auto theta = M_PI_2 - (pi_over_2_minus_theta_min_ * compressed_coord); | ||
| const auto phi = M_PI * fraction_of_torus_ * get<2>(source_coords); |
Member
There was a problem hiding this comment.
Change these autos to Ts, and then it should work.
Member
|
You have a syntax error typo, but otherwise looks good. You can squash when you fix it. |
e629b65 to
50a69f6
Compare
wthrowe
approved these changes
Sep 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed changes
Add an equatorial compression option for the spherical torus map using a simple cubic function. This is for PolarMagFmDisk runs which use spherical torus.
Upgrade instructions
Code review checklist
make docto generate the documentation locally intoBUILD_DIR/docs/html.Then open
index.html.code review guide.
bugfixornew featureif appropriate.Further comments