From 0c4cb7e5aeeed21996c22945bccb2cdec59aaaf0 Mon Sep 17 00:00:00 2001 From: Oliver Hahn Date: Sun, 13 Dec 2020 11:19:45 +0100 Subject: [PATCH] final polishing touches to PANPHASIA plugin as suggested by Adrian Jenkins --- src/plugins/random_panphasia.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/plugins/random_panphasia.cc b/src/plugins/random_panphasia.cc index 1244699..d40e36b 100644 --- a/src/plugins/random_panphasia.cc +++ b/src/plugins/random_panphasia.cc @@ -171,7 +171,7 @@ protected: { // if ngrid is not a multiple of i_base, then we need to enlarge and then sample down ngrid_ = pcf_->get_value("setup", "GridRes"); - int ngidminsize_panphasia = pcf_->get_value_safe("random", "PanphasiaMinRootResolution",512); + int ngridminsize_panphasia = pcf_->get_value_safe("random", "PanphasiaMinRootResolution",512); grid_p_ = pdescriptor_->i_base; @@ -180,15 +180,18 @@ protected: ngrid_panphasia_ = (1 << lextra_) * grid_p_; - if( ngrid_panphasia_ < ngidminsize_panphasia ){ + while( ngrid_panphasia_ < ngridminsize_panphasia ){ lextra_++; ngrid_panphasia_*=2; } - assert( ngrid_panphasia_ >= ngidminsize_panphasia); + assert( ngrid_panphasia_ >= ngridminsize_panphasia); + clear_panphasia_thread_states(); music::ilog.Print("PANPHASIA: using grid size %lld (level=%d)",ngrid_panphasia_, lextra_); + if (ngridminsize_panphasia<512) + music::ilog.Print("PANPHASIA WARNING: PanphasiaMinRootResolution = %d below minimum recommended of 512",ngridminsize_panphasia); music::ilog.Print("PANPHASIA: running with %d threads", num_threads_, ngrid_panphasia_ ); coordinate_system_shift_[0] = -pcf_->get_value_safe("setup", "shift_x", 0);