Vectorize omnigenity objective over multiple surfaces #1225
Conversation
This file contains 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
3 tasks
f0uriest
added a commit
that referenced
this pull request
Sep 2, 2024
- [x] Allows the calculation of `B_mn` on tensor product grids with multiple flux surfaces. - [x] Allows `QuasisymmetryBoozer` objective to target multiple surfaces at once ~- [ ] Allows `Omnigenity` objective to target multiple surfaces at once~ moved to #1225 - [x] Simplify boozer/QS plotting functions Resolves #754
| benchmark_name | dt(%) | dt(s) | t_new(s) | t_old(s) |
| -------------------------------------- | ---------------------- | ---------------------- | ---------------------- | ---------------------- |
test_build_transform_fft_midres | -0.20 +/- 5.86 | -1.34e-03 +/- 3.84e-02 | 6.54e-01 +/- 3.6e-02 | 6.55e-01 +/- 1.4e-02 |
test_build_transform_fft_highres | -3.69 +/- 5.44 | -3.65e-02 +/- 5.39e-02 | 9.53e-01 +/- 5.2e-02 | 9.90e-01 +/- 1.4e-02 |
test_equilibrium_init_lowres | -0.16 +/- 20.26 | -6.20e-03 +/- 7.88e-01 | 3.88e+00 +/- 5.6e-01 | 3.89e+00 +/- 5.6e-01 |
test_objective_compile_atf | +0.55 +/- 6.88 | +4.34e-02 +/- 5.44e-01 | 7.95e+00 +/- 2.1e-01 | 7.91e+00 +/- 5.0e-01 |
test_objective_compute_atf | +6.54 +/- 2.47 | +6.84e-04 +/- 2.59e-04 | 1.11e-02 +/- 2.0e-04 | 1.05e-02 +/- 1.7e-04 |
test_objective_jac_atf | -0.34 +/- 2.99 | -6.60e-03 +/- 5.79e-02 | 1.93e+00 +/- 4.2e-02 | 1.94e+00 +/- 3.9e-02 |
test_perturb_1 | -3.36 +/- 12.69 | -4.85e-01 +/- 1.83e+00 | 1.40e+01 +/- 1.4e+00 | 1.44e+01 +/- 1.2e+00 |
test_proximal_jac_atf | +0.36 +/- 3.37 | +2.98e-02 +/- 2.76e-01 | 8.22e+00 +/- 2.1e-01 | 8.19e+00 +/- 1.8e-01 |
+test_proximal_freeb_compute | -3.21 +/- 0.95 | -6.56e-03 +/- 1.94e-03 | 1.98e-01 +/- 7.8e-04 | 2.04e-01 +/- 1.8e-03 |
test_build_transform_fft_lowres | +7.54 +/- 5.46 | +3.90e-02 +/- 2.82e-02 | 5.56e-01 +/- 2.7e-02 | 5.17e-01 +/- 9.7e-03 |
test_equilibrium_init_medres | +1.00 +/- 2.09 | +4.10e-02 +/- 8.57e-02 | 4.15e+00 +/- 6.6e-02 | 4.11e+00 +/- 5.4e-02 |
test_equilibrium_init_highres | +0.21 +/- 1.91 | +1.14e-02 +/- 1.03e-01 | 5.41e+00 +/- 5.4e-02 | 5.40e+00 +/- 8.8e-02 |
test_objective_compile_dshape_current | -0.15 +/- 1.33 | -5.87e-03 +/- 5.13e-02 | 3.87e+00 +/- 3.1e-02 | 3.87e+00 +/- 4.1e-02 |
test_objective_compute_dshape_current | -0.26 +/- 1.58 | -9.52e-06 +/- 5.70e-05 | 3.61e-03 +/- 4.5e-05 | 3.62e-03 +/- 3.4e-05 |
test_objective_jac_dshape_current | -0.58 +/- 7.23 | -2.26e-04 +/- 2.84e-03 | 3.91e-02 +/- 9.9e-04 | 3.93e-02 +/- 2.7e-03 |
test_perturb_2 | +0.51 +/- 2.04 | +9.57e-02 +/- 3.86e-01 | 1.90e+01 +/- 3.3e-01 | 1.89e+01 +/- 2.1e-01 |
test_proximal_freeb_jac | -0.01 +/- 1.22 | -9.24e-04 +/- 9.11e-02 | 7.47e+00 +/- 7.5e-02 | 7.47e+00 +/- 5.2e-02 |
test_solve_fixed_iter | -0.32 +/- 54.50 | -1.59e-02 +/- 2.74e+00 | 5.02e+00 +/- 2.0e+00 | 5.04e+00 +/- 1.8e+00 | |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1225 +/- ##
==========================================
+ Coverage 95.50% 95.52% +0.02%
==========================================
Files 96 96
Lines 24028 24057 +29
==========================================
+ Hits 22948 22981 +33
+ Misses 1080 1076 -4
|
f0uriest
requested review from
dpanici,
daniel-dudt,
a team,
rahulgaur104,
kianorr,
sinaatalay,
unalmis and
YigitElma
and removed request for
a team
YigitElma
reviewed
Nov 22, 2024
| field_grid : Grid, optional | ||
| Collocation grid containing the nodes to evaluate at for omnigenous field data. | ||
| The grid nodes are given in the usual (ρ,θ,ζ) coordinates (with θ ∈ [0, 2π), | ||
| ζ ∈ [0, 2π/NFP)), but θ is mapped to η and ζ is mapped to α. Defaults to a | ||
| linearly space grid on the rho=1 surface. Must be a single flux surface without | ||
| stellarator symmetry. | ||
| linearly space grid on the rho=1 surface. Must be without stellarator symmetry. | ||
| M_booz : int, optional | ||
| Poloidal resolution of Boozer transformation. Default = 2 * eq.M. | ||
| N_booz : int, optional |
There was a problem hiding this comment.
It is probably discussed during the first PR but can we change the docs of eq_fixed at line 536 to say "only the field is allowed to change" or something on that front? The user probably doesn't know what self.things mean
| # the order will be different but the values should be the same so we sort | ||
| # before comparing | ||
| np.testing.assert_allclose( | ||
| np.sort(np.concatenate([f1, f2])), np.sort(f3), atol=1e-14 |
There was a problem hiding this comment.
why is the order different exactly?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.