Skip to content

Commit

Permalink
Merge branch 'master' into merge_candidate
Browse files Browse the repository at this point in the history
  • Loading branch information
mcjamieson authored Jul 18, 2024
2 parents 35ca2b9 + 4560b8b commit a95f0bb
Show file tree
Hide file tree
Showing 11 changed files with 1,101 additions and 5,873 deletions.
7 changes: 4 additions & 3 deletions src/psyclone/domain/lfric/lfric_builtins.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
# Modified by R. W. Ford, N. Nobre and S. Siso, STFC Daresbury Lab

''' This module implements the support for 'built-in' operations in the
PSyclone LFRic (Dynamo 0.3) API. Each supported built-in is implemented
PSyclone LFRic API. Each supported built-in is implemented
as a different Python class, all inheriting from the LFRicBuiltIn class.
The LFRicBuiltInCallFactory creates the Python object required for
a given built-in call. '''
Expand Down Expand Up @@ -74,7 +74,7 @@ def get_lowercase_builtin_map(builtin_map_capitalised_dict):
:param builtin_map_capitalised_dict: a dictionary of built-in names.
:type builtin_map_capitalised_dict: dict of str
:returns: a dictionary of lowercase Fortran built-in names as keys \
:returns: a dictionary of lowercase Fortran built-in names as keys
and case-sensitive Python built-in names as values.
:rtype: dict of str
Expand Down Expand Up @@ -2459,7 +2459,8 @@ def metadata(cls):

def __str__(self):
return (f"Built-in: {self._case_name} (sign of "
f"{a_or_an(self._datatype)} {self._datatype}-valued field)")
f"{a_or_an(self._datatype)} {self._datatype}-valued field, "
f"applied to a scalar argument)")

def lower_to_language_level(self):
'''
Expand Down
193 changes: 0 additions & 193 deletions src/psyclone/tests/domain/lfric/builtins/int_to_real_x_test.py

This file was deleted.

Loading

0 comments on commit a95f0bb

Please sign in to comment.