From cec2acba0211b969055f24bfe79cbaa1c5480bc6 Mon Sep 17 00:00:00 2001 From: Blake Walters Date: Sat, 27 Jul 2019 15:17:01 -0400 Subject: [PATCH] Remove parallel options from DOSXYZnrc gui Remove the IPARALLEL and PARNUM inputs from the main window in the DOSXYZnrc gui. Those are really only relevant for parallel runs handled by the deprecated pprocess scripts. At any rate, access to these inputs via the gui never made much sense, because the script changes their value automatically, anyway! --- .../progs/gui/dosxyznrc/load_input2_nrc.tcl | 8 +-- .../gui/dosxyznrc/reset_parameters_nrc.tcl | 1 - .../gui/dosxyznrc/set_main_inputs_egsnrc.tcl | 61 +------------------ .../progs/gui/dosxyznrc/xyznrc_parameters.tcl | 17 ------ 4 files changed, 3 insertions(+), 84 deletions(-) diff --git a/HEN_HOUSE/omega/progs/gui/dosxyznrc/load_input2_nrc.tcl b/HEN_HOUSE/omega/progs/gui/dosxyznrc/load_input2_nrc.tcl index 997687afc..0d9cf3bd2 100644 --- a/HEN_HOUSE/omega/progs/gui/dosxyznrc/load_input2_nrc.tcl +++ b/HEN_HOUSE/omega/progs/gui/dosxyznrc/load_input2_nrc.tcl @@ -744,14 +744,10 @@ proc read_input {} { # 16, NRCYCL set data [get_val $data values $i] - # for 17, iparallel, ncpu is the value and 17 is on/off + # ncpu and parnum + # these inputs are no longer available through the GUI set data [get_val $data arr 0] set ncpu $arr(0) - if $ncpu>1 { - set values(17) $options(17,1) - } else { - set values(17) $options(17,0) - } # now for parnum set data [get_val $data arr 0] set parnum $arr(0) diff --git a/HEN_HOUSE/omega/progs/gui/dosxyznrc/reset_parameters_nrc.tcl b/HEN_HOUSE/omega/progs/gui/dosxyznrc/reset_parameters_nrc.tcl index be0eaaa1a..ae35ffd9e 100644 --- a/HEN_HOUSE/omega/progs/gui/dosxyznrc/reset_parameters_nrc.tcl +++ b/HEN_HOUSE/omega/progs/gui/dosxyznrc/reset_parameters_nrc.tcl @@ -202,7 +202,6 @@ proc reset_parameters { } { for {set i 15} {$i<=16} {incr i} { set values($i) {} } - set values(17) $options(17,0) set values(18) 1 #EGSnrc default values diff --git a/HEN_HOUSE/omega/progs/gui/dosxyznrc/set_main_inputs_egsnrc.tcl b/HEN_HOUSE/omega/progs/gui/dosxyznrc/set_main_inputs_egsnrc.tcl index 99ad90f54..ac6bc9834 100644 --- a/HEN_HOUSE/omega/progs/gui/dosxyznrc/set_main_inputs_egsnrc.tcl +++ b/HEN_HOUSE/omega/progs/gui/dosxyznrc/set_main_inputs_egsnrc.tcl @@ -359,7 +359,7 @@ proc edit_parameters {} { enable_dflag $isource # now 13 to 18 on right - foreach j { 13 14 15 18 16 17 } { + foreach j { 13 14 15 18 16 } { frame $w2.inp$j -bd 4 button $w2.inp$j.help -text "?" -command "help $j" label $w2.inp$j.label -text $names($j) -anchor w @@ -476,11 +476,6 @@ proc set_value {io iopt w} { .main_w.main.sim.right.inp16.inp configure -state disabled .main_w.main.sim.right.inp16.label configure -fg grey } - } elseif {$io==17} { - # iparallel - if running in parallel, get ncpu and parnum - set values($io) $options($io,$iopt) - $w configure -text $values($io) - set_parallel $iopt } elseif {$io==14} { # range rejection on/off set values($io) $options($io,$iopt) @@ -564,60 +559,6 @@ proc set_value {io iopt w} { } } -proc set_parallel { opt } { - global ncpu parnum helvfont ypad - - if {$opt==0} { - set parnum 0 - set ncpu 0 - } elseif {$opt==1} { - set top .main_w.parallel - toplevel $top - wm title $top "Run in parallel" - set text { -Enter the number of machines you will be distributing\ - the job among (NCPU). The section of the phase\ - space source that will be used for this one of the series\ - of input files (for the same total simulation) is given by - -(PARNUM-1)*(nshist/NCPU) < nnphsp <= PARNUM*(nshist/NCPU) - -where nshist is the total number of particles in the phase space\ - file and nnphsp is the number of the particle chosen for the\ - simulation. Thus, PARNUM should cover the range 1<=PARNUM<=NCPU. - -Note that if you are using NRC's pprocess script (along with NQS) to submit\ - parallel jobs, then NCPU and PARNUM (and IPARALLEL) are automatically\ - set and so need not be adjusted here. -} - message $top.mess -text $text -font $helvfont -width 500 - pack $top.mess -pady $ypad - frame $top.frm -bd 4 - frame $top.frm.ncpu - label $top.frm.ncpu.lab -text "NCPU" - entry $top.frm.ncpu.inp -bg white -textvariable ncpu - pack $top.frm.ncpu.lab -side left -anchor w -padx 5 - pack $top.frm.ncpu.inp -side right -anchor e -fill x -expand true - - frame $top.frm.par - label $top.frm.par.lab -text "PARNUM" - entry $top.frm.par.inp -bg white -textvariable parnum - pack $top.frm.par.lab -side left -anchor w -padx 5 - pack $top.frm.par.inp -side right -anchor e -fill x -expand true - - pack $top.frm.ncpu $top.frm.par -pady $ypad -fill x - pack $top.frm -padx 10 - - #put in the "Done" button: - frame $top.button - button $top.button.b -text "Done" -command "destroy $top"\ - -relief groove -bd 8 - pack $top.button.b - pack $top.button -side top -pady [expr 2*$ypad] - } -} - - proc enable_dflag { iopt } { if [string compare $iopt {}]==0 { set iopt 0 diff --git a/HEN_HOUSE/omega/progs/gui/dosxyznrc/xyznrc_parameters.tcl b/HEN_HOUSE/omega/progs/gui/dosxyznrc/xyznrc_parameters.tcl index 7dee506c2..48eb8b08f 100644 --- a/HEN_HOUSE/omega/progs/gui/dosxyznrc/xyznrc_parameters.tcl +++ b/HEN_HOUSE/omega/progs/gui/dosxyznrc/xyznrc_parameters.tcl @@ -478,23 +478,6 @@ wrong charge and/or LATCH value. Note that the total number of histories is still limited by NCASE even if\ you are recycling. } -set names(17) "Run job in parallel" -set numopts(17) 2 -set options(17,0) "no" -set options(17,1) "yes" -set help_text(17) { -Run job in parallel, IPARALLEL: - -Set this parameter to 'yes' if you are distributing the job among more than\ - one machine. You will be asked to enter the\ - number of machines that you intend to use. This will generate a binary\ - .pardose file for each job which will contain the doses in all voxels\ - WITHOUT UNCERTAINTIES. IPARALLEL defaults to 0. - -Note that IPARALLEL is automatically set to 1 by NRC's pprocess script. So\ - if you are using the pprocess script (with NQS), you do not have\ - to set this parameter before submitting parallel jobs. -} set names(18) "Photon splitting number" set numopts(18) 0