diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 25367c65c5bb73d0110da16ff4ffb8bf3b2c7ce0_Yml0YnVja2V0LXBpcGVsaW5lcy55bWw=..c0c02adafb2c6417a50427dcd7fda4357641e31c_Yml0YnVja2V0LXBpcGVsaW5lcy55bWw= 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -14,5 +14,5 @@ caches: - pip script: - - pip install -U tox "fluidpythran>=0.1.0" --user + - pip install -U tox "fluidpythran>=0.1.0.post0" --user - tox -e py36,codecov diff --git a/fluidsim/base/init_fields.py b/fluidsim/base/init_fields.py index 25367c65c5bb73d0110da16ff4ffb8bf3b2c7ce0_Zmx1aWRzaW0vYmFzZS9pbml0X2ZpZWxkcy5weQ==..c0c02adafb2c6417a50427dcd7fda4357641e31c_Zmx1aWRzaW0vYmFzZS9pbml0X2ZpZWxkcy5weQ== 100644 --- a/fluidsim/base/init_fields.py +++ b/fluidsim/base/init_fields.py @@ -305,8 +305,9 @@ time = mpi.comm.bcast(time) it = mpi.comm.bcast(it) - self.sim.state.statespect_from_statephys() - self.sim.state.statephys_from_statespect() + if hasattr(self.sim.state, "statespect_from_statephys"): + self.sim.state.statespect_from_statephys() + self.sim.state.statephys_from_statespect() self.sim.time_stepping.t = time self.sim.time_stepping.it = it diff --git a/fluidsim/util/util.py b/fluidsim/util/util.py index 25367c65c5bb73d0110da16ff4ffb8bf3b2c7ce0_Zmx1aWRzaW0vdXRpbC91dGlsLnB5..c0c02adafb2c6417a50427dcd7fda4357641e31c_Zmx1aWRzaW0vdXRpbC91dGlsLnB5 100644 --- a/fluidsim/util/util.py +++ b/fluidsim/util/util.py @@ -194,7 +194,10 @@ times = _np.empty([nb_files]) for ii, name in enumerate(name_files): - times[ii] = float(name[ind_start_time : ind_start_time + 7]) + tmp = ".".join(name[ind_start_time:].split(".")[:2]) + if "_" in tmp: + tmp = tmp[:tmp.index("_")] + times[ii] = float(tmp) if t_approx is None: t_approx = times.max() i_file = abs(times - t_approx).argmin() diff --git a/pyproject.toml b/pyproject.toml index 25367c65c5bb73d0110da16ff4ffb8bf3b2c7ce0_cHlwcm9qZWN0LnRvbWw=..c0c02adafb2c6417a50427dcd7fda4357641e31c_cHlwcm9qZWN0LnRvbWw= 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,2 +1,2 @@ [build-system] -requires = ["setuptools", "wheel", "numpy", "fluidpythran>=0.1.0"] \ No newline at end of file +requires = ["setuptools", "wheel", "numpy", "fluidpythran>=0.1.0.post0"] \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index 25367c65c5bb73d0110da16ff4ffb8bf3b2c7ce0_c2V0dXAuY2Zn..c0c02adafb2c6417a50427dcd7fda4357641e31c_c2V0dXAuY2Zn 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,5 +21,5 @@ [options] setup_requires = - fluidpythran>=0.1.0 + fluidpythran>=0.1.0.post0 numpy diff --git a/setup.py b/setup.py index 25367c65c5bb73d0110da16ff4ffb8bf3b2c7ce0_c2V0dXAucHk=..c0c02adafb2c6417a50427dcd7fda4357641e31c_c2V0dXAucHk= 100644 --- a/setup.py +++ b/setup.py @@ -123,7 +123,7 @@ "future >= 0.16", "h5py", "h5netcdf", - "fluidpythran >= 0.1.0", + "fluidpythran >= 0.1.0.post0", "setuptools_scm", "xarray" ] @@ -210,6 +210,7 @@ ) + setup( name="fluidsim", version=__version__, diff --git a/tox.ini b/tox.ini index 25367c65c5bb73d0110da16ff4ffb8bf3b2c7ce0_dG94LmluaQ==..c0c02adafb2c6417a50427dcd7fda4357641e31c_dG94LmluaQ== 100644 --- a/tox.ini +++ b/tox.ini @@ -22,7 +22,7 @@ deps = pip==18.0 coverage - fluidpythran>=0.1.0 + fluidpythran>=0.1.0.post0 mako numpy matplotlib