Merge pull request #1067 from OceanParcels/reducing_pytest_warnings

Reducing number of pytest warnings

Author: erikvansebille

parcels/examples/example_peninsula.py

@@ -47,8 +47,8 @@ def peninsula_fieldset(xdim, ydim, mesh='flat', grid_type='A'):
 
     # Generate the original test setup on A-grid in m
     domainsizeX, domainsizeY = (1.e5, 5.e4)
-    La = np.linspace(0, domainsizeX, xdim, dtype=np.float32)
-    Wa = np.linspace(0, domainsizeY, ydim, dtype=np.float32)
+    La = np.linspace(1e3, domainsizeX, xdim, dtype=np.float32)
+    Wa = np.linspace(1e3, domainsizeY, ydim, dtype=np.float32)
 
     u0 = 1
     x0 = domainsizeX / 2

parcels/particleset/baseparticleset.py

@@ -488,9 +488,6 @@ def execute(self, pyfunc=AdvectionRK4, pyfunc_inter=None, endtime=None, runtime=
                     p.dt = dt
                 self.add(pset_new)
                 next_prelease += self.repeatdt * np.sign(dt)
-            if abs(time-next_output) < tol:
-                if output_file:
-                    output_file.write(self, time)
             if abs(time - next_output) < tol or dt == 0:
                 for fld in self.fieldset.get_fields():
                     if hasattr(fld, 'to_write') and fld.to_write:
@@ -499,6 +496,9 @@ def execute(self, pyfunc=AdvectionRK4, pyfunc_inter=None, endtime=None, runtime=
                         fldfilename = str(output_file.name).replace('.nc', '_%.4d' % fld.to_write)
                         fld.write(fldfilename)
                         fld.to_write += 1
+            if abs(time - next_output) < tol:
+                if output_file:
+                    output_file.write(self, time)
                 next_output += outputdt * np.sign(dt)
             if abs(time-next_movie) < tol:
                 self.show(field=movie_background_field, show_time=time, animation=True)

tests/test_kernel_language.py

@@ -438,7 +438,7 @@ def test_EOSseawaterproperties_kernels(pset_mode, mode):
                                         'temperature': 40,
                                         'potemperature': 36.89073},
                                   dimensions={'lat': 0, 'lon': 0, 'depth': 0})
-    fieldset.add_constant('refpressure', np.float(0))
+    fieldset.add_constant('refpressure', float(0))
 
     class PoTempParticle(ptype[mode]):
         potemp = Variable('potemp', dtype=np.float32)