From 2e1cb60772dd333b2ee6c2ac4075fab7b0a94904 Mon Sep 17 00:00:00 2001
From: Gareth Tribello <gt@eider.phy.qub.ac.uk>
Date: Tue, 28 Feb 2017 08:57:02 +0000
Subject: [PATCH] Removed problem that might cause race conditions for grid
vessel.
---
regtest/dimred/rt-mds/config | 2 +-
regtest/dimred/rt-mds2/config | 2 +-
regtest/dimred/rt-pca-2/config | 1 +
regtest/dimred/rt-pca-osample/config | 1 +
regtest/dimred/rt-pca/config | 1 +
regtest/dimred/rt-smap-osample/config | 1 +
regtest/dimred/rt-smap-pointwise/config | 1 +
regtest/dimred/rt-smap-read/config | 1 +
regtest/dimred/rt-smap-smacof/config | 1 +
regtest/dimred/rt-smap1/config | 1 +
regtest/dimred/rt-store-histo/config | 1 +
src/gridtools/GridVessel.cpp | 4 ++--
12 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/regtest/dimred/rt-mds/config b/regtest/dimred/rt-mds/config
index 57d886c44..4732f4939 100644
--- a/regtest/dimred/rt-mds/config
+++ b/regtest/dimred/rt-mds/config
@@ -1,2 +1,2 @@
type=simplemd
-
+plumed_modules=dimred
diff --git a/regtest/dimred/rt-mds2/config b/regtest/dimred/rt-mds2/config
index 57d886c44..4732f4939 100644
--- a/regtest/dimred/rt-mds2/config
+++ b/regtest/dimred/rt-mds2/config
@@ -1,2 +1,2 @@
type=simplemd
-
+plumed_modules=dimred
diff --git a/regtest/dimred/rt-pca-2/config b/regtest/dimred/rt-pca-2/config
index ef0169fdf..5d3bd9028 100644
--- a/regtest/dimred/rt-pca-2/config
+++ b/regtest/dimred/rt-pca-2/config
@@ -1,2 +1,3 @@
type=driver
+plumed_modules=dimred
arg="--plumed plumed.dat --ixyz diala_traj_nm.xyz"
diff --git a/regtest/dimred/rt-pca-osample/config b/regtest/dimred/rt-pca-osample/config
index ef0169fdf..5d3bd9028 100644
--- a/regtest/dimred/rt-pca-osample/config
+++ b/regtest/dimred/rt-pca-osample/config
@@ -1,2 +1,3 @@
type=driver
+plumed_modules=dimred
arg="--plumed plumed.dat --ixyz diala_traj_nm.xyz"
diff --git a/regtest/dimred/rt-pca/config b/regtest/dimred/rt-pca/config
index ef0169fdf..5d3bd9028 100644
--- a/regtest/dimred/rt-pca/config
+++ b/regtest/dimred/rt-pca/config
@@ -1,2 +1,3 @@
type=driver
+plumed_modules=dimred
arg="--plumed plumed.dat --ixyz diala_traj_nm.xyz"
diff --git a/regtest/dimred/rt-smap-osample/config b/regtest/dimred/rt-smap-osample/config
index bc4e14b1c..8bb5f26c4 100644
--- a/regtest/dimred/rt-smap-osample/config
+++ b/regtest/dimred/rt-smap-osample/config
@@ -1,3 +1,4 @@
type=driver
+plumed_modules=dimred
# this is to test a different name
arg="--plumed plumed.dat --noatoms"
diff --git a/regtest/dimred/rt-smap-pointwise/config b/regtest/dimred/rt-smap-pointwise/config
index bc4e14b1c..8bb5f26c4 100644
--- a/regtest/dimred/rt-smap-pointwise/config
+++ b/regtest/dimred/rt-smap-pointwise/config
@@ -1,3 +1,4 @@
type=driver
+plumed_modules=dimred
# this is to test a different name
arg="--plumed plumed.dat --noatoms"
diff --git a/regtest/dimred/rt-smap-read/config b/regtest/dimred/rt-smap-read/config
index bc4e14b1c..8bb5f26c4 100644
--- a/regtest/dimred/rt-smap-read/config
+++ b/regtest/dimred/rt-smap-read/config
@@ -1,3 +1,4 @@
type=driver
+plumed_modules=dimred
# this is to test a different name
arg="--plumed plumed.dat --noatoms"
diff --git a/regtest/dimred/rt-smap-smacof/config b/regtest/dimred/rt-smap-smacof/config
index bc4e14b1c..8bb5f26c4 100644
--- a/regtest/dimred/rt-smap-smacof/config
+++ b/regtest/dimred/rt-smap-smacof/config
@@ -1,3 +1,4 @@
type=driver
+plumed_modules=dimred
# this is to test a different name
arg="--plumed plumed.dat --noatoms"
diff --git a/regtest/dimred/rt-smap1/config b/regtest/dimred/rt-smap1/config
index bc4e14b1c..8bb5f26c4 100644
--- a/regtest/dimred/rt-smap1/config
+++ b/regtest/dimred/rt-smap1/config
@@ -1,3 +1,4 @@
type=driver
+plumed_modules=dimred
# this is to test a different name
arg="--plumed plumed.dat --noatoms"
diff --git a/regtest/dimred/rt-store-histo/config b/regtest/dimred/rt-store-histo/config
index f93ec1a97..114e81025 100644
--- a/regtest/dimred/rt-store-histo/config
+++ b/regtest/dimred/rt-store-histo/config
@@ -1,3 +1,4 @@
type=driver
+plumed_modules=dimred
# this is to test a different name
arg="--plumed plumed.dat --ixyz trajectory.xyz"
diff --git a/src/gridtools/GridVessel.cpp b/src/gridtools/GridVessel.cpp
index 97661dd84..a1a985bb3 100644
--- a/src/gridtools/GridVessel.cpp
+++ b/src/gridtools/GridVessel.cpp
@@ -213,8 +213,8 @@ void GridVessel::getSplineNeighbors( const unsigned& mybox, unsigned& nneighbors
if( mysneigh.size()!=nneigh ) mysneigh.resize(nneigh);
unsigned inind; nneighbors = 0;
- static std::vector<unsigned> tmp_indices( dimension );
- static std::vector<unsigned> my_indices( dimension );
+ std::vector<unsigned> tmp_indices( dimension );
+ std::vector<unsigned> my_indices( dimension );
getIndices( mybox, my_indices );
for(unsigned i=0;i<nneigh;++i){
unsigned tmp=i; inind=0;
--
GitLab