Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

more flexible mangled names #1401

Merged
merged 4 commits into from
Mar 17, 2022
Merged

more flexible mangled names #1401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f5ae872
more flexible mingled names
weiyuan-jiang Mar 1, 2022
314dccd
change CHANGELOG.md
weiyuan-jiang Mar 1, 2022
c227975
removing "*" for pointer declaration
weiyuan-jiang Mar 1, 2022
7631796
Merge branch 'develop' into feature/wjiang/mingled_name
tclune Mar 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions Apps/MAPL_GridCompSpecs_ACG.py
View file
Open in desktop
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
View file
Open in desktop
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