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

Do not ensure nestedness before fitting geometry of VMEC fit #1500

Merged
merged 2 commits into from
Jan 3, 2025

Conversation

dpanici
Copy link
Collaborator

@dpanici dpanici commented Dec 29, 2024

When loading a VMEC equilibrium, changes VMECIO.load to not try to ensure nestedness before fitting the geometry of the .nc file with the Fourier-Zernike basis. This can avoid situations where the guess based off the axis and surface is unnested when the fit of the geometry is actually fine and nested.

Resolves #1497

@dpanici dpanici requested review from a team, rahulgaur104, f0uriest, ddudt, kianorr, sinaatalay, unalmis and YigitElma and removed request for a team December 29, 2024 08:07
@dpanici dpanici added the skip_changelog No need to update changelog on this PR label Dec 29, 2024
Copy link

codecov bot commented Dec 29, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.63%. Comparing base (820f94c) to head (d0e1b31).
Report is 3 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #1500   +/-   ##
=======================================
  Coverage   95.63%   95.63%           
=======================================
  Files         101      101           
  Lines       25542    25542           
=======================================
  Hits        24428    24428           
  Misses       1114     1114           
Files with missing lines Coverage Δ
desc/vmec.py 91.88% <100.00%> (ø)

... and 2 files with indirect coverage changes

Copy link
Contributor

github-actions bot commented Dec 29, 2024

|             benchmark_name             |         dt(%)          |         dt(s)          |        t_new(s)        |        t_old(s)        | 
| -------------------------------------- | ---------------------- | ---------------------- | ---------------------- | ---------------------- |
 test_build_transform_fft_lowres         |     +2.51 +/- 4.80     | +1.46e-02 +/- 2.78e-02 |  5.94e-01 +/- 1.5e-02  |  5.79e-01 +/- 2.4e-02  |
 test_equilibrium_init_medres            |     -2.21 +/- 5.46     | -1.03e-01 +/- 2.56e-01 |  4.57e+00 +/- 1.5e-01  |  4.68e+00 +/- 2.1e-01  |
 test_equilibrium_init_highres           |     -0.54 +/- 2.96     | -3.20e-02 +/- 1.77e-01 |  5.93e+00 +/- 1.3e-01  |  5.97e+00 +/- 1.2e-01  |
 test_objective_compile_dshape_current   |     -0.48 +/- 5.05     | -2.00e-02 +/- 2.09e-01 |  4.13e+00 +/- 1.6e-01  |  4.15e+00 +/- 1.4e-01  |
 test_objective_compute_dshape_current   |     -3.79 +/- 5.72     | -2.05e-04 +/- 3.09e-04 |  5.19e-03 +/- 1.8e-04  |  5.40e-03 +/- 2.5e-04  |
 test_objective_jac_dshape_current       |     -6.03 +/- 8.73     | -2.81e-03 +/- 4.06e-03 |  4.38e-02 +/- 6.5e-04  |  4.66e-02 +/- 4.0e-03  |
 test_perturb_2                          |     +0.17 +/- 7.73     | +3.77e-02 +/- 1.68e+00 |  2.17e+01 +/- 1.6e+00  |  2.17e+01 +/- 4.0e-01  |
 test_proximal_freeb_jac                 |     +0.56 +/- 7.14     | +4.61e-02 +/- 5.91e-01 |  8.32e+00 +/- 2.9e-01  |  8.27e+00 +/- 5.1e-01  |
 test_solve_fixed_iter                   |     -2.38 +/- 2.80     | -8.31e-01 +/- 9.76e-01 |  3.40e+01 +/- 6.3e-01  |  3.49e+01 +/- 7.4e-01  |
 test_LinearConstraintProjection_build   |     -3.39 +/- 3.33     | -3.82e-01 +/- 3.76e-01 |  1.09e+01 +/- 3.1e-01  |  1.13e+01 +/- 2.2e-01  |
 test_build_transform_fft_midres         |     -2.12 +/- 3.01     | -1.38e-02 +/- 1.96e-02 |  6.38e-01 +/- 1.7e-02  |  6.52e-01 +/- 9.9e-03  |
 test_build_transform_fft_highres        |     -1.71 +/- 1.81     | -1.75e-02 +/- 1.85e-02 |  1.00e+00 +/- 1.2e-02  |  1.02e+00 +/- 1.4e-02  |
 test_equilibrium_init_lowres            |     -0.21 +/- 6.78     | -8.59e-03 +/- 2.78e-01 |  4.09e+00 +/- 9.9e-02  |  4.10e+00 +/- 2.6e-01  |
 test_objective_compile_atf              |     +1.99 +/- 1.19     | +1.62e-01 +/- 9.66e-02 |  8.29e+00 +/- 8.2e-02  |  8.12e+00 +/- 5.1e-02  |
 test_objective_compute_atf              |     +3.36 +/- 7.12     | +5.42e-04 +/- 1.15e-03 |  1.67e-02 +/- 9.0e-04  |  1.61e-02 +/- 7.1e-04  |
 test_objective_jac_atf                  |     +0.40 +/- 2.36     | +7.67e-03 +/- 4.57e-02 |  1.94e+00 +/- 1.9e-02  |  1.93e+00 +/- 4.2e-02  |
 test_perturb_1                          |     -0.21 +/- 3.17     | -3.26e-02 +/- 4.85e-01 |  1.53e+01 +/- 1.7e-01  |  1.53e+01 +/- 4.6e-01  |
 test_proximal_jac_atf                   |     +0.53 +/- 1.17     | +4.37e-02 +/- 9.66e-02 |  8.30e+00 +/- 6.3e-02  |  8.26e+00 +/- 7.3e-02  |
 test_proximal_freeb_compute             |     +0.66 +/- 1.02     | +1.31e-03 +/- 2.03e-03 |  2.01e-01 +/- 1.6e-03  |  1.99e-01 +/- 1.3e-03  |
 test_solve_fixed_iter_compiled          |     +2.26 +/- 1.23     | +4.59e-01 +/- 2.49e-01 |  2.08e+01 +/- 2.1e-01  |  2.03e+01 +/- 1.3e-01  |

@YigitElma YigitElma merged commit f8c66c7 into master Jan 3, 2025
25 checks passed
@YigitElma YigitElma deleted the dp/vmec-load-surfs branch January 3, 2025 20:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skip_changelog No need to update changelog on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Importing .nc file/proper conversion
3 participants