Fix initialisation of vector transmission model where multiple specie…

…s are present. This appears to be quite significant in some tests!
SwissTPH · Jul 5, 2015 · 84ecb75 · 84ecb75
1 parent 35d99a1
commit 84ecb75
Show file tree

Hide file tree

Showing 12 changed files with 60,694 additions and 60,693 deletions.
diff --git a/model/Transmission/VectorModel.cpp b/model/Transmission/VectorModel.cpp
@@ -334,7 +334,8 @@ SimTime VectorModel::initIterate () {
 
     bool needIterate = false;
     for (size_t i = 0; i < numSpecies; ++i) {
-        needIterate = needIterate || species[i].initIterate ();
+        bool result = species[i].initIterate ();        // run for all species
+        needIterate = needIterate || result;    // set true if any species requires another iteration
     }
     if( needIterate == false ){
         initIterations = -1;

diff --git a/test/expected/ctsoutMSAT.txt b/test/expected/ctsoutMSAT.txt
diff --git a/test/expected/ctsoutNoInterv.txt b/test/expected/ctsoutNoInterv.txt
diff --git a/test/expected/ctsoutNoMPDLarviciding.txt b/test/expected/ctsoutNoMPDLarviciding.txt
diff --git a/test/expected/ctsoutSimpleMPDLarviciding.txt b/test/expected/ctsoutSimpleMPDLarviciding.txt
diff --git a/test/expected/ctsoutVecFullTest.txt b/test/expected/ctsoutVecFullTest.txt