Skip to content
This repository has been archived by the owner on Jan 10, 2023. It is now read-only.

Clean up bad syntax #148

Merged
merged 1 commit into from
Aug 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 1 addition & 7 deletions src/auxkernels/PikaCriteria.C
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,13 @@ InputParameters validParams<PikaCriteria>()
params += validParams<PropertyUserObjectInterface>();

// Controls which type of AuxKernel calculation if performed
MooseEnum criteria("ice=0, air=1, vapor=2, velocity=3, time=4");
MooseEnum criteria("ice=0 air=1 vapor=2 velocity=3x time=4");
params.addParam<MooseEnum>("criteria", criteria, "Select the type of criteria to compute, see Eqs. (43), (45), and (47)");
params.addParam<bool>("use_temporal_scaling", false, "Temporally scale this Kernel with a value specified in PikaMaterials");

// Temporal scaling
params.addParam<Real>("estimated_pore_size", 10e-4, "Estimated pore size for time criterial (m); ; only need with 'criteria = time'");
params.addCoupledVar("interface_velocity", 3.2e-10, "The name of the variable containing the interface velocity; only need with 'criteria = time | velocity'. Default: 3.2e-10 m/s");

// These terms are not used, CoefficientKernelIntrface for temporal scaling of rho_i
params.suppressParameter<Real>("offset");
params.suppressParameter<Real>("scale");
params.suppressParameter<Real>("coefficient");
params.suppressParameter<std::string>("property");
return params;
}

Expand Down
2 changes: 1 addition & 1 deletion src/kernels/IbexShortwaveForcingFunction.C
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ InputParameters validParams<IbexShortwaveForcingFunction>()
params.addParam<Real>("vis_extinction", 40, "Extinction coefficient in visible (VIS) wavelengths (300-800 nm) [1/m]");
params.addParam<Real>("nir_extinction", 110, "Extinction coefficient in near-infrared (NIR) wavelenghts (800-1500 nm) [1/m]");

MooseEnum direction("x=0, y=1, z=2", "y");
MooseEnum direction("x=0 y=1 z=2", "y");
params.addParam<MooseEnum>("direction", direction, "Direction to apply the extinction function");
return params;
}
Expand Down