Skip to content

GitLab

"platforms/vscode:/vscode.git/clone" did not exist on "3a1936fda6959ae02fcd30695b8f25c2cdb50760"
Commit 0605ab4d authored by peastman's avatar peastman
Browse files

Merge pull request #496 from peastman/master 

Fixed some test failures
parents 1a94f435 fbbfe67a
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
platforms/cuda/tests/TestCudaCustomIntegrator.cpp
View file @ 0605ab4d
...@@ -292,6 +292,7 @@ void testWithThermostat() { ...@@ -292,6 +292,7 @@ void testWithThermostat() {
system.addForce(forceField); system.addForce(forceField);
AndersenThermostat* thermostat = new AndersenThermostat(temp, collisionFreq); AndersenThermostat* thermostat = new AndersenThermostat(temp, collisionFreq);
system.addForce(thermostat); system.addForce(thermostat);
integrator.setRandomNumberSeed(thermostat->getRandomNumberSeed());
Context context(system, integrator, platform); Context context(system, integrator, platform);
vector<Vec3> positions(numParticles); vector<Vec3> positions(numParticles);
for (int i = 0; i < numParticles; ++i) for (int i = 0; i < numParticles; ++i)
...@@ -424,6 +425,7 @@ void testParameter() { ...@@ -424,6 +425,7 @@ void testParameter() {
integrator.addGlobalVariable("temp", 0); integrator.addGlobalVariable("temp", 0);
integrator.addComputeGlobal("temp", "AndersenTemperature"); integrator.addComputeGlobal("temp", "AndersenTemperature");
integrator.addComputeGlobal("AndersenTemperature", "temp*2"); integrator.addComputeGlobal("AndersenTemperature", "temp*2");
integrator.setRandomNumberSeed(thermostat->getRandomNumberSeed());
Context context(system, integrator, platform); Context context(system, integrator, platform);
// See if the parameter is being used correctly. // See if the parameter is being used correctly.
......
platforms/opencl/tests/TestOpenCLCustomIntegrator.cpp
View file @ 0605ab4d
...@@ -292,6 +292,7 @@ void testWithThermostat() { ...@@ -292,6 +292,7 @@ void testWithThermostat() {
system.addForce(forceField); system.addForce(forceField);
AndersenThermostat* thermostat = new AndersenThermostat(temp, collisionFreq); AndersenThermostat* thermostat = new AndersenThermostat(temp, collisionFreq);
system.addForce(thermostat); system.addForce(thermostat);
integrator.setRandomNumberSeed(thermostat->getRandomNumberSeed());
Context context(system, integrator, platform); Context context(system, integrator, platform);
vector<Vec3> positions(numParticles); vector<Vec3> positions(numParticles);
for (int i = 0; i < numParticles; ++i) for (int i = 0; i < numParticles; ++i)
...@@ -424,6 +425,7 @@ void testParameter() { ...@@ -424,6 +425,7 @@ void testParameter() {
integrator.addGlobalVariable("temp", 0); integrator.addGlobalVariable("temp", 0);
integrator.addComputeGlobal("temp", "AndersenTemperature"); integrator.addComputeGlobal("temp", "AndersenTemperature");
integrator.addComputeGlobal("AndersenTemperature", "temp*2"); integrator.addComputeGlobal("AndersenTemperature", "temp*2");
integrator.setRandomNumberSeed(thermostat->getRandomNumberSeed());
Context context(system, integrator, platform); Context context(system, integrator, platform);
// See if the parameter is being used correctly. // See if the parameter is being used correctly.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment