Code

2nd Order NAE Constraints#1036

Code

Draft

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

+1,152-13

Commits

Commits on Mar 9, 2023

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

  Show description for 788f98f
  dpanici

  committed
  788f98f

• remove error for O(rho^2)

  dpanici

  committed
  b556f38

Commits on Mar 20, 2023

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  cf99cee

Commits on May 5, 2023

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  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

Commits on Jun 12, 2023

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  2ab30c3

• merge lambda constraints into dp/order_rho_sq_NAE

  dpanici

  committed
  6a4c865

Commits on Jun 13, 2023

• merge lambda constraints into dp/order_rho_sq_NAE

  dpanici

  committed
  2f2db27

Commits on Jul 6, 2023

• merge branch dp/pass_n_NAE_constraints intor dp/order_rho_sq_NAE

  dpanici

  committed
  2440d4e

Commits on Sep 28, 2023

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  30bb282

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

  dpanici

  committed
  15c5ce8

• add missing eq to build calls

  dpanici

  committed
  e3a196b

Commits on Sep 30, 2023

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

  dpanici

  committed
  326d7a8

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

  dpanici

  committed
  d5e71a4

Commits on Oct 19, 2023

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  fcc5053

Commits on Nov 7, 2023

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  c1b54d7

• increase tol of linear constraint factorization:

  dpanici

  committed
  9da265d

Commits on Nov 20, 2023

• add bounds argument to NAE constraints

  dpanici

  committed
  d7cd3f2

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  a0bfc3f

Commits on Jan 5, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  7e33d43

Commits on Jan 9, 2024

• add a new fitting method for from_near_axis

  dpanici

  committed
  d73f040

Commits on Jan 11, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  7864c1b

Commits on Jan 12, 2024

• OCS grid fit implemented for from_near_axis

  dpanici

  committed
  e50f2b1

Commits on Jan 15, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  4f59054

Commits on Jan 22, 2024

• correct lambda o(rho) constraint

  dpanici

  committed
  6118de6

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

  dpanici

  committed
  ea9c5a8

Commits on Jan 23, 2024

• add 2nd order lambda constraint

  dpanici

  committed
  e924642

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

  dpanici

  committed
  ccdf474

Commits on Jan 26, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  fdb5c58

Commits on Jan 30, 2024

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

  dpanici

  committed
  6d45de9

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

  dpanici

  committed
  867b251

Commits on Feb 2, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  b7daa42

Commits on Mar 12, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  5a0e399

Commits on May 16, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  705baa4

Commits on May 24, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  e693a2a

Commits on Jul 17, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  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

Commits on Aug 20, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  authored
  5bcd15a

Commits on Sep 2, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  authored
  37e3e4b

Commits on Sep 17, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  6728e4f

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

  dpanici

  committed
  a544973

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  36af776

• include simpler way of coef calc

  dpanici

  committed
  17d590f

Commits on Sep 19, 2024

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

  dpanici

  committed
  25be8b1

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

  dpanici

  committed
  98f1507

Commits on Sep 20, 2024

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

  dpanici

  committed
  fd7b381

Commits on Oct 7, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  9451f6b

Commits on Oct 17, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  db2c6b9

Commits on Oct 22, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  authored
  1d629f2

• remove fit_grid_type

  dpanici

  committed
  96a4686

Commits on Oct 26, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  authored
  35505c1

Commits on Nov 5, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  authored
  b2fc0da

• use untwisted coeffs for 2nd order

  dpanici

  committed
  9e4c1c8

Commits on Nov 8, 2024

• fix untwisted error

  dpanici

  committed
  fd59eaa

Commits on Nov 20, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  f9f8f01

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  83bd0df

Commits on Nov 21, 2024

• implement corrected, simpler 2nd order NAE constraint

  dpanici

  committed
  b7354b1

Commits on Dec 9, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  4311cf5

Commits on Dec 13, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  committed
  6015f44

Commits on Dec 18, 2024

• Merge branch 'master' into dp/order_rho_sq_NAE

  dpanici

  authored
  fc3cc6e