Changes in src/Actions/FillAction/SuspendInMoleculeAction.def [aa55d0:2440ce]

File:

• src/Actions/FillAction/SuspendInMoleculeAction.def (modified) (2 diffs)

src/Actions/FillAction/SuspendInMoleculeAction.def

@@ -17 +17 @@
 #include "Parameters/Validators/RangeValidator.hpp"
 #include "Parameters/Validators/STLVectorValidator.hpp"
+#include "Parameters/Validators/Ops_Validator.hpp"
 #include "Parameters/Validators/Specific/BoxLengthValidator.hpp"
 #include "Parameters/Validators/Specific/VectorZeroOneComponentsValidator.hpp"
@@ -25 +26 @@
 #define paramtypes (double)(double)(double)(double)(bool)
 #define paramtokens ("density")("min-distance")("random-atom-displacement")("random-molecule-displacement")("DoRotate")
-#define paramdescriptions ("desired density for the total domain")("minimum distance of water molecules to present atoms")("magnitude of random atom displacement")("magnitude of random molecule displacement")("whether to rotate or not")
+#define paramdescriptions ("desired density for the total domain, unequal 1.")("minimum distance of water molecules to present atoms")("magnitude of random atom displacement")("magnitude of random molecule displacement")("whether to rotate or not")
 #define paramdefaults (PARAM_DEFAULT(1.))(PARAM_DEFAULT(1.))(PARAM_DEFAULT(0.))(PARAM_DEFAULT(0.))(PARAM_DEFAULT(false))
 #define paramreferences (density)(mindistance)(RandAtomDisplacement)(RandMoleculeDisplacement)(DoRotate)
 #define paramvalids \
-(RangeValidator< double >(0., std::numeric_limits<double>::max())) \
+(RangeValidator< double >(0., 1. - std::numeric_limits<double>::epsilon()) || RangeValidator< double >(1. + std::numeric_limits<double>::epsilon(), std::numeric_limits<double>::max())) \
 (BoxLengthValidator()) \
 (BoxLengthValidator()) \