From 646c2c0a4ca089923a9c7f81e5b6a979579893dc Mon Sep 17 00:00:00 2001 From: Paul Talbot Date: Fri, 29 Apr 2022 11:07:41 -0600 Subject: [PATCH] vargroups in rrr dataobjects (#1823) --- ravenframework/BaseClasses/BaseEntity.py | 3 ++- .../framework/CodeInterfaceTests/RAVEN/ROM/ext_dataobjects.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ravenframework/BaseClasses/BaseEntity.py b/ravenframework/BaseClasses/BaseEntity.py index c873b79b5b..b39b1a30b7 100644 --- a/ravenframework/BaseClasses/BaseEntity.py +++ b/ravenframework/BaseClasses/BaseEntity.py @@ -21,7 +21,7 @@ Split from original BaseClasses.py module """ -from ..utils import mathUtils +from ..utils import mathUtils, xmlUtils from .BaseType import BaseType class BaseEntity(BaseType): @@ -83,6 +83,7 @@ def readXML(self, xmlNode, variableGroups=None, globalAttributes=None): @ Out, None """ self.variableGroups = variableGroups if variableGroups is not None else {} + xmlUtils.replaceVariableGroups(xmlNode, self.variableGroups) if 'name' in xmlNode.attrib.keys(): self.name = xmlNode.attrib['name'] else: diff --git a/tests/framework/CodeInterfaceTests/RAVEN/ROM/ext_dataobjects.xml b/tests/framework/CodeInterfaceTests/RAVEN/ROM/ext_dataobjects.xml index 547f6d322b..b47d460661 100644 --- a/tests/framework/CodeInterfaceTests/RAVEN/ROM/ext_dataobjects.xml +++ b/tests/framework/CodeInterfaceTests/RAVEN/ROM/ext_dataobjects.xml @@ -24,7 +24,7 @@ - DeltaTimeScramToAux,DG1recoveryTime + GRO_targets CladTempThreshold,time