Merge pull request #42 from bendudson/fix-optimisation

Fix wall intersection calculation for optimisation

11-optimise-coils.py

@@ -58,6 +58,8 @@
 
 from freegs import optimise as opt
 
+print("Starting optimisation")
+
 best_eq = opt.optimise(eq,  # Starting equilibrium
                        # List of controls
                        [opt.CoilRadius("P2U"),
@@ -68,6 +70,9 @@
                        maxgen=20, # How many generations
                        monitor=opt.PlotMonitor())  # Plot the best in each generation
 
+print("Finished optimisation")
+
 # Forces on the coils
 best_eq.printForces()
 best_eq.plot()
+

freegs/equilibrium.py

@@ -11,6 +11,8 @@
 from .boundary import fixedBoundary, freeBoundary
 from . import critical
 
+from . import polygons
+
 # Operators which define the G-S equation
 from .gradshafranov import mu0, GSsparse, GSsparse4thOrder