fix in setup.py to read f2py_f2cmap file

Author: tgastine

python/magic/cyl.py

@@ -31,7 +31,7 @@ def sph2cyl_plane(data, rad, ns):
     >>> vpm = gr.vphi.mean(axis=0)
     >>> sm = gr.entropy.mean(axis=0)
     >>> # Interpolate on a cylindrical grid
-    >>> Z, S, outputs = sph2cyl_plane([vpm, sm], gr.radius, 512, 1024)
+    >>> Z, S, outputs = sph2cyl_plane([vpm, sm], gr.radius, ns=512)
     >>> vpm_cyl, sm_cyl = outputs
 
     :param data: a list of 2-D arrays [(ntheta, nr), (ntheta, nr), ...]

python/magic/graph2vtk.py

@@ -6,7 +6,7 @@
 from .libmagic import symmetrize, thetaderavg, rderavg, phideravg
 import matplotlib.pyplot as plt
 import numpy as np
-from .vtklib import *
+from .vtklib import vtklib as vtk
 
 def sph2cart_scal(scals, radius, nx=96, ny=96, nz=96, minc=1):
     """
@@ -608,25 +608,25 @@ def writeVTS(self, filename, nFiles):
         """
         if self.nvecs == 0:
             if nFiles == 1 and np.size(self.scals)+3*np.size(self.vecr) < 512**3:
-                vts_scal(filename, self.radius, self.scals, self.scalNames,
-                         self.minc)
+                vtk.vts_scal(filename, self.radius, self.scals, self.scalNames,
+                             self.minc)
             elif nFiles > 1:
-                pvts_scal(filename, self.radius, self.scals, self.scalNames,
-                          nFiles, self.minc)
+                vtk.pvts_scal(filename, self.radius, self.scals, self.scalNames,
+                              nFiles, self.minc)
 
             else:
-                pvts_scal(filename, self.radius, self.scals, self.scalNames,
-                          8, self.minc)
+                vtk.pvts_scal(filename, self.radius, self.scals, self.scalNames,
+                              8, self.minc)
         else:
             if nFiles == 1 and np.size(self.scals)+3*np.size(self.vecr) < 512**3:
-                vts(filename, self.radius, self.vecr, self.vect, self.vecp,
-                    self.scals, self.scalNames, self.vecNames, self.minc)
+                vtk.vts(filename, self.radius, self.vecr, self.vect, self.vecp,
+                        self.scals, self.scalNames, self.vecNames, self.minc)
             elif nFiles > 1:
-                pvts(filename, self.radius, self.vecr, self.vect, self.vecp,
-                     self.scals, self.scalNames, self.vecNames, nFiles, self.minc)
+                vtk.pvts(filename, self.radius, self.vecr, self.vect, self.vecp,
+                         self.scals, self.scalNames, self.vecNames, nFiles, self.minc)
             else:
-                pvts(filename, self.radius, self.vecr, self.vect, self.vecp,
-                     self.scals, self.scalNames, self.vecNames, 8, self.minc)
+                vtk.pvts(filename, self.radius, self.vecr, self.vect, self.vecp,
+                         self.scals, self.scalNames, self.vecNames, 8, self.minc)
 
     def writeVTI(self, filename, nx=96, ny=96, nz=96):
         """
@@ -646,13 +646,13 @@ def writeVTI(self, filename, nx=96, ny=96, nz=96):
                                                      self.radius, nx, ny, nz,
                                                      self.minc)
         if self.nvecs == 0:
-            vti_scal(filename, scals_cart, self.scalNames, self.minc, \
+            vti_scal(filename, scals_cart, self.scalNames, \
                      gridMax, spacing)
         else:
             vecx, vecy, vecz = sph2cart_vec(self.vecr, self.vect, self.vecp, \
                                         self.radius, nx, ny, nz, self.minc)
             vti(filename, vecx, vecy, vecz, scals_cart, self.scalNames,
-                self.vecNames, self.minc, gridMax, spacing)
+                self.vecNames, gridMax, spacing)
 
 
 if __name__ == '__main__':

python/magic/setup.py

@@ -109,7 +109,8 @@ def buildLib(fileName, libName):
                         '--opt={}'.format(f90options),
                         '-c', '-m',
                         '{}'.format(libName),
-                        'fortranLib/{}'.format(fileName)],
+                        'fortranLib/{}'.format(fileName),
+                        '--f2cmap', 'fortranLib/f2py_f2cmap.in'],
                         stderr=sp.PIPE, stdout=sp.PIPE)
             else:
                 print("Please wait: building {} using meson...".format(libName))
@@ -119,7 +120,8 @@ def buildLib(fileName, libName):
                                        '-c', '-m',
                                        '{}'.format(libName),
                                        'fortranLib/{}'.format(fileName),
-                                       '--backend', 'meson'],
+                                       '--backend', 'meson',
+                                       '--f2cmap', 'fortranLib/f2py_f2cmap.in'],
                                        env=my_env,
                                        stderr=sp.PIPE, stdout=sp.PIPE)