From 7ff844167c82c9262d5cda933d82c5259f86b7ae Mon Sep 17 00:00:00 2001 From: David Ketcheson Date: Fri, 28 Apr 2017 09:57:25 +0300 Subject: [PATCH] Annihilate pyclaw.io. I think the only important change here is the one in pyclaw/src/pyclaw/fileio/setup.py. --- src/forestclaw/fileio/__init__.py | 2 +- src/forestclaw/fileio/ascii.py | 2 +- src/petclaw/fileio/hdf5.py | 4 ++-- src/pyclaw/controller.py | 8 ++++---- src/pyclaw/fileio/__init__.py | 2 +- src/pyclaw/fileio/ascii.py | 2 +- src/pyclaw/fileio/binary.py | 2 +- src/pyclaw/fileio/hdf5.py | 2 +- src/pyclaw/fileio/netcdf.py | 2 +- src/pyclaw/fileio/setup.py | 2 +- src/pyclaw/log.config | 2 +- src/pyclaw/solution.py | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/forestclaw/fileio/__init__.py b/src/forestclaw/fileio/__init__.py index b1a9f1875..8379d2d10 100644 --- a/src/forestclaw/fileio/__init__.py +++ b/src/forestclaw/fileio/__init__.py @@ -5,7 +5,7 @@ from __future__ import absolute_import import logging -logger = logging.getLogger('pyclaw.io') +logger = logging.getLogger('pyclaw.fileio') from . import ascii __all__ = ["ascii.read", "ascii.write"] diff --git a/src/forestclaw/fileio/ascii.py b/src/forestclaw/fileio/ascii.py index e5049c2d8..ed1269604 100644 --- a/src/forestclaw/fileio/ascii.py +++ b/src/forestclaw/fileio/ascii.py @@ -15,7 +15,7 @@ from clawpack.pyclaw.fileio.ascii import read from clawpack.pyclaw.util import read_data_line -logger = logging.getLogger('pyclaw.io') +logger = logging.getLogger('pyclaw.fileio') def write_patch_header(f, patch): diff --git a/src/petclaw/fileio/hdf5.py b/src/petclaw/fileio/hdf5.py index c1fe0801c..cb306eaf5 100644 --- a/src/petclaw/fileio/hdf5.py +++ b/src/petclaw/fileio/hdf5.py @@ -19,7 +19,7 @@ from clawpack import petclaw import six -logger = logging.getLogger('pyclaw.io') +logger = logging.getLogger('pyclaw.fileio') try: import h5py @@ -222,4 +222,4 @@ def from_hdf5_dataset(dset, ndim, ranges, shape): elif ndim == 2: return dset[:,ranges[0][0]:ranges[0][1],ranges[1][0]:ranges[1][1]].reshape(shape,order='F') elif ndim == 3: - return dset[:,ranges[0][0]:ranges[0][1],ranges[1][0]:ranges[1][1],ranges[2][0]:ranges[2][1]].reshape(shape,order='F') \ No newline at end of file + return dset[:,ranges[0][0]:ranges[0][1],ranges[1][0]:ranges[1][1],ranges[2][0]:ranges[2][1]].reshape(shape,order='F') diff --git a/src/pyclaw/controller.py b/src/pyclaw/controller.py index a472d4648..a6ddca43c 100644 --- a/src/pyclaw/controller.py +++ b/src/pyclaw/controller.py @@ -456,12 +456,12 @@ def file_format(self): @file_format.setter def file_format(self, value): if value.lower() == 'petsc': - self._io_module = __import__("clawpack.petclaw.io.petsc", - fromlist=["clawpack.petclaw.io"]) + self._io_module = __import__("clawpack.petclaw.fileio.petsc", + fromlist=["clawpack.petclaw.fileio"]) self._file_format = value else: - self._io_module = __import__("clawpack.pyclaw.io.%s" % value, - fromlist=['clawpack.pyclaw.io']) + self._io_module = __import__("clawpack.pyclaw.fileio.%s" % value, + fromlist=['clawpack.pyclaw.fileio']) self._file_format = value diff --git a/src/pyclaw/fileio/__init__.py b/src/pyclaw/fileio/__init__.py index a920e5972..741806cba 100644 --- a/src/pyclaw/fileio/__init__.py +++ b/src/pyclaw/fileio/__init__.py @@ -5,7 +5,7 @@ from __future__ import absolute_import import logging -logger = logging.getLogger('pyclaw.io') +logger = logging.getLogger('pyclaw.fileio') from . import ascii __all__ = ['ascii.read', 'ascii.write'] diff --git a/src/pyclaw/fileio/ascii.py b/src/pyclaw/fileio/ascii.py index c11deff99..d195b72d6 100644 --- a/src/pyclaw/fileio/ascii.py +++ b/src/pyclaw/fileio/ascii.py @@ -14,7 +14,7 @@ from clawpack.pyclaw.util import read_data_line from six.moves import range -logger = logging.getLogger('pyclaw.io') +logger = logging.getLogger('pyclaw.fileio') def write(solution, frame, path, file_prefix='fort', write_aux=False, options={}, write_p=False): diff --git a/src/pyclaw/fileio/binary.py b/src/pyclaw/fileio/binary.py index 23833245a..154d89040 100644 --- a/src/pyclaw/fileio/binary.py +++ b/src/pyclaw/fileio/binary.py @@ -16,7 +16,7 @@ import clawpack.pyclaw as pyclaw from six.moves import range -logger = logging.getLogger('pyclaw.io') +logger = logging.getLogger('pyclaw.fileio') def read(solution,frame,path='./',file_prefix='fort',read_aux=False, diff --git a/src/pyclaw/fileio/hdf5.py b/src/pyclaw/fileio/hdf5.py index ce87048de..77e438694 100644 --- a/src/pyclaw/fileio/hdf5.py +++ b/src/pyclaw/fileio/hdf5.py @@ -22,7 +22,7 @@ from clawpack import pyclaw import six -logger = logging.getLogger('pyclaw.io') +logger = logging.getLogger('pyclaw.fileio') # Import appropriate hdf5 package use_h5py = False diff --git a/src/pyclaw/fileio/netcdf.py b/src/pyclaw/fileio/netcdf.py index 1ba492d7b..68083ac3c 100644 --- a/src/pyclaw/fileio/netcdf.py +++ b/src/pyclaw/fileio/netcdf.py @@ -37,7 +37,7 @@ import six from six.moves import range -logger = logging.getLogger('pyclaw.io') +logger = logging.getLogger('pyclaw.fileio') # Import appropriate netcdf package use_netcdf4 = False diff --git a/src/pyclaw/fileio/setup.py b/src/pyclaw/fileio/setup.py index d22824682..0ae91d5bc 100644 --- a/src/pyclaw/fileio/setup.py +++ b/src/pyclaw/fileio/setup.py @@ -3,7 +3,7 @@ from __future__ import absolute_import def configuration(parent_package='',top_path=None): from numpy.distutils.misc_util import Configuration - config = Configuration('io', parent_package, top_path) + config = Configuration('fileio', parent_package, top_path) return config if __name__ == '__main__': diff --git a/src/pyclaw/log.config b/src/pyclaw/log.config index 854a6d938..1e0971854 100644 --- a/src/pyclaw/log.config +++ b/src/pyclaw/log.config @@ -42,7 +42,7 @@ parent=(pyclaw) [logger_io] level=NOTSET propagate=0 -qualname=pyclaw.io +qualname=pyclaw.fileio handlers=file channel=io parent=(pyclaw) diff --git a/src/pyclaw/solution.py b/src/pyclaw/solution.py index b761cb37f..9a9c19e81 100755 --- a/src/pyclaw/solution.py +++ b/src/pyclaw/solution.py @@ -298,7 +298,7 @@ def write(self,frame,path='./',file_format='ascii',file_prefix=None, write_aux=write_aux,options=options, write_p=write_p) msg = "Wrote out solution in format %s for time t=%s" % (form,self.t) - logging.getLogger('pyclaw.io').info(msg) + logging.getLogger('pyclaw.fileio').info(msg) def read(self, frame, path='./_output', file_format='ascii',