Skip to content

Commit

Permalink
fixes issues the enum error that was produced when running 2D bubble…
Browse files Browse the repository at this point in the history
… problem (refs idaholab#109)
  • Loading branch information
micahjohnson150 committed Feb 9, 2015
1 parent 1aab10c commit 66ecfc9
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ traceout*.txt
*.png
.depend
*.tar
*Revision.h
.ipynb_checkpoints/
doc/doxygen/html/
*.#*
Expand Down
4 changes: 2 additions & 2 deletions src/actions/PikaCriteriaAction.C
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ PikaCriteriaAction::createAction(const std::string & type, const std::string & n
var_name << "_pika_" << name << "_aux";
InputParameters & object_params = action->getObjectParams();
object_params.set<AuxVariableName>("variable") = var_name.str();
object_params.set<std::vector<MooseEnum> >("execute_on")[0] = "timestep";
object_params.set<MultiMooseEnum>("execute_on") = "timestep_end";
// object_params.set<bool>("use_temporal_scaling") = getParam<bool>("use_temporal_scaling");
object_params.set<Real>("coefficient") = 1.0;
object_params.applyParameters(_pars);
Expand Down Expand Up @@ -171,7 +171,7 @@ PikaCriteriaAction::addPostprocessorAction(const std::string & name, const std::
MooseSharedPointer<MooseObjectAction> action = MooseSharedNamespace::static_pointer_cast<MooseObjectAction>
(_action_factory.create("AddPostprocessorAction", long_name.str(), action_params));
action->getObjectParams().set<VariableName>("variable") = var_name;
action->getObjectParams().set<std::vector<MooseEnum> >("execute_on")[0] = "timestep";
action->getObjectParams().set<MultiMooseEnum>("execute_on") = "timestep_end";

// Account for the differing types
if (id == 0)
Expand Down
2 changes: 1 addition & 1 deletion src/userobjects/PropertyUserObject.C
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ InputParameters validParams<PropertyUserObject>()
{
InputParameters params = validParams<GeneralUserObject>();
params += PropertyUserObject::objectParams();
params.suppressParameter<std::vector<MooseEnum> >("execute_on");
params.suppressParameter<MultiMooseEnum>("execute_on");
return params;
}

Expand Down

0 comments on commit 66ecfc9

Please sign in to comment.