From 17b3a4abece4af6cfa90c99373b04b3679a6ba0c Mon Sep 17 00:00:00 2001
From: Oak Nelson <31452202+nelsonand@users.noreply.github.com>
Date: Tue, 27 Aug 2024 14:08:54 -0600
Subject: [PATCH 1/2] Add NT confinement scaling

---
 .../energy_confinement_scalings.yaml          | 30 +++++++++++++++++++
 docs/refs.bib                                 | 11 +++++++
 2 files changed, 41 insertions(+)

diff --git a/cfspopcon/formulas/energy_confinement/energy_confinement_scalings.yaml b/cfspopcon/formulas/energy_confinement/energy_confinement_scalings.yaml
index de8ae116..5d0dafd1 100644
--- a/cfspopcon/formulas/energy_confinement/energy_confinement_scalings.yaml
+++ b/cfspopcon/formulas/energy_confinement/energy_confinement_scalings.yaml
@@ -314,3 +314,33 @@ H_DS03:
     triangularity_alpha: 0.0
     qstar_alpha: 0.0
 
+H_NTD3D24:
+  metadata:
+    reference: "Simultaneous access to high normalized density, current, pressure, and confinement in strongly-shaped diverted negative triangularity plasmas, C. Paz-Soldan et. al (2024) Nuclear Fusion, 64"
+    notes: ""
+    regime: "Neg-D"
+  params:
+    constant: 0.0562
+    mass_ratio_alpha: 0.19
+    field_on_axis_alpha: 0.108
+    plasma_current_alpha: 1.024
+    input_power_alpha: -0.907
+    major_radius_alpha: 1.97
+    triangularity_alpha: 0.0
+    inverse_aspect_ratio_alpha: 0.58
+    areal_elongation_alpha: 0.78
+    separatrix_elongation_alpha: 0.0
+    average_density_alpha: 0.508
+    qstar_alpha: 0.0
+    C: 0.0562
+    a_A: 0.19
+    a_B: 0.108
+    a_I: 1.024
+    a_P: -0.907
+    a_R: 1.97
+    a_d: 0.0
+    a_e: 0.58
+    a_ka: 0.78
+    a_ks: 0.0
+    a_n: 0.508
+    a_q: 0.0
diff --git a/docs/refs.bib b/docs/refs.bib
index 841398ff..5b935a11 100644
--- a/docs/refs.bib
+++ b/docs/refs.bib
@@ -740,4 +740,15 @@ @article{kallenbach2019neutral
   pages={166--174},
   year={2019},
   publisher={Elsevier}
+}
+
+@article{paz-soldan2024nt,
+	title = {Simultaneous access to high normalized density, current, pressure, and confinement in strongly-shaped diverted negative triangularity plasmas},
+	author = {Paz-Soldan, C. and Chrystal, C. and Lunia, P. and Nelson, A.O. and Thome, K.E. and Austin, M.E. and Cote, T.B. and Hyatt, A.W. and Leuthold, N. and Marinoni, A. and Osborne, T.H. and Pharr, M. and Sauter, O. and Scotti, F. and Wilks, T.M. and Wilson, H.S.},
+	journal = {Nuclear Fusion},
+	volume = {64},
+	issn = {0029-5515, 1741-4326},
+	pages = {094002},
+	year = {2024},
+	publisher={IOP Publishing}
 }
\ No newline at end of file

From 5c728f1532cf31725ba7d550aa27fc979434c9c5 Mon Sep 17 00:00:00 2001
From: Oak Nelson <31452202+nelsonand@users.noreply.github.com>
Date: Wed, 28 Aug 2024 08:31:04 -0600
Subject: [PATCH 2/2] Update
 cfspopcon/formulas/energy_confinement/energy_confinement_scalings.yaml

Co-authored-by: Tom Body <116750897+tbody-cfs@users.noreply.github.com>
---
 .../energy_confinement_scalings.yaml                 | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/cfspopcon/formulas/energy_confinement/energy_confinement_scalings.yaml b/cfspopcon/formulas/energy_confinement/energy_confinement_scalings.yaml
index 5d0dafd1..e42ed786 100644
--- a/cfspopcon/formulas/energy_confinement/energy_confinement_scalings.yaml
+++ b/cfspopcon/formulas/energy_confinement/energy_confinement_scalings.yaml
@@ -332,15 +332,3 @@ H_NTD3D24:
     separatrix_elongation_alpha: 0.0
     average_density_alpha: 0.508
     qstar_alpha: 0.0
-    C: 0.0562
-    a_A: 0.19
-    a_B: 0.108
-    a_I: 1.024
-    a_P: -0.907
-    a_R: 1.97
-    a_d: 0.0
-    a_e: 0.58
-    a_ka: 0.78
-    a_ks: 0.0
-    a_n: 0.508
-    a_q: 0.0