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.

Sign up for GitHub

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

Move basis change to main compute function #1027

Merged
merged 79 commits into from
Jul 11, 2024
Merged

Move basis change to main compute function #1027

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
f9cd495
move basis chnage to main recursive _compute function, delete repeate…
YigitElma May 20, 2024
1364bad
fix inherent basis check
YigitElma May 21, 2024
eaf136c
add comment
YigitElma May 21, 2024
01f19c7
fix data index deps test temporarily, need a better check
YigitElma May 21, 2024
f1d2530
Merge branch 'master' into yge/rpz2xyz
dpanici May 22, 2024
148d08d
Merge branch 'master' into yge/rpz2xyz
YigitElma May 27, 2024
ccf43dd
take conversion out of main recursion
YigitElma May 28, 2024
a2f3b7f
add phi dependency to if statement
YigitElma May 28, 2024
a8bedb6
add x y z vectors as exception
YigitElma May 28, 2024
07a1e94
trying to fix tests
YigitElma May 28, 2024
702f132
just take the lowercase of basis kwarg for consistency
YigitElma May 29, 2024
443ceaf
set all curve compute functions to return in rpz
YigitElma Jun 5, 2024
512f81c
set all surface compute functions to return in rpz
YigitElma Jun 5, 2024
b433d0c
update _compute for 'x' conversion, it needs special care since it is…
YigitElma Jun 5, 2024
b87b018
don't include curve compute functions for this
YigitElma Jun 5, 2024
1716ba5
fix typo
YigitElma Jun 5, 2024
194f5cd
fix computing and converting x issue, there are many different 'x' fo…
YigitElma Jun 5, 2024
eca4cec
remove unused basis argument from surface computes
YigitElma Jun 5, 2024
cc82e1b
some quantities doesn't have rtz but tz or rt, change the condition t…
YigitElma Jun 5, 2024
8fbaaed
Merge branch 'master' into yge/rpz2xyz
YigitElma Jun 5, 2024
de8bb00
change compute_fun inside objectives from _compute to compute to acco…
YigitElma Jun 5, 2024
4b4a1e9
objectives should use jittable _compute, need to convert manally to xyz
YigitElma Jun 5, 2024
9c356b7
fix wrong import
YigitElma Jun 5, 2024
f94dde1
update documentation
YigitElma Jun 6, 2024
738661e
apply conversion to curve functions
YigitElma Jun 6, 2024
0cd22e0
update
YigitElma Jun 6, 2024
fc57953
Merge branch 'master' into yge/rpz2xyz
YigitElma Jun 12, 2024
aa18121
Merge branch 'master' into yge/rpz2xyz
YigitElma Jun 13, 2024
22de765
Merge branch 'master' into yge/rpz2xyz
YigitElma Jun 18, 2024
94f9202
revert back curve compute function to see if tests work
YigitElma Jun 18, 2024
567b9e1
Merge branch 'yge/rpz2xyz' of github.com:PlasmaControl/DESC into yge/…
YigitElma Jun 18, 2024
c5fb81a
Merge branch 'master' into yge/rpz2xyz
YigitElma Jun 18, 2024
f576c60
don't apply to _curve functions
YigitElma Jun 19, 2024
b702e06
Merge branch 'yge/rpz2xyz' of github.com:PlasmaControl/DESC into yge/…
YigitElma Jun 19, 2024
6e1069d
Merge branch 'master' into yge/rpz2xyz
YigitElma Jun 20, 2024
cb70d1b
Merge branch 'master' into yge/rpz2xyz
YigitElma Jun 25, 2024
b8f1867
Merge branch 'master' into yge/rpz2xyz
ddudt Jun 26, 2024
2605286
Merge branch 'master' into yge/rpz2xyz
ddudt Jun 26, 2024
51b39be
curve compute functions return in rpz basis
daniel-dudt Jun 26, 2024
c49ed7f
Merge branch 'master' into yge/rpz2xyz
ddudt Jun 27, 2024
24cd42c
fix bug with using xyz2rpz_vec for curves
daniel-dudt Jun 27, 2024
2718f93
Merge branch 'master' into yge/rpz2xyz
ddudt Jun 27, 2024
9c60daa
hot fix for mistake from last commit
daniel-dudt Jun 27, 2024
989ad9f
fixing tests
daniel-dudt Jun 28, 2024
2d2c6e1
Merge branch 'master' into yge/rpz2xyz
ddudt Jun 28, 2024
9283078
more succinct comment
daniel-dudt Jun 28, 2024
f003c5f
Merge branch 'yge/rpz2xyz' of https://github.com/PlasmaControl/DESC i…
daniel-dudt Jun 28, 2024
98774b1
update data dependencies
daniel-dudt Jun 28, 2024
7a6f290
Merge branch 'master' into yge/rpz2xyz
YigitElma Jul 3, 2024
adcff1e
add test_compute_everything_xyz
YigitElma Jul 3, 2024
0de21ef
uncomment temporary large file check
YigitElma Jul 3, 2024
e51cff4
Merge branch 'yge/rpz2xyz' of github.com:PlasmaControl/DESC into yge/…
YigitElma Jul 3, 2024
e286d65
add bad basis error
YigitElma Jul 3, 2024
031e431
remove redundant phi dependencies and add phi automatically to comput…
YigitElma Jul 3, 2024
528751d
fix xyz test, adding phi to data keys before causing some issue
YigitElma Jul 3, 2024
6a1c4f5
combine test_compute_everything functions
YigitElma Jul 3, 2024
2422990
fix the order of for loop and if statement
YigitElma Jul 3, 2024
d76ef40
Merge branch 'master' into yge/rpz2xyz
ddudt Jul 8, 2024
ce74517
remove 'basis' from compute function decorators
daniel-dudt Jul 8, 2024
854c50b
add basis arg to utils
daniel-dudt Jul 8, 2024
3c5cc3c
remove unnecessary 'phi' references
daniel-dudt Jul 8, 2024
96dedf7
add 'basis' as an allowed kwarg
daniel-dudt Jul 8, 2024
01072d1
add 'phi' to list of compute names if basis='xyz'
daniel-dudt Jul 8, 2024
cdb9a83
add basis kwarg to compute calls
daniel-dudt Jul 8, 2024
f752f0b
pop 'method' from compute kwargs
daniel-dudt Jul 8, 2024
636b5af
fix test
daniel-dudt Jul 8, 2024
926fc90
remove unnecessary change
daniel-dudt Jul 8, 2024
cca81e4
error if converting tensor quantities
daniel-dudt Jul 8, 2024
7f5876c
update documentation
daniel-dudt Jul 8, 2024
66470ab
remove duplicate basis kwarg in get_transforms
daniel-dudt Jul 8, 2024
c94c539
Merge branch 'master' into yge/rpz2xyz
ddudt Jul 8, 2024
b357bcf
remove more duplicate basis kwargs
daniel-dudt Jul 8, 2024
2028c27
Merge branch 'yge/rpz2xyz' of https://github.com/PlasmaControl/DESC i…
daniel-dudt Jul 8, 2024
8820a0a
make test_compute_everything_work
daniel-dudt Jul 9, 2024
f5281e5
Merge branch 'master' into yge/rpz2xyz
f0uriest Jul 10, 2024
375d87e
Add check for invalid kwarg, avoid reusing common argname
f0uriest Jul 10, 2024
986f529
Fix params left over from merge conflict
f0uriest Jul 10, 2024
9f86c2d
Merge branch 'master' into yge/rpz2xyz
f0uriest Jul 11, 2024
c6792ff
update Changelog
daniel-dudt Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Loading