Skip to content

Commit

Permalink
Remove code
Browse files Browse the repository at this point in the history
  • Loading branch information
thorbjoernl committed Apr 30, 2024
1 parent 9b0e0cc commit 114bf89
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 167 deletions.
24 changes: 0 additions & 24 deletions pyaerocom/griddeddata.py
Original file line number Diff line number Diff line change
Expand Up @@ -1346,12 +1346,6 @@ def _apply_vert_scheme(self, sample_points, vert_scheme):
vert_index = self._infer_index_surface_level()
return self[:, :, :, vert_index]
elif vert_scheme == "altitude":
if not "altitude" in [sp[0] for sp in sample_points]:
raise ValueError(
"Require altitude specification in sample points for vert_scheme altitude"
)
if not self.check_altitude_access():
raise DataDimensionError("Cannot access altitude information")
raise NotImplementedError(
"Cannot yet retrieve timeseries at altitude levels. Coming soon..."
)
Expand All @@ -1371,24 +1365,6 @@ def _apply_vert_scheme(self, sample_points, vert_scheme):
f"Cannot yet retrieve timeseries from 4D data for vert_scheme {vert_scheme}."
)

def check_altitude_access(self):
"""Checks if altitude levels can be accessed
Returns
-------
bool
True, if altitude access is provided, else False
"""
return self.altitude_access.check_altitude_access()

def get_altitude(self, **coords):
"""Extract (or try to compute) altitude values at input coordinates"""
if not isinstance(self._altitude_access, AltitudeAccess):
self.check_altitude_access()
self._altitude_access.get_altitude(**coords)
raise NotImplementedError("Coming soon...")

def extract_surface_level(self):
"""Extract surface level from 4D field"""
if not self.ndim == 4:
Expand Down
38 changes: 0 additions & 38 deletions pyaerocom/vert_coords.py
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,6 @@ def __init__(self, gridded_data):
self.data_obj = gridded_data
self._subset1d = None
self._checked_and_failed = []
self._has_access = False
self.logger = logger

def __setitem__(self, key, val):
Expand All @@ -275,19 +274,6 @@ def __getitem__(self, key):
def __contains__(self, key):
return True if key in self.__dict__ else False

@property
def has_access(self) -> bool:
"""Boolean specifying whether altitudes can be accessed
Note
----
Performs access check using :func:`check_altitude_access` if access
flag is False
"""
if not self._has_access:
self._has_access = self.check_altitude_access()
return self._has_access

@property
def coord_list(self):
"""List of AeroCom coordinate names for altitude access"""
Expand Down Expand Up @@ -343,27 +329,3 @@ def search_aux_coords(self, coord_list) -> bool:
def reader(self):
"""Instance of :class:`ReadGridded`"""
return self.data_obj.reader

def _check_vars_in_data_obj(self):
for var in self.ADD_FILE_VARS:
try:
self._check_var_in_data_obj(var_name=var)
return var
except Exception:
pass
raise VariableNotFoundError()

# ToDo: check alias names
def _check_var_in_data_obj(self, var_name):
c = VerticalCoordinate(var_name)

if c.var_name in self.data_obj:
self[var_name] = self.data_obj[var_name]
self._verify_altitude_access()
elif var_name in c.STANDARD_NAMES:
std_name = c.STANDARD_NAMES[var_name]
if std_name in self.data_obj:
self[var_name] = self.data_obj[std_name]

def get_altitude(self, latitude, longitude):
raise NotImplementedError
91 changes: 0 additions & 91 deletions test.py

This file was deleted.

14 changes: 0 additions & 14 deletions tests/test_vert_coords.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,20 +142,6 @@ def test_AltitudeAccess_exceptions():
AltitudeAccess(None)


def test_AltitudeAccess_get_altitude(alt: AltitudeAccess):
with pytest.raises(NotImplementedError):
alt.get_altitude(None, None)


@lustre_unavail
@pytest.mark.xfail
# TODO: This test is currently failing because of a ValueError caused by
# a variable name containing an underscore. This seems like an unrelated
# issue to me, so I have marked it xfail for now.
def test_AltitudeAccess_check_access(alt: AltitudeAccess):
assert alt.check_altitude_access()


def test_AltitudeAccess_search_aux_coords(alt: AltitudeAccess):
with pytest.raises(CoordinateNameError):
alt.search_aux_coords(["gkjfdshglk"])
Expand Down

0 comments on commit 114bf89

Please sign in to comment.