Skip to content
Snippets Groups Projects
Commit 4cc921a4 authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge remote-tracking branch 'origin/master'

parents 1e14a0b2 7d595d92
No related branches found
No related tags found
No related merge requests found
......@@ -27,5 +27,7 @@ Changes from version 2.0 which are relevant for developers:
- Improved class Communicator. Many operations can now be done directly on Vectors, Tensors, std::vector and PLMD::Matrix.
- Patches for GPL codes (QuantumEspresso and Gromacs) now also include
original code so as to simplify their modification.
- Fixed dependencies among actions such that it is now possible (and reliable)
to use MPI calls inside Action::prepare()
*/
......@@ -121,7 +121,7 @@ void Action::parseFlag(const std::string&key,bool & t){
}
void Action::addDependency(Action*action){
after.insert(action);
after.push_back(action);
}
void Action::activate(){
......
......@@ -72,7 +72,7 @@ class Action
std::vector<std::string> line;
public:
typedef std::set<Action*> Dependencies;
typedef std::vector<Action*> Dependencies;
private:
/// Actions on which this Action depends.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment