Merge pull request #229 from PrincetonUniversity/new_vacuum

logan-nc · web-flow · commit 2d16c27a4151 · 2025-08-27T14:47:42.000-04:00
Update Vacuum code to use M.S. Chance's 2007 improvements
diff --git a/docs/examples/a10_ideal_example/vac.in b/docs/examples/a10_ideal_example/vac.in
@@ -37,6 +37,7 @@
 	delg=15.01
 	delfac=1e-3
 	cn0=1
+	use_legacy_greens_function = f
 /
 	
 &shape
diff --git a/docs/examples/a10_kinetic_example/vac.in b/docs/examples/a10_kinetic_example/vac.in
@@ -37,6 +37,7 @@
 	delg=15.01
 	delfac=1e-3
 	cn0=1
+	use_legacy_greens_function = f
 /
 	
 &shape
diff --git a/docs/examples/a5_tearing_example/vac.in b/docs/examples/a5_tearing_example/vac.in
@@ -37,6 +37,7 @@
 	delg=15.01
 	delfac=1e-3
 	cn0=1
+	use_legacy_greens_function = f
 /
 	
 &shape
diff --git a/docs/examples/run_ideal_example/vac.in b/docs/examples/run_ideal_example/vac.in
@@ -38,6 +38,7 @@
 	delg=15.01
 	delfac=1e-3
 	cn0=1
+	use_legacy_greens_function = f
 /
 	
 &shape
diff --git a/docs/examples/run_kinetic_example/vac.in b/docs/examples/run_kinetic_example/vac.in
@@ -37,6 +37,7 @@
 	delg=15.01
 	delfac=1e-3
 	cn0=1
+	use_legacy_greens_function = f
 /
 	
 &shape
diff --git a/input/vac.in b/input/vac.in
@@ -38,6 +38,7 @@
 	delg=15.01
 	delfac=1e-3
 	cn0=1
+	use_legacy_greens_function = f
 /
 
 &shape
diff --git a/vacuum/vacuum_global.f b/vacuum/vacuum_global.f
@@ -20,7 +20,8 @@ MODULE vglobal_mod
       IMPLICIT NONE
 
       LOGICAL :: lsymz,check1,check2,lanal,lkdis,lpest1,lpless,wall,
-     $     lnova,checks,lfunin,checke,checkd,symvac,verbose_timer_output
+     $     lnova,checks,lfunin,checke,checkd,symvac,
+     $     verbose_timer_output, use_legacy_greens_function
 
       INTEGER, PARAMETER :: nc31=31,maxc1=100,maxa1=200,max2=3,
      $     nccl3=72,numvar=100,ndima=2,ndim0=5,neqv1=1
@@ -114,6 +115,7 @@ SUBROUTINE global_alloc(nths0,nfm,mtot,ntsin0)
 c-----------------------------------------------------------------------
 c     define derived sizes.
 c-----------------------------------------------------------------------
+      use_legacy_greens_function = .false.
       ntsin=ntsin0+5
       nsf=nsf0+1
       nfe=1+nsf/2
diff --git a/vacuum/vacuum_io.f b/vacuum/vacuum_io.f
@@ -66,11 +66,11 @@ subroutine cardmo
       data under / "--------" /
       namelist / modes  / mfel,m,mth,n,mdiv,lsymz,lfunin,xiin,
      .     leqarcw, lpest1, lnova, ladj, ldcon, lgato, lrgato, lspark,
-     $     ismth, lzio, mp0,mp1
+     $     ismth, lzio, mp0, mp1
       namelist / debugs / checkd, checke, check1, check2, checks,
      $     wall, lkplt, verbose_timer_output
       namelist / vacdat / ishape,aw,bw,cw,dw,tw,nsing,epsq,noutv,delg,
-     .     idgt, idot, delfac, idsk, cn0
+     .     idgt, idot, delfac, idsk, cn0, use_legacy_greens_function
       namelist / diagns / lkdis, ieig, iloop,
      $     nloop,nloopr,
      .     lpsub, nphil, nphse, mx, mz, nph, xofsl,
diff --git a/vacuum/vacuum_math.f b/vacuum/vacuum_math.f

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@`
`37`	`37`	`delg=15.01`
`38`	`38`	`delfac=1e-3`
`39`	`39`	`cn0=1`
	`40`	`+ use_legacy_greens_function = f`
`40`	`41`	`/`
`41`	`42`
`42`	`43`	`&shape`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@`
`38`	`38`	`delg=15.01`
`39`	`39`	`delfac=1e-3`
`40`	`40`	`cn0=1`
	`41`	`+ use_legacy_greens_function = f`
`41`	`42`	`/`
`42`	`43`
`43`	`44`	`&shape`