diff --git a/gusto/__init__.py b/gusto/__init__.py index b31ea8ee9..12116eed0 100644 --- a/gusto/__init__.py +++ b/gusto/__init__.py @@ -13,6 +13,9 @@ def perp(self, o, a): _monkey_patch_ufl() +# Start logging first, incase anything goes wrong +from gusto.logging import * # noqa + from gusto.active_tracers import * # noqa from gusto.common_forms import * # noqa from gusto.configuration import * # noqa @@ -27,7 +30,6 @@ def perp(self, o, a): from gusto.labels import * # noqa from gusto.limiters import * # noqa from gusto.linear_solvers import * # noqa -from gusto.logging import * # noqa from gusto.meshes import * # noqa from gusto.numerical_integrator import * # noqa from gusto.physics import * # noqa diff --git a/gusto/configuration.py b/gusto/configuration.py index 66dc37ad1..4bf3b8b2b 100644 --- a/gusto/configuration.py +++ b/gusto/configuration.py @@ -2,7 +2,6 @@ from abc import ABCMeta, abstractproperty from enum import Enum from firedrake import sqrt, Constant -from gusto.logging import logger __all__ = [ diff --git a/gusto/timeloop.py b/gusto/timeloop.py index 753f5c140..3f73913b1 100644 --- a/gusto/timeloop.py +++ b/gusto/timeloop.py @@ -5,6 +5,7 @@ from pyop2.profiling import timed_stage from gusto.equations import PrognosticEquationSet from gusto.fml import drop, Label, Term +from gusto.fields import TimeLevelFields, StateFields from gusto.forcing import Forcing from gusto.labels import ( transport, diffusion, time_derivative, linearisation, prognostic,