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

HeatingPower objective #1168

Merged
merged 35 commits into from
Aug 25, 2024
Merged

HeatingPower objective #1168

merged 35 commits into from
Aug 25, 2024

Conversation

ddudt
Copy link
Collaborator

@ddudt ddudt commented Aug 6, 2024

New objective to minimize the required heating power, determined by the ISS04 energy confinement time scaling.

Also change compute quantity B0 to the name psi_r/sqrt(g)

@ddudt ddudt added the objectives Adding or improving objective functions label Aug 6, 2024
@ddudt ddudt self-assigned this Aug 6, 2024
desc/objectives/_confinement.py Outdated Show resolved Hide resolved
Copy link
Contributor

github-actions bot commented Aug 7, 2024

|             benchmark_name             |         dt(%)          |         dt(s)          |        t_new(s)        |        t_old(s)        | 
| -------------------------------------- | ---------------------- | ---------------------- | ---------------------- | ---------------------- |
 test_build_transform_fft_lowres         |    +10.10 +/- 7.77     | +5.15e-02 +/- 3.96e-02 |  5.62e-01 +/- 3.9e-02  |  5.10e-01 +/- 6.6e-03  |
-test_build_transform_fft_midres         |     +8.39 +/- 1.81     | +4.97e-02 +/- 1.07e-02 |  6.42e-01 +/- 9.3e-03  |  5.93e-01 +/- 5.3e-03  |
 test_build_transform_fft_highres        |     +4.23 +/- 2.06     | +4.20e-02 +/- 2.04e-02 |  1.03e+00 +/- 1.8e-02  |  9.92e-01 +/- 1.0e-02  |
 test_equilibrium_init_lowres            |     +6.93 +/- 5.51     | +2.65e-01 +/- 2.11e-01 |  4.09e+00 +/- 1.6e-01  |  3.82e+00 +/- 1.4e-01  |
-test_equilibrium_init_medres            |    +11.23 +/- 2.82     | +4.63e-01 +/- 1.16e-01 |  4.58e+00 +/- 6.2e-02  |  4.12e+00 +/- 9.9e-02  |
 test_equilibrium_init_highres           |     +1.27 +/- 8.84     | +6.96e-02 +/- 4.86e-01 |  5.57e+00 +/- 4.8e-01  |  5.50e+00 +/- 3.7e-02  |
 test_objective_compile_dshape_current   |     -0.22 +/- 0.79     | -8.41e-03 +/- 3.02e-02 |  3.81e+00 +/- 2.5e-02  |  3.82e+00 +/- 1.6e-02  |
 test_objective_compile_atf              |     -0.20 +/- 1.72     | -1.59e-02 +/- 1.35e-01 |  7.80e+00 +/- 7.7e-02  |  7.81e+00 +/- 1.1e-01  |
 test_objective_compute_dshape_current   |     -0.04 +/- 1.65     | -1.31e-06 +/- 5.72e-05 |  3.46e-03 +/- 4.0e-05  |  3.46e-03 +/- 4.1e-05  |
 test_objective_compute_atf              |     -0.80 +/- 1.75     | -8.23e-05 +/- 1.80e-04 |  1.02e-02 +/- 1.5e-04  |  1.03e-02 +/- 1.0e-04  |
 test_objective_jac_dshape_current       |     +5.26 +/- 7.91     | +2.03e-03 +/- 3.05e-03 |  4.06e-02 +/- 2.3e-03  |  3.85e-02 +/- 2.0e-03  |
 test_objective_jac_atf                  |     +3.41 +/- 3.43     | +6.32e-02 +/- 6.36e-02 |  1.92e+00 +/- 4.7e-02  |  1.86e+00 +/- 4.3e-02  |
 test_perturb_1                          |     +0.47 +/- 1.03     | +5.67e-02 +/- 1.25e-01 |  1.22e+01 +/- 8.9e-02  |  1.21e+01 +/- 8.8e-02  |
 test_perturb_2                          |     -0.04 +/- 1.02     | -6.86e-03 +/- 1.74e-01 |  1.70e+01 +/- 1.2e-01  |  1.71e+01 +/- 1.2e-01  |
 test_proximal_jac_atf                   |     -0.54 +/- 1.18     | -4.41e-02 +/- 9.63e-02 |  8.11e+00 +/- 6.9e-02  |  8.15e+00 +/- 6.7e-02  |
 test_proximal_freeb_compute             |     +0.96 +/- 0.84     | +1.73e-03 +/- 1.52e-03 |  1.83e-01 +/- 9.7e-04  |  1.81e-01 +/- 1.2e-03  |
 test_proximal_freeb_jac                 |     -0.24 +/- 1.37     | -1.77e-02 +/- 1.02e-01 |  7.41e+00 +/- 9.1e-02  |  7.43e+00 +/- 4.6e-02  |
 test_solve_fixed_iter                   |     +0.51 +/- 60.02    | +2.55e-02 +/- 2.98e+00 |  4.99e+00 +/- 2.1e+00  |  4.96e+00 +/- 2.1e+00  |

desc/compute/_field.py Outdated Show resolved Hide resolved
desc/compute/_field.py Outdated Show resolved Hide resolved
Copy link

codecov bot commented Aug 16, 2024

Codecov Report

Attention: Patch coverage is 94.69027% with 6 lines in your changes missing coverage. Please review.

Project coverage is 95.42%. Comparing base (4281a96) to head (07366ef).
Report is 36 commits behind head on master.

Files Patch % Lines
desc/objectives/_confinement.py 88.67% 6 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1168      +/-   ##
==========================================
- Coverage   95.42%   95.42%   -0.01%     
==========================================
  Files          89       90       +1     
  Lines       22493    22576      +83     
==========================================
+ Hits        21464    21543      +79     
- Misses       1029     1033       +4     
Files Coverage Δ
desc/compute/_equil.py 100.00% <100.00%> (ø)
desc/compute/_field.py 100.00% <100.00%> (ø)
desc/compute/_omnigenity.py 99.21% <100.00%> (ø)
desc/compute/_profiles.py 99.17% <100.00%> (+0.02%) ⬆️
desc/objectives/__init__.py 100.00% <100.00%> (ø)
desc/plotting.py 95.81% <ø> (ø)
desc/objectives/_confinement.py 88.67% <88.67%> (ø)

... and 2 files with indirect coverage changes

desc/compute/_profiles.py Outdated Show resolved Hide resolved
tests/test_profiles.py Outdated Show resolved Hide resolved
@ddudt ddudt marked this pull request as ready for review August 16, 2024 16:28
@ddudt ddudt requested a review from f0uriest August 16, 2024 16:28
@ddudt ddudt requested a review from f0uriest August 22, 2024 03:35
@ddudt
Copy link
Collaborator Author

ddudt commented Aug 22, 2024

Changed the density to use the volume-average instead of a line-average and updated the master compute data, so this PR should be good to go now

desc/compute/_profiles.py Outdated Show resolved Hide resolved
tests/test_profiles.py Outdated Show resolved Hide resolved
@ddudt ddudt requested review from f0uriest and unalmis August 22, 2024 15:37
@ddudt ddudt mentioned this pull request Aug 22, 2024
f0uriest
f0uriest previously approved these changes Aug 23, 2024
desc/objectives/_confinement.py Outdated Show resolved Hide resolved
desc/compute/_equil.py Show resolved Hide resolved
desc/compute/_equil.py Show resolved Hide resolved
@ddudt ddudt merged commit f9469d2 into master Aug 25, 2024
17 of 18 checks passed
@ddudt ddudt deleted the dd/iss04 branch August 25, 2024 22:41
ddudt added a commit that referenced this pull request Aug 27, 2024
Very similar to #1168, but this one is for output power.
unalmis added a commit that referenced this pull request Sep 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
objectives Adding or improving objective functions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants