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

Gamma_c (Nemov and Velasco et. al) Γ_c #1042

Merged
merged 128 commits into from
Dec 13, 2024
Merged

Gamma_c (Nemov and Velasco et. al) Γ_c #1042

merged 128 commits into from
Dec 13, 2024

Conversation

unalmis
Copy link
Collaborator

@unalmis unalmis commented Jun 2, 2024

Resolves #522 . Automatically differentiable

@unalmis unalmis changed the base branch from master to ripple June 2, 2024 02:32
Copy link
Contributor

github-actions bot commented Jun 2, 2024

|             benchmark_name             |         dt(%)          |         dt(s)          |        t_new(s)        |        t_old(s)        | 
| -------------------------------------- | ---------------------- | ---------------------- | ---------------------- | ---------------------- |
 test_build_transform_fft_lowres         |     -3.30 +/- 4.20     | -1.84e-02 +/- 2.34e-02 |  5.38e-01 +/- 2.0e-02  |  5.57e-01 +/- 1.1e-02  |
 test_equilibrium_init_medres            |     -4.92 +/- 2.24     | -2.18e-01 +/- 9.96e-02 |  4.22e+00 +/- 7.3e-02  |  4.44e+00 +/- 6.8e-02  |
 test_equilibrium_init_highres           |     +2.74 +/- 3.16     | +1.51e-01 +/- 1.74e-01 |  5.66e+00 +/- 1.2e-01  |  5.51e+00 +/- 1.3e-01  |
 test_objective_compile_dshape_current   |     +1.80 +/- 6.13     | +7.10e-02 +/- 2.42e-01 |  4.02e+00 +/- 5.9e-02  |  3.95e+00 +/- 2.3e-01  |
 test_objective_compute_dshape_current   |     +1.06 +/- 2.29     | +5.43e-05 +/- 1.18e-04 |  5.20e-03 +/- 1.0e-04  |  5.15e-03 +/- 6.3e-05  |
 test_objective_jac_dshape_current       |     +2.72 +/- 8.58     | +1.17e-03 +/- 3.68e-03 |  4.41e-02 +/- 3.0e-03  |  4.29e-02 +/- 2.1e-03  |
 test_perturb_2                          |     -1.07 +/- 5.14     | -2.21e-01 +/- 1.06e+00 |  2.04e+01 +/- 7.1e-01  |  2.06e+01 +/- 7.9e-01  |
 test_proximal_freeb_jac                 |     -2.68 +/- 2.73     | -2.04e-01 +/- 2.08e-01 |  7.42e+00 +/- 9.8e-02  |  7.63e+00 +/- 1.8e-01  |
 test_solve_fixed_iter                   |     +1.08 +/- 2.38     | +3.60e-01 +/- 7.91e-01 |  3.36e+01 +/- 5.9e-01  |  3.33e+01 +/- 5.3e-01  |
 test_LinearConstraintProjection_build   |     +5.02 +/- 2.87     | +5.16e-01 +/- 2.95e-01 |  1.08e+01 +/- 1.9e-01  |  1.03e+01 +/- 2.3e-01  |
 test_build_transform_fft_midres         |     -3.38 +/- 3.66     | -2.16e-02 +/- 2.34e-02 |  6.18e-01 +/- 1.6e-02  |  6.40e-01 +/- 1.7e-02  |
 test_build_transform_fft_highres        |     -1.69 +/- 2.63     | -1.70e-02 +/- 2.65e-02 |  9.91e-01 +/- 2.3e-02  |  1.01e+00 +/- 1.3e-02  |
 test_equilibrium_init_lowres            |     -3.63 +/- 4.57     | -1.51e-01 +/- 1.89e-01 |  4.00e+00 +/- 1.7e-01  |  4.15e+00 +/- 8.5e-02  |
 test_objective_compile_atf              |     -1.06 +/- 4.53     | -8.74e-02 +/- 3.74e-01 |  8.17e+00 +/- 2.8e-01  |  8.26e+00 +/- 2.5e-01  |
 test_objective_compute_atf              |     -5.20 +/- 3.34     | -8.76e-04 +/- 5.63e-04 |  1.60e-02 +/- 2.3e-04  |  1.68e-02 +/- 5.1e-04  |
 test_objective_jac_atf                  |     -1.93 +/- 3.29     | -3.81e-02 +/- 6.50e-02 |  1.94e+00 +/- 4.4e-02  |  1.98e+00 +/- 4.8e-02  |
 test_perturb_1                          |     -3.78 +/- 2.76     | -5.84e-01 +/- 4.27e-01 |  1.49e+01 +/- 3.7e-01  |  1.55e+01 +/- 2.2e-01  |
 test_proximal_jac_atf                   |     -0.81 +/- 0.97     | -6.75e-02 +/- 8.06e-02 |  8.25e+00 +/- 6.4e-02  |  8.32e+00 +/- 4.9e-02  |
 test_proximal_freeb_compute             |     +1.40 +/- 0.99     | +2.82e-03 +/- 1.99e-03 |  2.04e-01 +/- 1.2e-03  |  2.01e-01 +/- 1.6e-03  |
 test_solve_fixed_iter_compiled          |     +1.49 +/- 2.54     | +3.26e-01 +/- 5.57e-01 |  2.22e+01 +/- 4.1e-01  |  2.19e+01 +/- 3.8e-01  |

@unalmis unalmis marked this pull request as ready for review June 13, 2024 18:11
desc/compute/_metric.py Outdated Show resolved Hide resolved
@unalmis unalmis added the P2 Medium Priority, not urgent but should be on the near-term agend label Dec 7, 2024
@unalmis unalmis added P3 Highest Priority, someone is/should be actively working on this and removed P2 Medium Priority, not urgent but should be on the near-term agend labels Dec 9, 2024
Copy link

codecov bot commented Dec 9, 2024

Codecov Report

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

Project coverage is 95.60%. Comparing base (9ef0b38) to head (ce98913).
Report is 129 commits behind head on master.

Files with missing lines Patch % Lines
desc/compute/_neoclassical.py 98.11% 1 Missing ⚠️
desc/objectives/_neoclassical.py 98.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1042      +/-   ##
==========================================
+ Coverage   95.57%   95.60%   +0.02%     
==========================================
  Files          98       98              
  Lines       25156    25300     +144     
==========================================
+ Hits        24044    24187     +143     
- Misses       1112     1113       +1     
Files with missing lines Coverage Δ
desc/compute/_basis_vectors.py 100.00% <100.00%> (ø)
desc/compute/_core.py 100.00% <100.00%> (ø)
desc/compute/_field.py 100.00% <100.00%> (ø)
desc/equilibrium/coords.py 88.25% <ø> (ø)
desc/objectives/__init__.py 100.00% <100.00%> (ø)
desc/compute/_neoclassical.py 99.08% <98.11%> (-0.92%) ⬇️
desc/objectives/_neoclassical.py 97.82% <98.00%> (+4.49%) ⬆️

... and 3 files with indirect coverage changes

@unalmis unalmis merged commit 4bfa728 into master Dec 13, 2024
25 checks passed
@unalmis unalmis deleted the Gamma_c branch December 13, 2024 17:41
unalmis added a commit that referenced this pull request Dec 24, 2024
This PR updates the
- `Gamma_c` #1042 
- `effective ripple` #1003

objectives to use the numerical methods from #1119
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
P3 Highest Priority, someone is/should be actively working on this skip_changelog No need to update changelog on this PR stable only merges and reviewer requested changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add particle confinement proxies
5 participants