From f5ae872b4f3082a07f956858f126819b15f08a8d Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Mon, 28 Feb 2022 20:09:10 -0500 Subject: [PATCH 1/3] more flexible mingled names --- Apps/MAPL_GridCompSpecs_ACG.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Apps/MAPL_GridCompSpecs_ACG.py b/Apps/MAPL_GridCompSpecs_ACG.py index b65e51d3a808..5f21e5bb8176 100755 --- a/Apps/MAPL_GridCompSpecs_ACG.py +++ b/Apps/MAPL_GridCompSpecs_ACG.py @@ -79,10 +79,7 @@ def internal_name(name): return name @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 From 314dccdf76adca00411ef15bf7039284123f6e14 Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Tue, 1 Mar 2022 08:56:36 -0500 Subject: [PATCH 2/3] change CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bc2f7908057..b85acdcefbac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,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. ### Removed From c2279757638d9a5229b6d911137d63c00edfc6b8 Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Tue, 1 Mar 2022 11:00:09 -0500 Subject: [PATCH 3/3] removing "*" for pointer declaration --- Apps/MAPL_GridCompSpecs_ACG.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Apps/MAPL_GridCompSpecs_ACG.py b/Apps/MAPL_GridCompSpecs_ACG.py index 5f21e5bb8176..990e4c63ee2a 100755 --- a/Apps/MAPL_GridCompSpecs_ACG.py +++ b/Apps/MAPL_GridCompSpecs_ACG.py @@ -73,10 +73,8 @@ 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): return "'" + name.replace("*","'//trim(comp_name)//'") + "'"