Code

2nd Order NAE Constraints#1036

Code

Open

dpanici wants to merge 89 commits intomasterPlasmaControl/DESC:masterfrom dp/order_rho_sq_NAEPlasmaControl/DESC:dp/order_rho_sq_NAECopy head branch name to clipboard

+6,946-156

Commits

Commits on Mar 9, 2023

• Revert "remove O(r^2) constraints"

  Show description for 788f98f
  dpanici

  committed
  788f98f

  Copy full SHA for 788f98f

• remove error for O(rho^2)

  dpanici

  committed
  b556f38

  Copy full SHA for b556f38

Commits on Mar 20, 2023

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  cf99cee

  Copy full SHA for cf99cee

Commits on May 5, 2023

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  f6cf464

  Copy full SHA for f6cf464

Commits on May 15, 2023

• change d_varphi_d_phi to use formula so it will work with pyQic (which does not use same name)

  dpanici

  committed
  7e765bb

  Copy full SHA for 7e765bb

Commits on Jun 12, 2023

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  2ab30c3

  Copy full SHA for 2ab30c3

• merge lambda constraints into dp/order_rho_sq_NAE

  dpanici

  committed
  6a4c865

  Copy full SHA for 6a4c865

Commits on Jun 13, 2023

• merge lambda constraints into dp/order_rho_sq_NAE

  dpanici

  committed
  2f2db27

  Copy full SHA for 2f2db27

Commits on Jul 6, 2023

• merge branch dp/pass_n_NAE_constraints intor dp/order_rho_sq_NAE

  dpanici

  committed
  2440d4e

  Copy full SHA for 2440d4e

Commits on Sep 28, 2023

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  30bb282

  Copy full SHA for 30bb282

• Merge branch 'dp/NAE-lambda-constraints' into dp/order_rho_sq_NAE

  dpanici

  committed
  15c5ce8

  Copy full SHA for 15c5ce8

• add missing eq to build calls

  dpanici

  committed
  e3a196b

  Copy full SHA for e3a196b

Commits on Sep 30, 2023

• correct the r multiplying the 2nd order NAE targets to be r squared

  dpanici

  committed
  326d7a8

  Copy full SHA for 326d7a8

• revert previous commit, add abs value to psi over B bar

  dpanici

  committed
  d5e71a4

  Copy full SHA for d5e71a4

Commits on Oct 19, 2023

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  fcc5053

  Copy full SHA for fcc5053

Commits on Nov 7, 2023

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  c1b54d7

  Copy full SHA for c1b54d7

• increase tol of linear constraint factorization:

  dpanici

  committed
  9da265d

  Copy full SHA for 9da265d

Commits on Nov 20, 2023

• add bounds argument to NAE constraints

  dpanici

  committed
  d7cd3f2

  Copy full SHA for d7cd3f2

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  a0bfc3f

  Copy full SHA for a0bfc3f

Commits on Jan 5, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  7e33d43

  Copy full SHA for 7e33d43

Commits on Jan 9, 2024

• add a new fitting method for from_near_axis

  dpanici

  committed
  d73f040

  Copy full SHA for d73f040

Commits on Jan 11, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  7864c1b

  Copy full SHA for 7864c1b

Commits on Jan 12, 2024

• OCS grid fit implemented for from_near_axis

  dpanici

  committed
  e50f2b1

  Copy full SHA for e50f2b1

Commits on Jan 15, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  4f59054

  Copy full SHA for 4f59054

Commits on Jan 22, 2024

• correct lambda o(rho) constraint

  dpanici

  committed
  6118de6

  Copy full SHA for 6118de6

• Merge branch 'dp/hotfix-lambda-order-rho' into dp/order_rho_sq_NAE

  dpanici

  committed
  ea9c5a8

  Copy full SHA for ea9c5a8

Commits on Jan 23, 2024

• add 2nd order lambda constraint

  dpanici

  committed
  e924642

  Copy full SHA for e924642

• Merge branch 'dp/hotfix-linear-constraint-projection' into dp/order_rho_sq_NAE

  dpanici

  committed
  ccdf474

  Copy full SHA for ccdf474

Commits on Jan 26, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  fdb5c58

  Copy full SHA for fdb5c58

Commits on Jan 30, 2024

• Merge branch 'dp/hotfix-lambda-order-rho' into dp/order_rho_sq_NAE

  dpanici

  committed
  6d45de9

  Copy full SHA for 6d45de9

• Merge branch 'dp/hotfix-lambda-order-rho' into dp/order_rho_sq_NAE

  dpanici

  committed
  867b251

  Copy full SHA for 867b251

Commits on Feb 2, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  b7daa42

  Copy full SHA for b7daa42

Commits on Mar 12, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  5a0e399

  Copy full SHA for 5a0e399

Commits on May 16, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  705baa4

  Copy full SHA for 705baa4

Commits on May 24, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  e693a2a

  Copy full SHA for e693a2a

Commits on Jul 17, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  5c9e2b4

  Copy full SHA for 5c9e2b4

Commits on Aug 15, 2024

• merge master into this branch, and remove bounds as it wont work with master updated FixNearAxisXXX objectives

  dpanici

  committed
  51755d2

  Copy full SHA for 51755d2

Commits on Aug 20, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  authored
  5bcd15a

  Copy full SHA for 5bcd15a

Commits on Sep 2, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  authored
  37e3e4b

  Copy full SHA for 37e3e4b

Commits on Sep 17, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  6728e4f

  Copy full SHA for 6728e4f

• add 2nd order test (RZ 2nd order and axis lambda)

  dpanici

  committed
  a544973

  Copy full SHA for a544973

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  36af776

  Copy full SHA for 36af776

• include simpler way of coef calc

  dpanici

  committed
  17d590f

  Copy full SHA for 17d590f

Commits on Sep 19, 2024

• Merge branch 'dp/nae-constraint-fix' into dp/order_rho_sq_NAE

  dpanici

  committed
  25be8b1

  Copy full SHA for 25be8b1

• Merge branch 'dp/nae-constraint-fix' into dp/order_rho_sq_NAE

  dpanici

  committed
  98f1507

  Copy full SHA for 98f1507

Commits on Sep 20, 2024

• Merge branch 'dp/nae-constraint-fix' into dp/order_rho_sq_NAE

  dpanici

  committed
  fd7b381

  Copy full SHA for fd7b381

Commits on Oct 7, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  9451f6b

  Copy full SHA for 9451f6b

Commits on Oct 17, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  db2c6b9

  Copy full SHA for db2c6b9

Commits on Oct 22, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  authored
  1d629f2

  Copy full SHA for 1d629f2

• remove fit_grid_type

  dpanici

  committed
  96a4686

  Copy full SHA for 96a4686

Commits on Oct 26, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  authored
  35505c1

  Copy full SHA for 35505c1

Commits on Nov 5, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  authored
  b2fc0da

  Copy full SHA for b2fc0da

• use untwisted coeffs for 2nd order

  dpanici

  committed
  9e4c1c8

  Copy full SHA for 9e4c1c8

Commits on Nov 8, 2024

• fix untwisted error

  dpanici

  committed
  fd59eaa

  Copy full SHA for fd59eaa

Commits on Nov 20, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  f9f8f01

  Copy full SHA for f9f8f01

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  83bd0df

  Copy full SHA for 83bd0df

Commits on Nov 21, 2024

• implement corrected, simpler 2nd order NAE constraint

  dpanici

  committed
  b7354b1

  Copy full SHA for b7354b1

Commits on Dec 9, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  4311cf5

  Copy full SHA for 4311cf5

Commits on Dec 13, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  6015f44

  Copy full SHA for 6015f44

Commits on Dec 18, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  authored
  fc3cc6e

  Copy full SHA for fc3cc6e

Commits on Jan 7, 2025

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  619e7ab

  Copy full SHA for 619e7ab

Commits on Jan 8, 2025

• update test

  dpanici

  committed
  fbfe21f

  Copy full SHA for fbfe21f

Commits on Jan 15, 2025

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  authored
  999c8b0

  Copy full SHA for 999c8b0

Commits on Jan 16, 2025

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  authored
  f070b0b

  Copy full SHA for f070b0b

Commits on Jan 20, 2025

• tighten test tol

  dpanici

  committed
  0edce82

  Copy full SHA for 0edce82

• remove unneeded code

  dpanici

  committed
  995d389

  Copy full SHA for 995d389

• reduce test iters

  dpanici

  committed
  da6f352

  Copy full SHA for da6f352

• remove unused fix_lambda arg for 2nd order

  dpanici

  committed
  1b52d63

  Copy full SHA for 1b52d63

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  authored
  e4bd78a

  Copy full SHA for e4bd78a

Commits on Jan 23, 2025

• update first-order nae constraint notebook

  dpanici

  committed
  f7e7795

  Copy full SHA for f7e7795

• Merge branch 'dp/order_rho_sq_NAE' of github.com:PlasmaControl/DESC into dp/order_rho_sq_NAE

  dpanici

  committed
  1c607ba

  Copy full SHA for 1c607ba

Commits on Jan 27, 2025

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  a68ed1b

  Copy full SHA for a68ed1b

• update changelog

  dpanici

  committed
  ee26962

  Copy full SHA for ee26962

• fix error in lambda basis for nae asym

  dpanici

  committed
  0d93e04

  Copy full SHA for 0d93e04

• address some comments

  dpanici

  committed
  764a8d7

  Copy full SHA for 764a8d7

Commits on Feb 1, 2025

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  3fe6de5

  Copy full SHA for 3fe6de5

• add docs

  dpanici

  committed
  7ee9e05

  Copy full SHA for 7ee9e05

• update docstring

  dpanici

  committed
  6577c42

  Copy full SHA for 6577c42

Commits on Feb 16, 2025

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  6d972fe

  Copy full SHA for 6d972fe

• add warning for asym

  dpanici

  committed
  2219f3d

  Copy full SHA for 2219f3d

• add test to test coefficient symmetries

  dpanici

  committed
  7d654c3

  Copy full SHA for 7d654c3

Commits on Feb 18, 2025

• fix warning

  dpanici

  committed
  a931dc9

  Copy full SHA for a931dc9

• add a NAE constraint asym test for when basing off of existing DESC eq, not QSC

  dpanici

  committed
  6a5521a

  Copy full SHA for 6a5521a

Commits on Feb 19, 2025

• add asym solve test, change warning to error in specific case

  dpanici

  committed
  249d08a

  Copy full SHA for 249d08a

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  e2cecde

  Copy full SHA for e2cecde

• fix test

  dpanici

  committed
  6aa50e6

  Copy full SHA for 6aa50e6

• fix test

  dpanici

  committed
  26aebe8

  Copy full SHA for 26aebe8

Commits on Feb 20, 2025

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  authored
  144bfe1

  Copy full SHA for 144bfe1

Commits on Feb 24, 2025

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  authored
  54575b4

  Copy full SHA for 54575b4