added re-initialization of HostsQuarantine back into InitModel() whic…

…h fixes regression tests
mrc-ide · Jun 25, 2020 · e8f7864 · e8f7864
1 parent 7124e8c
commit e8f7864
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/CovidSim.cpp b/src/CovidSim.cpp
@@ -2473,7 +2473,7 @@ void InitModel(int run) // passing run number so we can save run number in the i
 					StateT[Thread].cumInf_age_adunit [AgeGroup][Adunit] = 0;
 				}
 
-
+	std::fill(HostsQuarantine.begin(), HostsQuarantine.end(), PersonQuarantine());
 #pragma omp parallel for schedule(static,1) default(none) \
 		shared(P, Hosts)
 	for (int tn = 0; tn < P.NumThreads; tn++)

diff --git a/src/SetupModel.cpp b/src/SetupModel.cpp
@@ -1065,7 +1065,7 @@ void SetupPopulation(std::string const& density_file, std::string const& out_den
 	i2 = 0;
 
 	Hosts = (Person*)Memory::xcalloc(P.PopSize, sizeof(Person));
-	HostsQuarantine = std::vector<PersonQuarantine>(P.PopSize);
+	HostsQuarantine = std::vector<PersonQuarantine>(P.PopSize, PersonQuarantine());
 	fprintf(stderr, "sizeof(Person)=%i\n", (int) sizeof(Person));
 	for (int i = 0; i < P.NCP; i++)
 	{