Skip to content

Commit

Permalink
fix multiple variable adding due to actions being double registered #…
Browse files Browse the repository at this point in the history
…1222

r11915
  • Loading branch information
friedmud authored and permcody committed Feb 14, 2014
1 parent 394ad9b commit 0414019
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 3 additions & 0 deletions framework/src/base/FEProblem.C
Original file line number Diff line number Diff line change
Expand Up @@ -874,6 +874,9 @@ FEProblem::addConstraint(const std::string & c_name, const std::string & name, I
void
FEProblem::addAuxVariable(const std::string & var_name, const FEType & type, const std::set< SubdomainID > * const active_subdomains/* = NULL*/)
{
if (_aux.hasVariable(var_name))
mooseError("Variable with name '" << var_name << "' already exists.");

_aux.addVariable(var_name, type, 1.0, active_subdomains);
if (_displaced_problem)
_displaced_problem->addAuxVariable(var_name, type, active_subdomains);
Expand Down
4 changes: 0 additions & 4 deletions gui/vtk/ExodusResultRenderWidget.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,6 @@ def setFileName(self, file_name):
var_name = self.data.GetCellData().GetArrayName(var_num)
self.current_variables.append(var_name)
components = self.data.GetCellData().GetVectors(var_name).GetNumberOfComponents()
print 'Elemental:',var_name
self.current_elemental_components[var_name] = components

self.mapper = vtk.vtkPolyDataMapper()
Expand Down Expand Up @@ -325,15 +324,12 @@ def _contourVariableSelected(self, value, force_update=False):
if not self.data.GetPointData().GetVectors(value_string) and not self.data.GetCellData().GetVectors(value_string):
return

print 'value:',value_string
print self.current_elemental_components
if value_string in self.current_nodal_components:
self.mapper.SetScalarModeToUsePointFieldData()
self.mapper.SetScalarRange(self.data.GetPointData().GetVectors(value_string).GetRange(-1))
self.clip_mapper.SetScalarModeToUsePointFieldData()
self.clip_mapper.SetScalarRange(self.data.GetPointData().GetVectors(value_string).GetRange(-1))
elif value_string in self.current_elemental_components:
print 'setting element value'
self.mapper.SetScalarModeToUseCellFieldData()
self.mapper.SetScalarRange(self.data.GetCellData().GetVectors(value_string).GetRange(-1))
self.clip_mapper.SetScalarModeToUseCellFieldData()
Expand Down

0 comments on commit 0414019

Please sign in to comment.