merging david's changes

c97sr · Mar 29, 2020 · 3d94a3a · 3d94a3a
1 parent 70328b4
commit 3d94a3a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/scenarios/ebola/both_run.in b/scenarios/ebola/both_run.in
@@ -61,7 +61,7 @@
 
 [Contact tracing and vaccination]			
 	Start_Time_Contact_Tracing	1	999
-	Start_Time_Self_Isolation	1	999
+	Start_Time_Self_Isolation	1	999g
 	Vaccine_Probability_Susceptible	1	0.95
 	Latent_Vaccinated_One_Minimum_Time	1	5
 	Latent_Vaccinated_One_Maximum_Time	1	7

diff --git a/scenarios/ebola/both_setup.in b/scenarios/ebola/both_setup.in
@@ -2,7 +2,7 @@
 	dblHexagonWidth	1	0.001	[radians]
 	intNoMaximalNodes	1	1
 	dblMaxSpatialNeighbours	1	100
-	blNetworkDumpFile	0	FALSE
+	blNetworkDumpFile	0	TRUE
 	intBlockSizeInUnitsOfPointers	1	4096
 
 [Household setup]			
@@ -13,7 +13,7 @@
 [Workplace setup]			
 	dblPropColleguesInNetwork	1	0.1
 	dblAverageWorkplaceSize	1	1000
-	strWorkplaceDensityFile	0 	../../data/bikoroSmallAscii.asc [../data/Uniform_0_to_199]
+	strWorkplaceDensityFile	0       ../../data/bikoroSmallAscii.asc [../data/Uniform_0_to_199]
 	dblDistanceAllWorkplacesHistDx	1	10
 	dblDistanceAllWorkplacesGridDx	1	5
 	intMCMCMaxSamplesInMillions	1	0