Skip to content

Commit

Permalink
Merge pull request #1401 from GEOS-ESM/feature/wjiang/mingled_name
Browse files Browse the repository at this point in the history
more flexible mangled names
  • Loading branch information
mathomp4 authored Mar 17, 2022
2 parents 95b0906 + 7631796 commit 857ff5e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
11 changes: 3 additions & 8 deletions Apps/MAPL_GridCompSpecs_ACG.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,11 @@ def get_rank(self):

@staticmethod
def internal_name(name):
if name[-1] == '*':
return name[:-1]
else:
return name
return name.replace('*','')

@staticmethod
def mangled_name(name):
if name[-1] == '*':
return "'" + name[:-1] + "'//trim(comp_name)"
else:
return "'" + name + "'"
return "'" + name.replace("*","'//trim(comp_name)//'") + "'"

# Pointers must be declared regardless of COND status. Deactivated
# pointers should not be _referenced_ but such sections should still
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Replaced a wild card "*" in any position of a string in MAPL_GridCompSpecs_ACG.py
- Updated `MAPL_SunGetSolarConstantFromNRLFile` to open NRL Solar Table file only on root and broadcast the tables to all processes. Now all processes do interpolation.
- Add voting interpolation method as optional argument to SimpleBundleRead method

Expand Down

0 comments on commit 857ff5e

Please sign in to comment.