Skip to content

Commit be3cef7

Browse files
ignore RedefinitionError in get_unit_registry
1 parent 964752f commit be3cef7

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

src/geophires_x/Units.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,26 @@
11
# copyright, 2023, Malcolm I Ross
2+
import logging
23
from enum import IntEnum, Enum, auto
34
from typing import Any
45

56
import pint
67
import os
78

9+
from pint import RedefinitionError
10+
811
_UREG = None
912

13+
_log = logging.getLogger(__name__)
14+
1015

1116
def get_unit_registry():
1217
global _UREG
1318
if _UREG is None:
1419
_UREG = pint.get_application_registry()
15-
_UREG.load_definitions(os.path.join(os.path.abspath(os.path.dirname(__file__)), 'GEOPHIRES3_newunits.txt'))
20+
try:
21+
_UREG.load_definitions(os.path.join(os.path.abspath(os.path.dirname(__file__)), 'GEOPHIRES3_newunits.txt'))
22+
except RedefinitionError as rde:
23+
_log.warning(f'Encountered RedefinitionError when attempting to load unit definitions: {rde}')
1624

1725
return _UREG
1826

0 commit comments

Comments
 (0)