Change the specification of the magnetic geometry to add a finite bze…

…ta to the 1D mirror option to allow a nonzero ExB drift to emerge in 2D simulations.
mabarnes · Feb 6, 2024 · 9330f25 · 9330f25
1 parent 5abac5e
commit 9330f25
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 14 deletions.
diff --git a/moment_kinetics/ext/manufactured_solns_ext.jl b/moment_kinetics/ext/manufactured_solns_ext.jl
@@ -61,8 +61,8 @@ using IfElse
         # compute symbolic geometry functions
         option = geometry_input_data.option
         rhostar = geometry_input_data.rhostar
+        pitch = geometry_input_data.pitch
         if option == "constant-helical" || option == "default"
-            pitch = geometry_input_data.pitch
             bzed = pitch
             bzeta = sqrt(1 - bzed^2)
             Bmag = 1.0
@@ -73,8 +73,8 @@ using IfElse
             jacobian = 1.0
         elseif option == "1D-mirror"
             DeltaB = geometry_input_data.DeltaB
-            bzed = 1.0
-            bzeta = 0.0
+            bzed = pitch
+            bzeta = sqrt(1 - bzed^2)
             # B(z)/Bref = 1 + DeltaB*( 2(2z/L)^2 - (2z/L)^4)
             # chosen so that
             # B(z)/Bref = 1 + DeltaB at 2z/L = +- 1 

diff --git a/moment_kinetics/src/geo.jl b/moment_kinetics/src/geo.jl
@@ -114,10 +114,11 @@ function init_magnetic_geometry(geometry_input_data::geometry_input,z,r)
         if DeltaB < -0.99999999
             input_option_error("$option: You have specified DeltaB < -1 -> set DeltaB > -1", option)
         end
+        pitch = geometry_input_data.pitch
         for ir in 1:nr
             for iz in 1:nz
-                bzed[iz,ir] = 1.0
-                bzeta[iz,ir] = 0.0
+                bzed[iz,ir] = pitch
+                bzeta[iz,ir] = sqrt(1 - bzed[iz,ir]^2)
                 # B(z)/Bref = 1 + DeltaB*( 2(2z/L)^2 - (2z/L)^4)
                 # chosen so that
                 # B(z)/Bref = 1 + DeltaB at 2z/L = +- 1 

diff --git a/runs/1D-mirror_MMS_ngrid_9_nel_r_1_z_16_vpa_16_vperp_8_diss.toml b/runs/1D-mirror_MMS_ngrid_9_nel_r_1_z_16_vpa_16_vperp_8_diss.toml
@@ -10,7 +10,7 @@ force_Er_zero_at_wall = false #true
 geometry_option="1D-mirror"
 DeltaB=0.5
 #geometry_option="constant-helical"
-#pitch=1.0
+pitch=1.0
 Er_constant = 0.0
 T_e = 1.0
 T_wall = 1.0

diff --git a/runs/1D-mirror_MMS_ngrid_9_nel_r_1_z_32_vpa_32_vperp_16_diss.toml b/runs/1D-mirror_MMS_ngrid_9_nel_r_1_z_32_vpa_32_vperp_16_diss.toml
@@ -10,7 +10,7 @@ force_Er_zero_at_wall = false #true
 geometry_option="1D-mirror"
 DeltaB=0.5
 #geometry_option="constant-helical"
-#pitch=1.0
+pitch=1.0
 Er_constant = 0.0
 T_e = 1.0
 T_wall = 1.0

diff --git a/runs/1D-mirror_MMS_ngrid_9_nel_r_1_z_4_vpa_4_vperp_2_diss.toml b/runs/1D-mirror_MMS_ngrid_9_nel_r_1_z_4_vpa_4_vperp_2_diss.toml
@@ -10,7 +10,7 @@ force_Er_zero_at_wall = false #true
 geometry_option="1D-mirror"
 DeltaB=0.5
 #geometry_option="constant-helical"
-#pitch=1.0
+pitch=1.0
 Er_constant = 0.0
 T_e = 1.0
 T_wall = 1.0

diff --git a/runs/1D-mirror_MMS_ngrid_9_nel_r_1_z_64_vpa_64_vperp_32_diss.toml b/runs/1D-mirror_MMS_ngrid_9_nel_r_1_z_64_vpa_64_vperp_32_diss.toml
@@ -10,7 +10,7 @@ force_Er_zero_at_wall = false #true
 geometry_option="1D-mirror"
 DeltaB=0.5
 #geometry_option="constant-helical"
-#pitch=1.0
+pitch=1.0
 Er_constant = 0.0
 T_e = 1.0
 T_wall = 1.0

diff --git a/runs/1D-mirror_MMS_ngrid_9_nel_r_1_z_8_vpa_8_vperp_4_diss.toml b/runs/1D-mirror_MMS_ngrid_9_nel_r_1_z_8_vpa_8_vperp_4_diss.toml
@@ -10,7 +10,7 @@ force_Er_zero_at_wall = false #true
 geometry_option="1D-mirror"
 DeltaB=0.5
 #geometry_option="constant-helical"
-#pitch=1.0
+pitch=1.0
 Er_constant = 0.0
 T_e = 1.0
 T_wall = 1.0

diff --git a/runs/2D-mirror_MMS_ngrid_5_nel_r_16_z_16_vpa_16_vperp_8_diss.toml b/runs/2D-mirror_MMS_ngrid_5_nel_r_16_z_16_vpa_16_vperp_8_diss.toml
@@ -10,7 +10,7 @@ force_Er_zero_at_wall = false #true
 geometry_option="1D-mirror"
 DeltaB=0.5
 #geometry_option="constant-helical"
-#pitch=1.0
+pitch=0.5
 Er_constant = 0.0
 T_e = 1.0
 T_wall = 1.0

diff --git a/runs/2D-mirror_MMS_ngrid_5_nel_r_32_z_32_vpa_32_vperp_16_diss.toml b/runs/2D-mirror_MMS_ngrid_5_nel_r_32_z_32_vpa_32_vperp_16_diss.toml
@@ -10,7 +10,7 @@ force_Er_zero_at_wall = false #true
 geometry_option="1D-mirror"
 DeltaB=0.5
 #geometry_option="constant-helical"
-#pitch=1.0
+pitch=0.5
 Er_constant = 0.0
 T_e = 1.0
 T_wall = 1.0

diff --git a/runs/2D-mirror_MMS_ngrid_5_nel_r_4_z_4_vpa_4_vperp_2_diss.toml b/runs/2D-mirror_MMS_ngrid_5_nel_r_4_z_4_vpa_4_vperp_2_diss.toml
@@ -10,7 +10,7 @@ force_Er_zero_at_wall = false #true
 geometry_option="1D-mirror"
 DeltaB=0.5
 #geometry_option="constant-helical"
-#pitch=1.0
+pitch=0.5
 Er_constant = 0.0
 T_e = 1.0
 T_wall = 1.0

diff --git a/runs/2D-mirror_MMS_ngrid_5_nel_r_8_z_8_vpa_8_vperp_4_diss.toml b/runs/2D-mirror_MMS_ngrid_5_nel_r_8_z_8_vpa_8_vperp_4_diss.toml
@@ -10,7 +10,7 @@ force_Er_zero_at_wall = false #true
 geometry_option="1D-mirror"
 DeltaB=0.5
 #geometry_option="constant-helical"
-#pitch=1.0
+pitch=0.5
 Er_constant = 0.0
 T_e = 1.0
 T_wall = 1.0