From 206896f81a1d473488bbcb2307b98f704224df67 Mon Sep 17 00:00:00 2001 From: Ben Haller Date: Tue, 15 Aug 2023 15:01:08 -0400 Subject: [PATCH] final per-task values for sorting --- EidosScribe/EidosHelpFunctions.rtf | 6 ++++++ QtSLiM/help/EidosHelpFunctions.html | 3 +++ eidos/eidos_globals.cpp | 12 ++++++------ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/EidosScribe/EidosHelpFunctions.rtf b/EidosScribe/EidosHelpFunctions.rtf index b93aa2b7..6284c683 100644 --- 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 index 673bf6c9..6dc93de0 100644 --- a/QtSLiM/help/EidosHelpFunctions.html +++ b/QtSLiM/help/EidosHelpFunctions.html @@ -605,6 +605,9 @@ "FITNESS_SEX_2" fitness eval, sexual, no fitnessScaling or mutations
"FITNESS_SEX_3" fitness eval, sexual, fitnessScaling and mutations
"MIGRANT_CLEAR" clearing the migrant property at tick end
+"SIMPLIFY_SORT_PRE" preparation for simplification sorting (internal)
+"SIMPLIFY_SORT" simplification sorting
+"SIMPLIFY_SORT_POST" cleanup after simplification sorting (internal)
"PARENTS_CLEAR" clearing parental genomes at tick end in WF models
"UNIQUE_MUTRUNS" uniquing mutation runs (internal bookkeeping)
"SURVIVAL" survival evaluation (no callbacks)

diff --git a/eidos/eidos_globals.cpp b/eidos/eidos_globals.cpp index be260e15..3c3f6787 100644 --- 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;