diff --git a/compass/ocean/tests/utility/__init__.py b/compass/ocean/tests/utility/__init__.py index aab46ff42..bb996c2d0 100644 --- a/compass/ocean/tests/utility/__init__.py +++ b/compass/ocean/tests/utility/__init__.py @@ -1,7 +1,9 @@ from compass.ocean.tests.utility.combine_topo import CombineTopo +from compass.ocean.tests.utility.create_salin_restoring import ( + CreateSalinRestoring, +) from compass.ocean.tests.utility.cull_restarts import CullRestarts from compass.ocean.tests.utility.extrap_woa import ExtrapWoa -from compass.ocean.tests.utility.create_salin_restoring import CreateSalinRestoring from compass.testgroup import TestGroup diff --git a/compass/ocean/tests/utility/create_salin_restoring/__init__.py b/compass/ocean/tests/utility/create_salin_restoring/__init__.py index 5ab2e1009..4e96f63aa 100644 --- a/compass/ocean/tests/utility/create_salin_restoring/__init__.py +++ b/compass/ocean/tests/utility/create_salin_restoring/__init__.py @@ -1,9 +1,9 @@ -from compass.ocean.tests.utility.create_salin_restoring.salinity_restoring import ( - Salinity, -) from compass.ocean.tests.utility.create_salin_restoring.extrap_salin import ( ExtrapSalin, ) +from compass.ocean.tests.utility.create_salin_restoring.salinity_restoring import ( + Salinity, +) from compass.testcase import TestCase diff --git a/compass/ocean/tests/utility/create_salin_restoring/extrap_salin.py b/compass/ocean/tests/utility/create_salin_restoring/extrap_salin.py index d9e358e57..2559ab4ee 100644 --- a/compass/ocean/tests/utility/create_salin_restoring/extrap_salin.py +++ b/compass/ocean/tests/utility/create_salin_restoring/extrap_salin.py @@ -1,6 +1,6 @@ +from datetime import datetime import numpy as np import xarray as xr -from datetime import datetime from scipy.signal import convolve2d from compass.step import Step diff --git a/compass/ocean/tests/utility/create_salin_restoring/salinity_restoring.py b/compass/ocean/tests/utility/create_salin_restoring/salinity_restoring.py index 06e59255b..f1df58f3c 100644 --- a/compass/ocean/tests/utility/create_salin_restoring/salinity_restoring.py +++ b/compass/ocean/tests/utility/create_salin_restoring/salinity_restoring.py @@ -1,5 +1,5 @@ -import numpy as np from mpas_tools.io import write_netcdf +import numpy as np import xarray as xr from compass.step import Step