-
Notifications
You must be signed in to change notification settings - Fork 10
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix test against collect #55
Commits on Oct 23, 2019
-
Finish implementing test_against_collect
Also removes dependency on saved binary files.
Configuration menu - View commit details
-
Copy full SHA for 7491906 - Browse repository at this point
Copy the full SHA 7491906View commit details -
pip-install boutdata for Travis tests
Required for test_against_collect
Configuration menu - View commit details
-
Copy full SHA for 896459b - Browse repository at this point
Copy the full SHA 896459bView commit details -
Include BOUT_VERSION in create_bout_ds
This is needed for BOUT++'s 'collect' function to work correctly, as for BOUT_VERSION<3.5 it was necessary to ignore the last point in the z-grid, so collect needs to be able to check the BOUT_VERSION.
Configuration menu - View commit details
-
Copy full SHA for d7b5971 - Browse repository at this point
Copy the full SHA d7b5971View commit details -
Remove MYPE, PE_XIND and PE_YIND from METADATA_VARS
These scalar variables change from processor to processor, so are dropped when loading a dataset and cannot be checked.
Configuration menu - View commit details
-
Copy full SHA for ba95d92 - Browse repository at this point
Copy the full SHA ba95d92View commit details -
Drop _BOUT_PER_PROC_VARIABLES in test_load
In some tests, these need to be dropped in addition to METADATA_VARS before comparing generated and loaded datasets.
Configuration menu - View commit details
-
Copy full SHA for 1c97746 - Browse repository at this point
Copy the full SHA 1c97746View commit details -
Fix load._get_limit() for case when number of guard cells is 0
Returning 0 for an upper limit causes a bug, as the data is sliced with slice(lower, upper), where upper=-<number of guard cells>, but -0=0 so the slice would remove all the data.
Configuration menu - View commit details
-
Copy full SHA for 5fdf62b - Browse repository at this point
Copy the full SHA 5fdf62bView commit details -
Can then ignore it safely in the test suite.
Configuration menu - View commit details
-
Copy full SHA for d3278e5 - Browse repository at this point
Copy the full SHA d3278e5View commit details -
Many tests produce a warning from xarray like: RuntimeWarning: deallocating CachingFileManager(<class 'netCDF4._netCDF4.Dataset'>, '/tmp/pytest-of-***/<path-to-file>', mode='r', kwargs={'clobber': True, 'diskless': False, 'persist': False, 'format': 'NETCDF4'}), but file is not already closed. This may indicate a bug. Ignore these warnings, as they do not tell us anything useful about xBOUT.
Configuration menu - View commit details
-
Copy full SHA for 93f6f91 - Browse repository at this point
Copy the full SHA 93f6f91View commit details -
pip-install vtk in .travis.yml, workaround for Python-3.6 install
In Python-3.6 the mayavi install fails if vtk is not available. mayavi is a dependency of boutdata, needed for test_against_collect. As a workaround, pip-install vtk before pip-installing boutdata.
Configuration menu - View commit details
-
Copy full SHA for 740c822 - Browse repository at this point
Copy the full SHA 740c822View commit details -
Configuration menu - View commit details
-
Copy full SHA for 212f913 - Browse repository at this point
Copy the full SHA 212f913View commit details
Commits on Oct 24, 2019
-
Configuration menu - View commit details
-
Copy full SHA for b970c1a - Browse repository at this point
Copy the full SHA b970c1aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 807c8e3 - Browse repository at this point
Copy the full SHA 807c8e3View commit details
Commits on Oct 25, 2019
-
May be needed to provide some variables that are not saved by default to BOUT++'s output files, e.g. psixy, Rxy, Zxy.
Configuration menu - View commit details
-
Copy full SHA for f8fa440 - Browse repository at this point
Copy the full SHA f8fa440View commit details -
Add 'hthe' from grid in s-alpha geometry
Need to add hthe before getting toroidal coordinates, as dimension names are changed only in the Dataset, not in the _grid member variable. 'r' coordinate is created as 1d, so selecting 'theta=0' part is an error.
Configuration menu - View commit details
-
Copy full SHA for 4fad704 - Browse repository at this point
Copy the full SHA 4fad704View commit details -
Configuration menu - View commit details
-
Copy full SHA for 181a691 - Browse repository at this point
Copy the full SHA 181a691View commit details -
Configuration menu - View commit details
-
Copy full SHA for 60b9d9a - Browse repository at this point
Copy the full SHA 60b9d9aView commit details
Commits on Oct 26, 2019
-
Don't store _grid in dataset attrs
Doing this prevented the dataset being saved to netCDF file. Also use _open_grid instead of open_boutdataset to open the grid file so that the grid dataset does not have metadata added to the DataArray variables. These variables are added as coordinates and become members of the DataArrays representing simulation variables; if they have a metadata dict, it is not possible to save them to netCDF.
Configuration menu - View commit details
-
Copy full SHA for cfc039c - Browse repository at this point
Copy the full SHA cfc039cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7ae0f18 - Browse repository at this point
Copy the full SHA 7ae0f18View commit details -
Do not save hthe in dataset for s-alpha geometry
...when hthe is loaded from the grid file. Variables from the grid file do not have all the correct metadata, so cause errors when trying to save to netCDF.
Configuration menu - View commit details
-
Copy full SHA for 3fc4f02 - Browse repository at this point
Copy the full SHA 3fc4f02View commit details -
Remove workaround for mayavi dependency of boutdata
Depedency has been made optional by an update to boututils.
Configuration menu - View commit details
-
Copy full SHA for 75f3072 - Browse repository at this point
Copy the full SHA 75f3072View commit details
Commits on Oct 28, 2019
-
Remove workaround for mayavi dependency of boutdata
Depedency has been made optional by an update to boututils.
Configuration menu - View commit details
-
Copy full SHA for 7c05112 - Browse repository at this point
Copy the full SHA 7c05112View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4902a74 - Browse repository at this point
Copy the full SHA 4902a74View commit details -
Revert addition of xBOUTWarning
Instead use UserWarning, and in pytest.ini set a filter on the warning message.
Configuration menu - View commit details
-
Copy full SHA for 4a86947 - Browse repository at this point
Copy the full SHA 4a86947View commit details
Commits on Dec 3, 2019
-
Merge pull request #58 from boutproject/test-geometries
Test geometries
Configuration menu - View commit details
-
Copy full SHA for 5047941 - Browse repository at this point
Copy the full SHA 5047941View commit details -
Don't try to store grid dataset after reading coordinates
Previously, a gridfile was loaded and stored as an attribute of the Dataset and DataArrays, then it was attempted to store the grid Dataset as a member of the BoutDataset accessor (this does not work because accessors are not permanent). As of BOUT++ v4.3.0, the only information we need to load from the grid file is some coordinates (e.g. psixy, Rxy, Zxy for 'toroidal' geometry), so we can just open the grid file, set the coordinates and not save the grid. This has the advantage that DataArrays inherit the coordinates from their parent Dataset without having to do special things when loading, or causing problems when saving to netCDF.
Configuration menu - View commit details
-
Copy full SHA for bf9de54 - Browse repository at this point
Copy the full SHA bf9de54View commit details -
Remove skipped grid_merge test
We no longer merge grid data from a grid file into the Dataset, so this test is not needed.
Configuration menu - View commit details
-
Copy full SHA for 9922188 - Browse repository at this point
Copy the full SHA 9922188View commit details -
MXG is not contained in the grid file, so needs to be passed as an argument to _open_grid: read from the Dataset if one is being opened, otherwise defaults to 2.
Configuration menu - View commit details
-
Copy full SHA for d7f8163 - Browse repository at this point
Copy the full SHA d7f8163View commit details -
Configuration menu - View commit details
-
Copy full SHA for c099242 - Browse repository at this point
Copy the full SHA c099242View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0583eac - Browse repository at this point
Copy the full SHA 0583eacView commit details -
Skip test_against_collect if boutdata.collect is not available
If boutdata.collect, 'old collect', is not available, then skip tests comparing to it. Ensures users who do not install old python tools can still run the tests.
Configuration menu - View commit details
-
Copy full SHA for dcda0d3 - Browse repository at this point
Copy the full SHA dcda0d3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5370f7d - Browse repository at this point
Copy the full SHA 5370f7dView commit details