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

read VMEC input ZAXIS as ZAXIS_CS #1134

Merged
merged 8 commits into from
Jul 19, 2024
Merged

read VMEC input ZAXIS as ZAXIS_CS #1134

merged 8 commits into from
Jul 19, 2024

Conversation

ddudt
Copy link
Collaborator

@ddudt ddudt commented Jul 18, 2024

Resolves #1120

@ddudt ddudt added easy Short and simple to code or review EZ-review bug fix Something was fixed labels Jul 18, 2024
@ddudt ddudt requested review from f0uriest and dpanici July 18, 2024 16:37
Copy link
Member

@f0uriest f0uriest left a comment

Choose a reason for hiding this comment

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

This looks like its swapping CC and CS, doesn't that break the expected parity and stuff? (the minus sign is in a different place?)
I think we just want to swap where the parens are?

Copy link
Contributor

github-actions bot commented Jul 18, 2024

|             benchmark_name             |         dt(%)          |         dt(s)          |        t_new(s)        |        t_old(s)        | 
| -------------------------------------- | ---------------------- | ---------------------- | ---------------------- | ---------------------- |
 test_build_transform_fft_lowres         |     +1.20 +/- 8.90     | +6.33e-03 +/- 4.71e-02 |  5.35e-01 +/- 3.0e-02  |  5.29e-01 +/- 3.6e-02  |
 test_build_transform_fft_midres         |     +1.25 +/- 5.13     | +7.59e-03 +/- 3.10e-02 |  6.13e-01 +/- 1.8e-02  |  6.05e-01 +/- 2.6e-02  |
 test_build_transform_fft_highres        |     +0.62 +/- 5.95     | +6.23e-03 +/- 5.93e-02 |  1.00e+00 +/- 4.6e-02  |  9.97e-01 +/- 3.8e-02  |
 test_equilibrium_init_lowres            |     +0.87 +/- 1.87     | +3.28e-02 +/- 7.04e-02 |  3.81e+00 +/- 3.4e-02  |  3.77e+00 +/- 6.2e-02  |
 test_equilibrium_init_medres            |     -0.31 +/- 3.56     | -1.31e-02 +/- 1.53e-01 |  4.27e+00 +/- 4.4e-02  |  4.28e+00 +/- 1.5e-01  |
 test_equilibrium_init_highres           |     +0.87 +/- 1.53     | +4.91e-02 +/- 8.61e-02 |  5.69e+00 +/- 4.4e-02  |  5.64e+00 +/- 7.4e-02  |
 test_objective_compile_dshape_current   |     +0.55 +/- 0.96     | +2.10e-02 +/- 3.67e-02 |  3.84e+00 +/- 3.5e-02  |  3.82e+00 +/- 1.2e-02  |
 test_objective_compile_atf              |     +0.20 +/- 2.45     | +1.64e-02 +/- 2.02e-01 |  8.26e+00 +/- 5.5e-02  |  8.25e+00 +/- 1.9e-01  |
 test_objective_compute_dshape_current   |     +2.16 +/- 4.98     | +2.67e-05 +/- 6.15e-05 |  1.26e-03 +/- 5.2e-05  |  1.24e-03 +/- 3.2e-05  |
 test_objective_compute_atf              |     -0.08 +/- 6.47     | -3.17e-06 +/- 2.73e-04 |  4.21e-03 +/- 1.4e-04  |  4.21e-03 +/- 2.3e-04  |
 test_objective_jac_dshape_current       |     -1.15 +/- 6.07     | -4.42e-04 +/- 2.33e-03 |  3.80e-02 +/- 1.4e-03  |  3.84e-02 +/- 1.8e-03  |
 test_objective_jac_atf                  |     +1.91 +/- 2.89     | +3.52e-02 +/- 5.34e-02 |  1.88e+00 +/- 3.0e-02  |  1.85e+00 +/- 4.4e-02  |
 test_perturb_1                          |     +0.63 +/- 1.14     | +8.44e-02 +/- 1.52e-01 |  1.34e+01 +/- 7.2e-02  |  1.33e+01 +/- 1.3e-01  |
 test_perturb_2                          |     -1.40 +/- 1.78     | -2.60e-01 +/- 3.30e-01 |  1.83e+01 +/- 2.5e-01  |  1.86e+01 +/- 2.2e-01  |
 test_proximal_jac_atf                   |     -0.18 +/- 1.75     | -1.34e-02 +/- 1.28e-01 |  7.32e+00 +/- 9.7e-02  |  7.33e+00 +/- 8.4e-02  |
 test_proximal_freeb_compute             |     +0.47 +/- 1.31     | +8.42e-04 +/- 2.33e-03 |  1.78e-01 +/- 1.7e-03  |  1.78e-01 +/- 1.6e-03  |
 test_proximal_freeb_jac                 |     +1.22 +/- 1.97     | +9.00e-02 +/- 1.45e-01 |  7.46e+00 +/- 7.1e-02  |  7.37e+00 +/- 1.3e-01  |
 test_solve_fixed_iter                   |     -0.31 +/- 6.57     | -5.77e-02 +/- 1.21e+00 |  1.83e+01 +/- 7.9e-01  |  1.84e+01 +/- 9.1e-01  |

@dpanici dpanici requested a review from f0uriest July 18, 2024 18:59
dpanici
dpanici previously approved these changes Jul 18, 2024
@ddudt
Copy link
Collaborator Author

ddudt commented Jul 18, 2024

This looks like its swapping CC and CS, doesn't that break the expected parity and stuff? (the minus sign is in a different place?) I think we just want to swap where the parens are?

Woops, my bad. Should be fixed now.

Copy link

codecov bot commented Jul 18, 2024

Codecov Report

Attention: Patch coverage is 75.00000% with 2 lines in your changes missing coverage. Please review.

Project coverage is 95.28%. Comparing base (23a4ce8) to head (1c37f49).
Report is 1870 commits behind head on master.

Files with missing lines Patch % Lines
desc/input_reader.py 75.00% 2 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##           master    #1134   +/-   ##
=======================================
  Coverage   95.28%   95.28%           
=======================================
  Files          87       87           
  Lines       21772    21772           
=======================================
  Hits        20745    20745           
  Misses       1027     1027           
Files with missing lines Coverage Δ
desc/input_reader.py 92.00% <75.00%> (ø)

@f0uriest f0uriest requested a review from dpanici July 18, 2024 23:06
@ddudt ddudt merged commit 9c63c54 into master Jul 19, 2024
17 of 18 checks passed
@ddudt ddudt deleted the dd/vmec branch July 19, 2024 16:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug fix Something was fixed easy Short and simple to code or review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Issue reading axis from vmec input
4 participants