final per-task values for sorting

MesserLab · Aug 15, 2023 · 206896f · 206896f
1 parent 1a312aa
commit 206896f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/EidosScribe/EidosHelpFunctions.rtf b/EidosScribe/EidosHelpFunctions.rtf
@@ -6063,6 +6063,12 @@ The task keys recognized, and the tasks they govern, are:\
 \f3\fs20 clearing the 
 \f1\fs18 migrant
 \f3\fs20  property at tick end
+\f1\fs18 \uc0\u8232 "SIMPLIFY_SORT_PRE"	
+\f3\fs20 preparation for simplification sorting (internal)
+\f1\fs18 \uc0\u8232 "SIMPLIFY_SORT"	
+\f3\fs20 simplification sorting
+\f1\fs18 \uc0\u8232 "SIMPLIFY_SORT_POST"	
+\f3\fs20 cleanup after simplification sorting (internal)
 \f1\fs18 \uc0\u8232 "PARENTS_CLEAR"	
 \f3\fs20 clearing parental genomes at tick end in WF models
 \f1\fs18 \uc0\u8232 "UNIQUE_MUTRUNS"	

diff --git a/QtSLiM/help/EidosHelpFunctions.html b/QtSLiM/help/EidosHelpFunctions.html
@@ -605,6 +605,9 @@
 "FITNESS_SEX_2"<span class="Apple-tab-span">	</span></span>fitness eval, sexual, no <span class="s2">fitnessScaling</span> or mutations<span class="s2"><br>
 "FITNESS_SEX_3"<span class="Apple-tab-span">	</span></span>fitness eval, sexual, <span class="s2">fitnessScaling</span> and mutations<span class="s2"><br>
 "MIGRANT_CLEAR"<span class="Apple-tab-span">	</span></span>clearing the <span class="s2">migrant</span> property at tick end<span class="s2"><br>
+"SIMPLIFY_SORT_PRE"<span class="Apple-tab-span">	</span></span>preparation for simplification sorting (internal)<span class="s2"><br>
+"SIMPLIFY_SORT"<span class="Apple-tab-span">	</span></span>simplification sorting<span class="s2"><br>
+"SIMPLIFY_SORT_POST"<span class="Apple-tab-span">	</span></span>cleanup after simplification sorting (internal)<span class="s2"><br>
 "PARENTS_CLEAR"<span class="Apple-tab-span">	</span></span>clearing parental genomes at tick end in WF models<span class="s2"><br>
 "UNIQUE_MUTRUNS"<span class="Apple-tab-span">	</span></span>uniquing mutation runs (internal bookkeeping)<span class="s2"><br>
 "SURVIVAL"<span class="Apple-tab-span">	</span></span>survival evaluation (no callbacks)</p>

diff --git a/eidos/eidos_globals.cpp b/eidos/eidos_globals.cpp
@@ -643,9 +643,9 @@ void _Eidos_SetOpenMPThreadCounts(EidosPerTaskThreadCounts per_task_thread_count
 		gEidos_OMP_threads_FITNESS_SEX_2 = 8;
 		gEidos_OMP_threads_FITNESS_SEX_3 = 2;
 		gEidos_OMP_threads_MIGRANT_CLEAR = 4;
-		gEidos_OMP_threads_SIMPLIFY_SORT_PRE = 16;	// needs revision
-		gEidos_OMP_threads_SIMPLIFY_SORT = 16;		// needs revision
-		gEidos_OMP_threads_SIMPLIFY_SORT_POST = 16;	// needs revision
+		gEidos_OMP_threads_SIMPLIFY_SORT_PRE = 8;
+		gEidos_OMP_threads_SIMPLIFY_SORT = 16;
+		gEidos_OMP_threads_SIMPLIFY_SORT_POST = 6;
 		gEidos_OMP_threads_PARENTS_CLEAR = 16;
 		gEidos_OMP_threads_UNIQUE_MUTRUNS = 16;
 		gEidos_OMP_threads_SURVIVAL = 16;
@@ -782,9 +782,9 @@ void _Eidos_SetOpenMPThreadCounts(EidosPerTaskThreadCounts per_task_thread_count
 		gEidos_OMP_threads_FITNESS_SEX_2 = 40;
 		gEidos_OMP_threads_FITNESS_SEX_3 = 5;
 		gEidos_OMP_threads_MIGRANT_CLEAR = 20;
-		gEidos_OMP_threads_SIMPLIFY_SORT_PRE = 40;	// needs revision
-		gEidos_OMP_threads_SIMPLIFY_SORT = 40;		// needs revision
-		gEidos_OMP_threads_SIMPLIFY_SORT_POST = 40;	// needs revision
+		gEidos_OMP_threads_SIMPLIFY_SORT_PRE = 20;
+		gEidos_OMP_threads_SIMPLIFY_SORT = 40;
+		gEidos_OMP_threads_SIMPLIFY_SORT_POST = 40;
 		gEidos_OMP_threads_PARENTS_CLEAR = 40;
 		gEidos_OMP_threads_UNIQUE_MUTRUNS = 40;
 		gEidos_OMP_threads_SURVIVAL = 40;