Update to example.

hiddenSymmetries · Dec 23, 2023 · 02afa81 · 02afa81
1 parent 2087a79
commit 02afa81
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/examples/2_Intermediate/tracing_boozer.py b/examples/2_Intermediate/tracing_boozer.py
@@ -6,7 +6,7 @@
 import matplotlib.pyplot as plt
 
 from simsopt.field import (BoozerRadialInterpolant, InterpolatedBoozerField, trace_particles_boozer,
-                           ToroidalFluxStoppingCriterion,
+                           MinToroidalFluxStoppingCriterion, MaxToroidalFluxStoppingCriterion,
                            ToroidalTransitStoppingCriterion, compute_resonances)
 from simsopt.mhd import Vmec
 from simsopt.util import in_github_actions
@@ -75,7 +75,7 @@
 
 gc_tys, gc_zeta_hits = trace_particles_boozer(
     field, stz_inits, vpar_inits, tmax=1e-2, mass=mass, charge=ELEMENTARY_CHARGE,
-    Ekin=Ekin, tol=1e-8, mode='gc_vac', stopping_criteria=[ToroidalFluxStoppingCriterion(0.99,False), ToroidalFluxStoppingCriterion(0.01,True), ToroidalTransitStoppingCriterion(100, True)],
+    Ekin=Ekin, tol=1e-8, mode='gc_vac', stopping_criteria=[MaxToroidalFluxStoppingCriterion(0.99), MinToroidalFluxStoppingCriterion(0.01), ToroidalTransitStoppingCriterion(100, True)],
     forget_exact_path=False)
 
 Nparticles = len(gc_tys)
@@ -112,7 +112,7 @@
 
 gc_tys, gc_zeta_hits = trace_particles_boozer(
     field, stz_inits, vpar_inits, tmax=1e-2, mass=mass, charge=ELEMENTARY_CHARGE,
-    Ekin=Ekin, zetas=[0], tol=1e-8, stopping_criteria=[ToroidalFluxStoppingCriterion(0.01,True), ToroidalFluxStoppingCriterion(0.99,False), ToroidalTransitStoppingCriterion(30, True)],
+    Ekin=Ekin, zetas=[0], tol=1e-8, stopping_criteria=[MinToroidalFluxStoppingCriterion(0.01), MaxToroidalFluxStoppingCriterion(0.99), ToroidalTransitStoppingCriterion(30, True)],
     forget_exact_path=False)
 
 resonances = compute_resonances(gc_tys, gc_zeta_hits, ma=None, delta=0.01)
@@ -134,7 +134,7 @@
 
 gc_tys, gc_zeta_hits = trace_particles_boozer(
     field, stz_res, vpar_res, tmax=1e-2, mass=mass, charge=ELEMENTARY_CHARGE,
-    Ekin=Ekin, zetas=[0], tol=1e-8, stopping_criteria=[ToroidalFluxStoppingCriterion(0.01,True), ToroidalFluxStoppingCriterion(0.99,False), ToroidalTransitStoppingCriterion(30, True)],
+    Ekin=Ekin, zetas=[0], tol=1e-8, stopping_criteria=[MinToroidalFluxStoppingCriterion(0.01), MaxToroidalFluxStoppingCriterion(0.99), ToroidalTransitStoppingCriterion(30, True)],
     forget_exact_path=False)
 
 if not in_github_actions: