From af4bb7645ce7d177daa736dfb351203a02960878 Mon Sep 17 00:00:00 2001 From: Frederic Tessier Date: Sun, 3 Nov 2024 20:41:45 +0100 Subject: [PATCH 1/3] Fix #1210: replace "restart" with "resume" Address a long-standing semantic confusion in EGSnrc. The term "restart" has been used ambiguously to describe resuming a simulation after an interruption (e.g., a power failure). Use "resume" instead to accurately reflect continuing from where the simulation left off. Restarting conveys the idea that the simulation is starting over from the beginning. --- .../src/getting-started/getting-started.tex | 2 +- HEN_HOUSE/doc/src/pirs3100-g-app/Doxyfile | 2 +- .../pirs509a-beamnrc/inputformats/BEAM1.inp | 8 +- .../src/pirs509a-beamnrc/pirs509a-beamnrc.tex | 69 ++++++----- HEN_HOUSE/doc/src/pirs623-gui/maintenance.tex | 5 +- HEN_HOUSE/doc/src/pirs623-gui/pirs623-gui.tex | 2 +- .../inputs/egsnrc_system_considerations.tex | 2 +- .../src/pirs701-egsnrc/inputs/new_um_app2.tex | 2 +- .../pirs702-egsnrc-codes.tex | 90 +++++++------- .../pirs794-dosxyznrc/inputs/dosxyznrc.inp | 12 +- .../pirs794-dosxyznrc/pirs794-dosxyznrc.tex | 62 +++++----- HEN_HOUSE/doc/src/pirs898-egs++/Doxyfile | 2 +- HEN_HOUSE/doc/src/pirs898-egs++/common.doxy | 4 +- HEN_HOUSE/doc/src/pirs898-egs++/egs_cbct.doxy | 2 +- .../doc/src/pirs898-egs++/egs_chamber.doxy | 2 +- .../egs_phsp_scoring/egs_phsp_scoring.cpp | 10 +- .../egs_phsp_scoring/egs_phsp_scoring.h | 4 +- HEN_HOUSE/egs++/egs_advanced_application.h | 6 +- HEN_HOUSE/egs++/egs_application.h | 8 +- HEN_HOUSE/egs++/egs_ausgab_object.h | 4 +- HEN_HOUSE/egs++/egs_base_source.h | 22 ++-- HEN_HOUSE/egs++/egs_rndm.h | 2 +- HEN_HOUSE/egs++/egs_run_control.cpp | 16 +-- HEN_HOUSE/egs++/egs_run_control.h | 6 +- HEN_HOUSE/egs++/egs_scoring.h | 6 +- .../sources/egs_beam_source/egs_beam_source.h | 4 +- .../sources/egs_phsp_source/egs_phsp_source.h | 2 +- .../iaea_phsp_source/iaea_phsp_source.h | 2 +- .../gui/egs_configure/egs_install_conf.cpp | 2 +- HEN_HOUSE/gui/egs_inprz/include/datainp.h | 2 +- HEN_HOUSE/gui/egs_inprz/include/ioinputs.h | 2 +- HEN_HOUSE/gui/egs_inprz/include/tooltips.h | 6 +- HEN_HOUSE/gui/egs_inprz/src/inputRZForm.cpp | 6 +- HEN_HOUSE/gui/egs_inprz/src/inputRZSave.cpp | 2 +- HEN_HOUSE/gui/egs_inprz/src/ioinputs.cpp | 10 +- HEN_HOUSE/gui/egs_inprz/ui/inputRZ.ui | 18 +-- .../BEAMnrc_examples/EX10MeVe/EX10MeVe.egslog | 4 +- .../EX10MeVe/EX10MeVe.egstmpa | 2 +- .../BEAMnrc_examples/EX16MVp/EX16MVp.egslog | 4 +- .../BEAMnrc_examples/EX16MVp/EX16MVp.egstmpa | 2 +- .../EXphantom/EXphantom.egsinp | 2 +- .../EXphantom/EXphantom.egslog | 4 +- .../EXphantom/EXphantom.egstmpa | 2 +- .../BEAMnrc_examples/EXslabs/EXslabs.egslog | 4 +- .../BEAMnrc_examples/EXslabs/EXslabs.egstmpa | 2 +- HEN_HOUSE/omega/beamnrc/beamnrc.mortran | 112 +++++++++--------- .../omega/beamnrc/beamnrc_user_macros.mortran | 4 +- .../omega/progs/gui/beamdp/beamdp_gui.tcl | 3 +- .../omega/progs/gui/beamnrc/beamnrc_gui.tcl | 6 +- .../progs/gui/beamnrc/beamnrc_params.tcl | 8 +- .../progs/gui/beamnrc/load_input2_egsnrc.tcl | 2 +- .../gui/beamnrc/new_create_file_egsnrc.tcl | 4 +- .../gui/beamnrc/set_main_inputs_egsnrc.tcl | 3 +- .../progs/gui/dosxyznrc/dosxyznrc_gui.tcl | 9 +- .../progs/gui/dosxyznrc/xyznrc_parameters.tcl | 12 +- HEN_HOUSE/user_codes/cavity/cavity.cpp | 2 +- HEN_HOUSE/user_codes/cavrznrc/cavrznrc.io | 4 +- .../user_codes/cavrznrc/cavrznrc.mortran | 66 +++++------ .../cavrznrc/cavrznrc_template.egsinp | 6 +- HEN_HOUSE/user_codes/cavsphnrc/cavsphnrc.io | 4 +- .../user_codes/cavsphnrc/cavsphnrc.mortran | 80 ++++++------- .../cavsphnrc/cavsphnrc_template.egsinp | 2 +- .../user_codes/dosrznrc/dosrznrc.mortran | 68 +++++------ .../dosrznrc/dosrznrc_template.egsinp | 6 +- .../examples/brem_split_example.egsinp | 4 +- .../examples/brem_split_relax_example.egsinp | 6 +- .../examples/depth_dose_example.egsinp | 6 +- .../examples/relaxation_example.egsinp | 6 +- .../user_codes/dosxyznrc/dosxyznrc.mortran | 62 +++++----- .../user_codes/dosxyznrc/read_write_pardose.c | 2 +- HEN_HOUSE/user_codes/edknrc/edknrc.io | 4 +- HEN_HOUSE/user_codes/edknrc/edknrc.mortran | 48 ++++---- .../user_codes/edknrc/edknrc_template.egsinp | 4 +- .../user_codes/flurznrc/flurznrc.mortran | 16 +-- .../flurznrc/flurznrc_template.egsinp | 6 +- HEN_HOUSE/user_codes/mevegs/mevegs.cpp | 4 +- .../user_codes/sprrznrc/sprrznrc.mortran | 64 +++++----- .../sprrznrc/sprrznrc_template.egsinp | 6 +- HEN_HOUSE/user_codes/tutor7pp/test1.egsinp | 2 +- HEN_HOUSE/user_codes/tutor7pp/tutor7pp.cpp | 8 +- HEN_HOUSE/utils/iaea_phsp_macros.mortran | 4 +- HEN_HOUSE/utils/phsp_macros.mortran | 22 ++-- 82 files changed, 550 insertions(+), 557 deletions(-) diff --git a/HEN_HOUSE/doc/src/getting-started/getting-started.tex b/HEN_HOUSE/doc/src/getting-started/getting-started.tex index a018f3b02..35d9f218a 100644 --- a/HEN_HOUSE/doc/src/getting-started/getting-started.tex +++ b/HEN_HOUSE/doc/src/getting-started/getting-started.tex @@ -1026,7 +1026,7 @@ \section{Navigating egs++ input files} test1.output \end{lstlisting} -The \Verb+.egsdat+ file can generally be ignored - it is used by EGSnrc to restart jobs that crashed, or combine parallel runs. The \Verb+.output+ file is where we manually redirected the output from the simulation (if you ran the simulation using the GUI, this file was not created). Looking at the output, we can observe the reflected, deposited and transmitted energy fractions for the simulation of electrons through a single slab. Below this, is the pulse height distribution for region 1 (the slab itself). +The \Verb+.egsdat+ file can generally be ignored - it is used by EGSnrc to resume jobs that crashed, or combine parallel runs. The \Verb+.output+ file is where we manually redirected the output from the simulation (if you ran the simulation using the GUI, this file was not created). Looking at the output, we can observe the reflected, deposited and transmitted energy fractions for the simulation of electrons through a single slab. Below this, is the pulse height distribution for region 1 (the slab itself). \subsection{Write a new input file} When writing an egs++ input file, you will find yourself frequently referencing the full online documentation, \Verb+PIRS-898+: diff --git a/HEN_HOUSE/doc/src/pirs3100-g-app/Doxyfile b/HEN_HOUSE/doc/src/pirs3100-g-app/Doxyfile index 0f925117e..0d98f3354 100644 --- a/HEN_HOUSE/doc/src/pirs3100-g-app/Doxyfile +++ b/HEN_HOUSE/doc/src/pirs3100-g-app/Doxyfile @@ -1322,7 +1322,7 @@ QHG_LOCATION = # Eclipse, the contents of the directory containing the HTML and XML files needs # to be copied into the plugins directory of eclipse. The name of the directory # within the plugins directory should be the same as the ECLIPSE_DOC_ID value. -# After copying Eclipse needs to be restarted before the help appears. +# After copying Eclipse needs to be relaunched before the help appears. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/HEN_HOUSE/doc/src/pirs509a-beamnrc/inputformats/BEAM1.inp b/HEN_HOUSE/doc/src/pirs509a-beamnrc/inputformats/BEAM1.inp index 24fc084c9..369bd154b 100644 --- a/HEN_HOUSE/doc/src/pirs509a-beamnrc/inputformats/BEAM1.inp +++ b/HEN_HOUSE/doc/src/pirs509a-beamnrc/inputformats/BEAM1.inp @@ -1,7 +1,7 @@ \begin{verbatim} Next Record *********** - IWATCH,ISTORE,IRESTART,IO_OPT,IDAT,LATCH_OPTION,IZLAST + IWATCH,ISTORE,IRESUME,IO_OPT,IDAT,LATCH_OPTION,IZLAST IWATCH = 0 for normal output (the default) = 1 output for every discrete interaction @@ -16,8 +16,8 @@ This is a debugging tool. If run quits, rerun with ISTORE=1, then again ISTORE=-1 and IWATCH = 1/2 and/or the debugger on. - IRESTART = 0 first run for this data set (the default) - = 1 restart of a previous run + IRESUME = 0 first run for this data set (the default) + = 1 resume a previous run = 2 just create the input file and exit = 3 read in the raw data from a previous run and do the statistical analysis on dose etc. @@ -26,7 +26,7 @@ with the extension _w#, where # can be any positive integer. These .egsdat files will be summed and then the result analyzed similar - to IRESTART=3. + to IRESUME=3. IO_OPT = 0 phase-space output at each scoring plane(the default) = 1 no phase-space output when particles cross scoring plane diff --git a/HEN_HOUSE/doc/src/pirs509a-beamnrc/pirs509a-beamnrc.tex b/HEN_HOUSE/doc/src/pirs509a-beamnrc/pirs509a-beamnrc.tex index 5b0e13c8b..8be6f5ab0 100644 --- a/HEN_HOUSE/doc/src/pirs509a-beamnrc/pirs509a-beamnrc.tex +++ b/HEN_HOUSE/doc/src/pirs509a-beamnrc/pirs509a-beamnrc.tex @@ -1189,7 +1189,7 @@ \subsection{BEAMnrc Output Files} \index{phase space sources!when restarted} \item [.egsdat] -This file contains all of the information required to restart a run and +This file contains all of the information required to resume a run and also the information required to obtain dose and fluence when parallel jobs are recombined. Data stored in the {\tt .egsdat} file include: @@ -1205,7 +1205,7 @@ \subsection{BEAMnrc Output Files} \item state of the random number generator at the end of the last batch \index{batches} \end{enumerate} -When a run is restarted, BEAMnrc reads the energy deposited and +When a run is resumed, BEAMnrc reads the energy deposited and fluence data (item 1 above) for the previous run from the {\tt .egsdat} file and then adds it to the current results before calculating doses, fluence values and uncertainties~\cite{Wa02a}. When @@ -1215,9 +1215,9 @@ \subsection{BEAMnrc Output Files} (without running any further simulations) calculates the doses, fluence values and uncertainties for the complete simulation. -See section~\ref{IRESTART} about the input variable IRESTART and +See section~\ref{IRESUME} about the input variable IRESUME and Section~\ref{parallelcalc} about parallel runs. -\index{restart!.egsdat} +\index{resume!.egsdat} \index{.egsdat} \index{.egsrns} @@ -1226,7 +1226,7 @@ \subsection{BEAMnrc Output Files} at the start the current batch (\verb+ISTORE=0+) or current history (\verb+ISTORE=1+) in a simulation. This is only used for debugging when problems occur. -These data are used to restart the run with this RNG +These data are used to resume the run with this RNG when \verb+ISTORE+ is set to -1. Note that running with \verb+ISTORE=1+ slows down a simulation significantly. \index{ISTORE} @@ -1825,7 +1825,7 @@ \section{Description of main BEAMnrc input file} \begin{small} \input{./inputformats/BEAM0.inp} %\newline -\index{IWATCH} \index{ISTORE} \index{IRESTART} \index{IO\_OPT} +\index{IWATCH} \index{ISTORE} \index{IRESUME} \index{IO\_OPT} \index{IDAT} \index{LATCH!LATCH\_OPTION} \index{IZLAST} \index{.egsgph} \input{./inputformats/BEAM1.inp} @@ -5309,12 +5309,12 @@ \subsection{ISTORE} \index{random number generator} \end{description} -\subsection{IRESTART} -\label{IRESTART} -\index{IRESTART} +\subsection{IRESUME} +\label{IRESUME} +\index{IRESUME} -IRESTART controls how BEAMnrc treats the current run - either as new or as a -continuation of a previous run. The possible settings of IRESTART are: +IRESUME controls how BEAMnrc treats the current run - either as new or as a +continuation of a previous run. The possible settings of IRESUME are: \begin{description} \item [= 0] (default) BEAMnrc initiates a new run, deleting all of the output files from previous runs of the same name if present @@ -5322,8 +5322,8 @@ \subsection{IRESTART} \etc). \index{.egsphsp1} \index{random number generator} -\index{restart} -\item [= 1] Restart of a previous run; BEAMnrc reads fluence and dose data +\index{resume} +\item [= 1] Resume a previous run; BEAMnrc reads fluence and dose data from the previous run, the number of histories already run, the time taken by the previous run, and the state of the random number generator from the last @@ -5371,8 +5371,8 @@ \subsection{IDAT} \index{IDAT} \verb+IDAT+ controls output of the \verb+.egsdat+ file, which contains data -from a previous run so that BEAMnrc is able to restart this run -\index{restart} +from a previous run so that BEAMnrc is able to resume this run +\index{resume} if required. The {\tt .egsdat} files from parallel jobs are required for recombining to obtain the final results (see section~\ref{parallelcalc}). Possible settings of \verb+IDAT+ are: @@ -5447,7 +5447,7 @@ \subsection{NCASE} Starting with BEAM99, {\tt NCASE} and other variables related to the number of histories, such as {\tt IHSTRY}, were made {\tt INTEGER*8} variables. This allows -$>$2x10$^9$ total histories, and is particularly useful for restarts and +$>$2x10$^9$ total histories, and is particularly useful for resuming and for parallel runs, where a large number of total histories can be accrued quite easily. However, {\tt INTEGER*8} may cause problems for some Fortran compilers. For a more detailed description of this problem and how to fix it if it does @@ -5481,10 +5481,9 @@ \subsection{IXXIN, JXXIN} the random number generator, and, during a simulation, they no longer reflect the values of the seeds that are actually used to generate the random numbers. -During restarts -({\tt IRESTART} = 1), the state of the random number generator at the end -of the previous run is read from the {\tt .egsdat} file and is used at the -beginning of the restart. Thus, a restarted run with a total of, eg, +When resuming +({\tt IRESUME} = 1), the state of the random number generator at the end +of the previous run is read from the {\tt .egsdat} file and is used for resuming. Thus, a resumed run with a total of, eg, 10000+10000 histories should generate results identical to a single run of the same simulation with 20000 histories. Also note that when running parallel simulations with BEAMnrc (see section~\ref{parallelcalc}), {\tt IXXIN} @@ -5520,8 +5519,8 @@ \subsection{TIMMAX} At the end of each batch, an estimate is made of how much time is needed to complete another batch. If the next batch cannot be completed within \verb+TIMMAX+ for the current run, then BEAMnrc terminates the run and -analyses the results for the shortened run. The restart feature (see -section~\ref{IRESTART} on \verb+IRESTART+) can be used to continue the +analyses the results for the shortened run. The resume feature (see +section~\ref{IRESUME} on \verb+IRESUME+) can be used to continue the run if needed and if \verb+IDAT+ (section~\ref{IDAT}) is set to 0 (\ie\ the {\tt .egsdat} files are created). Note that the total CPU time @@ -6508,17 +6507,17 @@ \subsection{Combining Results from Parallel Jobs} are output (see section~\ref{IDAT}, page~\pageref{IDAT} for more information about {\tt IDAT}). -\index{IRESTART=4} +\index{IRESUME=4} \index{combining parallel runs} Parallel runs can be combined manually by re-running your accelerator -with the input variable {\tt IRESTART}=4 (in the GUI, this is equivalent +with the input variable {\tt IRESUME}=4 (in the GUI, this is equivalent to setting the Run option to ``analyze parallel jobs") after all parallel -jobs have finished. Use of {\tt IRESTART}=4 is generally not necessary +jobs have finished. Use of {\tt IRESUME}=4 is generally not necessary since the last job automatically combines parallel results, however, it may be useful if, for some reason, all of the {\tt .egsdat} files were not moved out of their temporary working directories or if you wish to add more {\tt .egsdat} files from a separate group of parallel runs. -For more information on {\tt IRESTART} options, see section~\ref{IRESTART}. +For more information on {\tt IRESUME} options, see section~\ref{IRESUME}. \index{phase space files! from parallel jobs} The process of combining parallel runs described above does not @@ -6615,20 +6614,20 @@ \subsection{Parallel Jobs Run from the GUI} to PBS, unless specified otherwise by the {\tt \$EGS\_BATCH\_SYSTEM} environmental variable. -\subsection{Restarting Parallel Jobs} -\index{restarting parallel jobs} +\subsection{Resuming Parallel Jobs} +\index{resuming parallel jobs} -Parallel runs can be restarted (by setting {\tt IRESTART}=1 in +Parallel runs can be resumed (by setting {\tt IRESUME}=1 in {\tt inputfile.egsinp}) provided that you have the {\tt .egsdat} files from all of the previous individual parallel jobs available in your {\tt \$EGS\_HOME/BEAM\_myaccel} directory. If you are using a -phase space source, however, restarting presents a problem in that a +phase space source, however, resuming presents a problem in that a particular partition of the source may get used by a different job the second time around. At the end of the run, results from the second use of this partition will be recombined with those from its first use with no attention paid to the correlation between the two results. This will result in the uncertainties being underestimated. We recommend that -you do not restart a parallel run if you are using a phase space source. +you do not resume a parallel run if you are using a phase space source. \section{Statistics in BEAMnrc} @@ -10010,7 +10009,7 @@ \section{Known Problems/Restrictions} Variables related to the number of particle histories, such as the input variable {\tt NCASE}, the variable {\tt IHSTRY}, etc, have been changed to {\tt INTEGER*8} to allow for $>$ 2x10$^9$ histories. This is -particularly useful for restarts and recombining parallel jobs, where a large +particularly useful for resuming and recombining parallel jobs, where a large number of histories may be accrued. However, some Fortran compilers do not support {\tt INTEGER*8}. We have compiled with {\tt INTEGER*8} successfully on Linux PC, SGI, DEC Alpha, and Sun sparc @@ -10044,11 +10043,11 @@ \section{Known Problems/Restrictions} \index{EGS\_Windows} -A restarted run that uses a phase space source with particle recycling will +A resumed run that uses a phase space source with particle recycling will not produce dose/uncertainty results identical to a single run with the same total number of histories. This is because the last particle -used before the restart may not have been recycled the full -{\tt NRCYCL} times, and restarting automatically skips to the next particle. +used before resuming may not have been recycled the full +{\tt NRCYCL} times, and resuming automatically skips to the next particle. Results will agree within uncertainty, however. \section{History of Revisions} diff --git a/HEN_HOUSE/doc/src/pirs623-gui/maintenance.tex b/HEN_HOUSE/doc/src/pirs623-gui/maintenance.tex index dbb3415da..631b0ad45 100644 --- a/HEN_HOUSE/doc/src/pirs623-gui/maintenance.tex +++ b/HEN_HOUSE/doc/src/pirs623-gui/maintenance.tex @@ -1044,7 +1044,7 @@ \subsection{Main parameters} values(2) & MEDIUM for nominal air \\ values(3) & IWATCH \\ values(4) & ISTORE \\ -values(5) & IRESTART\\ +values(5) & IRESUME\\ values(6) & IO\_OPT\\ values(7) & IDAT\\ values(8) & LATCH\_OPTION\\ @@ -1650,7 +1650,7 @@ \subsection{Main} values(9) & inseed2 \\ values(10) & beam\_size \\ values(11) & ismooth \\ -values(12) & irestart \\ +values(12) & iresume \\ values(13) & idat \\ values(14) & ireject \\ values(15) & esave\_global \\ @@ -1779,4 +1779,3 @@ \subsection{Define voxel media} \end{document} - diff --git a/HEN_HOUSE/doc/src/pirs623-gui/pirs623-gui.tex b/HEN_HOUSE/doc/src/pirs623-gui/pirs623-gui.tex index ca9ee8408..328d982b3 100644 --- a/HEN_HOUSE/doc/src/pirs623-gui/pirs623-gui.tex +++ b/HEN_HOUSE/doc/src/pirs623-gui/pirs623-gui.tex @@ -759,7 +759,7 @@ \subsection{Simulation parameters} enter general simulation parameters, such as the number of histories, IWATCH output, maximum CPU time, random number generator seeds, incident beam size, phase space -redistribution, run option, output restart data, range rejection and ESAVE +redistribution, run option, output data for resuming, range rejection and ESAVE inputs. The help buttons to the left of each parameter will provide you with the information necessary to properly specify these values. diff --git a/HEN_HOUSE/doc/src/pirs701-egsnrc/inputs/egsnrc_system_considerations.tex b/HEN_HOUSE/doc/src/pirs701-egsnrc/inputs/egsnrc_system_considerations.tex index 5ad75c2ea..74d3daca2 100644 --- a/HEN_HOUSE/doc/src/pirs701-egsnrc/inputs/egsnrc_system_considerations.tex +++ b/HEN_HOUSE/doc/src/pirs701-egsnrc/inputs/egsnrc_system_considerations.tex @@ -603,7 +603,7 @@ \subsubsection{user\_code.environment file (obsolete)} prompts when running in batch. Note, this has most of the {\bf error} messages too, so get in the habit of reading this file. \item [input.egsdat:] A file containing all the information needed to -allow a calculation to be restarted again. +allow a calculation to be resumed. \item [input.egsrns:] Some codes allow a record of random number seeds at the start of each history to be kept (just most recent). These are kept in this file if requested. diff --git a/HEN_HOUSE/doc/src/pirs701-egsnrc/inputs/new_um_app2.tex b/HEN_HOUSE/doc/src/pirs701-egsnrc/inputs/new_um_app2.tex index 6a0e4307a..f21628946 100644 --- a/HEN_HOUSE/doc/src/pirs701-egsnrc/inputs/new_um_app2.tex +++ b/HEN_HOUSE/doc/src/pirs701-egsnrc/inputs/new_um_app2.tex @@ -2606,7 +2606,7 @@ \subsection{Random number generators} \cen{{\tt 0$<$ IXX$<=$31328} and {\tt 0$<$JXX$<=$30081}} The other macros are for use when saving the state of a random number -generator to disk and possibly restarting a run or other book keeping tasks. +generator to disk and possibly resuming a run or other book keeping tasks. There are two files available for use in codes doing correlated sampling. These files are: diff --git a/HEN_HOUSE/doc/src/pirs702-egsnrc-codes/pirs702-egsnrc-codes.tex b/HEN_HOUSE/doc/src/pirs702-egsnrc-codes/pirs702-egsnrc-codes.tex index e36dc2978..a9433cbaa 100644 --- a/HEN_HOUSE/doc/src/pirs702-egsnrc-codes/pirs702-egsnrc-codes.tex +++ b/HEN_HOUSE/doc/src/pirs702-egsnrc-codes/pirs702-egsnrc-codes.tex @@ -1439,9 +1439,9 @@ \subsubsection{STORE INITIAL RANDOM NUMBERS} All user codes give the user the option of storing random numbers at the beginning of each history using the {\tt STORE INITIAL RANDOM NUMBERS} input. Random numbers are stored -in a {\tt .egsrns} file. You can restart the simulation -using these random numbers using one of the {\tt IRESTART} options, -described in section~\ref{restartsect}\lpage{restartsect}. +in a {\tt .egsrns} file. You can resume the simulation +with these random numbers using one of the {\tt IRESUME} options, +described in section~\ref{resumesect}\lpage{resumesect}. The options for {\tt STORE INITIAL RANDOM NUMBERS} are: @@ -1472,44 +1472,44 @@ \subsubsection{STORE INITIAL RANDOM NUMBERS} Note that the {\tt STORE INITIAL RANDOM NUMBERS} option is mostly used for debugging purposes. -\subsubsection{IRESTART - restarting runs} -\label{restartsect} -\index{IRESTART} -\index{restarting runs} +\subsubsection{IRESUME - resuming runs} +\label{resumesect} +\index{IRESUME} +\index{resuming runs} \index{recovery after crashes} -All user codes offer several restart options. These are: +All user codes offer several resume options. These are: \begin{verbatim} - IRESTART + IRESUME = first (0) first run for this data set - = restart (1) restart of a previous run + = resume (1) resume a previous run = analyze (3) just read in the raw data and do the statistical analysis = start-RNS (4) read starting random numbers from a file = parallel (5) Combine results from previous parallel runs \end{verbatim} -Set {\tt IRESTART= first} if this is the first run of this simulation. +Set {\tt IRESUME= first} if this is the first run of this simulation. -Use {\tt IRESTART= restart} if you wish to take the data from this simulation +Use {\tt IRESUME= resume} if you wish to take the data from this simulation and append it to the data from a previous run. If you use this option, your previous run must have been done with {\tt STORE DATA ARRAYS= yes} (see section~\ref{dataarrsect}\lpage{dataarrsect}). Note that CPU times -are cumulative, so if you're restarting a run, then the maximum CPU time +are cumulative, so if you're resuming a run, then the maximum CPU time allowed (see section~\ref{cpusect}\lpage{cpusect}) must account for the time of the previous run as well. \index{STORE DATA ARRAYS} \index{interim data storage} -Use {\tt IRESTART= analyze} if you have data from a previous run in +Use {\tt IRESUME= analyze} if you have data from a previous run in a {\tt .egsdat} file (you must have run it with {\tt STORE DATA ARRAYS= yes}-- see section~\ref{dataarrsect}\lpage{dataarrsect}) and you want to reanalyze it and output the results to the {\tt .egslst} file. This is very useful if you want to change the quantity that you are outputting from the data after you have already run the simulation. -When {\tt IRESTART= start-RNS}, then your user code will use the +When {\tt IRESUME= start-RNS}, then your user code will use the random numbers stored in the {\tt .egsrns} file (see section~\ref{rnssect}\lpage{rnssect}) to run the simulation. If you ran the previous simulation with {\tt STORE INITIAL RANDOM NUMBERS= last}, then the current simulation @@ -1527,7 +1527,7 @@ \subsubsection{IRESTART - restarting runs} compared to code which appears to just reread first value every time} \index{parallel processing} -{\tt IRESTART= parallel} is used to read the {\tt .egsdat} files from +{\tt IRESUME= parallel} is used to read the {\tt .egsdat} files from separate parallel jobs, combine them, analyze them, and output the combined results to the {\tt .egslst} file. See section~\ref{parallelsect}\lpage{parallelsect} @@ -1537,7 +1537,7 @@ \subsubsection{IRESTART - restarting runs} {\tt inputfile\_w(i).egsdat}, {\tt inputfile\_w(i+1).egdat},... \\ This is the naming scheme used by the {\tt pprocess} script described in section~\ref{parallelsect}\lpage{parallelsect}. Note that the user -code SPRRZnrc does not have the {\tt IRESTART= parallel} option. +code SPRRZnrc does not have the {\tt IRESUME= parallel} option. \index{SPRRZnrc} \subsubsection{STORE DATA ARRAYS} @@ -1556,17 +1556,17 @@ \subsubsection{STORE DATA ARRAYS} \begin{enumerate} \item the current random number state -\item the total number of histories so far (including restarts) -\item total fluence so far (including restarts) (not for all codes) -\item the total CPU time so far (including restarts) +\item the total number of histories so far (including resumes) +\item total fluence so far (including resumes) (not for all codes) +\item the total CPU time so far (including resumes) \item the total number of particles read from a phase space source - (including restarts) -\item the total number of charged particle steps taken (including restarts) + (including resumes) +\item the total number of charged particle steps taken (including resumes) \item the total number of times multiple scattering has been switched off - (including restarts) + (including resumes) \item Raw data needed by the code to calculate quantities of interest. - These data are cumulative and include data from previous runs if - this is a restart. Just the required sums are stored. The raw + These data are cumulative and include data from previous runs when + resuming a run. Just the required sums are stored. The raw data stored will depend on the user code AND the output options requested by the user. For example, DOSRZnrc could store the total energy deposited in each region, the total-minus-stopper @@ -1574,9 +1574,9 @@ \subsubsection{STORE DATA ARRAYS} the kerma deposited in each region. \end{enumerate} -The {\tt .egsdat} file is necessary for {\tt IRESTART= restart}, -{\tt IRESTART= analyze} and {\tt IRESTART= parallel} options described in -Section~\ref{restartsect}\lpage{restartsect}. Note that the {\tt .egsdat} +The {\tt .egsdat} file is necessary for {\tt IRESUME= resume}, +{\tt IRESUME= analyze} and {\tt IRESUME= parallel} options described in +Section~\ref{resumesect}\lpage{resumesect}. Note that the {\tt .egsdat} file can become very large (we have seen 100 Mbyte), especially for the code FLURZnrc. For short runs, writing this file can dominate the simulation time and so it may be best not to store it, at least for any @@ -1662,7 +1662,7 @@ \subsubsection{Maximum CPU time} this section using the {\tt MAX CPU HOURS ALLOWED} input. The default is {\tt MAX CPU HOURS ALLOWED= 999.}, and the current maximum is 1000 hrs. This is the total CPU time for the run, -including restarts. For parallel runs using EGSnrcMP's built-in +including resumes. For parallel runs using EGSnrcMP's built-in parallel processing functionality (see section~\ref{parallelsect}\lpage{parallelsect}), it is the maximum CPU time for each parallel job. At the end of each output batch, the amount @@ -2140,7 +2140,7 @@ \subsection{Internally used scoring arrays} \index{.egsdat} After the completion of a batch, the \verb+.egsdat+ file will be updated and will contain the complete scoring arrays, random generator -state, etc calculated so far, and consequently, a run can be restarted +state, etc calculated so far, and consequently, a run can be resumed from that point on. So although the batch results are no-longer used for statistical analysis, the calculations are still done in 10 batches to facilitate storage of partial results. @@ -2431,8 +2431,8 @@ \subsubsection{Combining results of parallel runs} The {\tt inputfile\_w[i\_parallel].egsdat} can also be manually combined by rerunning your code with the input parameter -\index{IRESTART!parallel} -\verb+IRESTART= PARALLEL+. This may be useful if you want to combine +\index{IRESUME!parallel} +\verb+IRESUME= PARALLEL+. This may be useful if you want to combine results from several different groups of parallel runs. This system of combining results works very well unless you have @@ -2440,28 +2440,28 @@ \subsubsection{Combining results of parallel runs} files (can happen with FLURZnrc), in which case you can quickly run out of disk space and or bring your network to its knees. -\subsubsection{Restarting parallel runs} -\index{parallel jobs!restarting} +\subsubsection{Resuming parallel runs} +\index{parallel jobs!resuming} -Parallel jobs can be restarted the same way as a single run, by -rerunning with {\tt IRESTART= restart} (see section~\ref{restartsect}) +Parallel jobs can be resumed in the same way as a single run, by +rerunning with {\tt IRESUME= resume} (see section~\ref{resumesect}) in {\tt inputfile.egsinp}. Note that all of the {\tt .egsdat} files from the previous parallel jobs must be available and you must submit the same number of parallel jobs beginning with the same value of {\tt i\_start} (see section~\ref{subparsect} above). If you are using a -phase space source, however, restarting presents a problem in that a +phase space source, however, resuming presents a problem in that a particular partition of the source may get used by a different job the second time around. At the end of the run, results from the second use of this partition will be recombined with those from its first use with no attention paid to the correlation between the two results. This will result in the uncertainties being underestimated. We recommend that -you do not restart a parallel run if you are using a phase space source. +you do not resume a parallel run if you are using a phase space source. -If you are restarting a parallel run that uses a full BEAMnrc simulation +If you are resuming a parallel run that uses a full BEAMnrc simulation source (source 23--See Section~\ref{source_inputs}). Then you must go into the input file for the simulation source and set the input variable -{\tt IRESTART} to 1. Otherwise, the simulation source in the restarted run +{\tt IRESUME} to 1. Otherwise, the simulation source in the resumed run will use identical random numbers as in the original run. \subsection{Pegsless Mode} @@ -2666,7 +2666,7 @@ \subsection{Standard I/O Units} \index{.egsdat} \item [input.egsdat:] A file containing all the information needed to -allow a calculation to be restarted again. +allow a calculation to be resumed. \index{.egsrns} \item [input.egsrns:] Some codes allow a record of random number seeds @@ -4155,8 +4155,8 @@ \subsection{Input/output control} section~\ref{rnssect}\lpage{rnssect}). With this option, the initial random numbers from only those histories that end up depositing energy in the cavity region are stored in the -{\tt .egsrns} file. Then, if the run is restarted with -{\tt IRESTART= start-RNS} (see section~\ref{restartsect}\lpage{restartsect}), +{\tt .egsrns} file. Then, if the run is resumed with +{\tt IRESUME= start-RNS} (see section~\ref{resumesect}\lpage{resumesect}), all histories will end up depositing energy in the cavity region. \index{CAVRZnrc!output options} @@ -4635,9 +4635,9 @@ \subsection{EDKnrc} \begin{verbatim} :start I/O control: - IRESTART + IRESUME = first (0) First run for this data set - = restart (1) Restart a previous run + = resume (1) Resume a previous run = analyze (3) Just read in the raw data and do the statistical analysis = parallel (5) Combine results from previous parallel runs STORE DATA ARRAYS diff --git a/HEN_HOUSE/doc/src/pirs794-dosxyznrc/inputs/dosxyznrc.inp b/HEN_HOUSE/doc/src/pirs794-dosxyznrc/inputs/dosxyznrc.inp index 4a725b54a..18e67e734 100644 --- a/HEN_HOUSE/doc/src/pirs794-dosxyznrc/inputs/dosxyznrc.inp +++ b/HEN_HOUSE/doc/src/pirs794-dosxyznrc/inputs/dosxyznrc.inp @@ -22,7 +22,7 @@ Unit 1 Output summary and results Unit 2 .egsrns file for storing random numbers Unit 3 output .3ddose file containing dose arrays - Unit 4 Raw data output file for restarts + Unit 4 Raw data output file for resuming simulation Unit 5 Input stream - file or terminal Unit 6 prompts for and echoes input Unit 8 echoes input cross-section data (usually assigned to a null file) @@ -841,7 +841,7 @@ Record SC1-20a and SC1-21a (required for sources 20 and 21) Record 13 (9 if NMED=0) NCASE, IWATCH, TIMMAX, INSEED1, INSEED2, - BEAM_SIZE, ISMOOTH,IRESTART,IDAT,IREJECT,ESAVE_GLOBAL,NRCYCL,IPARALLEL, + BEAM_SIZE, ISMOOTH,IRESUME,IDAT,IREJECT,ESAVE_GLOBAL,NRCYCL,IPARALLEL, PARNUM,n_split,ihowfarless,i_phsp_out,i_bindos NCASE Number of histories @@ -864,15 +864,15 @@ Record SC1-20a and SC1-21a (required for sources 20 and 21) ISMOOTH =1 re-distribute particles when re-start a ph-sp file and/or recycle an individual particle =0 re-use the ph-sp data once run out (no redistribution) - IRESTART = 0 first run for this data set (the default) - = 1 restart of a previous run + IRESUME = 0 first run for this data set (the default) + = 1 resume a previous run = 2 just create the input file and exit = 3 just read in the raw data and do the statistical analysis = 4 recombine .pardose files from parallel runs - IDAT = 0 output intermediate files for restarts + IDAT = 0 output intermediate files to resume run = 1 do not output intermediate data files at all - = 2 output the data file for restart at end only + = 2 output the resume data file at end only IREJECT = 0 (default) do not perform charged particle range rejection. = 1 perform charged particle range rejection. If diff --git a/HEN_HOUSE/doc/src/pirs794-dosxyznrc/pirs794-dosxyznrc.tex b/HEN_HOUSE/doc/src/pirs794-dosxyznrc/pirs794-dosxyznrc.tex index 83c2e68e5..bd5ee4570 100644 --- a/HEN_HOUSE/doc/src/pirs794-dosxyznrc/pirs794-dosxyznrc.tex +++ b/HEN_HOUSE/doc/src/pirs794-dosxyznrc/pirs794-dosxyznrc.tex @@ -196,8 +196,8 @@ of Hounsfield numbers and converting it into the information needed by DOSXYZnrc to simulate transport in a phantom (i.e. ~the appropriate material and density are specified in each voxel). Any of the available -beams can be incident on this CT phantom. The code includes a restart -facility and can be run on parallel computing platforms. The statistical +beams can be incident on this CT phantom. The code includes a resume +option and can be run on parallel computing platforms. The statistical analysis is based on a history by history method as opposed to the batch method used in DOSXYZ. @@ -262,7 +262,7 @@ \subsection{Overview} DOSXYZnrc has a number of important and unique features such as dose component calculations, a wide variety of source configurations and beam reconstruction techniques, CT to phantom conversion -(via {\tt ctcreate}), restart capabilities, phase-space redistribution, \etc. +(via {\tt ctcreate}), resume capabilities, phase-space redistribution, \etc. \indexm{ctcreate} {\tt ctcreate} is a stand alone program which converts CT data sets into the @@ -727,7 +727,7 @@ \subsection{Compiling and Running DOSXYZnrc} DOSXYZnrc outputs the following files: {\tt inputfile.egslst, inputfile.egslog} (for batch runs only, where it contains screen output), {\tt -inputfile.egsdat} (which can be used to restart the calculation) and {\tt +inputfile.egsdat} (which can be used to resume the calculation) and {\tt inputfile.3ddose} which contains a summary of the data in all regions and can be used by STATDOSE to create {\tt xmgr/xmgrace} graphs (see ``STATDOSE Users Manual''\cite{MC95} ). If this is a parallel run, then the @@ -2956,11 +2956,11 @@ \subsection{{\tt INSEED1, INSEED2}} the random number generator, and, during a simulation, they no longer reflect the values of the seeds that are actually used to generate the random numbers. -During restarts -({\tt IRESTART} = 1), the state of the random number generator at the end -of the previous run is read from the {\tt .egsdat} file and is used at the -beginning of the restart. -Thus, a restarted run with a total of +When resuming +({\tt IRESUME} = 1), the state of the random number generator at the end +of the previous run is read from the {\tt .egsdat} file and is used when the +simulation resumes. +Thus, a resumed run with a total of 10000+10000 histories should generate results identical to a single run of the same simulation with 20000 histories. Also note that when running parallel jobs @@ -3170,17 +3170,17 @@ \subsection{{\tt NRCYCL}} would be restarted at least once during the run. After restarting, particle recycling continues as before. -\subsection{{\tt IRESTART}} -\label{irestartsect} -\indexm{IRESTART} -\indexm{restarting} +\subsection{{\tt IRESUME}} +\label{iresumesect} +\indexm{IRESUME} +\indexm{resuming} \indexm{.egsdat} -The possible settings of {\tt IRESTART} are: +The possible settings of {\tt IRESUME} are: \begin{description} \item [~~~~= 0] (default) DOSXYZnrc initiates a new run, deleting all of the output files ({\tt .egslog,} {\tt .egslst}, {\tt .egsdat}, \etc) if present -\item [~~~~= 1] Restart of a previous run; DOSXYZnrc opens the +\item [~~~~= 1] Resume a previous run; DOSXYZnrc opens the {\tt .egsdat} from the previous run and reads: \begin{enumerate} \item $\sum_{i=1}^{nhist}edep_i$ and $\sum_{i=1}^{nhist}edep_i^2$ for @@ -3200,7 +3200,7 @@ \subsection{{\tt IRESTART}} the previous run~\cite{Wa02a}. Note that the number of histories to run and the total CPU time allowed for the simulation do not include the histories and CPU time from the previous run. -Also note that, currently, although a restarted simulation with, for example +Also note that, currently, although a resumed simulation with, for example 100000+100000 histories will have identical dose results to a one-off simulation with 200000 histories, the uncertainty estimates on the doses may not be @@ -3226,9 +3226,9 @@ \subsection{{\tt IDAT}} The possible settings of the variable {\tt IDAT} are: \begin{description} \item [~~~~= 0] (default) DOSXYZnrc outputs {\tt .egsdat} file with -restart data after every batch. +resume data after every batch. \item [~~~~= 1] DOSXYZnrc does not output a {\tt .egsdat} file at all. -\item [~~~~= 2] DOSXYZnrc outputs a {\tt .egsdat} with restart data only at +\item [~~~~= 2] DOSXYZnrc outputs a {\tt .egsdat} with resume data only at the end of the entire run. \end{description} For large phantoms, writing this file will take a lot of time. For @@ -4234,16 +4234,16 @@ \section{Parallel Runs using DOSXYZnrc} {\tt .pardose} files from all jobs and then recombines the data to create {\tt inputfile.3ddose}. -\indexm{IRESTART} +\indexm{IRESUME} {\tt .pardose} files can be recombined separately by re-running -DOSXYZnrc with the input parameter, {\tt IRESTART}=4 after all +DOSXYZnrc with the input parameter, {\tt IRESUME}=4 after all jobs have completed. -Use of {\tt IRESTART}=4 is generally not necessary +Use of {\tt IRESUME}=4 is generally not necessary now that the last job automatically recombines parallel results, however, it may be useful if, for some reason, all of the {\tt .pardose} files were not moved out of their temporary working directories or if you wish to add more {\tt .pardose} files from a separate group of parallel runs. -See section~\ref{irestartsect}(page~\pageref{irestartsect}) for more on {\tt IRESTART}. +See section~\ref{iresumesect}(page~\pageref{iresumesect}) for more on {\tt IRESUME}. \indexm{.egsdat} Note that {\tt .egsdat} files could have been used for recombining after @@ -4269,16 +4269,16 @@ \section{Parallel Runs using DOSXYZnrc} where {\tt nshist} is the total number of particles in the phase space source. See the BEAMnrc Manual\cite{Ro04a} for more details. -\indexm{restarting parallel jobs} -Parallel runs can be restarted, provided that you have the {\tt .egsdat} files +\indexm{resuming parallel jobs} +Parallel runs can be resumed, provided that you have the {\tt .egsdat} files from all of the previous parallel jobs available. If you are using a -phase space source, however, restarting presents a problem in that a +phase space source, however, resuming presents a problem in that a particular partition of the source may get used by a different job the second time around. At the end of the run, results from the second use of this partition will be recombined with those from its first use with no attention paid to the correlation between the two results. This will result in the uncertainties being underestimated. We recommend that -you do not restart a parallel run if you are using a phase space source. +you do not resume a parallel run if you are using a phase space source. \section{Adjustable Parameters in the Source Code} \label{mortran-parameters} @@ -5361,19 +5361,19 @@ \subsection{Files and Macros for implementation.} \section{Known Bugs/Restrictions} -A restarted run that uses a phase space source with particle recycling will +A resumed run that uses a phase space source with particle recycling will not produce dose/uncertainty results identical to a single run with the same total number of histories. This is because the last particle -used before the restart may not have been recycled the full -{\tt NRCYCL} times, and restarting automatically skips to the next particle. +used before resuming may not have been recycled the full +{\tt NRCYCL} times, and resuming automatically skips to the next particle. Results will agree within uncertainty, however. It is recommended that when using the built-in parallel processing -functionality you do not restart parallel runs that use +functionality you do not resume parallel runs that use a phase space source. In this case, parallel jobs have lost track of which chunks of the phase space source they were using in the original run and the uncertainty analysis after recombining the -restarted runs will not take into account correlations due to reusing +resumed runs will not take into account correlations due to reusing chunks of the phase space source. \section{Acknowledgments} diff --git a/HEN_HOUSE/doc/src/pirs898-egs++/Doxyfile b/HEN_HOUSE/doc/src/pirs898-egs++/Doxyfile index 862b1cf17..59983cfa2 100644 --- a/HEN_HOUSE/doc/src/pirs898-egs++/Doxyfile +++ b/HEN_HOUSE/doc/src/pirs898-egs++/Doxyfile @@ -1321,7 +1321,7 @@ QHG_LOCATION = # Eclipse, the contents of the directory containing the HTML and XML files needs # to be copied into the plugins directory of eclipse. The name of the directory # within the plugins directory should be the same as the ECLIPSE_DOC_ID value. -# After copying Eclipse needs to be restarted before the help appears. +# After copying Eclipse needs to be relaunched before the help appears. # The default value is: NO. # This tag requires that the tag GENERATE_HTML is set to YES. diff --git a/HEN_HOUSE/doc/src/pirs898-egs++/common.doxy b/HEN_HOUSE/doc/src/pirs898-egs++/common.doxy index bcfeeeebc..9f06df5a3 100644 --- a/HEN_HOUSE/doc/src/pirs898-egs++/common.doxy +++ b/HEN_HOUSE/doc/src/pirs898-egs++/common.doxy @@ -249,7 +249,7 @@ The run control input block specifies generic parameters about the simulation. I nbatch = [optional] number of batches to use (default is 10) statistical accuracy sought = [optional] required uncertainty in % max cpu hours allowed = [optional] max. CPU time allowed - calculation = [optional] first or restart or combine or analyze + calculation = [optional] first or resume or combine or analyze geometry error limit = [optional] number of geometry errors allowed before crashing :stop run control: \endverbatim @@ -274,7 +274,7 @@ simulation time to some maximum time in hours. With the \c calculation input one determines the type of simulation: - \c first means a fresh simulation (the default) - - with \c restart one can restart a previously performed simulation + - with \c resume one can resume a previously interrupted simulation - with \c combine one can combine the results of parallel runs. This is needed when one or more of the parallel jobs has not finished so that the results are not automatically combined or when one uses a simple RCO diff --git a/HEN_HOUSE/doc/src/pirs898-egs++/egs_cbct.doxy b/HEN_HOUSE/doc/src/pirs898-egs++/egs_cbct.doxy index c5e3373e3..a204f7fb9 100644 --- a/HEN_HOUSE/doc/src/pirs898-egs++/egs_cbct.doxy +++ b/HEN_HOUSE/doc/src/pirs898-egs++/egs_cbct.doxy @@ -280,7 +280,7 @@ of a signal map (\em *.egsmap) file containing \f$Katt\f$, \f$Kscat\f$ and \f$Kt The \c store \c data \c arrays input key defines whether the user wants to create \em *.egsdat files containing a snapshot of the simulation which gets updated after every batch. -This is necessary to be able to restart a calculation, for instance +This is necessary to be able to resume a calculation, for instance when computing a real scan. However, if you are running very fast simulations (eg. computing scatter for many projections) in a cluster environment, generation of such files could slow down the network significantly. The \c verbose option outputs several diff --git a/HEN_HOUSE/doc/src/pirs898-egs++/egs_chamber.doxy b/HEN_HOUSE/doc/src/pirs898-egs++/egs_chamber.doxy index 6adc22c90..7301fc9a0 100644 --- a/HEN_HOUSE/doc/src/pirs898-egs++/egs_chamber.doxy +++ b/HEN_HOUSE/doc/src/pirs898-egs++/egs_chamber.doxy @@ -1512,7 +1512,7 @@ simulation source = the_source :start run control: ncase = 100000000 - #calculation = restart + #calculation = resume :stop run control: diff --git a/HEN_HOUSE/egs++/ausgab_objects/egs_phsp_scoring/egs_phsp_scoring.cpp b/HEN_HOUSE/egs++/ausgab_objects/egs_phsp_scoring/egs_phsp_scoring.cpp index 113e0a49e..3639ce219 100644 --- a/HEN_HOUSE/egs++/ausgab_objects/egs_phsp_scoring/egs_phsp_scoring.cpp +++ b/HEN_HOUSE/egs++/ausgab_objects/egs_phsp_scoring/egs_phsp_scoring.cpp @@ -47,7 +47,7 @@ EGS_PhspScoring::EGS_PhspScoring(const string &Name, EGS_ObjectFactory *f) : EGS_AusgabObject(Name,f), phsp_index(0), store_max(1000), phsp_file(), - count(0), countg(0), emin(1.e30), emax(-1.e30), first_flush(true), is_restart(false) { + count(0), countg(0), emin(1.e30), emax(-1.e30), first_flush(true), is_resume(false) { otype = "EGS_PhspScoring"; } @@ -301,7 +301,7 @@ void EGS_PhspScoring::storeParticle(EGS_I64 ncase) { void EGS_PhspScoring::openPhspFile() const { //the file has already been named at this point if (oformat==0) { //EGSnrc format - if (is_restart) { + if (is_resume) { phsp_file.open(phsp_fname.c_str(),ios::binary|ios::out|ios::in); if (!(phsp_file)) egsFatal("\nEGS_PhspScoring: Failed to open phase space file %s for appending.\n", @@ -334,7 +334,7 @@ void EGS_PhspScoring::openPhspFile() const { int iaea_iostat; iaea_id = 1; //numerical index indicating this is the 1st file associated with this object scored //hard coded to 1 - if (is_restart) { + if (is_resume) { int rwmode = 3; iaea_new_source(&iaea_id,phsp_fname_char,&rwmode,&iaea_iostat,len); if (iaea_iostat < 0) { @@ -394,7 +394,7 @@ int EGS_PhspScoring::flushBuffer() const { if (first_flush) { openPhspFile(); //here's where we open the phase space file } - //awkward logic because we do not know if this is a restart + //awkward logic because we do not know if this is a resumed simulation //until after initialization first_flush = false; @@ -495,7 +495,7 @@ bool EGS_PhspScoring::setState(istream &data) { return false; } countprev = count; - is_restart = true; + is_resume = true; return true; } diff --git a/HEN_HOUSE/egs++/ausgab_objects/egs_phsp_scoring/egs_phsp_scoring.h b/HEN_HOUSE/egs++/ausgab_objects/egs_phsp_scoring/egs_phsp_scoring.h index fcb7a6262..e76db175f 100644 --- a/HEN_HOUSE/egs++/ausgab_objects/egs_phsp_scoring/egs_phsp_scoring.h +++ b/HEN_HOUSE/egs++/ausgab_objects/egs_phsp_scoring/egs_phsp_scoring.h @@ -519,8 +519,8 @@ class EGS_PHSP_SCORING_EXPORT EGS_PhspScoring : public EGS_AusgabObject { float emax; //max. k.e. of particles in phsp file mutable bool first_flush; //first time writing to file in this run -- mutable so we can change it in storeState - bool is_restart; //true if this is a restart - EGS_I64 countprev; //no. of particles written to file before restart + bool is_resume; //true if this is a resumed simulation + EGS_I64 countprev; //no. of particles written to file before resume EGS_I64 last_case; //last primary history scored EGS_I64 current_case; //current primary history diff --git a/HEN_HOUSE/egs++/egs_advanced_application.h b/HEN_HOUSE/egs++/egs_advanced_application.h index 683d0cd71..990737c24 100644 --- a/HEN_HOUSE/egs++/egs_advanced_application.h +++ b/HEN_HOUSE/egs++/egs_advanced_application.h @@ -332,7 +332,7 @@ class APP_EXPORT EGS_AdvancedApplication : public EGS_Application { \ref Geometry "geometry package" for any particle source that can be defined using the \c egspp \ref Sources "source package". In addition, tutor7pp provides the functionality of being able - to restart a calculation, run a calculation in parallel and + to resume a calculation, run a calculation in parallel and automatically recombine the results, limit the simulation time to a user defined maximum time, or abort the simulation if a user defined statistical uncertainty has been reached. @@ -374,7 +374,7 @@ class APP_EXPORT EGS_AdvancedApplication : public EGS_Application { \until int initScoring the function for scoring the quantities of interest at run time, \until int ausgab - the functions needed for restarting simulations and parallel runs, + the functions needed for resuming simulations and parallel runs, \until int addState the function to output the results of the simulation, \until void outputResults() @@ -689,7 +689,7 @@ class APP_EXPORT EGS_AdvancedApplication : public EGS_Application { EGS_SimpleApplication (see \em e.g. this example). However, a closer examination shows that a significant part - of the code is neede to implement the restart/parallel runs/combine + of the code is needed to implement the resume/parallel runs/combine results functionality and to provide the user with the capability to specify the regions for PHD calculation in the input file. Without this added functionality, the tutor7pp diff --git a/HEN_HOUSE/egs++/egs_application.h b/HEN_HOUSE/egs++/egs_application.h index b15124c71..320a6b86b 100644 --- a/HEN_HOUSE/egs++/egs_application.h +++ b/HEN_HOUSE/egs++/egs_application.h @@ -131,7 +131,7 @@ struct EGS_Particle { } \endverbatim - Re-implement the outputData() function to output the current simulation - results to a data file. This is necessary for the ability to restart a + results to a data file. This is necessary for the ability to resume a simulation or to combine the results of a parallel run. In most cases the implementation will involve calling the EGS_AdvancedApplication version first, so that data related to the state of the particle source, @@ -150,7 +150,7 @@ struct EGS_Particle { the function returns this error code. Otherwise it stores the dose data and returns a special error code if EGS_ScoringArray::storeState() fails. - Re-implement the readData() function to read results from a data file. - This is necessary for restarted calculations and is basically the + This is necessary for resumed calculations and is basically the same as outputData() but now readData() and setState() are used instead of outputData() and storeState(): \verbatim @@ -453,7 +453,7 @@ class EGS_EXPORT EGS_Application { Derived classes should re-implement to add their own data to the above after invoking the base class outputData() function. - The data stored should be enough to be able to restart a previous + The data stored should be enough to be able to resume a previous calculation and/or to combine the results of parallel runs. */ virtual int outputData(); @@ -470,7 +470,7 @@ class EGS_EXPORT EGS_Application { the state of the random number generator. Derived classes should re-implement to read their additional data after invoking the base class readData() function. - This function is intended to be used for restarted calculations. + This function is intended to be used for resumed calculations. */ virtual int readData(); diff --git a/HEN_HOUSE/egs++/egs_ausgab_object.h b/HEN_HOUSE/egs++/egs_ausgab_object.h index 975759c3a..82ffb6f57 100644 --- a/HEN_HOUSE/egs++/egs_ausgab_object.h +++ b/HEN_HOUSE/egs++/egs_ausgab_object.h @@ -122,7 +122,7 @@ class EGS_EXPORT EGS_AusgabObject : public EGS_Object { * * Every ausgab object should reimplement this method to store * the data needed to set the state of the object to its current - * state into the stream \a data_out. This is used for restarted + * state into the stream \a data_out. This is used for resumed * calculations. Should return \c true on success, \c false on failure. * \sa setState(), addState(), resetCounter(). */ @@ -134,7 +134,7 @@ class EGS_EXPORT EGS_AusgabObject : public EGS_Object { * * Every ausgab object should reimplement this method to read from the stream * \a data_in data previously stored using storeState() and to set its - * state according to this data. This is used for restarted calculations. + * state according to this data. This is used for resumed calculations. * Should return \c true on success, \c false on failure (\em e.g. I/O error). * * \sa addState(), storeState(), resetCounter() diff --git a/HEN_HOUSE/egs++/egs_base_source.h b/HEN_HOUSE/egs++/egs_base_source.h index 110afabaa..4a4ee37d1 100644 --- a/HEN_HOUSE/egs++/egs_base_source.h +++ b/HEN_HOUSE/egs++/egs_base_source.h @@ -75,7 +75,7 @@ class EGS_RandomGenerator; - getFluence(): returns the fluence the source has emitted so far - getSourceDescription(): returns a string describing the source - storeState(), setState(), resetCounter(), addState(): these are functions - needed for restarting calculations or combining the results of parallel + needed to resume calculations or combining the results of parallel runs \todo Add time dependence @@ -209,7 +209,7 @@ class EGS_EXPORT EGS_BaseSource : public EGS_Object { * * Every source should reimplement this method to store * the data needed to set the state of the source to its current - * state into the stream \a data_out. This is used for restarted + * state into the stream \a data_out. This is used to resume * calculations. Examples of data needed is the number of statistically * independent particles delivered so far by the source. * Should return \c true on success, \c false on failure. @@ -224,7 +224,7 @@ class EGS_EXPORT EGS_BaseSource : public EGS_Object { * * Every source should reimplement this method to read from the stream * \a data_in data previously stored using storeState() and to set its - * state according to this data. This is used for restarted calculations. + * state according to this data. This is used to resume calculations. * Should return \c true on success, \c false on failure (\em e.g. I/O * error). * @@ -349,7 +349,7 @@ class EGS_EXPORT EGS_BaseSource : public EGS_Object { /* This method is essentially used to determine whether the simulation * source contains a dynamic source. The only * non-empty implementations of this function are in composite sources - * (where it simply calls containsDynamic on its components), + * (where it simply calls containsDynamic on its components), * where it will update the boolean reference to true and * call containsDynamic on its base geometry, and sources that * can contain time indices (dynamic, phsp, beam sources). @@ -453,7 +453,7 @@ class EGS_EXPORT EGS_BaseSpectrum { * additional information to the stream, if needed. * * storeState(), setState(), addState() and resetCounter() are needed - * for restarted calculations and for combining the results of + * to resume calculations and for combining the results of * parallel runs. */ virtual bool storeState(ostream &data_out) const { @@ -477,7 +477,7 @@ class EGS_EXPORT EGS_BaseSpectrum { * if they are storing additional data in the storeState() method. * * storeState(), setState(), addState() and resetCounter() are needed - * for restarted calculations and for combining the results of + * to resume calculations and for combining the results of * parallel runs. */ virtual bool setState(istream &data_in) { @@ -500,7 +500,7 @@ class EGS_EXPORT EGS_BaseSpectrum { * are storing extra information using storeState(). * * storeState(), setState(), addState() and resetCounter() are needed - * for restarted calculations and for combining the results of + * to resume calculations and for combining the results of * parallel runs. */ virtual bool addState(istream &data_in) { @@ -523,7 +523,7 @@ class EGS_EXPORT EGS_BaseSpectrum { * object to reset this data as well. * * storeState(), setState(), addState() and resetCounter() are needed - * for restarted calculations and for combining the results of + * to resume calculations and for combining the results of * parallel runs. */ virtual void resetCounter() { @@ -568,7 +568,7 @@ class EGS_EXPORT EGS_BaseSpectrum { * This function prints information about the expected and actually * sampled average energy of the spectrum using egsInformation(). */ - void reportAverageEnergy() const { + void reportAverageEnergy() const { egsInformation("expected average energy: %g\n",expectedAverage()); EGS_Float e=0,de=0; getSampledAverage(e,de); @@ -724,7 +724,7 @@ class EGS_EXPORT EGS_BaseSimpleSource : public EGS_BaseSource { * * Must be implemented in derived classes to store the data needed to set * the state of this source object to its current state. This is needed - * in restarted calculations. + * to resume calculations. * * \sa EGS_BaseSource::storeState(), EGS_BaseSource::setState(), * EGS_BaseSource::addState() and EGS_BaseSource::resetCounter(). @@ -969,7 +969,7 @@ getNextParticle() \endlink function. The next task is to implement the functions that store the state of a point source object to a data stream and restore the state -from a data stream. This is needed for the ability to restart +from a data stream. This is needed for the ability to resume simulations. Because our source class is very simple, no data needs to be stored/restored in addition to the data already stored/restored by EGS_BaseSource and EGS_BaseSimpleSource. diff --git a/HEN_HOUSE/egs++/egs_rndm.h b/HEN_HOUSE/egs++/egs_rndm.h index 5a63d6ffd..38b24d3f6 100644 --- a/HEN_HOUSE/egs++/egs_rndm.h +++ b/HEN_HOUSE/egs++/egs_rndm.h @@ -213,7 +213,7 @@ class EGS_EXPORT EGS_RandomGenerator { /*! \brief Functions for storing, seting and reseting the state of a RNG * object. * - * These functions are useful for being able to perform restarted + * These functions are useful for being able to resume * calculations and to combine the result of parallel runs. * They are used by the default implementations of the * outputData(), readData(), etc. of the EGS_Application class. diff --git a/HEN_HOUSE/egs++/egs_run_control.cpp b/HEN_HOUSE/egs++/egs_run_control.cpp index 5bde4e5e3..484bd76ea 100644 --- a/HEN_HOUSE/egs++/egs_run_control.cpp +++ b/HEN_HOUSE/egs++/egs_run_control.cpp @@ -56,7 +56,7 @@ static int n_run_controls = 0; EGS_RunControl::EGS_RunControl(EGS_Application *a) : geomErrorCount(0), geomErrorMax(0), app(a), input(0), ncase(0), ndone(0), maxt(-1), accu(-1), - nbatch(10), restart(0), nchunk(1), cpu_time(0), previous_cpu_time(0), + nbatch(10), resume(0), nchunk(1), cpu_time(0), previous_cpu_time(0), rco_type(simple) { n_run_controls++; if (!app) egsFatal("EGS_RunControl::EGS_RunControl: it is not allowed\n" @@ -110,10 +110,10 @@ EGS_RunControl::EGS_RunControl(EGS_Application *a) : geomErrorCount(0), vector ctype; ctype.push_back("first"); - ctype.push_back("restart"); + ctype.push_back("resume"); ctype.push_back("analyze"); ctype.push_back("combine"); - restart = input->getInput("calculation",ctype,0); + resume = input->getInput("calculation",ctype,0); } EGS_RunControl::~EGS_RunControl() { @@ -183,17 +183,17 @@ void EGS_RunControl::resetCounter() { } int EGS_RunControl::startSimulation() { - if (restart == 1 || restart == 2) { + if (resume == 1 || resume == 2) { if (app->readData()) { return -1; } - if (restart == 2) { + if (resume == 2) { ncase = ndone; egsInformation("\n\nResult analysis only\n\n"); return 1; } } - else if (restart == 3) { + else if (resume == 3) { app->describeSimulation(); egsInformation("\n\nCombine results only\n\n"); egsInformation("calling combineResults()\n"); @@ -205,11 +205,11 @@ int EGS_RunControl::startSimulation() { time_t tinfo = time(0); egsInformation("\n\nStarting simulation on %s\n", asctime(localtime(&tinfo))); - if (restart == 0) { + if (resume == 0) { egsInformation(" Fresh simulation of %lld histories\n\n\n",ncase); } else { - egsInformation(" Restarted simulation with %lld old and %lld" + egsInformation(" Resumed simulation with %lld old and %lld" " new histories\n\n\n",ndone,ncase-ndone); } timer.start(); diff --git a/HEN_HOUSE/egs++/egs_run_control.h b/HEN_HOUSE/egs++/egs_run_control.h index caf91e75d..97f606b49 100644 --- a/HEN_HOUSE/egs++/egs_run_control.h +++ b/HEN_HOUSE/egs++/egs_run_control.h @@ -80,7 +80,7 @@ class EGS_Input; for single job control. This RCO provides the ability to run simulations with a user specified number of particles and up to a user specified statistical uncertainty. It also provides the ability to restrict - the simulation to a user specified maximum CPU time, to perform restarted + the simulation to a user specified maximum CPU time, to resume simulations or to simply analyze the results of a previous run or to combine the results of previously performed parallel runs. - A \link EGS_JCFControl 'job control file' (JCF) RCO \endlink. @@ -243,8 +243,8 @@ class EGS_EXPORT EGS_RunControl { EGS_Float maxt; // maximum time to run in hours. EGS_Float accu; // statistical uncertainty sought. int nbatch; // number of batches. - int restart;// =0 => fresh calculation - // =1 => restart calculation + int resume;// =0 => fresh calculation + // =1 => resume calculation // =2 => analyze results // =3 => combine parallel run int nchunk; // number of simulation "chunks" diff --git a/HEN_HOUSE/egs++/egs_scoring.h b/HEN_HOUSE/egs++/egs_scoring.h index 5148cc697..8c1b414d8 100644 --- a/HEN_HOUSE/egs++/egs_scoring.h +++ b/HEN_HOUSE/egs++/egs_scoring.h @@ -134,7 +134,7 @@ class EGS_EXPORT EGS_ScoringSingle { \a data. Returns \c true on success, \a false on failure. This function can be used for storing intermediate results into a - data file for later recovery in \em e.g. restarted calculations. + data file for later recovery in \em e.g. resumed calculations. The data stored is the sum of scores, sum of scores squared and the 16 bit integer representing the last statistically independent event that contributed to the score. @@ -306,7 +306,7 @@ class EGS_EXPORT EGS_ScoringArray { stream \a data. This function can be used for storing intermediate results into a - data file for later recovery in \em e.g. restarted calculations. + data file for later recovery in \em e.g. resumed calculations. The information stored in the number of element in the array #nreg, the current short integer history counter, the current history counter, the current history counter divided by 65536 and @@ -335,7 +335,7 @@ class EGS_EXPORT EGS_ScoringArray { This function is useful for seting the state of the scoring object to a state previously stored using storeState() in \em e.g. - restarted simulations. + resumed simulations. */ bool setState(istream &data) { int nreg1; diff --git a/HEN_HOUSE/egs++/sources/egs_beam_source/egs_beam_source.h b/HEN_HOUSE/egs++/sources/egs_beam_source/egs_beam_source.h index 8f5dbe07a..1c5d4c9e1 100644 --- a/HEN_HOUSE/egs++/sources/egs_beam_source/egs_beam_source.h +++ b/HEN_HOUSE/egs++/sources/egs_beam_source/egs_beam_source.h @@ -111,8 +111,8 @@ key is present, particles having statistical weights less than \c wmin or greater than \c wmax will be rejected. This is useful to \em e.g. reject "phat" particles from a simulation using DBS. -BEWARE: When restarting calculations using this source, one must make -sure that the RESTART calculation option is defined in +BEWARE: When resuming calculations using this source, one must make +sure that the RESUME calculation option is defined in both, the source and the application input files. A simple example. Note that you must build the required shared library for diff --git a/HEN_HOUSE/egs++/sources/egs_phsp_source/egs_phsp_source.h b/HEN_HOUSE/egs++/sources/egs_phsp_source/egs_phsp_source.h index c74b7c505..07c1d3cf1 100644 --- a/HEN_HOUSE/egs++/sources/egs_phsp_source/egs_phsp_source.h +++ b/HEN_HOUSE/egs++/sources/egs_phsp_source/egs_phsp_source.h @@ -251,7 +251,7 @@ class EGS_PHSP_SOURCE_EXPORT EGS_PhspSource : public EGS_BaseSource { Nlast, //!< Last record this source can use count; /*!< Particles delivered so far (may be less than Nread because some particles were rejected */ - int Nrestart; //!< Number of times the file was restarted + int Nrestart; //!< Number of times the phsp file was restarted int Nrecycle_g; //!< Number of times to recycle a photon int Nrecycle_e; //!< Number of times to recycle a charged particle int Nrecycle; //!< Number of times to recycle current particle diff --git a/HEN_HOUSE/egs++/sources/iaea_phsp_source/iaea_phsp_source.h b/HEN_HOUSE/egs++/sources/iaea_phsp_source/iaea_phsp_source.h index 14a365c7c..0be9005a5 100644 --- a/HEN_HOUSE/egs++/sources/iaea_phsp_source/iaea_phsp_source.h +++ b/HEN_HOUSE/egs++/sources/iaea_phsp_source/iaea_phsp_source.h @@ -258,7 +258,7 @@ class IAEA_PHSP_SOURCE_EXPORT IAEA_PhspSource : public EGS_BaseSource { Nlast, //!< Last record this source can use count; /*!< Particles delivered so far (may be less than Nread because some particles were rejected */ - int Nrestart; //!< Number of times the file was restarted + int Nrestart; //!< Number of times the phsp file was restarted int Nrecycle_g; //!< Number of times to recycle a photon int Nrecycle_e; //!< Number of times to recycle a charged particle int Nrecycle; //!< Number of times to recycle current particle diff --git a/HEN_HOUSE/gui/egs_configure/egs_install_conf.cpp b/HEN_HOUSE/gui/egs_configure/egs_install_conf.cpp index 09f6bc616..04b48fa21 100644 --- a/HEN_HOUSE/gui/egs_configure/egs_install_conf.cpp +++ b/HEN_HOUSE/gui/egs_configure/egs_install_conf.cpp @@ -1664,4 +1664,4 @@ void QInstallPage::copy_user_codes(){ return; } emit userCodesCopied(); -} \ No newline at end of file +} diff --git a/HEN_HOUSE/gui/egs_inprz/include/datainp.h b/HEN_HOUSE/gui/egs_inprz/include/datainp.h index ca63f87c3..36a90b21c 100644 --- a/HEN_HOUSE/gui/egs_inprz/include/datainp.h +++ b/HEN_HOUSE/gui/egs_inprz/include/datainp.h @@ -61,7 +61,7 @@ using namespace std; #define WARNING_IWATCH "Wrong IWATCH in input file!\n" #define WARNING_STRAND "Wrong value for random number store mode !\n" #define WARNING_STRDAT "Wrong value for data store mode !\n" -#define WARNING_IRESTART "Wrong value for irestart mode !\n" +#define WARNING_IRESUME "Wrong value for iresume mode !\n" #define WARNING_OUTOPT "Wrong value for output options !\n" #define WARNING_ETRANS "Wrong value for e- transport options !\n" #define WARNING_SPROUT "Wrong value for stopp. pwr out option !\n" diff --git a/HEN_HOUSE/gui/egs_inprz/include/ioinputs.h b/HEN_HOUSE/gui/egs_inprz/include/ioinputs.h index 52abc4f31..15fc98a69 100644 --- a/HEN_HOUSE/gui/egs_inprz/include/ioinputs.h +++ b/HEN_HOUSE/gui/egs_inprz/include/ioinputs.h @@ -61,7 +61,7 @@ class MIOInputs : public MInputBlock QString iwatch; QString strnd; - QString irestart; + QString iresume; QString strdat; QString outopt; QString etransport; diff --git a/HEN_HOUSE/gui/egs_inprz/include/tooltips.h b/HEN_HOUSE/gui/egs_inprz/include/tooltips.h index bfc185d81..77cd9bf31 100644 --- a/HEN_HOUSE/gui/egs_inprz/include/tooltips.h +++ b/HEN_HOUSE/gui/egs_inprz/include/tooltips.h @@ -159,14 +159,14 @@ static const char* electron_transport[] = { "
to do a full CSDA calculation." }; -static const char* irestart[] = { +static const char* iresume[] = { "First run for this input file.", -"Restart a previous run, i.e. add more histories.", +"Resume a previous run, i.e. add more histories.", "Just read in the raw data and do the statistical" -"\nanalysis( gives no timing - restart 100 histories" +"\nanalysis( gives no timing - resume 100 histories" "\nto get the same effect and more info)", "Read starting random numbers from a file
" diff --git a/HEN_HOUSE/gui/egs_inprz/src/inputRZForm.cpp b/HEN_HOUSE/gui/egs_inprz/src/inputRZForm.cpp index d4c3025bc..f2a60abca 100644 --- a/HEN_HOUSE/gui/egs_inprz/src/inputRZForm.cpp +++ b/HEN_HOUSE/gui/egs_inprz/src/inputRZForm.cpp @@ -790,9 +790,9 @@ void inputRZImpl::update_IOControl( const MIOInputs* EGSio ) //delete[] rb; - // IRESTART - error = QString(WARNING_IRESTART); - validate_combo( EGSio->irestart.toLatin1().data() , error, irestartComboBox ); + // IRESUME + error = QString(WARNING_IRESUME); + validate_combo( EGSio->iresume.toLatin1().data() , error, iresumeComboBox ); // STORE DATA ARRAYS if ( EGSio->strdat.toLower() == "yes" ){ diff --git a/HEN_HOUSE/gui/egs_inprz/src/inputRZSave.cpp b/HEN_HOUSE/gui/egs_inprz/src/inputRZSave.cpp index 1c32e2641..1fc9d6deb 100644 --- a/HEN_HOUSE/gui/egs_inprz/src/inputRZSave.cpp +++ b/HEN_HOUSE/gui/egs_inprz/src/inputRZSave.cpp @@ -155,7 +155,7 @@ MIOInputs* inputRZImpl::GetIO() EGSio->iwatch = iwatchComboBox->currentText(); EGSio->strnd = TextRadioBChecked(3, rb); - EGSio->irestart = irestartComboBox->currentText(); + EGSio->iresume = iresumeComboBox->currentText(); EGSio->strdat = (storeDataCheckBox->isChecked()) ? "yes" : "no"; EGSio->outopt = outoptComboBox->currentText (); EGSio->etransport = etransportComboBox->currentText (); diff --git a/HEN_HOUSE/gui/egs_inprz/src/ioinputs.cpp b/HEN_HOUSE/gui/egs_inprz/src/ioinputs.cpp index 71f476daa..bd5a67116 100644 --- a/HEN_HOUSE/gui/egs_inprz/src/ioinputs.cpp +++ b/HEN_HOUSE/gui/egs_inprz/src/ioinputs.cpp @@ -39,7 +39,7 @@ MIOInputs::MIOInputs() { iwatch = "off"; strnd = "no"; - irestart = "first"; + iresume = "first"; strdat = "yes"; outopt = "short"; etransport = "normal"; @@ -69,7 +69,7 @@ std::ifstream & operator >> ( std::ifstream & in, MIOInputs* rIO ) std::vector codes; codes.push_back("IWATCH"); codes.push_back("STORE INITIAL RANDOM NUMBERS"); - codes.push_back("IRESTART"); + codes.push_back("IRESUME"); codes.push_back("STORE DATA ARRAYS"); codes.push_back("OUTPUT OPTIONS"); codes.push_back("ELECTRON TRANSPORT"); @@ -93,7 +93,7 @@ std::ifstream & operator >> ( std::ifstream & in, MIOInputs* rIO ) DE_Parser *p = new DE_Parser(codes,0,"I/O control", in, false); rIO->iwatch = getIt( codes[0] , "off" , rIO->errors, p ) ; rIO->strnd = getIt( codes[1] , "no" , rIO->errors, p ) ; - rIO->irestart = getIt( codes[2] , "first" , rIO->errors, p ) ; + rIO->iresume = getIt( codes[2] , "first" , rIO->errors, p ) ; rIO->strdat = getIt( codes[3] , "no" , rIO->errors, p ) ; if ( ( rIO->gusercode() != sprrznrc) && ( rIO->gusercode() != flurznrc) ) rIO->outopt = getIt( codes[4] , "short", rIO->errors, p ) ; @@ -148,7 +148,7 @@ Q3TextStream & operator << ( Q3TextStream & t, MIOInputs * rIO ) t << "IWATCH= " << rIO->iwatch << "\n"; t << "STORE INITIAL RANDOM NUMBERS= " << rIO->strnd << "\n"; - t << "IRESTART= " << rIO->irestart << "\n"; + t << "IRESUME= " << rIO->iresume << "\n"; t << "STORE DATA ARRAYS= " << rIO->strdat << "\n"; if ( ( rIO->gusercode() != sprrznrc ) && ( rIO->gusercode() != flurznrc ) ){ @@ -205,7 +205,7 @@ QTextStream & operator << ( QTextStream & t, MIOInputs * rIO ) t << "IWATCH= " << rIO->iwatch << "\n"; t << "STORE INITIAL RANDOM NUMBERS= " << rIO->strnd << "\n"; - t << "IRESTART= " << rIO->irestart << "\n"; + t << "IRESUME= " << rIO->iresume << "\n"; t << "STORE DATA ARRAYS= " << rIO->strdat << "\n"; if ( ( rIO->gusercode() != sprrznrc ) && ( rIO->gusercode() != flurznrc ) ){ diff --git a/HEN_HOUSE/gui/egs_inprz/ui/inputRZ.ui b/HEN_HOUSE/gui/egs_inprz/ui/inputRZ.ui index 68067cfe5..37ede6d26 100644 --- a/HEN_HOUSE/gui/egs_inprz/ui/inputRZ.ui +++ b/HEN_HOUSE/gui/egs_inprz/ui/inputRZ.ui @@ -1251,10 +1251,10 @@ - output *.egsdat file for restarts, parallel post-processing, etc + output *.egsdat file for resuming, parallel post-processing, etc - output *.egsdat file for restarts, parallel post-processing, etc + output *.egsdat file for resuming, parallel post-processing, etc QFrame::StyledPanel @@ -1266,10 +1266,10 @@ - output *.egsdat file for restarts, parallel post-processing, etc + output *.egsdat file for resuming, parallel post-processing, etc - output *.egsdat file for restarts, parallel post-processing, etc + output *.egsdat file for resuming, parallel post-processing, etc store data array @@ -1522,7 +1522,7 @@ - + Define run mode @@ -1530,7 +1530,7 @@ Define run mode - irestart : + iresume : false @@ -1554,7 +1554,7 @@ - + run mode @@ -1571,7 +1571,7 @@ - restart + resume @@ -11394,7 +11394,7 @@ Will start in /pegs4/density_corrections/ subdirectory off the directory selecte outoptComboBox etransportComboBox iwatchComboBox - irestartComboBox + iresumeComboBox minPlnSpinBox maxPlnSpinBox minCylSpinBox diff --git a/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EX10MeVe/EX10MeVe.egslog b/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EX10MeVe/EX10MeVe.egslog index 3cfcfa46f..d741e9e88 100644 --- a/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EX10MeVe/EX10MeVe.egslog +++ b/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EX10MeVe/EX10MeVe.egslog @@ -44,13 +44,13 @@ output file(s)..............................................ex MEDIUM of nominal AIR (exactly as in pegs4dat) (left justify): AIR521ICRU - IWATCH(-N-4), ISTOR(0,+-1), IRESTART(0-3), IO_OPT(0-3), + IWATCH(-N-4), ISTOR(0,+-1), IRESUME(0-3), IO_OPT(0-3), IDAT(0-1), LATCH_OPTION (1-3), IZLAST(0-2) : 0 0 0 0 0 2 0 Do not track(0) or track(>0) every interaction or track Nth history only(-N): 0 Store random # for a batch(0),a history(1) or read random #(-1): 0 - First run(0),restarted(1),make(2),analyze(3): 0 + First run(0),resumed(1),make(2),analyze(3): 0 Output to PH-SP(0),not(1),BEAM-MODEL(2),PH-SP&MODEL(3): 0 Store data(0) or not(1): 0 LATCH OPTION,do not inherit(1),inherit+record origin(2,3): 2 diff --git a/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EX10MeVe/EX10MeVe.egstmpa b/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EX10MeVe/EX10MeVe.egstmpa index 6421b3871..b961afad4 100644 --- a/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EX10MeVe/EX10MeVe.egstmpa +++ b/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EX10MeVe/EX10MeVe.egstmpa @@ -1,6 +1,6 @@ EX10MeVe: example electron beam, 10 MeV, SSD=100cm, 10x10cm field AIR521ICRU - 0 0 0 0 0 2 0, IWATCH,ISTORE,IRESTART,etc + 0 0 0 0 0 2 0, IWATCH,ISTORE,IRESUME,etc 50000. 97 33 500.00 0 0 0 NCASE, etc -1 0 0.100000 0.00000 0.00000 1.00000 , IQIN,ISOURCE etc 0, MONOEN diff --git a/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EX16MVp/EX16MVp.egslog b/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EX16MVp/EX16MVp.egslog index 5231d02d4..8ce24cf90 100644 --- a/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EX16MVp/EX16MVp.egslog +++ b/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EX16MVp/EX16MVp.egslog @@ -44,13 +44,13 @@ output file(s)..............................................ex MEDIUM of nominal AIR (exactly as in pegs4dat) (left justify): AIR700ICRU - IWATCH(-N-4), ISTOR(0,+-1), IRESTART(0-3), IO_OPT(0-3), + IWATCH(-N-4), ISTOR(0,+-1), IRESUME(0-3), IO_OPT(0-3), IDAT(0-1), LATCH_OPTION (1-3), IZLAST(0-2) : 0 0 0 0 1 3 1 Do not track(0) or track(>0) every interaction or track Nth history only(-N): 0 Store random # for a batch(0),a history(1) or read random #(-1): 0 - First run(0),restarted(1),make(2),analyze(3): 0 + First run(0),resumed(1),make(2),analyze(3): 0 Output to PH-SP(0),not(1),BEAM-MODEL(2),PH-SP&MODEL(3): 0 Store data(0) or not(1): 1 LATCH OPTION,do not inherit(1),inherit+record origin(2,3): 3 diff --git a/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EX16MVp/EX16MVp.egstmpa b/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EX16MVp/EX16MVp.egstmpa index ce0ed9440..457c68ddf 100644 --- a/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EX16MVp/EX16MVp.egstmpa +++ b/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EX16MVp/EX16MVp.egstmpa @@ -1,6 +1,6 @@ EX16MVp.egs4inp, 16 MV photons,SSD=100 from front face of target, 10x10 field AIR700ICRU - 0 0 0 0 1 3 1, IWATCH,ISTORE,IRESTART,etc + 0 0 0 0 1 3 1, IWATCH,ISTORE,IRESUME,etc 15000. 31 77 900.00 1 20 0 NCASE, etc -1 0 0.100000E-02 0.00000 0.00000 1.00000 , IQIN,ISOURCE etc 0, MONOEN diff --git a/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EXphantom/EXphantom.egsinp b/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EXphantom/EXphantom.egsinp index 7e7ff6698..903e1a7fb 100644 --- a/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EXphantom/EXphantom.egsinp +++ b/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EXphantom/EXphantom.egsinp @@ -1,6 +1,6 @@ EXphantom: example depth-dose calc using a phsp source from a 10MeV e- beam #!GUI1.0 AIR700ICRU -0, 0, 0, 1, 0, 0, 0, IWATCH,ISTORE,IRESTART,etc +0, 0, 0, 1, 0, 0, 0, IWATCH,ISTORE,IRESUME,etc 70000.0, 0, 0, 0.99, 0, 0, 0, 0, NCASE, etc 9, 21, 1, 0.0, 0.0, 0.0, 0.0, 0.0,0.0,0.0, Phase space source incident on CM 1 $EGS_HOME/BEAM_EX10MeVe/EX10MeVe.egsphsp1 diff --git a/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EXphantom/EXphantom.egslog b/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EXphantom/EXphantom.egslog index 6e90cb129..193dcf606 100644 --- a/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EXphantom/EXphantom.egslog +++ b/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EXphantom/EXphantom.egslog @@ -44,13 +44,13 @@ output file(s)..............................................ex MEDIUM of nominal AIR (exactly as in pegs4dat) (left justify): AIR700ICRU - IWATCH(-N-4), ISTOR(0,+-1), IRESTART(0-3), IO_OPT(0-3), + IWATCH(-N-4), ISTOR(0,+-1), IRESUME(0-3), IO_OPT(0-3), IDAT(0-1), LATCH_OPTION (1-3), IZLAST(0-2) : 0 0 0 1 0 0 0 Do not track(0) or track(>0) every interaction or track Nth history only(-N): 0 Store random # for a batch(0),a history(1) or read random #(-1): 0 - First run(0),restarted(1),make(2),analyze(3): 0 + First run(0),resumed(1),make(2),analyze(3): 0 Output to PH-SP(0),not(1),BEAM-MODEL(2),PH-SP&MODEL(3): 1 Store data(0) or not(1): 0 LATCH OPTION,do not inherit(1),inherit+record origin(2,3): 2 diff --git a/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EXphantom/EXphantom.egstmpa b/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EXphantom/EXphantom.egstmpa index 8c2b35b37..623454458 100644 --- a/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EXphantom/EXphantom.egstmpa +++ b/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EXphantom/EXphantom.egstmpa @@ -1,6 +1,6 @@ EXphantom: example depth-dose calc using a phsp source from a 10MeV e- beam AIR700ICRU - 0 0 0 1 0 2 0, IWATCH,ISTORE,IRESTART,etc + 0 0 0 1 0 2 0, IWATCH,ISTORE,IRESUME,etc 70000. 1802 9373 0.99 0 0 0 NCASE, etc 0 21 1.00000 0.00000 0.00000 0.00000 , IQIN,ISOURCE etc 0.00000 0.00000 0.00000 0.00000 , IQIN,ISOURCE etc diff --git a/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EXslabs/EXslabs.egslog b/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EXslabs/EXslabs.egslog index 5e8e25348..7d7aea559 100644 --- a/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EXslabs/EXslabs.egslog +++ b/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EXslabs/EXslabs.egslog @@ -44,13 +44,13 @@ output file(s)..............................................ex MEDIUM of nominal AIR (exactly as in pegs4dat) (left justify): AIR700ICRU - IWATCH(-N-4), ISTOR(0,+-1), IRESTART(0-3), IO_OPT(0-3), + IWATCH(-N-4), ISTOR(0,+-1), IRESUME(0-3), IO_OPT(0-3), IDAT(0-1), LATCH_OPTION (1-3), IZLAST(0-2) : 0 0 0 0 0 2 0 Do not track(0) or track(>0) every interaction or track Nth history only(-N): 0 Store random # for a batch(0),a history(1) or read random #(-1): 0 - First run(0),restarted(1),make(2),analyze(3): 0 + First run(0),resumed(1),make(2),analyze(3): 0 Output to PH-SP(0),not(1),BEAM-MODEL(2),PH-SP&MODEL(3): 0 Store data(0) or not(1): 0 LATCH OPTION,do not inherit(1),inherit+record origin(2,3): 2 diff --git a/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EXslabs/EXslabs.egstmpa b/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EXslabs/EXslabs.egstmpa index 4f9ef3ba9..9b282b007 100644 --- a/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EXslabs/EXslabs.egstmpa +++ b/HEN_HOUSE/omega/beamnrc/BEAMnrc_examples/EXslabs/EXslabs.egstmpa @@ -1,6 +1,6 @@ EXslabs: pencil beam of 20 MeV electrons thru 100 cm air phase space AIR700ICRU - 0 0 0 0 0 2 0, IWATCH,ISTORE,IRESTART,etc + 0 0 0 0 0 2 0, IWATCH,ISTORE,IRESUME,etc 1000. 1802 9373 0.99 0 0 0 NCASE, etc -1 0 0.00000 0.00000 0.00000 0.00000 , IQIN,ISOURCE etc 0, MONOEN diff --git a/HEN_HOUSE/omega/beamnrc/beamnrc.mortran b/HEN_HOUSE/omega/beamnrc/beamnrc.mortran index 5721aafc9..fa226edeb 100644 --- a/HEN_HOUSE/omega/beamnrc/beamnrc.mortran +++ b/HEN_HOUSE/omega/beamnrc/beamnrc.mortran @@ -142,12 +142,12 @@ WITH {,' ',} " " 1 listing file for user " 2 state of random no. generator at start of history(ISTORE non-zero) -" 3 ploting file -" 4 stored scoring arrays written end each batch for restart +" 3 plotting file +" 4 stored scoring arrays written end each batch for resuming " 5 user input from keyboard or input file " 6 echo of user input / log file -" 7 echo of input file - for restart or creating a file interactively -" 8 EGSnrc echos the cross section data read in to this unit +" 7 echo of input file - for resuming or creating a file interactively +" 8 EGSnrc echoes the cross section data read in to this unit " 17 EGS_windows geometry file " 12 HATCH reads the cross section data prepared by PEGS4 from this unit " 13 EGS_windows file for graphical display particle histories @@ -247,7 +247,7 @@ WITH {,' ',} "%A00 "I> Next Record "I> *********** -"I> IWATCH,ISTORE,IRESTART,IO_OPT,IDAT,LATCH_OPTION,IZLAST +"I> IWATCH,ISTORE,IRESUME,IO_OPT,IDAT,LATCH_OPTION,IZLAST "I> "I> IWATCH = 0 for normal output (the default) "I> = 1 output for every discrete interaction @@ -262,8 +262,8 @@ WITH {,' ',} "I> This is a debugging tool. If run quits, rerun with "I> ISTORE=1, then again ISTORE=-1 and IWATCH = 1/2 "I> and/or the debugger on. -"I> IRESTART = 0 first run for this data set (the default) -"I> = 1 restart of a previous run +"I> IRESUME = 0 first run for this data set (the default) +"I> = 1 resume a previous run "I> = 2 just create the input file and exit "I> = 3 read in the raw data from a previous run and do "I> the statistical analysis on dose etc. @@ -272,7 +272,7 @@ WITH {,' ',} "I> with the extension _w#, where # "I> can be any positive integer. These .egsdat files "I> will be summed and then the result analyzed similar -"I> to IRESTART=3. +"I> to IRESUME=3. "I> IO_OPT = 0 phase-space output at each scoring plane(the default) "I> = 1 no phase-space output when particles cross scoring "I> plane @@ -2479,7 +2479,7 @@ INTEGER NREG; } "V>Unit numbers passed in common: "V>IOUTLIST = listing "V>IOUTPLOT = plot file -"V>IORSTRT = restart file, mainly containing scoring arrays (input) +"V>IORSTRT = resume file, mainly containing scoring arrays (input) "V>IOUTGPH = EGS_Windows file for graphical display of particle history "V> note this is hardwired as 13 in the WATCH subroutine "V>IOUTGEOM = EGS_Windows geometry file @@ -2544,8 +2544,8 @@ INTEGER IOUTLIST,IOUTPLOT,IORSTRT,IOUTGPH,IOUTGEOM,IOUTRN, "V> in previous runs (ISOURC=21 only) "V>NCASET = number of histories already done. "V>JCASE = no. of histories in each batch -"V>IRESTART = 0 => initial run -"V> = 1 => restarted run +"V>IRESUME = 0 => initial run +"V> = 1 => resumed run "V> = 2 => creation of input file only "V> = 3 => data analysis only "V>is_finished = .true. on finishing the last job in a parallel run @@ -2667,7 +2667,7 @@ REPLACE {;COMIN/SCORE/;} WITH { NPPHSP, NPHOTPHSP, INPHSP,NPFLU, SCFLU_NUM, is_finished, data_unit,MXNP,ISTORE,IWATCH,IO_OPT,IOUTSP,ID, NSC_PLANES,NSC_ZONES, IPLANE_to_CM,IZLAST,I_MU_PHSP,IZSCORE,JHSTRY, - ISCORE,ISZ,IDAT, IRESTART, IQIN,MZONE_TYPE,NDOSE_ZONE,DOSE_ZONE, + ISCORE,ISZ,IDAT, IRESUME, IQIN,MZONE_TYPE,NDOSE_ZONE,DOSE_ZONE, MAX_BIT,IREGION_TO_BIT, LNEXC, LNINC, L_N_EXC,L_N_INC, FLUENCERR,IPLOTFLAG,DOSE_STAT,NUM_BREM, SCFLU_NOCOV,NHSTRY_LAST,SCSTP_LAST,SCDSTP_LAST, SCDOSE_LAST, SCFLU_LAST; @@ -2698,7 +2698,7 @@ $LOGICAL is_finished; INTEGER data_unit,MXNP,ISTORE,IWATCH,IO_OPT,IOUTSP,ID, NSC_PLANES,NSC_ZONES($MAX_SC_PLANES), IPLANE_to_CM($MAX_SC_PLANES),IZLAST,I_MU_PHSP,IZSCORE,JHSTRY, - ISCORE,ISZ,IDAT, IRESTART, + ISCORE,ISZ,IDAT, IRESUME, IQIN,MZONE_TYPE($MAX_SC_PLANES),NDOSE_ZONE,DOSE_ZONE($MXREG), MAX_BIT,IREGION_TO_BIT($MXREG), LNEXC, LNINC, L_N_EXC($MAXIT, 32),L_N_INC($MAXIT,32), @@ -3710,15 +3710,15 @@ IF(IO_OPT = 0 | IO_OPT >= 3) ["requested phase space files be output" ] ] - IF(IRESTART = 0)["start a new run" + IF(IRESUME = 0)["start a new run" DO I=1,NSC_PLANES [ $BEAM_OPEN_PHSP_FOR_WRITE; ] - ] "end of IRESTART = 0 block" + ] "end of IRESUME = 0 block" - ELSEIF(IRESTART = 1)["restart from a previous run" + ELSEIF(IRESUME = 1)["resume from a previous run" $BEAM_OPEN_PHSP_FOR_READ; - ] "end of IRESTART = 1 block" + ] "end of IRESUME = 1 block" ] "end of block opening phase space files if there" "initialize counters for phase space output for 1st scorig plane only" @@ -3865,7 +3865,7 @@ IF(ISOURC~=21 & ISOURC~=24)[ NRCYCL=0; ] -IF(IRESTART = 0)[ "Fresh start, set everything to zero" +IF(IRESUME = 0)[ "Fresh start, set everything to zero" DO I=1,NSC_PLANES [ NPPHSP(I)=0;"Initialize the counters + variables for the ph-sp I/O" @@ -3874,9 +3874,9 @@ IF(IRESTART = 0)[ "Fresh start, set everything to zero" NPHOTPHSP(I)=0; ] NINCPHSP=0; -] "END IF IRESTART=0" +] "END IF IRESUME=0" -ELSEIF(IRESTART = 1)["Restart, read old data from unit 4" +ELSEIF(IRESUME = 1)["Resume, read old data from unit 4" "Open unit 4 as an old file" OUTPUT; (/' *** About to read dose/fluence data from previous run ***'); data_unit=egs_open_datfile(IORSTRT,0,1,'.egsdat'); @@ -3904,9 +3904,9 @@ ELSEIF(IRESTART = 1)["Restart, read old data from unit 4" $BEAM_READ_PHSP_FOR_RESTART; -] "end of IRESTART=1 block" +] "end of IRESUME=1 block" -ELSEIF(IRESTART = 3)[ +ELSEIF(IRESUME = 3)[ "Analysis only, read old data from unit 4" "Open unit 4 as an old file" OUTPUT; (/' *** About to read dose/fluence data from previous run ***'); @@ -3931,14 +3931,14 @@ ELSEIF(IRESTART = 3)[ CLOSE(data_unit); NCASE=0;"no new cases, just analyze old data" -] "end of IRESTART = 3 loop" +] "end of IRESUME = 3 loop" -ELSEIF(IRESTART = 4)[ +ELSEIF(IRESUME = 4)[ call egs_combine_runs(combine_results,'.egsdat'); NCASE=0;"no new cases, just analyze old data" -] "end of IRESTART = 4 loop" +] "end of IRESUME = 4 loop" -IF(IRESTART=1|IRESTART=3)[ +IF(IRESUME=1|IRESUME=3)[ "set NPFLU(I)=the total no. of particles that have already crossed" "scoring plane I" DO I=1,NSC_PLANES[ @@ -4371,7 +4371,7 @@ DO I=1,NMED[ ' IS GREATER THAN COVERED BY DATA FILE WHERE UP,UE=',2F10.1,' MeV'/ ' EXECUTION WILL TERMINATE AFTER COMPLETION OF INPUT FILE'// 1X,50('*')//); - IRESTART=2; "Signal an early exit" + IRESUME=2; "Signal an early exit" ] ] "End of loop over media" @@ -4421,8 +4421,8 @@ WRITE(IOUTLIST,200); WRITE(i_log,200); " Print execution mode -IF(IRESTART = 0)[WRITE(i_log,201);WRITE(IOUTLIST,201);] -ELSEIF(IRESTART = 1)[ +IF(IRESUME = 0)[WRITE(i_log,201);WRITE(IOUTLIST,201);] +ELSEIF(IRESUME = 1)[ IF(ISOURC=21 | ISOURC=24)[ WRITE(i_log,205) NCASE,NCASEO,NHSTRYO,NPASS_ph_spO,NFAT_ph_spO, (NPPHSP(IS),IS=1,NSC_PLANES); @@ -4440,23 +4440,23 @@ ELSEIF(IRESTART = 1)[ WRITE(IOUTLIST,202)NCASE,NCASEO,(NPPHSP(IS),IS=1,NSC_PLANES); ] ] -ELSEIF(IRESTART = 2)[ +ELSEIF(IRESUME = 2)[ WRITE(i_log,203); WRITE(IOUTLIST,203); ircode = 2; return; ] -ELSEIF(IRESTART = 3)[ +ELSEIF(IRESUME = 3)[ WRITE(i_log,204); WRITE(IOUTLIST,204); ircode = 1; return; ] 201 FORMAT(/'********* NEW INPUT FILE *********'/); -202 FORMAT(/' ********* RESTARTED INPUT FILE ********* '/ +202 FORMAT(/' ********* RESUMED INPUT FILE ********* '/ ' ',10X,I12,' NEW + ',I12,' OLD HISTORIES'/ ' ',10X,'USING RN SEEDS FROM PREVIOUS RUN'/ ' ',10X,'# OF PARTICLES IN THE PH-SP FILE FROM PREVIOUS RUN ='/ ' ',20X,4(1X,I12)/); 203 FORMAT(/' ********* INPUT FILE CREATION ONLY *********'/); 204 FORMAT(/' ********* DATA ANALYSIS ONLY *********'/); -205 FORMAT(/' ********* RESTARTED INPUT FILE ********* '/ +205 FORMAT(/' ********* RESUMED INPUT FILE ********* '/ ' ',10X,I12,' NEW + ',I12,' OLD HISTORIES (',I12,' PRIMARY HISTORIES)'/ ' ',10X,'# OF MULTIPLE PASSERS REJECTED FROM PREVIOUS RUN = ',I12/ ' ',10X,'# OF PHOTONS REJECTED BECAUSE THEY FALL OUTSIDE '/ @@ -4464,7 +4464,7 @@ ELSEIF(IRESTART = 3)[ ' ',10X,'USING RN SEEDS FROM PREVIOUS RUN'/ ' ',10X,'# OF PARTICLES IN THE PH-SP FILE FROM PREVIOUS RUN ='/ ' ',20X,4(1X,I12)/); -206 FORMAT(/' ********* RESTARTED INPUT FILE ********* '/ +206 FORMAT(/' ********* RESUMED INPUT FILE ********* '/ ' ',10X,I12,' NEW + ',I12,' OLD HISTORIES (',I12,' PRIMARY HISTORIES)'/ ' ',10X,'# OF FAT PHOTONS REJECTED=',I12/ ' ',10X,'USING RN SEEDS FROM PREVIOUS RUN'/ @@ -4848,10 +4848,10 @@ IF( n_parallel > 0 ) [ "Job is part of a parallel run " "another batch. Note: these are not statistical batches, they are only for "output purposes. -IF(IRESTART=3)[ +IF(IRESUME=3)[ OUTPUT;(/' Analyzing data from a previous run'//); ] -ELSEIF(IRESTART=4)[ +ELSEIF(IRESUME=4)[ OUTPUT;(/' Combining and analyzing data from parallel runs'//); ] ELSE[ @@ -5080,7 +5080,7 @@ IF(ISOURC=21 | ISOURC=24)[ :TIME-PLUS-ANAL: -IF(IRESTART~=4 & ~is_finished)[ +IF(IRESUME~=4 & ~is_finished)[ WRITE(IOUTLIST,250); $SHOW-RNG-STATE(IOUTLIST); WRITE(i_log,250); @@ -5091,7 +5091,7 @@ $SET_ELAPSED_CPUTIME(CPUT2); TIMCPU=CPUT2-tzero; ETIMETOT=ETIMETOT+TIMEB; RATIO=ETIMETOT/TIMCPU; -IF(IRESTART ~= 3 & IRESTART ~=4 & ~is_finished)[ +IF(IRESUME ~= 3 & IRESUME ~=4 & ~is_finished)[ WRITE(IOUTLIST,260)ETIMETOT,TIMCPU,TIMCPU/3600.,RATIO; WRITE(i_log,260)ETIMETOT,TIMCPU,TIMCPU/3600.,RATIO; IF(ientry=1) [ @@ -5107,7 +5107,7 @@ IF(IRESTART ~= 3 & IRESTART ~=4 & ~is_finished)[ 3600.*dble((IBATCH-1)*JCASE)/TIMCPU; ] ] -IF(IRESTART = 1)[ +IF(IRESUME = 1)[ WRITE(IOUTLIST,270) TIMCPU+TMCPUO,(TIMCPU+TMCPUO)/3600.; WRITE(i_log,270) TIMCPU+TMCPUO,(TIMCPU+TMCPUO)/3600.; WRITE(IOUTLIST,280)(TIMCPU+TMCPUO)/dble(IHSTRY), @@ -5115,7 +5115,7 @@ IF(IRESTART = 1)[ WRITE(i_log,280)(TIMCPU+TMCPUO)/dble(IHSTRY), 3600.*dble(IHSTRY)/(TIMCPU+TMCPUO); ] -ELSEIF(IRESTART = 3)[ +ELSEIF(IRESUME = 3)[ WRITE(IOUTLIST,275) TMCPUO,TMCPUO/3600.; WRITE(i_log,275) TMCPUO,TMCPUO/3600.; WRITE(IOUTLIST,280)TMCPUO/dble(IHSTRY), @@ -5123,7 +5123,7 @@ ELSEIF(IRESTART = 3)[ WRITE(i_log,280)TMCPUO/dble(IHSTRY), 3600.*dble(IHSTRY)/TMCPUO; ] -ELSEIF(IRESTART = 4 | is_finished)[ +ELSEIF(IRESUME = 4 | is_finished)[ WRITE(IOUTLIST,285) DATCOUNT,TMCPUO,TMCPUO/3600.,TMCPUO/FLOAT(DATCOUNT); WRITE(i_log,285) DATCOUNT,TMCPUO,TMCPUO/3600.,TMCPUO/FLOAT(DATCOUNT); WRITE(IOUTLIST,290)TMCPUO/dble(IHSTRY), @@ -7687,33 +7687,33 @@ DO J=1,24[MEDIA(J,1)=MED_IN(J);] "medium 1 is nominal AIR "next record "*********** -OUTPUT;(/' IWATCH(-N-4), ISTOR(0,+-1), IRESTART(0-3), IO_OPT(0-4), ',/ +OUTPUT;(/' IWATCH(-N-4), ISTOR(0,+-1), IRESUME(0-3), IO_OPT(0-4), ',/ ' IDAT(0-1), LATCH_OPTION (1-3), IZLAST(0-2): ',$); -;MINPUT (INPUTS) IWATCH,ISTORE,IRESTART,IO_OPT,IDAT,LATCH_OPTION ,IZLAST; +;MINPUT (INPUTS) IWATCH,ISTORE,IRESUME,IO_OPT,IDAT,LATCH_OPTION ,IZLAST; (7I12); -OUTPUT IWATCH,ISTORE,IRESTART,IO_OPT,IDAT,LATCH_OPTION ,IZLAST; +OUTPUT IWATCH,ISTORE,IRESUME,IO_OPT,IDAT,LATCH_OPTION ,IZLAST; (2I12,3I10,2I12); IF(IWATCH > 4)IWATCH=0; IF((ISTORE < -1) | (ISTORE > 1)) ISTORE=0; -IF((IRESTART < 0) | (IRESTART > 4))IRESTART=0; +IF((IRESUME < 0) | (IRESUME > 4))IRESUME=0; IF((IO_OPT < 0) | (IO_OPT > 4)) IO_OPT=0; IF((IDAT < 0) | (IDAT > 1)) IDAT =0; IF((IZLAST < 0) | (IZLAST > 2)) IZLAST = 0; IF(LATCH_OPTION <=0| LATCH_OPTION>3) LATCH_OPTION = 2; $BEAMMODEL_INPUT_OPTION; -OUTPUT IWATCH,ISTORE,IRESTART,IO_OPT,IDAT,LATCH_OPTION ,IZLAST; +OUTPUT IWATCH,ISTORE,IRESUME,IO_OPT,IDAT,LATCH_OPTION ,IZLAST; (/' Do not track(0) or track(>0) every interaction or track Nth'/ ' history only(-N):',T60,I12/ ' Store random # for a batch(0),a history(1) or read random #(-1):',T70,I2/ - ' First run(0),restarted(1),make(2),analyze(3):',T70,I2/ + ' First run(0),resumed(1),make(2),analyze(3):',T70,I2/ ' Output to PH-SP(0),not(1),BEAM-MODEL(2),PH-SP&MODEL(3),'/ ' output to PH-SP in IAEA format(4):',T70,I2/ ' Store data(0) or not(1):',T70,I2/ ' LATCH OPTION,do not inherit(1),inherit+record origin(2,3):',T70,I2/ ' Do not score ZLAST(0), score ZLAST(1), output file for graphics(2):', T70,I2); -"IF((IRESTART = 2) | (IDAT = 1))[INEXT=0;]ELSE[INEXT=1;]" -IF(IRESTART = 1)[INEXT=1;]ELSE[INEXT=0;]"Only leave restart=1 if already is" +"IF((IRESUME = 2) | (IDAT = 1))[INEXT=0;]ELSE[INEXT=1;]" +IF(IRESUME = 1)[INEXT=1;]ELSE[INEXT=0;]"Only leave resume=1 if already is" OUTPUT;(' '); " MONTE CARLO CONTROL INPUT ""toc: @@ -8143,7 +8143,7 @@ IF (NSC_PLANES > $MAX_SC_PLANES)[ OUTPUT NSC_PLANES, $MAX_SC_PLANES; IF(IO_OPT ~= 1)&(NSC_PLANES = 0) [ OUTPUT; (//' AT LEAST ONE SCORING PLANE HAS TO BE GIVEN FOR PH-SP OUTPUT!!'/ - ' PLEASE RESTART AND USE NSC_PLANES > 0.'///); + ' PLEASE RELAUNCH AND USE NSC_PLANES > 0.'///); $CALL_EXIT(1); ] @@ -8990,7 +8990,7 @@ SCSTP2,(count_pII_steps+PIISTP)/SCSTP,SCSTP2; 1PE10.3,' +/-',0PF4.1,'%'/ ' ','# PRESTA-II STEPS/TOTAL # CHARGED PARTICLE STEPS',T60, F7.3,' +/-',0PF4.1,'%'); -IF(IRESTART~=4 & ~is_finished)[ "do not keep track of this when combining" +IF(IRESUME~=4 & ~is_finished)[ "do not keep track of this when combining" "parallel runs" WRITE(IOUTLIST, '(/'' NO. OF BREMSSTRAHLUNG EVENTS IN THIS RUN:'',T60,I12)') @@ -9049,7 +9049,7 @@ IF (NSC_PLANES > 0) [ DO ICM=1,MAX_CMs [ ISCORE=ICM_to_SCORE(ICM); IF (ISCORE ~= 0) [ - IF(IRESTART=3|IRESTART=4|is_finished)[ + IF(IRESUME=3|IRESUME=4|is_finished)[ WRITE(IOUTLIST,'(I4,I7,I11,I9,''**'',F11.4,''**'',F15.4,''**'', F14.3,''**''/)') ISCORE,ISCORE,NPPHSP(ISCORE), @@ -9126,11 +9126,11 @@ IF (NSC_PLANES > 0) [ ] ] WRITE(IOUTLIST, '(/'' *Includes all particles of all weights'')'); - IF(IRESTART=3 | IRESTART=4 | is_finished)[ + IF(IRESUME=3 | IRESUME=4 | is_finished)[ WRITE(IOUTLIST, '(/'' **Information not available from runs in which previous data''/ - '' is simply analyzed (IRESTART=3) or combined from parallel''/ - '' runs (automatically or with IRESTART=4). The missing phase''/ + '' is simply analyzed (IRESUME=3) or combined from parallel''/ + '' runs (automatically or with IRESUME=4). The missing phase''/ '' space file info is available in the header of the (combined)''/ '' phase space file.'')'); ] @@ -9245,7 +9245,7 @@ IF (NSC_PLANES > 0) [ ] "End of fluence summary" "output min and max overall particle weights" - IF(IRESTART < 2 & ~is_finished)[ + IF(IRESUME < 2 & ~is_finished)[ IF(NUMTOT=0.) MINWEIGHT=0.; "reset from 999 if no particles scored" IF(MINWEIGHT > 0.0000030 )[ WRITE(IOUTLIST, diff --git a/HEN_HOUSE/omega/beamnrc/beamnrc_user_macros.mortran b/HEN_HOUSE/omega/beamnrc/beamnrc_user_macros.mortran index c5f21285c..7f4df914f 100644 --- a/HEN_HOUSE/omega/beamnrc/beamnrc_user_macros.mortran +++ b/HEN_HOUSE/omega/beamnrc/beamnrc_user_macros.mortran @@ -221,11 +221,11 @@ REPLACE {$USER-INIT;} WITH {;} "tasks to be performed at the end of the run (eg data analysis, output)" REPLACE {$USER-FINISH;} WITH {;} -"extra data to be written to .egsdat file for restarts, recombination" +"extra data to be written to .egsdat file for resuming, recombination" "after parallel. {P1} is the unit number of the file." REPLACE {$USER-WRITE-DAT(#);} WITH {;} -"extra data to be from .egsdat file for restarts, recombination" +"extra data to be from .egsdat file for resuming, recombination" "after parallel. {P1} is the unit number of the file." REPLACE {$USER-READ-DAT(#);} WITH {;} diff --git a/HEN_HOUSE/omega/progs/gui/beamdp/beamdp_gui.tcl b/HEN_HOUSE/omega/progs/gui/beamdp/beamdp_gui.tcl index 9061e230b..a6646f57f 100755 --- a/HEN_HOUSE/omega/progs/gui/beamdp/beamdp_gui.tcl +++ b/HEN_HOUSE/omega/progs/gui/beamdp/beamdp_gui.tcl @@ -68,7 +68,7 @@ # The backslash at the end of the comment line below is a continuation # character in wish, but not in sh. # -# The next line restarts using wishx\ +# The next line relaunches using wishx\ exec wish "$0" ${1+"$@"} # THIS IS THE MAIN PROGRAM FOR A GUI FOR BEAMDP @@ -1636,4 +1636,3 @@ proc help_gif { w iconfile } { #REPLACE {$MAXANGLE} WITH {0.1745}; set maxvals(nb) [get_1_default NB] set maxvals(nbinangle) [get_1_default NBINANGLE] - diff --git a/HEN_HOUSE/omega/progs/gui/beamnrc/beamnrc_gui.tcl b/HEN_HOUSE/omega/progs/gui/beamnrc/beamnrc_gui.tcl index 6d5ac4882..27df8934b 100755 --- a/HEN_HOUSE/omega/progs/gui/beamnrc/beamnrc_gui.tcl +++ b/HEN_HOUSE/omega/progs/gui/beamnrc/beamnrc_gui.tcl @@ -67,7 +67,7 @@ # # cd /usr; find . -name "*wish*" -print; # -# The next line restarts using wish \ +# The next line relaunches using wish \ exec wish "$0" ${1+"$@"} @@ -633,7 +633,7 @@ if {$argc > 1} { tk_dialog .pegs_file_error "PEGS file does not exist." "The pegs file $pegs4filename\ specified on the command line does not exist in either the local or main\ pegs4 data directory. You will have to browse for the PEGS4 data\ - or restart with another argument." error 0 OK + or relaunch with another argument." error 0 OK set pegs4filename {} } } @@ -665,7 +665,7 @@ if {$argc > 0} { if {![file exists $full_inp_file]} { tk_dialog .inp_file_error "Input file does not exist." "The input file $full_inp_file\ specified on the command line does not exist. Use the GUI to browse for\ - an existing input file or restart with another argument." error 0 OK + an existing input file or relaunch with another argument." error 0 OK set inp_file {} return } else { diff --git a/HEN_HOUSE/omega/progs/gui/beamnrc/beamnrc_params.tcl b/HEN_HOUSE/omega/progs/gui/beamnrc/beamnrc_params.tcl index 8124ad21e..3fd6a3c7b 100644 --- a/HEN_HOUSE/omega/progs/gui/beamnrc/beamnrc_params.tcl +++ b/HEN_HOUSE/omega/progs/gui/beamnrc/beamnrc_params.tcl @@ -215,14 +215,14 @@ set values(4) $options(4,0) set names(5) "Run option"; set help_text(5) { -Restart option, IRESTART: +Resume option, IRESUME: "first time" (0) means that this is the first run for this data\ set (default). BEAMnrc initiates a new run, deleting all\ of the output files from previous runs of the same\ name if present (.egslog, .egslst, .egsrns, .egsphsp1, etc.). -"restart" (1) means that this is a restart of a previous run. BEAMnrc reads\ +"resume" (1) means that this is resuming a previous run. BEAMnrc reads\ fluence and dose data from the previous run, the number of\ histories already run, the time taken by the previous run, and\ the random number seeds from the last batch of the previous run\ @@ -247,7 +247,7 @@ Restart option, IRESTART: } set numopts(5) 5; set options(5,0) "first time"; -set options(5,1) "restart"; +set options(5,1) "resume"; set options(5,3) "analyze previous"; set options(5,4) "analyze parallel jobs"; set values(5) $options(5,0) @@ -445,7 +445,7 @@ This is the maximum CPU time in hours allowed for this run. \ each batch, an estimate is made of how much time is needed\ to complete another batch. If the next batch cannot be\ completed in this time limit, BEAMnrc terminates the run and\ - analyzes the results for the shortened run. The restart\ + analyzes the results for the shortened run. The resume\ feature can be used to continue the run if needed, as long\ as data arrays are stored ("Store Data Arrays" option). } diff --git a/HEN_HOUSE/omega/progs/gui/beamnrc/load_input2_egsnrc.tcl b/HEN_HOUSE/omega/progs/gui/beamnrc/load_input2_egsnrc.tcl index ccd0c4ec0..890cc0981 100644 --- a/HEN_HOUSE/omega/progs/gui/beamnrc/load_input2_egsnrc.tcl +++ b/HEN_HOUSE/omega/progs/gui/beamnrc/load_input2_egsnrc.tcl @@ -283,7 +283,7 @@ proc read_input {} { set data [get_str $data values 2] gets $fileid data - # IWATCH,ISTORE,IRESTART,IO_OPT,IDAT,LATCH_OPTION,IZLAST + # IWATCH,ISTORE,IRESUME,IO_OPT,IDAT,LATCH_OPTION,IZLAST for {set i 3} {$i <= 9} {incr i} { set data [get_val $data values $i] if { $i==3 & [expr $values($i)]<0 } { diff --git a/HEN_HOUSE/omega/progs/gui/beamnrc/new_create_file_egsnrc.tcl b/HEN_HOUSE/omega/progs/gui/beamnrc/new_create_file_egsnrc.tcl index c0596d232..0c62787b7 100644 --- a/HEN_HOUSE/omega/progs/gui/beamnrc/new_create_file_egsnrc.tcl +++ b/HEN_HOUSE/omega/progs/gui/beamnrc/new_create_file_egsnrc.tcl @@ -121,7 +121,7 @@ proc create_file { file } { } } } elseif $i==5 { - # IRESTART option (0,1,3,4) + # IRESUME option (0,1,3,4) foreach j {0 1 3 4} { if { [string compare $values($i) $options($i,$j)]==0 } { set val $j @@ -781,5 +781,3 @@ proc create_file { file } { close $file } - - diff --git a/HEN_HOUSE/omega/progs/gui/beamnrc/set_main_inputs_egsnrc.tcl b/HEN_HOUSE/omega/progs/gui/beamnrc/set_main_inputs_egsnrc.tcl index 31f5a9a27..c99acb308 100644 --- a/HEN_HOUSE/omega/progs/gui/beamnrc/set_main_inputs_egsnrc.tcl +++ b/HEN_HOUSE/omega/progs/gui/beamnrc/set_main_inputs_egsnrc.tcl @@ -252,7 +252,7 @@ proc make_menu_button {i w} { -command "set_value $i $iopt $w.inp" } } elseif $i==5 { - # IT'S IRESTART (0,1,3,4) (no create input file option) + # IT'S IRESUME (0,1,3,4) (no create input file option) foreach iopt {0 1 3 4} { $w.inp.m add command -label $options($i,$iopt) \ -command "set_value $i $iopt $w.inp" @@ -2452,4 +2452,3 @@ proc set_pegs_file { tree filename } { if $extindex<0 {set extindex [expr $len-1]} set the_pegs_file [string range $the_pegs_file 0 $extindex] } - diff --git a/HEN_HOUSE/omega/progs/gui/dosxyznrc/dosxyznrc_gui.tcl b/HEN_HOUSE/omega/progs/gui/dosxyznrc/dosxyznrc_gui.tcl index 0d88a2947..ae7f45db1 100755 --- a/HEN_HOUSE/omega/progs/gui/dosxyznrc/dosxyznrc_gui.tcl +++ b/HEN_HOUSE/omega/progs/gui/dosxyznrc/dosxyznrc_gui.tcl @@ -66,13 +66,13 @@ # # cd /usr; find . -name "*wish*" -print; # -# The next line restarts using wishx \ +# The next line relaunches using wishx \ exec wish "$0" "$@" #note: either wishx is on your system path of you must modify the following # line to put the explicit path to wishx # To find wishx: cd /usr;find . -name "*wish*" -print ; -# the next line restarts using wishx \ +# the next line relaunches using wishx \ exec wish "$0" "$@" @@ -550,7 +550,7 @@ if {$argc > 1} { tk_dialog .pegs_file_error "PEGS file does not exist." "The pegs file $pegs4filename\ specified on the command line does not exist in either the local or main\ pegs4 data directory. You will have to browse for the PEGS4 data\ - or restart with another argument." error 0 OK + or relaunch with another argument." error 0 OK set pegs4filename {} } } @@ -566,7 +566,7 @@ if {$argc > 0} { if {![file exists $full_inp_file]} { tk_dialog .inp_file_error "Input file does not exist." "The input file $full_inp_file\ specified on the command line does not exist. Use the GUI to browse for\ - an existing input file or restart with another argument." error 0 OK + an existing input file or relaunch with another argument." error 0 OK set inp_file {} return } else { @@ -672,4 +672,3 @@ proc exit_prompt {} { input file! Exit the DOSXYZnrc GUI?" question 0 No Yes] if $result==1 { exit } } - diff --git a/HEN_HOUSE/omega/progs/gui/dosxyznrc/xyznrc_parameters.tcl b/HEN_HOUSE/omega/progs/gui/dosxyznrc/xyznrc_parameters.tcl index e82c5e1e6..24cc7d19d 100644 --- a/HEN_HOUSE/omega/progs/gui/dosxyznrc/xyznrc_parameters.tcl +++ b/HEN_HOUSE/omega/progs/gui/dosxyznrc/xyznrc_parameters.tcl @@ -373,11 +373,11 @@ With this option, DOSXYZnrc can redistribute the phase-space particles when\ } set names(12) "Run option"; set help_text(12) { -Restart option, IRESTART: +Resume option, IRESUME: "first time" means that this is the first run for this data\ set (default). -"restart" means that this is a restart of a previous run. +"resume" means that this run is resuming a previous run. "create input file and exit" does just that. "analyze previous" means read in the raw data from a\ previous run and do the statistical analysis on dose etc. @@ -386,20 +386,20 @@ Restart option, IRESTART: scheme: inputfile_w1.pardose, inputfile_w2.pardose, etc.} set numopts(12) 5; set options(12,0) "first time"; -set options(12,1) "restart"; +set options(12,1) "resume"; set options(12,2) "create input file and exit" set options(12,3) "analyze previous" set options(12,4) "combine parallel" -set names(13) "Output restart data" +set names(13) "Output resume data" set numopts(13) 3 set options(13,0) "after every batch" set options(13,1) "never" set options(13,2) "at end of run only" set help_text(13) { -Output restart data, IDAT: +Output resume data, IDAT: For large phantoms, writing this file will take a lot of time. For production\ - runs, output with restart data at the end of the run only. + runs, output with resume data at the end of the run only. } set names(14) "Range rejection" set numopts(14) 2 diff --git a/HEN_HOUSE/user_codes/cavity/cavity.cpp b/HEN_HOUSE/user_codes/cavity/cavity.cpp index 08bb32db9..dc79a71a2 100644 --- a/HEN_HOUSE/user_codes/cavity/cavity.cpp +++ b/HEN_HOUSE/user_codes/cavity/cavity.cpp @@ -105,7 +105,7 @@ # nbatch = number of batches to use # statistical accuracy sought = required uncertainty, in % # max cpu hours allowed = max. processor time allowed -# calculation = first | restart | combine | analyze +# calculation = first | resume | combine | analyze # # All inputs except for ncase are optional (a missing ncase key will result # in a simulation with 0 particles). diff --git a/HEN_HOUSE/user_codes/cavrznrc/cavrznrc.io b/HEN_HOUSE/user_codes/cavrznrc/cavrznrc.io index 8f64d1f73..7f7493ccd 100644 --- a/HEN_HOUSE/user_codes/cavrznrc/cavrznrc.io +++ b/HEN_HOUSE/user_codes/cavrznrc/cavrznrc.io @@ -38,9 +38,9 @@ # # 1 .egslst -# Unit 2 is explicitly opened if needed, depending on istore and/or irestart +# Unit 2 is explicitly opened if needed, depending on istore and/or iresume #2 .egsrns -# Unit 4 is explicitly opened if needed, depending on idat and/or irestart +# Unit 4 is explicitly opened if needed, depending on idat and/or iresume #4 .egsdat #9 .egseff # Unit 13 is explicitly opened if needed diff --git a/HEN_HOUSE/user_codes/cavrznrc/cavrznrc.mortran b/HEN_HOUSE/user_codes/cavrznrc/cavrznrc.mortran index a0bc1a458..2c457a68a 100644 --- a/HEN_HOUSE/user_codes/cavrznrc/cavrznrc.mortran +++ b/HEN_HOUSE/user_codes/cavrznrc/cavrznrc.mortran @@ -287,9 +287,9 @@ REPLACE {$MXMDSH} WITH {200} " THAT DEPOSIT ENERGY IN THE CAVITY " = all (3) STORE ALL THE INITIAL RANDOM NUMBERS " -" IRESTART +" IRESUME " = first (0) first run for this data set -" = restart (1) restart of a previous run +" = resume (1) resume a previous run " = analyze (3) just read in the raw data and do the statistical " analysis " = start-RNS (4) read starting random numbers from a file @@ -1962,15 +1962,15 @@ COMMON/IODAT2/ NCASE,NCASEO,NCASET,NNREADO, AMASS($MAXZREG,$MAXRADII),TMCPUO,TIMMAX,STATLM,EIN, ISUMCV($MXREG),MEDSAV($MXREG),RHOSAV($MXREG), -IDAT,IDOPES,IRESTART,IQIN,IVAL,datcount,jrng1,jrng2; +IDAT,IDOPES,IRESUME,IQIN,IVAL,datcount,jrng1,jrng2; $REAL AMASS,TMCPUO,TIMMAX,STATLM,EIN, RHOSAV; -$INTEGER ISUMCV,MEDSAV,IDAT,IDOPES,IRESTART,IQIN,IVAL,datcount, +$INTEGER ISUMCV,MEDSAV,IDAT,IDOPES,IRESUME,IQIN,IVAL,datcount, jrng1,jrng2; $LONG_INT NCASE,NCASEO,NCASET,NNREADO; "Added type declarations, IK January 10 2000" "datcount used to be a local variable that holds the number of parallel" -"jobs if irestart=5. As now data file reading from parallel runs is done" +"jobs if iresume=5. As now data file reading from parallel runs is done" "in a separate routine, it must go into a common block as it is used in" "main." } @@ -1993,8 +1993,8 @@ $LONG_INT NCASE,NCASEO,NCASET,NNREADO; "NCASET NUMBER OF HISTORIES ALREADY DONE "NNREADO TOTAL NO. OF PARTICLES READ FROM PHSP SOURCE IN PREVIOUS " RUNS -"IRESTART = 0 => INITIAL RUN -" = 1 => RESTARTED RUN +"IRESUME = 0 => INITIAL RUN +" = 1 => RESUMED RUN " = 3 => DATA ANALYSIS ONLY " = 4 => READ STARTING RANDOM NUMBERS FROM A FILE " = 5 => analyse previous parallel runs @@ -2402,8 +2402,8 @@ CALL INPUTS; IF(ERROR_FLAG=1)[ OUTPUT; (//' *** END OF FILE IN SUBROUTINE INPUTS WAS REACHED ***'/ - ' *** OR A RESTART OF A CALCULATION WAS REQUESTED ***'/ - ' *** WITH NO PREVIOUS DAT FILE ***'/ + ' *** OR RESUMING A CALCULATION WAS REQUESTED WITH ***'/ + ' *** NO PREVIOUS DAT FILE ***'/ ' EXECUTION WILL TERMINATE AFTER COMPLETION OF INPUT FILE'/); GOTO :END-OF-RUN:; ] @@ -2412,18 +2412,18 @@ IF(ERROR_FLAG=1)[ IF( istore > 0 ) [ "We want to store the rng state in a file" rng_unit = egs_open_file(2,0,1,'.egsrns'); ] -ELSE IF( irestart = 4 ) [ +ELSE IF( iresume = 4 ) [ rng_unit = egs_open_datfile(2,0,1,'.egsrns'); ] -IF(IRESTART.EQ.5)[ +IF(IRESUME.EQ.5)[ call egs_combine_runs(combine_results,'.egsdat'); NBATCH=0; "DON'T WANT IT TO RUN ANY HISTORIES" NCASET=NCASEO; "To prevent a wrong normalization if some of the " "parallel runs not available, IK, Jan 21 1999" -] "end of IRESTART = 5, DISTRIBUTED POST-PROCESSING" +] "end of IRESUME = 5, DISTRIBUTED POST-PROCESSING" ELSE [ IF(NCASE/$NBATCH=0)[NCASE=$NBATCH;] JCASE=NCASE/$NBATCH; NCASE=JCASE*$NBATCH;"NUMBER OF HISTORIES PER BATCH @@ -2610,17 +2610,17 @@ WRITE(IOUT,100) TITLE; call egs_fdate(iout); write(iout,*); WRITE(IOUT,200);WRITE(6,200); "PRINT HEADER FOR EXECUTION MESSAGES" "PRINT EXECUTION MODE" -IF(IRESTART = 0)[WRITE(6,201);WRITE(IOUT,201);] -ELSEIF(IRESTART.EQ.1)[ +IF(IRESUME = 0)[WRITE(6,201);WRITE(IOUT,201);] +ELSEIF(IRESUME.EQ.1)[ WRITE(6,202) NCASE,NCASEO; write(6,'(21x,a,$)') 'New RNG state: '; $SHOW-RNG-STATE(6); write(6,*); write(iout,'(21x,a,$)') 'New RNG state: '; $SHOW-RNG-STATE(iout); write(iout,*); ] -ELSEIF(IRESTART.EQ.3)[WRITE(6,204);WRITE(IOUT,204);GO TO :END-SIM:;] -ELSEIF(IRESTART.EQ.4)[WRITE(6,205);WRITE(IOUT,205);] -ELSEIF(IRESTART.EQ.5)[WRITE(6,206);WRITE(IOUT,206);GO TO :END-SIM:;] +ELSEIF(IRESUME.EQ.3)[WRITE(6,204);WRITE(IOUT,204);GO TO :END-SIM:;] +ELSEIF(IRESUME.EQ.4)[WRITE(6,205);WRITE(IOUT,205);] +ELSEIF(IRESUME.EQ.5)[WRITE(6,206);WRITE(IOUT,206);GO TO :END-SIM:;] "Initialize IWATCH routine" IF(IWATCH ~= 0) CALL WATCH(-99,IWATCH); @@ -2765,7 +2765,7 @@ DO IBATCH=1,$NBATCH[ NFTIME = 0; "reset the photon forced interaction counter" "retrieve starting random numbers if reading from a file" - IF(IRESTART.EQ.4) [ + IF(IRESUME.EQ.4) [ $RETRIEVE RNG STATE FROM UNIT rng_unit; "was $RESET-RNG(2);" ] @@ -3031,13 +3031,13 @@ $SET_ELAPSED_TOTAL_TIME(TIMEB); ETIMETOT=ETIMETOT+TIMEB; $SET_ELAPSED_CPUTIME(CPUT2); TIMCPU=CPUT2-CPUT1+TMCPUO; -IF(IRESTART=3)["just analyzing data--no elapsed time" +IF(IRESUME=3)["just analyzing data--no elapsed time" WRITE(IOUT,250)TMCPUO,TMCPUO/3600; WRITE(6,250)TMCPUO,TMCPUO/3600; WRITE(IOUT,280)TMCPUO/dble(IHSTRY),3600.*dble(IHSTRY)/TMCPUO; WRITE(6,280)TMCPUO/dble(IHSTRY),3600.*dble(IHSTRY)/TMCPUO; ] -ELSEIF(IRESTART=5)["output time results for parallel runs" +ELSEIF(IRESUME=5)["output time results for parallel runs" WRITE(IOUT,255)DATCOUNT,TMCPUO,TMCPUO/3600.,TMCPUO/dble(DATCOUNT); WRITE(6,255)DATCOUNT,TMCPUO,TMCPUO/3600.,TMCPUO/dble(DATCOUNT); WRITE(IOUT,280)TMCPUO/dble(IHSTRY),3600.*dble(IHSTRY)/TMCPUO; @@ -3341,7 +3341,7 @@ $CALL_EXIT(0); // ,79('*')/ //'USING CAVRZnrc(EGSnrc) '$VERSION' ON '$MACHINE' '); 201 FORMAT(/'********* NEW INPUT FILE *********'/); -202 FORMAT(/'********* RESTARTED INPUT FILE ********* '/ +202 FORMAT(/'********* RESUMED INPUT FILE ********* '/ ' ',10X,I12,' NEW + ',I12,' OLD HISTORIES'); 204 FORMAT(/'********* DATA ANALYSIS ONLY *********'/); 205 FORMAT(/'********* RANDOM NUMBERS READ FROM FILE *********'/); @@ -4310,7 +4310,7 @@ INTEGER NUM_TITLE, "I/O Contol" NUM_IWATCH, NUM_STRAND, - NUM_IRESTART, + NUM_IRESUME, NUM_OUTOPTS, NUM_STORE, @@ -4401,12 +4401,12 @@ ALLOWED_INPUTS(IVAL,2)='ALL DEPOSITED'; ALLOWED_INPUTS(IVAL,3)='ALL'; IVAL=IVAL+1; -NUM_IRESTART=IVAL; -VALUES_SOUGHT(IVAL)='IRESTART'; +NUM_IRESUME=IVAL; +VALUES_SOUGHT(IVAL)='IRESUME'; NVALUE(IVAL)=1; TYPE(IVAL)=3; ALLOWED_INPUTS(IVAL,0)='FIRST'; -ALLOWED_INPUTS(IVAL,1)='RESTART'; +ALLOWED_INPUTS(IVAL,1)='RESUME'; ALLOWED_INPUTS(IVAL,3)='ANALYZE'; ALLOWED_INPUTS(IVAL,4)='START-RNS'; ALLOWED_INPUTS(IVAL,5)='PARALLEL'; " ADDED BY JT, DEC.98 " @@ -4433,13 +4433,13 @@ $GET_INPUTS(NUM_IWATCH,NUM_STORE); OUTPUT;(' *** INPUT CARD IO2 ***'); IWATCH=VALUE(NUM_IWATCH,1); ISTORE=VALUE(NUM_STRAND,1); -IRESTART=VALUE(NUM_IRESTART,1); +IRESUME=VALUE(NUM_IRESUME,1); IOOPTN=VALUE(NUM_OUTOPTS,1); IDAT=VALUE(NUM_STORE,1); -OUTPUT IWATCH,ISTORE,IRESTART,IOOPTN,IDAT; +OUTPUT IWATCH,ISTORE,IRESUME,IOOPTN,IDAT; (/' Do not track(0) or track(>0) every interaction:',T60,I12/ ' Do not store(0) or store(1,2,3) initial random #:',T60,I12/ - ' First run(0),restarted(1),analyze(3),read RNS(4),'/ + ' First run(0),resumed(1),analyze(3),read RNS(4),'/ ' parallel(5):',T60,I12/ ' Output option: cavity summary(0) plus region detail(1):',T60,I12/ ' Store raw data(0) or not(1):',T60,I12/); @@ -4447,7 +4447,7 @@ OUTPUT IWATCH,ISTORE,IRESTART,IOOPTN,IDAT; $SKIP-LINE; IF(IDAT.EQ.1)[INEXT=0;]ELSE[INEXT=1;] -IF(IRESTART = 4) [ +IF(IRESUME = 4) [ IDAT=1; "do not store output in this case to avoid biasing" ISTORE=0; "do not store the starting random numbers either" ] @@ -5062,7 +5062,7 @@ IF(IOOPTN=1 & (n_split>1 | use_enhance))[ NCASEO=0;NCASET=0;TMCPUO=0; NNREADO=0; "SET PREVIOUS RUN COUNTERS" -IF(IRESTART.EQ.0.OR.IRESTART.EQ.5)[ "FRESH START, SET EVERYTHING TO ZERO" +IF(IRESUME.EQ.0.OR.IRESUME.EQ.5)[ "FRESH START, SET EVERYTHING TO ZERO" NNREAD=0; SCSTP=0.; SCSTP2=0.; SCSTP_TMP=0.; SCSTP_LAST=0; SCCSTP=0.; SCCSTP2=0.; SCCSTP_TMP=0.; SCCSTP_LAST=0; @@ -5093,8 +5093,8 @@ IF(IRESTART.EQ.0.OR.IRESTART.EQ.5)[ "FRESH START, SET EVERYTHING TO ZERO" ] ] ] -ELSEIF(IRESTART.NE.4)[ - "Restart or stats analysis only, read old data from unit 4" +ELSEIF(IRESUME.NE.4)[ + "Resume or stats analysis only, read old data from unit 4" "open unit 4 as an old file" OUTPUT;(' About to read the previous .egsdat file'); my_unit = egs_open_datfile(4,0,1,'.egsdat'); @@ -5120,7 +5120,7 @@ ELSEIF(IRESTART.NE.4)[ NNREAD=NNREADO; ] -IF(IRESTART = 3)[NCASE=0;] +IF(IRESUME = 3)[NCASE=0;] NCASET=NCASE+NCASEO; diff --git a/HEN_HOUSE/user_codes/cavrznrc/cavrznrc_template.egsinp b/HEN_HOUSE/user_codes/cavrznrc/cavrznrc_template.egsinp index 7154c8444..c80772efd 100644 --- a/HEN_HOUSE/user_codes/cavrznrc/cavrznrc_template.egsinp +++ b/HEN_HOUSE/user_codes/cavrznrc/cavrznrc_template.egsinp @@ -54,9 +54,9 @@ # in the cavity #all: store initial random numbers for each # history - IRESTART= first #first,restart,make,analyze,for graphics,parallel; + IRESUME= first #first,resume,make,analyze,for graphics,parallel; #first: first run - #restart: restart of old run (requires .egsdat file) + #resume: resume of old run (requires .egsdat file) #make: just create an input file and exit #analyze: read in data from .egsdat file and # do statistical analysis and output results @@ -68,7 +68,7 @@ # analysis and output to .egslst STORE DATA ARRAYS= yes #yes,no; - #yes: output .egsdat file for restarts, parallel + #yes: output .egsdat file for resuming, parallel # post-processing, etc OUTPUT OPTIONS= short #short,cavity details; #short: output cavity summary + dose grid diff --git a/HEN_HOUSE/user_codes/cavsphnrc/cavsphnrc.io b/HEN_HOUSE/user_codes/cavsphnrc/cavsphnrc.io index dcf1582b7..2019786fd 100644 --- a/HEN_HOUSE/user_codes/cavsphnrc/cavsphnrc.io +++ b/HEN_HOUSE/user_codes/cavsphnrc/cavsphnrc.io @@ -37,9 +37,9 @@ # # 1 .egslst -# Unit 2 is explicitly opened if needed, depending on istore and/or irestart +# Unit 2 is explicitly opened if needed, depending on istore and/or iresume #2 .egsrns -# Unit 4 is explicitly opened if needed, depending on idat and/or irestart +# Unit 4 is explicitly opened if needed, depending on idat and/or iresume #4 .egsdat #9 .egseff # Unit 13 is explicitly opened if needed diff --git a/HEN_HOUSE/user_codes/cavsphnrc/cavsphnrc.mortran b/HEN_HOUSE/user_codes/cavsphnrc/cavsphnrc.mortran index 57d1d3ab3..13440105e 100644 --- a/HEN_HOUSE/user_codes/cavsphnrc/cavsphnrc.mortran +++ b/HEN_HOUSE/user_codes/cavsphnrc/cavsphnrc.mortran @@ -167,9 +167,9 @@ REPLACE {$MXMDSH} WITH {200}; " THAT DEPOSIT ENERGY IN THE CAVITY " = all (3) STORE ALL THE INITIAL RANDOM NUMBERS " -" IRESTART +" IRESUME " = first (0) FIRST RUN FOR THIS DATA SET -" = restart (1) RESTART OF A PREVIOUS RUN +" = resume (1) RESUME A PREVIOUS RUN " = make (2) JUST CREATE THE INPUT FILE AND EXIT " = analyze (3) JUST READ IN THE RAW DATA AND DO THE STATISTICAL " ANALYSIS @@ -1260,11 +1260,11 @@ REPLACE {;COMIN/IODAT2/;} WITH COMMON/IODAT2/ AMASS($MAXCDOSE,$MAXRADII),TMCPUO,TIMMAX,STATLM,EIN,ECUTIN,PCUTIN, RHOSAV($MXREG),cavreg($MXREG),MEDSAV($MXREG), -NCASE,NCASEO,NCASET,IDAT,IDORAY,IDOPES,IRESTART,IQIN,IVAL, +NCASE,NCASEO,NCASET,IDAT,IDORAY,IDOPES,IRESUME,IQIN,IVAL, numcavreg,datcount; $REAL AMASS,TMCPUO,TIMMAX,STATLM,EIN,ECUTIN,PCUTIN, RHOSAV; -$INTEGER cavreg,MEDSAV,IDAT,IDORAY,IDOPES,IRESTART,IQIN,IVAL,datcount; +$INTEGER cavreg,MEDSAV,IDAT,IDORAY,IDOPES,IRESUME,IQIN,IVAL,datcount; $LONG_INT NCASE,NCASEO,NCASET; $INTEGER numcavreg; "moved from IODAT3 to IODAT2" "Added type declarations from cavrznrc, EMH January 9 2002" @@ -1289,8 +1289,8 @@ $INTEGER numcavreg; "moved from IODAT3 to IODAT2" "NCASE NUMBER OF HISTORIES REMAINING TO BE DONE "NCASEO NUMBER OF HISTORIES DONE IN PREVIOUS SESSIONS "NCASET NUMBER OF HISTORIES ALREADY DONE -"IRESTART = 0 => INITIAL RUN -" = 1 => RESTARTED RUN +"IRESUME = 0 => INITIAL RUN +" = 1 => RESUMED RUN " = 2 => CREATION OF INPUT FILE ONLY " = 3 => DATA ANALYSIS ONLY " = 4 => READ STARTING RANDOM NUMBERS FROM A FILE @@ -1692,7 +1692,7 @@ INTEGER MAKE_IT_AN_INT; "***************************************************************************" "$INTEGER DATCOUNT; T>number of .egs4dat files "datcount used to be a local variable that holds the number of parallel" -"jobs if irestart=5. As now data file reading from parallel runs is done" +"jobs if iresume=5. As now data file reading from parallel runs is done" "in a separate routine, it must go into a common block as it is used in" "main." @@ -1860,29 +1860,29 @@ CALL INPUTS; IF(ERROR_FLAG=1)[ OUTPUT; (//' *** END OF FILE IN SUBROUTINE INPUTS WAS REACHED ***'/ - ' *** OR A RESTART OF A CALCULATION WAS REQUESTED ***'/ - ' *** WITH NO PREVIOUS DAT FILE ***'/ + ' *** OR RESUMING A CALCULATION WAS REQUESTED WITH ***'/ + ' *** NO PREVIOUS DAT FILE ***'/ ' EXECUTION WILL TERMINATE AFTER COMPLETION OF INPUT FILE'/); GOTO :END-OF-RUN:;"SIGNAL AN EARLY EXIT" - "IRESTART=2; SIGNAL AN EARLY EXIT" + "IRESUME=2; SIGNAL AN EARLY EXIT" ] "OPEN A FILE FOR STORING OR READING RANDOM NUMBERS" IF( istore > 0 ) [ "We want to store the rng state in a file" rng_unit = egs_open_file(2,0,1,'.egsrns'); ] -ELSE IF( irestart = 4 ) [ +ELSE IF( iresume = 4 ) [ rng_unit = egs_open_datfile(2,0,1,'.egsrns'); ] -IF(IRESTART.EQ.5)[ +IF(IRESUME.EQ.5)[ call egs_combine_runs(combine_results,'.egsdat'); NBATCH=0; "DON'T WANT IT TO RUN ANY HISTORIES" NCASET=NCASEO; "To prevent a wrong normalization if some of the " "parallel runs not available, IK, Jan 21 1999" -] "end of IRESTART = 5, DISTRIBUTED POST-PROCESSING" +] "end of IRESUME = 5, DISTRIBUTED POST-PROCESSING" ELSE [ IF(NCASE/$STAT**2=0)[NCASE=$STAT**2;] NBATCH=NCASE/($STAT**2); "NUMBER OF HISTORIES IN EACH BIN PER BATCH @@ -2037,7 +2037,7 @@ DO I=1,NMED[ ' IS GREATER THAN COVERED BY DATA FILE WHERE UP,UE=',2F10.1,' MEV'/ ' EXECUTION WILL TERMINATE AFTER COMPLETION OF INPUT FILE'// 1X,50('*')//); - IRESTART=2; "SIGNAL AN EARLY EXIT" + IRESUME=2; "SIGNAL AN EARLY EXIT" ] ] "END OF LOOP OVER MEDIA" @@ -2107,18 +2107,18 @@ WRITE(IOUT,100) TITLE; call egs_fdate(iout); write(iout,*); WRITE(IOUT,200);WRITE(6,200); "PRINT HEADER FOR EXECUTION MESSAGES" "PRINT EXECUTION MODE" -IF(IRESTART.EQ.0)[WRITE(6,201);WRITE(IOUT,201);] -ELSEIF(IRESTART.EQ.1)["updated from cavrznrc, EMH January, 2002" +IF(IRESUME.EQ.0)[WRITE(6,201);WRITE(IOUT,201);] +ELSEIF(IRESUME.EQ.1)["updated from cavrznrc, EMH January, 2002" WRITE(6,202) NCASE,NCASEO; write(6,'(21x,a,$)') 'New RNG state: '; $SHOW-RNG-STATE(6); write(6,*); write(iout,'(21x,a,$)') 'New RNG state: '; $SHOW-RNG-STATE(iout); write(iout,*); ] -ELSEIF(IRESTART.EQ.2)[WRITE(6,203);WRITE(IOUT,203);GO TO :END-OF-RUN:;] -ELSEIF(IRESTART.EQ.3)[WRITE(6,204);WRITE(IOUT,204);GO TO :STATS-ANAL:;] -ELSEIF(IRESTART.EQ.4)[WRITE(6,205);WRITE(IOUT,205);] -ELSEIF(IRESTART.EQ.5)[WRITE(6,206);WRITE(IOUT,206);GO TO :END-SIM:;] +ELSEIF(IRESUME.EQ.2)[WRITE(6,203);WRITE(IOUT,203);GO TO :END-OF-RUN:;] +ELSEIF(IRESUME.EQ.3)[WRITE(6,204);WRITE(IOUT,204);GO TO :STATS-ANAL:;] +ELSEIF(IRESUME.EQ.4)[WRITE(6,205);WRITE(IOUT,205);] +ELSEIF(IRESUME.EQ.5)[WRITE(6,206);WRITE(IOUT,206);GO TO :END-SIM:;] "INITIALIZE IWATCH ROUTINE" IF(IWATCH.NE.0) CALL WATCH(-99,IWATCH); @@ -2292,7 +2292,7 @@ DO IBATCH=1,$STAT[ "RNG macros updated from cavrznrc, EMH, January, 2002 " "*****************************************************" "retrieve starting random numbers if reading from a file" - IF((IPASS.EQ.0).AND.(IRESTART.EQ.4)) [ + IF((IPASS.EQ.0).AND.(IRESUME.EQ.4)) [ "$RETRIEVE RNG STATE FROM UNIT 2; was $RESET-RNG(2);" $RETRIEVE RNG STATE FROM UNIT rng_unit; "was $RESET-RNG(2);" ] @@ -2674,13 +2674,13 @@ TIMCPU=(CPUT2-CPUT1)*$CONVERSION_TO_SECONDS+TMCPUO; "**************************************" "taken from cavrznrc, EMH, January 2002" "**************************************" -IF(IRESTART=3)["just analyzing data--no elapsed time" +IF(IRESUME=3)["just analyzing data--no elapsed time" WRITE(IOUT,250)TMCPUO,TMCPUO/3600; WRITE(6,250)TMCPUO,TMCPUO/3600; WRITE(IOUT,280)TMCPUO/dble(IHSTRY),3600.*dble(IHSTRY)/TMCPUO; WRITE(6,280)TMCPUO/dble(IHSTRY),3600.*dble(IHSTRY)/TMCPUO; ] -ELSEIF(IRESTART=5)["output time results for parallel runs" +ELSEIF(IRESUME=5)["output time results for parallel runs" WRITE(IOUT,255)DATCOUNT,TMCPUO,TMCPUO/3600.,TMCPUO/dble(DATCOUNT); WRITE(6,255)DATCOUNT,TMCPUO,TMCPUO/3600.,TMCPUO/dble(DATCOUNT); WRITE(IOUT,280)TMCPUO/dble(IHSTRY),3600.*dble(IHSTRY)/TMCPUO; @@ -3171,7 +3171,7 @@ $CALL_EXIT(0); // ,79('*')/ //'Using CAVSPHnrc(EGSnrc) '$VERSION' on '$MACHINE' '); 201 FORMAT(/'********* NEW INPUT FILE *********'/); -202 FORMAT(/'********* RESTARTED INPUT FILE ********* '/ +202 FORMAT(/'********* RESUMED INPUT FILE ********* '/ ' ',10X,I12,' NEW + ',I12,' OLD HISTORIES'/ ' ',20X,'NEW RN SEEDS=',2(1X,I12)/); 203 FORMAT(/'********* INPUT FILE CREATION ONLY *********'/); @@ -4401,7 +4401,7 @@ NMIN = {P1}; NMAX = {P2}; CALL GET_INPUT; "***************************************************************************" "* Variables used to declare inputs *" "***************************************************************************" -"INTEGER IDAT,INEXT,IWATCH,ISTORE,IRESTART,IOOPTN;" +"INTEGER IDAT,INEXT,IWATCH,ISTORE,IRESUME,IOOPTN;" INTEGER INEXT; "REAL TIMMAX;" @@ -4441,7 +4441,7 @@ INTEGER NUM_TITLE, "I/O Contol" NUM_IWATCH, NUM_STRAND, - NUM_IRESTART, + NUM_IRESUME, NUM_OUTOPTS, NUM_STORE, @@ -4551,12 +4551,12 @@ ALLOWED_INPUTS(IVAL,2)='ALL DEPOSITED'; ALLOWED_INPUTS(IVAL,3)='ALL'; IVAL=IVAL+1; -NUM_IRESTART=IVAL; -VALUES_SOUGHT(IVAL)='IRESTART'; +NUM_IRESUME=IVAL; +VALUES_SOUGHT(IVAL)='IRESUME'; NVALUE(IVAL)=1; TYPE(IVAL)=3; ALLOWED_INPUTS(IVAL,0)='FIRST'; -ALLOWED_INPUTS(IVAL,1)='RESTART'; +ALLOWED_INPUTS(IVAL,1)='RESUME'; ALLOWED_INPUTS(IVAL,2)='MAKE'; ALLOWED_INPUTS(IVAL,3)='ANALYZE'; ALLOWED_INPUTS(IVAL,4)='FOR GRAPHICS'; @@ -4584,20 +4584,20 @@ $GET_INPUTS(NUM_IWATCH,NUM_STORE); OUTPUT;(' *** INPUT CARD IO2 ***'); IWATCH=VALUE(NUM_IWATCH,1); ISTORE=VALUE(NUM_STRAND,1); -IRESTART=VALUE(NUM_IRESTART,1); +IRESUME=VALUE(NUM_IRESUME,1); IOOPTN=VALUE(NUM_OUTOPTS,1); IDAT=VALUE(NUM_STORE,1); -OUTPUT IWATCH,ISTORE,IRESTART,IOOPTN,IDAT; +OUTPUT IWATCH,ISTORE,IRESUME,IOOPTN,IDAT; (/' DO NOT TRACK(0) OR TRACK(>0) EVERY INTERACTION:',T60,I12/ ' DO NOT STORE(0) OR STORE(1,2,3) INITIAL RANDOM #:',T60,I12/ - ' FIRST RUN(0),RESTARTED(1),MAKE(2),ANALYZE(3),GRAPHICS(4):',T60,I12/ + ' FIRST RUN(0),RESUMED(1),MAKE(2),ANALYZE(3),GRAPHICS(4):',T60,I12/ ' OUTPUT OPTION: CAVITY SUMMARY(0) PLUS REGION DETAIL(1):',T60,I12/ ' STORE RAW DATA(0) OR NOT(1):',T60,I12/); $SKIP-LINE; -IF((IRESTART.EQ.2).OR.(IDAT.EQ.1))[INEXT=0;]ELSE[INEXT=1;] -IF(IRESTART.EQ.4) [ +IF((IRESUME.EQ.2).OR.(IDAT.EQ.1))[INEXT=0;]ELSE[INEXT=1;] +IF(IRESUME.EQ.4) [ IDAT=1; "DO NOT STORE OUTPUT IN THIS CASE TO AVOID BIASING" ISTORE=0; "DO NOT STORE THE STARTING RANDOM NUMBERS EITHER" ] @@ -4973,8 +4973,8 @@ ELSEIF(IFULL.EQ.3)[ITMAX=$MAXIT;] "SCORE Afl AND g,w AS WELL" NCASEO=0;NCASET=0;TMCPUO=0; "SET PREVIOUS RUN COUNTERS" -IF(IRESTART.EQ.0.OR.IRESTART.EQ.5)[ "FRESH START, SET EVERYTHING TO ZERO" - "IRESTART=5 AS WELL, CHANGED BY JT, NOV.98" +IF(IRESUME.EQ.0.OR.IRESUME.EQ.5)[ "FRESH START, SET EVERYTHING TO ZERO" + "IRESUME=5 AS WELL, CHANGED BY JT, NOV.98" /cav_dose, cav_dose0, cav_dose1, cav_dose2/ =0; /cav2_dose,cav2_dose0,cav2_dose1,cav2_dose2/=0; @@ -4992,8 +4992,8 @@ IF(IRESTART.EQ.0.OR.IRESTART.EQ.5)[ "FRESH START, SET EVERYTHING TO ZERO" ] ] ] -ELSEIF((IRESTART.NE.2).AND.(IRESTART.NE.4))[ - "RESTART OR STATS ANALYSIS ONLY, READ OLD DATA FROM UNIT 4" +ELSEIF((IRESUME.NE.2).AND.(IRESUME.NE.4))[ + "RESUME OR STATS ANALYSIS ONLY, READ OLD DATA FROM UNIT 4" "OPEN UNIT 4 AS AN OLD FILE" OUTPUT;(' About to read the previous .egsdat file'); @@ -5018,7 +5018,7 @@ ELSEIF((IRESTART.NE.2).AND.(IRESTART.NE.4))[ CLOSE(UNIT=my_unit); ] -IF(IRESTART.EQ.3)[NCASE=0;] +IF(IRESUME.EQ.3)[NCASE=0;] NCASET=NCASE+NCASEO; @@ -6281,7 +6281,7 @@ $REAL TMPTMCPU; "T>dummy variable for TIMCPU "$INTEGER DATCOUNT; T>number of .egs4dat files" "datcount used to be a local variable that holds the number of parallel" -"jobs if irestart=5. As now data file reading from parallel runs is done" +"jobs if iresume=5. As now data file reading from parallel runs is done" "in a separate routine, it must go into a common block as it is used in" "main." diff --git a/HEN_HOUSE/user_codes/cavsphnrc/cavsphnrc_template.egsinp b/HEN_HOUSE/user_codes/cavsphnrc/cavsphnrc_template.egsinp index cd8b03093..4bd8e8996 100644 --- a/HEN_HOUSE/user_codes/cavsphnrc/cavsphnrc_template.egsinp +++ b/HEN_HOUSE/user_codes/cavsphnrc/cavsphnrc_template.egsinp @@ -35,7 +35,7 @@ IWATCH= off STORE INITIAL RANDOM NUMBERS= no - IRESTART= first + IRESUME= first OUTPUT OPTIONS= cavity details STORE DATA ARRAYS= yes diff --git a/HEN_HOUSE/user_codes/dosrznrc/dosrznrc.mortran b/HEN_HOUSE/user_codes/dosrznrc/dosrznrc.mortran index 2a20aa15b..3033e28ae 100644 --- a/HEN_HOUSE/user_codes/dosrznrc/dosrznrc.mortran +++ b/HEN_HOUSE/user_codes/dosrznrc/dosrznrc.mortran @@ -326,17 +326,17 @@ REPLACE {$VERSION} WITH { " = last (1) STORE THE INITIAL RANDOM NUMBER FOR THE LAST HISTORY " = all (2) STORE ALL THE INITIAL RANDOM NUMBERS " -" IRESTART +" IRESUME " = first (0) first run for this input file -" = restart (1) restart of a previous run, i.e. add more histories +" = resume (1) resume a previous run, i.e. add more histories " = analyze (3) just read in the raw data and do the statistical -" analysis( gives no timing - restart 100 histories +" analysis( gives no timing - resume 100 histories " to get the same effect and more info) " = start-RNS (4) read starting random numbers from a filE (e.g. FOR " OUTPUT TO A GRAPHICS PACKAGE) " = parallel (5) post-process distributed runs (all files " named _w#) -" [IRESTART ] +" [IRESUME ] " " OUTPUT OPTIONS " = short (0) short output -just dose grid(DG) @@ -2058,9 +2058,9 @@ REPLACE {;COMIN/IODAT2/;} WITH COMMON/IODAT2/ NCASE,NCASEO,NCASET, AMASS($MAXZREG,$MAXRADII),TMCPUO,TIMMAX,STATLM,EIN,EKMAX, -IDAT,IRESTART,IQIN,NESTEP,NSMAX,IXXIN,JXXIN,IVAL,DATCOUNT; +IDAT,IRESUME,IQIN,NESTEP,NSMAX,IXXIN,JXXIN,IVAL,DATCOUNT; $REAL AMASS,TMCPUO,TIMMAX,STATLM,EIN,EKMAX; -$INTEGER IDAT,IRESTART,IQIN,NESTEP,NSMAX, +$INTEGER IDAT,IRESUME,IQIN,NESTEP,NSMAX, IXXIN,JXXIN,IVAL,DATCOUNT; $LONG_INT NCASE,NCASEO,NCASET; "Added type declaration, IK, Jan 5 2000" @@ -2076,8 +2076,8 @@ $LONG_INT NCASE,NCASEO,NCASET; "NCASE number of histories remaining to be done "NCASEO number of histories done in previous sessions "NCASET number of histories already done -"IRESTART = 0 => initial run -" = 1 => restarted run +"IRESUME = 0 => initial run +" = 1 => resumed run " = 3 => data analysis only " = 4 => read random number seeds " = 5 => post-process distributed runs @@ -2519,7 +2519,7 @@ IF (ERROR_FLAG=1) [ IF( istore > 0 ) [ "We want to store the rng state in a file" rng_unit = egs_open_file(2,0,1,'.egsrns'); ] -ELSE IF( irestart = 4 ) [ "We well read RN's from a file" +ELSE IF( iresume = 4 ) [ "We well read RN's from a file" rng_unit = egs_open_datfile(2,0,1,'.egsrns'); ] @@ -2528,9 +2528,9 @@ ELSE IF( irestart = 4 ) [ "We well read RN's from a file" IF((IFULL.EQ.0).OR.(IFULL.EQ.2).OR.(IFULL.EQ.3))[ITMAX=2;] ELSE[ITMAX=$MAXIT;] -" THE IRESTART=5 case, post-processing for distributed runs, goes here +" THE IRESUME=5 case, post-processing for distributed runs, goes here " ADDED BY JT, NOV.98 -IF(IRESTART.EQ.5)[ +IF(IRESUME.EQ.5)[ "IK: the egs_combine_runs subroutine checks for files named " " output_file_wiii.egsdat (iii=1,99) in the user code directory " @@ -2547,7 +2547,7 @@ IF(IRESTART.EQ.5)[ NBATCH=0; "DON'T WANT IT TO RUN ANY HISTORIES" NCASET=NCASEO; -] "end of IRESTART = 5, DISTRIBUTED POST-PROCESSING" +] "end of IRESUME = 5, DISTRIBUTED POST-PROCESSING" ELSE [ IF(NCASE/$NBATCH=0)[NCASE=$NBATCH;] JCASE=NCASE/$NBATCH; NCASE=JCASE*$NBATCH;"number of histories per batch" @@ -2762,8 +2762,8 @@ write(iout,100) ' '; call egs_fdate(iout); write(iout,*); WRITE(IOUT,200);WRITE(6,200); "PRINT HEADER FOR EXECUTION MESSAGES" "PRINT EXECUTION MODE" -IF(IRESTART .EQ.0)[WRITE(6,201);WRITE(IOUT,201);] -ELSEIF(IRESTART .EQ.1)[ +IF(IRESUME .EQ.0)[WRITE(6,201);WRITE(IOUT,201);] +ELSEIF(IRESUME .EQ.1)[ WRITE(6,202) NCASE,NCASEO; write(6,'(21x,a,$)') 'New RNG state: '; $SHOW-RNG-STATE(6); write(6,*); @@ -2771,9 +2771,9 @@ ELSEIF(IRESTART .EQ.1)[ write(iout,'(21x,a,$)') 'New RNG state: '; $SHOW-RNG-STATE(iout); write(iout,*); ] -ELSEIF(IRESTART .EQ.3)[WRITE(6,204);WRITE(IOUT,204);GO TO :END-SIM:;] -ELSEIF(IRESTART.EQ.4)[ WRITE(6,206); WRITE(IOUT,206); ] -ELSEIF(IRESTART.EQ.5)[WRITE(6,205);WRITE(IOUT,205);GO TO :END-SIM:;] +ELSEIF(IRESUME .EQ.3)[WRITE(6,204);WRITE(IOUT,204);GO TO :END-SIM:;] +ELSEIF(IRESUME.EQ.4)[ WRITE(6,206); WRITE(IOUT,206); ] +ELSEIF(IRESUME.EQ.5)[WRITE(6,205);WRITE(IOUT,205);GO TO :END-SIM:;] "INITIALIZE IWATCH ROUTINE" IF(IWATCH.NE.0) CALL WATCH(-99,IWATCH); @@ -2900,7 +2900,7 @@ DO IBATCH=1,$NBATCH[ NFTIME=0; "RESET THE PHOTON FORCED INTERACTION COUNTER" - IF(IRESTART=4) [ + IF(IRESUME=4) [ $RETRIEVE RNG STATE FROM UNIT rng_unit; ] @@ -3161,13 +3161,13 @@ ETIMETOT=ETIMETOT+TIMEB; $SET_ELAPSED_CPUTIME(CPUT2); TIMCPU=CPUT2-CPUT1+TMCPUO; IF(TMCPUO.EQ.0)[RATIO=ETIMETOT/TIMCPU;]ELSE[RATIO=0.;] "ONLY FOR SINGLE RUN" -IF(IRESTART=3)["just analyzing data--no elapsed time" +IF(IRESUME=3)["just analyzing data--no elapsed time" WRITE(IOUT,250)TMCPUO,TMCPUO/3600; WRITE(6,250)TMCPUO,TMCPUO/3600; WRITE(IOUT,280)TMCPUO/dble(IHSTRY),3600.*dble(IHSTRY)/TMCPUO; WRITE(6,280)TMCPUO/dble(IHSTRY),3600.*dble(IHSTRY)/TMCPUO; ] -ELSEIF(IRESTART=5)["output time results for parallel runs" +ELSEIF(IRESUME=5)["output time results for parallel runs" WRITE(IOUT,255)DATCOUNT,TMCPUO,TMCPUO/3600.,TMCPUO/dble(DATCOUNT); WRITE(6,255)DATCOUNT,TMCPUO,TMCPUO/3600.,TMCPUO/dble(DATCOUNT); WRITE(IOUT,280)TMCPUO/dble(IHSTRY),3600.*dble(IHSTRY)/TMCPUO; @@ -3562,7 +3562,7 @@ $CALL_EXIT(0); /' ',79('*')/ /' USING DOSRZnrc(EGSnrc) '$VERSION' '); 201 FORMAT(/' ********* NEW INPUT FILE *********'/); -202 FORMAT(/' ********* RESTARTED INPUT FILE ********* '/ +202 FORMAT(/' ********* RESUMED INPUT FILE ********* '/ ' ',10X,I12,' NEW + ',I12,' OLD HISTORIES'/ ' ',20X,'NEW RN SEEDS=',$); 204 FORMAT(/' ********* DATA ANALYSIS ONLY *********'/); @@ -4511,7 +4511,7 @@ $INTEGER NUM_TITLE, "I/O Contol" NUM_IWATCH, NUM_STRAND, - NUM_IRESTART , + NUM_IRESUME , NUM_OUTOPTS, NUM_STORE, NUM_ETRANS, @@ -4639,12 +4639,12 @@ ALLOWED_INPUTS(IVAL,1)='LAST'; ALLOWED_INPUTS(IVAL,2)='ALL'; IVAL=IVAL+1; -NUM_IRESTART =IVAL; -VALUES_SOUGHT(IVAL)='IRESTART'; +NUM_IRESUME =IVAL; +VALUES_SOUGHT(IVAL)='IRESUME'; NVALUE(IVAL)=1; TYPE(IVAL)=3; ALLOWED_INPUTS(IVAL,0)='FIRST'; -ALLOWED_INPUTS(IVAL,1)='RESTART'; +ALLOWED_INPUTS(IVAL,1)='RESUME'; ALLOWED_INPUTS(IVAL,3)='ANALYZE'; ALLOWED_INPUTS(IVAL,4)='START-RNS'; ALLOWED_INPUTS(IVAL,5)='PARALLEL'; @@ -4720,7 +4720,7 @@ $GET_INPUTS(NUM_IWATCH,NUM_DRMAX); OUTPUT;(' *** INPUT CARD IO2 ***'); IWATCH=VALUE(NUM_IWATCH,1); ISTORE=VALUE(NUM_STRAND,1); -IRESTART =VALUE(NUM_IRESTART ,1); +IRESUME =VALUE(NUM_IRESUME ,1); IOOPTN=VALUE(NUM_OUTOPTS,1); IDAT=VALUE(NUM_STORE,1); ICSDA=VALUE(NUM_ETRANS,1); @@ -4730,11 +4730,11 @@ NRDMIN=VALUE(NUM_DRMIN,1); NRDMAX=VALUE(NUM_DRMAX,1); NZDOSE=NZDMAX-NZDMIN; NRDOSE=NRDMAX-NRDMIN; -OUTPUT IWATCH,ISTORE,IRESTART ,IOOPTN,IDAT,ICSDA; +OUTPUT IWATCH,ISTORE,IRESUME ,IOOPTN,IDAT,ICSDA; ( / ' DO NOT TRACK(0) OR TRACK(>0) EVERY INTERACTION:',T72,I4/ ' DO NOT STORE(0) OR STORE(1,2) INITIAL RANDOM #s:',T72,I4/ -' FIRST RUN(0),RESTARTED(1),ANALYZE(3),start-RNS(4),parallel(5):', +' FIRST RUN(0),RESUMED(1),ANALYZE(3),start-RNS(4),parallel(5):', T72,I4/ ' OUTPUT OPTION (1 THRU 4):',T72,I4/ ' STORE DATA(0) OR NOT(1):',T72,I4/ @@ -4745,7 +4745,7 @@ OUTPUT NZDMIN,NZDMAX,NRDMIN,NRDMAX; $SKIP-LINE; IF(IDAT.EQ.1)[INEXT=0;]ELSE[INEXT=1;] -IF(IRESTART .EQ.4) [ +IF(IRESUME .EQ.4) [ IDAT=1; "DO NOT STORE OUTPUT IN THIS CASE TO AVOID BIASING" ISTORE=0; "DO NOT STORE THE STARTING RANDOM NUMBERS EITHER" ] @@ -5403,7 +5403,7 @@ ELSE[ITMAX=$MAXIT;] NCASEO=0;NCASET=0;TMCPUO=0; -IF(IRESTART.EQ.0.OR.IRESTART.EQ.5)[ "0-FRESH START, SET EVERYTHING TO" +IF(IRESUME.EQ.0.OR.IRESUME.EQ.5)[ "0-FRESH START, SET EVERYTHING TO" "ZERO OR 5- INITIALIZE ALL ARRAYS TO 0 FOR PARALLEL POST-PROCESSING" NNREAD=0; "have not read any particles from phase space source" @@ -5448,14 +5448,14 @@ IF(IRESTART.EQ.0.OR.IRESTART.EQ.5)[ "0-FRESH START, SET EVERYTHING TO" SCPTOT2=0.0; SCPDST_LAST=0; ] -] "END OF IRESTART =0 OR 5" +] "END OF IRESUME =0 OR 5" -ELSEIF(IRESTART.EQ.4)[ "retrieve random numbers from .egsrns file" +ELSEIF(IRESUME.EQ.4)[ "retrieve random numbers from .egsrns file" OUTPUT;(/' Will READ RANDOM NUMBER PARAMETERS FROM UNIT 2:'); ] ELSE[ - "RESTART OR STATS ANALYSIS ONLY, READ OLD DATA FROM UNIT 4" + "RESUME OR STATS ANALYSIS ONLY, READ OLD DATA FROM UNIT 4" "OPEN UNIT 4 AS AN OLD FILE" OUTPUT;(/' ***START READING DATA FILE from PREVIOUS RUN***'/); "IK: we don't wont ro rely upon a symbolic link to the .egsdat file " @@ -5498,7 +5498,7 @@ ELSE[ CLOSE(data_unit); ] -IF(IRESTART .EQ.3)[NCASE=0;] +IF(IRESUME .EQ.3)[NCASE=0;] NCASET=NCASE+NCASEO; diff --git a/HEN_HOUSE/user_codes/dosrznrc/dosrznrc_template.egsinp b/HEN_HOUSE/user_codes/dosrznrc/dosrznrc_template.egsinp index da44d7bbb..9608500f8 100644 --- a/HEN_HOUSE/user_codes/dosrznrc/dosrznrc_template.egsinp +++ b/HEN_HOUSE/user_codes/dosrznrc/dosrznrc_template.egsinp @@ -62,9 +62,9 @@ #can store initial random numbers for #last history or each history in .egsrns #(useful for debugging) - IRESTART= first #first,restart,make,analyze,start-RNS,parallel; + IRESUME= first #first,resume,make,analyze,start-RNS,parallel; #first: first run - #restart: restart of old run (requires .egsdat file) + #resume: resume of old run (requires .egsdat file) #make: just create an input file and exit #analyze: read in data from .egsdat file and # do statistical analysis and output results @@ -84,7 +84,7 @@ #long=> MG + DG + DS STORE DATA ARRAYS= yes #yes,no; - #yes: output .egsdat file for restarts, parallel + #yes: output .egsdat file for resuming, parallel # post-processing, etc ELECTRON TRANSPORT= normal #normal, no interactions; diff --git a/HEN_HOUSE/user_codes/dosrznrc/examples/brem_split_example.egsinp b/HEN_HOUSE/user_codes/dosrznrc/examples/brem_split_example.egsinp index 78456256b..97d1ac2a2 100644 --- a/HEN_HOUSE/user_codes/dosrznrc/examples/brem_split_example.egsinp +++ b/HEN_HOUSE/user_codes/dosrznrc/examples/brem_split_example.egsinp @@ -42,11 +42,11 @@ #relaxations. STORE INITIAL RANDOM NUMBERS= no - IRESTART= first #First time for this run + IRESUME= first #First time for this run OUTPUT OPTIONS= material summary #Output material summary in addition to #dose output - STORE DATA ARRAYS= yes #Allow possibility for restart by storing data arrays + STORE DATA ARRAYS= yes #Enable resuming by storing data arrays #at the end of each batch ELECTRON TRANSPORT= normal #Discrete interactions diff --git a/HEN_HOUSE/user_codes/dosrznrc/examples/brem_split_relax_example.egsinp b/HEN_HOUSE/user_codes/dosrznrc/examples/brem_split_relax_example.egsinp index 26f5f8cd2..daafea11b 100644 --- a/HEN_HOUSE/user_codes/dosrznrc/examples/brem_split_relax_example.egsinp +++ b/HEN_HOUSE/user_codes/dosrznrc/examples/brem_split_relax_example.egsinp @@ -42,12 +42,12 @@ #relaxations. STORE INITIAL RANDOM NUMBERS= no - IRESTART= first #First time for this run + IRESUME= first #First time for this run OUTPUT OPTIONS= material summary #Output material summary in addition to #dose output - STORE DATA ARRAYS= yes #Allow possibility for restart by storing data arrays - #at the end of each batch + STORE DATA ARRAYS= yes #Enable resuming by storing data arrays at the end + #of each batch ELECTRON TRANSPORT= normal #Discrete interactions :stop I/O control: diff --git a/HEN_HOUSE/user_codes/dosrznrc/examples/depth_dose_example.egsinp b/HEN_HOUSE/user_codes/dosrznrc/examples/depth_dose_example.egsinp index c50ea068c..16ccc23fb 100644 --- a/HEN_HOUSE/user_codes/dosrznrc/examples/depth_dose_example.egsinp +++ b/HEN_HOUSE/user_codes/dosrznrc/examples/depth_dose_example.egsinp @@ -42,11 +42,11 @@ IWATCH= off STORE INITIAL RANDOM NUMBERS= no - IRESTART= first #First time for this run + IRESUME= first #First time for this run OUTPUT OPTIONS= short #Just output dose grid - STORE DATA ARRAYS= yes #Allow possibility for restart by storing data arrays - #at the end of each batch + STORE DATA ARRAYS= yes #Enable resuming by storing data arrays at the end + #of each batch ELECTRON TRANSPORT= normal #Discrete interactions :stop I/O control: diff --git a/HEN_HOUSE/user_codes/dosrznrc/examples/relaxation_example.egsinp b/HEN_HOUSE/user_codes/dosrznrc/examples/relaxation_example.egsinp index c3762584e..05de5cba5 100644 --- a/HEN_HOUSE/user_codes/dosrznrc/examples/relaxation_example.egsinp +++ b/HEN_HOUSE/user_codes/dosrznrc/examples/relaxation_example.egsinp @@ -43,12 +43,12 @@ #relaxations. STORE INITIAL RANDOM NUMBERS= no - IRESTART= first #First time for this run + IRESUME= first #First time for this run OUTPUT OPTIONS= material summary #Output material summary in addition to #dose output - STORE DATA ARRAYS= yes #Allow possibility for restart by storing data arrays - #at the end of each batch + STORE DATA ARRAYS= yes #Enable resuming by storing data arrays at the end + #of each batch ELECTRON TRANSPORT= normal #Discrete interactions :stop I/O control: diff --git a/HEN_HOUSE/user_codes/dosxyznrc/dosxyznrc.mortran b/HEN_HOUSE/user_codes/dosxyznrc/dosxyznrc.mortran index 7ec50930a..69261cc36 100644 --- a/HEN_HOUSE/user_codes/dosxyznrc/dosxyznrc.mortran +++ b/HEN_HOUSE/user_codes/dosxyznrc/dosxyznrc.mortran @@ -133,7 +133,7 @@ " Unit 1 Output summary and results " Unit 2 .egsrns file for storing random numbers " Unit 3 output .3ddose file containing dose arrays -" Unit 4 Raw data output file for restarts +" Unit 4 Raw data output file for resuming " Unit 5 Input stream - file or terminal " Unit 6 prompts for and echoes input " Unit 8 echoes input cross-section data (usually assigned to a null file) @@ -290,7 +290,7 @@ " " Record 13 (9 if NMED=0) " NCASE, IWATCH, TIMMAX, INSEED1, INSEED2, -" BEAM_SIZE, ISMOOTH,IRESTART,IDAT,IREJECT,ESAVE_GLOBAL,NRCYCL,IPARALLEL, +" BEAM_SIZE, ISMOOTH,IRESUME,IDAT,IREJECT,ESAVE_GLOBAL,NRCYCL,IPARALLEL, " PARNUM,n_split,ihowfarless,i_phsp_out,i_bindos " " NCASE Number of histories @@ -313,15 +313,15 @@ " ISMOOTH =1 re-distribute particles when re-start a ph-sp file " and/or recycle an individual particle " =0 re-use the ph-sp data once run out (no redistribution) -" IRESTART = 0 first run for this data set (the default) -" = 1 restart of a previous run +" IRESUME = 0 first run for this data set (the default) +" = 1 resume a previous run " = 2 just create the input file and exit " = 3 just read in the raw data and do the statistical " analysis " = 4 recombine .pardose files from parallel runs -" IDAT = 0 output intermediate files for restarts +" IDAT = 0 output intermediate files for resuming " = 1 do not output intermediate data files at all -" = 2 output the data file for restart at end only +" = 2 output the data file for resuming at end only " IREJECT = 0 (default) do not perform charged particle range " rejection. " = 1 perform charged particle range rejection. If @@ -1186,7 +1186,7 @@ REPLACE {;COMIN/TIMEINFO/;} WITH { REPLACE {$CTUnitNumber} WITH {45} "assign a unit number for the CT data" REPLACE {$MXDATA} WITH {1} "To get over nrccaux(p).mortran definition -REPLACE {$NBATCH} WITH {10} "Use 10 batches for restart features, etc. +REPLACE {$NBATCH} WITH {10} "Use 10 batches for resuming features, etc. REPLACE {$MXDOS} WITH {7} "Max number of groups of regions to analyse "Some macros for facilitating access to boundaries and regions @@ -1375,7 +1375,7 @@ REAL XMIN_YMIN_ZMIN,YMIN_XMIN_ZMIN,ZMIN_XMIN_YMIN, XMAX_YMIN_ZMAX,YMIN_XMAX_ZMAX,ZMAX_XMAX_YMIN; "used to output" "rep of source plane" "to .egsgeom file" -INTEGER IRESTART,ibatch,ncaseold; +INTEGER IRESUME,ibatch,ncaseold; character title(80); REAL BATCHT, "T>used by timing TIMEB, "T>used by timing routines @@ -1879,12 +1879,12 @@ dose_stat=0; "assume non phsp source or we can get nhist from phsp source" call srcinput(ieof); OUTPUT61; -(//' NCASE,IWATCH,TIMMAX,INSEED1,INSEED2,BEAM_SIZE,ISMOOTH,IRESTART,IDAT,'/ +(//' NCASE,IWATCH,TIMMAX,INSEED1,INSEED2,BEAM_SIZE,ISMOOTH,IRESUME,IDAT,'/ ' IREJECT,ESAVE_GLOBAL,NRCYCL,IPARALLEL,PARNUM,n_split,ihowfarless,i_phsp_out,'/ ' i_bindos '/ ' : ',$); read(5,'(2I16,F15.0,2I10,F15.0,4I10,F15.0,7I10)') -NCASE,IWATCH,TIMMAX,IXXIN,JXXIN,BEAM_SIZE,ISMOOTH,IRESTART,IDAT,IREJECT, +NCASE,IWATCH,TIMMAX,IXXIN,JXXIN,BEAM_SIZE,ISMOOTH,IRESUME,IDAT,IREJECT, ESAVE_GLOBAL,NRCYCL,IPARALLEL,PARNUM,n_split,ihowfarless,i_phsp_out,i_bindos; IF(n_split<=1 & e_split>1)[ @@ -1917,7 +1917,7 @@ IF( i_parallel > 0 ) JXXIN = JXXIN - 1 + i_parallel; IF(BEAM_SIZE <= 0.0) BEAM_SIZE=100.; -IF(IRESTART < 0 | IRESTART > 4)IRESTART=0;"SET UP THE DEFAULT VALUE" +IF(IRESUME < 0 | IRESUME > 4)IRESUME=0;"SET UP THE DEFAULT VALUE" IF(IPARALLEL<0) IPARALLEL=0; IF(PARNUM<0) PARNUM=0; @@ -2003,10 +2003,10 @@ ELSE[ " reset for other sources elsewhere" IF(iqin = 0)[etotin = ein;] ELSE [etotin = ein + prm;] -OUTPUT61 NCASE,IWATCH,TIMMAX,IXXIN,JXXIN,BEAM_SIZE,ISMOOTH,IRESTART,IDAT, +OUTPUT61 NCASE,IWATCH,TIMMAX,IXXIN,JXXIN,BEAM_SIZE,ISMOOTH,IRESUME,IDAT, IREJECT,ESAVE_GLOBAL,NRCYCL,IPARALLEL,PARNUM,n_split,ihowfarless,i_phsp_out; (/i12,i4,f7.2,2i10,f7.2,i7,i5,i4,i4,F7.2,i4,i4,i4,i4,i4,i4/); -IF(IRESTART=1)[ +IF(IRESUME=1)[ OUTPUT61;(/' Above RNG seeds will be replaced by those from previous run.'); ] @@ -2160,12 +2160,12 @@ IF( isource = 2 | isource = 8 | isource = 20)["phase space source" ] ] -IF(IRESTART = 0) [OUTPUT;(/' Starting a new calculation');] -ELSEIF(IRESTART = 1) [OUTPUT;(/' Restarting from a previous run');] -ELSEIF(IRESTART = 2) [OUTPUT;(/' Just create input file and exit');] -ELSEIF(IRESTART = 3) [OUTPUT;(/' Read in stored data and analyse');] -ELSEIF(IRESTART = 4) [OUTPUT;(/' Recombining parallel runs');] -ELSE [ IRESTART = 0; OUTPUT;(/' IRESTART set to 0, start new caln');] +IF(IRESUME = 0) [OUTPUT;(/' Starting a new calculation');] +ELSEIF(IRESUME = 1) [OUTPUT;(/' Resuming from a previous run');] +ELSEIF(IRESUME = 2) [OUTPUT;(/' Just create input file and exit');] +ELSEIF(IRESUME = 3) [OUTPUT;(/' Read in stored data and analyse');] +ELSEIF(IRESUME = 4) [OUTPUT;(/' Recombining parallel runs');] +ELSE [ IRESUME = 0; OUTPUT;(/' IRESUME set to 0, start new caln');] IF(IDAT = 0) [OUTPUT;(/' Store intermediate files for each batch');] ELSEIF (IDAT = 1) [OUTPUT;(/' Do not store intermediate files at all');] @@ -2405,13 +2405,13 @@ IF(howfarless) call modify_tmxs(MIN(mindelX,mindelY,mindelZ)); OUTPUT61;(/' Medium',t24,'AE',t34,'AP'); DO n=1,NMED[OUTPUT61 (media(j,n),j=1,15),ae(n),ap(n);(1x,15a1,2f10.3);] -"RESTART FEATURES" +"RESUME FEATURES" "================" DO irl=1,irmax[endep_last(irl)=0;] "always zero this array" IHSTRY=0; "always zero this as well" -IF(IRESTART = 0)["START A NEW RUN" +IF(IRESUME = 0)["START A NEW RUN" nnread = 0;"initialize counter" nsmiss=0; nmissm=0; ncaseold=0; nsrjct=0; nsoutside=0; ndbsrjct=0; @@ -2439,7 +2439,7 @@ IF(IRESTART = 0)["START A NEW RUN" ] tcpuold=0.; ] -ELSEIF(IRESTART = 1)["READ DATA FROM A PREVIOUS RUN" +ELSEIF(IRESUME = 1)["READ DATA FROM A PREVIOUS RUN" OUTPUT; (/' *** About to read dose data from previous run ***'); i_par_temp=i_parallel; IF(IPARALLEL>0 & n_parallel=0) i_parallel=0; @@ -2458,14 +2458,14 @@ ELSEIF(IRESTART = 1)["READ DATA FROM A PREVIOUS RUN" OUTPUT61 nhist; (/' Equivalent no. of primary histories',i12); ] OUTPUT61 tcpuold/3600.;(/' Total previou CPU time (hour) ',f10.3); - OUTPUT61;(/' Random number seeds for restart ',$); + OUTPUT61;(/' Random number seeds for resuming ',$); $SHOW-RNG-STATE(6); $SHOW-RNG-STATE(1); OUTPUT;(/' ***Successfully read previous dose data file ***'); ] -ELSEIF(IRESTART = 2)["Just create the input file and then quit" GO TO :END:; ] +ELSEIF(IRESUME = 2)["Just create the input file and then quit" GO TO :END:; ] -ELSEIF(IRESTART = 3)["Just do a data analysis" +ELSEIF(IRESUME = 3)["Just do a data analysis" NCASE=0; OUTPUT; (/' *** About to read dose data from previous run ***'); i_par_temp=i_parallel; @@ -2487,7 +2487,7 @@ ELSEIF(IRESTART = 3)["Just do a data analysis" OUTPUT;(/' ***Successfully read previous dose data file ***'); GO TO :STAT-ANALYSIS:; ] -ELSEIF(IRESTART=4)["just combine .pardose files" +ELSEIF(IRESUME=4)["just combine .pardose files" call egs_combine_runs(combine_results,'.pardose'); ainflu=temp2; "need to define this because it is used to normalize dose" IF((isource = 0 | isource = 1 | isource = 3 | isource = 7) & @@ -2870,18 +2870,18 @@ IF(i_phsp_out>0)[" close output phsp file (JL 2013)" :STAT-ANALYSIS:; "toc: "==============" -IF (IRESTART ~= 3)[ +IF (IRESUME ~= 3)[ OUTPUT61 timcpu,timcpu/3600.,dble(IHSTRY)/(timcpu/3600.); (/' Total CPU time for run =',f8.1,' s =',f8.3,' hr =>', F12.0,' hist/hr'/T3,' On '$MACHINE' '); ] -IF (IRESTART = 1) ["Case of restarting" +IF (IRESUME = 1) ["Case of resuming" OUTPUT61 timcpu+tcpuold,(timcpu+tcpuold)/3600.,dble(IHSTRY+ncaseold) /((timcpu+tcpuold)/3600.); (/' CPU time for this+previous run =',f8.1,' s =',f8.3,' hr =>', F12.0,' hist/hr'/T3,' On '$MACHINE' '); ] -ELSEIF (IRESTART = 3)["just data analysis" +ELSEIF (IRESUME = 3)["just data analysis" OUTPUT61 timcpu+tcpuold,(timcpu+tcpuold)/3600.,float(ncaseold) /((timcpu+tcpuold)/3600.); (/' Total CPU time for old run =',f8.1,' s =',f8.3,' hr =>', @@ -3136,7 +3136,7 @@ DO i=1,IMAX [ " ============== REPLACE {$PRINT-HEADER;} WITH {; - IF((n_parallel>0 & is_finished)|IRESTART=4 )[ + IF((n_parallel>0 & is_finished)|IRESUME=4 )[ "fluence meaningless in final analysis" OUTPUT1 title; (//,'1',80a1 // @@ -3442,7 +3442,7 @@ $SET_ELAPSED_CPUTIME(cput2); timcpu=$CONVERSION_TO_SECONDS*(cput2-cput0); OUTPUT61 timcpu,timcpu/3600.; (/' Total CPU time for this run =',f8.1,' s =',f8.3,' hr'); -IF(IRESTART=4)[ +IF(IRESUME=4)[ OUTPUT61;(/' CPU time is for combining .pardose files only.'); ] ELSEIF(n_parallel>0 & is_finished)[ diff --git a/HEN_HOUSE/user_codes/dosxyznrc/read_write_pardose.c b/HEN_HOUSE/user_codes/dosxyznrc/read_write_pardose.c index 8547d3944..e6b9ac938 100644 --- a/HEN_HOUSE/user_codes/dosxyznrc/read_write_pardose.c +++ b/HEN_HOUSE/user_codes/dosxyznrc/read_write_pardose.c @@ -32,7 +32,7 @@ # This file replaces files write_pardose.c and read_pardose.c. Since 2004 the # .pardose files are automatically recombined at the end of a parallel run # or when the user recombines them manually by running dosxyznrc with the -# input flag IRESTART=4. +# input flag IRESUME=4. # ############################################################################### */ diff --git a/HEN_HOUSE/user_codes/edknrc/edknrc.io b/HEN_HOUSE/user_codes/edknrc/edknrc.io index 6907f6901..62534dcef 100644 --- a/HEN_HOUSE/user_codes/edknrc/edknrc.io +++ b/HEN_HOUSE/user_codes/edknrc/edknrc.io @@ -37,9 +37,9 @@ # # 1 .egslst -# Unit 2 is explicitly opened if needed, depending on istore and/or irestart +# Unit 2 is explicitly opened if needed, depending on istore and/or iresume #2 .egsrns -# Unit 4 is explicitly opened if needed, depending on idat and/or irestart +# Unit 4 is explicitly opened if needed, depending on idat and/or iresume #4 .egsdat #9 .egseff # Unit 13 is explicitly opened if needed diff --git a/HEN_HOUSE/user_codes/edknrc/edknrc.mortran b/HEN_HOUSE/user_codes/edknrc/edknrc.mortran index 5a7dc4546..4ccf14b5a 100644 --- a/HEN_HOUSE/user_codes/edknrc/edknrc.mortran +++ b/HEN_HOUSE/user_codes/edknrc/edknrc.mortran @@ -131,9 +131,9 @@ " ************************** "******************************************************************************* " -" IRESTART +" IRESUME " = first (0) First run for this data set -" = restart (1) Restart a previous run +" = resume (1) Resume a previous run " = analyze (3) Just read in the raw data and do the statistical analysis " = parallel (5) Combine results from previous parallel runs " STORE DATA ARRAYS @@ -1227,10 +1227,10 @@ REPLACE {;COMIN/IODAT2/;} WITH {; COMMON/IODAT2/ NCASEO, NCASET, AMASS($MAXCDOSE,$MAXRADII),TMCPUO,ECUTIN,PCUTIN, -EDKF, IDAT,IRESTART,IDORAY,IDOPES,IVAL,datcount; +EDKF, IDAT,IRESUME,IDORAY,IDOPES,IVAL,datcount; $LONG_INT NCASEO, NCASET; $REAL AMASS,TMCPUO,ECUTIN,PCUTIN; -$INTEGER IDAT,IDORAY,IDOPES,IVAL,IRESTART,EDKF,datcount; +$INTEGER IDAT,IDORAY,IDOPES,IVAL,IRESUME,EDKF,datcount; "Added type declarations, IK January 10 2000" } " @@ -1488,9 +1488,9 @@ $SET_ELAPSED_CPUTIME(CPUT0); "OBTAIN THE INITIAL STARTING TIME" call inputs; -" THE IRESTART=5 CASE, POST-PROCESSING FOR DISTRIBUTED RUNS, GOES HERE +" THE IRESUME=5 CASE, POST-PROCESSING FOR DISTRIBUTED RUNS, GOES HERE " ADDED BY JT, NOV.98 -IF(IRESTART.EQ.5)[ +IF(IRESUME.EQ.5)[ call egs_combine_runs(combine_results,'.egsdat'); @@ -1498,7 +1498,7 @@ IF(IRESTART.EQ.5)[ NBATCH= 0; "DON'T WANT IT TO RUN ANY HISTORIES" NCASET= NCASEO; "To prevent a wrong normalization if some of the " "parallel runs not available, IK, Jan 21 1999" -] "end of IRESTART = 5, DISTRIBUTED POST-PROCESSING" +] "end of IRESUME = 5, DISTRIBUTED POST-PROCESSING" ELSE[ jcase = ncase; @@ -1638,16 +1638,16 @@ WRITE(IOUT,200);WRITE(6,200); "PRINT HEADER FOR EXECUTION MESSAGES" OUTPUT61;(' '); "PRINT EXECUTION MODE" -IF(IRESTART.EQ.0)[WRITE(6,201);WRITE(IOUT,201);] -ELSEIF(IRESTART.EQ.1)[ +IF(IRESUME.EQ.0)[WRITE(6,201);WRITE(IOUT,201);] +ELSEIF(IRESUME.EQ.1)[ WRITE(6,202) NCASE,NCASEO; write(6,'(21x,a,$)') 'New RNG state: '; $SHOW-RNG-STATE(6); write(6,*); write(iout,'(21x,a,$)') 'New RNG state: '; $SHOW-RNG-STATE(iout); write(iout,*); ] -ELSEIF(IRESTART.EQ.3)[WRITE(6,204);WRITE(IOUT,204);GO TO :END-SIM:;] -ELSEIF(IRESTART.EQ.5)[WRITE(6,206);WRITE(IOUT,206);GO TO :END-SIM:;] +ELSEIF(IRESUME.EQ.3)[WRITE(6,204);WRITE(IOUT,204);GO TO :END-SIM:;] +ELSEIF(IRESUME.EQ.5)[WRITE(6,206);WRITE(IOUT,206);GO TO :END-SIM:;] "SET CLOCK AT THE BEGINNING OF SIMULATIONS" $INITIALIZE_ELAPSED_CPU_TIME; @@ -1794,13 +1794,13 @@ OUTPUT61 ihstry,TIMCPU+TMCPUO;(//I15,' histories run in ',f7.1); $UPDATE_LAST_HISTORY;"This is done always, $UPDATE_BATCH_LAST_HISTORY" "is done only if idat = 0" -IF(IRESTART=3)["just analyzing data--no elapsed time" +IF(IRESUME=3)["just analyzing data--no elapsed time" WRITE(IOUT,250)TMCPUO,TMCPUO/3600; WRITE(6,250)TMCPUO,TMCPUO/3600; WRITE(IOUT,280)TMCPUO/dble(IHSTRY),3600.*dble(IHSTRY)/TMCPUO; WRITE(6,280)TMCPUO/dble(IHSTRY),3600.*dble(IHSTRY)/TMCPUO; ] -ELSEIF(IRESTART=5)["output time results for parallel runs" +ELSEIF(IRESUME=5)["output time results for parallel runs" WRITE(IOUT,255)DATCOUNT,TMCPUO,TMCPUO/3600.,TMCPUO/dble(DATCOUNT); WRITE(6,255)DATCOUNT,TMCPUO,TMCPUO/3600.,TMCPUO/dble(DATCOUNT); WRITE(IOUT,280)TMCPUO/dble(IHSTRY),3600.*dble(IHSTRY)/TMCPUO; @@ -2166,7 +2166,7 @@ $CALL_EXIT(0); // ,79('*')/ //'USING EDKnrc(EGSnrc) '$VERSION' ON '$MACHINE' '); 201 FORMAT(/'********* NEW INPUT FILE *********'/); -202 FORMAT(/'********* RESTARTED INPUT FILE ********* '/ +202 FORMAT(/'********* RESUMED INPUT FILE ********* '/ ' ',10X,I12,' NEW + ',I12,' OLD HISTORIES'); 204 FORMAT(/'********* DATA ANALYSIS ONLY *********'/); 206 FORMAT(/' ********* ANALYZING RESULTS FROM PARALLEL RUNS *******'/); @@ -2258,7 +2258,7 @@ $INTEGER data_unit, egs_get_unit, egs_open_datfile; INTEGER NUM_TITLE, "I/O Contol" - NUM_IRESTART, + NUM_IRESUME, NUM_STORE, NUM_EDKF, "M-C Input" @@ -2349,12 +2349,12 @@ $SKIP-LINE; DELIMETER='I/O CONTROL'; IVAL=IVAL+1; -NUM_IRESTART =IVAL; -VALUES_SOUGHT(IVAL)='IRESTART'; +NUM_IRESUME =IVAL; +VALUES_SOUGHT(IVAL)='IRESUME'; NVALUE(IVAL)=1; TYPE(IVAL)=3; ALLOWED_INPUTS(IVAL,0)='FIRST'; -ALLOWED_INPUTS(IVAL,1)='RESTART'; +ALLOWED_INPUTS(IVAL,1)='RESUME'; ALLOWED_INPUTS(IVAL,3)='ANALYZE'; ALLOWED_INPUTS(IVAL,5)='PARALLEL'; @@ -2375,14 +2375,14 @@ ALLOWED_INPUTS(IVAL,0)='YES'; ALLOWED_INPUTS(IVAL,1)='NO'; "********************************" -$GET_INPUTS(NUM_IRESTART,NUM_EDKF); +$GET_INPUTS(NUM_IRESUME,NUM_EDKF); "********************************" -IRESTART =VALUE(NUM_IRESTART ,1); +IRESUME =VALUE(NUM_IRESUME ,1); IDAT=VALUE(NUM_STORE,1); EDKF=VALUE(NUM_EDKF,1); -OUTPUT IRESTART,IDAT; +OUTPUT IRESUME,IDAT; ( / -' FIRST RUN(0),RESTARTED(1),ANALYZE(3),parallel(5):', +' FIRST RUN(0),RESUMED(1),ANALYZE(3),parallel(5):', T72,I4/ ' STORE DATA(0) OR NOT(1):',T72,I4/); IF (EDKF = 0)[ @@ -2811,11 +2811,11 @@ DO j=1,$MXREG[ ] cavdose = 0.0; cavdose2 = 0.0; cavdose_tmp = 0.0; -IF(IRESTART > 0 & IRESTART < 5)[ "Analize or restart run" +IF(IRESUME > 0 & IRESUME < 5)[ "Analize or resume run" $READ_OLD_DATA; ] -IF(IRESTART = 3)[NCASE=0;] +IF(IRESUME = 3)[NCASE=0;] NCASET=NCASE+NCASEO; diff --git a/HEN_HOUSE/user_codes/edknrc/edknrc_template.egsinp b/HEN_HOUSE/user_codes/edknrc/edknrc_template.egsinp index 239d04692..d0a0d5743 100644 --- a/HEN_HOUSE/user_codes/edknrc/edknrc_template.egsinp +++ b/HEN_HOUSE/user_codes/edknrc/edknrc_template.egsinp @@ -43,8 +43,8 @@ TITLE= Energy deposition kernel for 1 MeV photons ########################## :start I/O control: -IRESTART= first # first (0) First run for this data set - # restart (1) Restart a previous run +IRESUME= first # first (0) First run for this data set + # resume (1) Resume a previous run # analyze (3) Just read in the raw data and do the statistical analysis # parallel (5) Combine results from previous parallel runs diff --git a/HEN_HOUSE/user_codes/flurznrc/flurznrc.mortran b/HEN_HOUSE/user_codes/flurznrc/flurznrc.mortran index d286d0526..3717ed008 100644 --- a/HEN_HOUSE/user_codes/flurznrc/flurznrc.mortran +++ b/HEN_HOUSE/user_codes/flurznrc/flurznrc.mortran @@ -274,9 +274,9 @@ REPLACE {$VERSION} WITH { " = last (1) store the initial random number for the last history " = all (2) store all the initial random numbers " -" IRESTART +" IRESUME " = first (0) first run for this data set -" = restart (1) restart of a previous run +" = resume (1) resume a previous run " = analyze (3) just read in the raw data and do the statistical " analysis " = start-RNS (4) read starting random numbers from a file (e.g. for @@ -1834,7 +1834,7 @@ $LONG_INT NCASE,NCASEO,NCASET; "NCASEO NUMBER OF HISTORIES DONE IN PREVIOUS SESSIONS "NCASET NUMBER OF HISTORIES ALREADY DONE "IRSTRT = 0 => INITIAL RUN -" = 1 => RESTARTED RUN +" = 1 => RESUMED RUN " = 3 => DATA ANALYSIS ONLY " = 4 => READ RANDOM NUMBER SEEDS FROM UNIT 2 " = 5 => PARALLEL POST-PROCESSING @@ -3000,7 +3000,7 @@ $CALL_EXIT(0); %F %I0 201 FORMAT(/' ********* NEW INPUT FILE *********'/) -202 FORMAT(/' ********* RESTARTED INPUT FILE ********* '/ +202 FORMAT(/' ********* RESUMED INPUT FILE ********* '/ 1' ',10X,I12,' NEW + ',I12,' OLD HISTORIES'/ 2' ',20X,'NEW RN SEEDS=',$) 204 FORMAT(/' ********* DATA ANALYSIS ONLY *********'/) @@ -3788,11 +3788,11 @@ ALLOWED_INPUTS(IVAL,2)='ALL'; IVAL = IVAL + 1; NUM_IRSTRT = IVAL; -VALUES_SOUGHT(IVAL)='IRESTART'; +VALUES_SOUGHT(IVAL)='IRESUME'; NVALUE(IVAL)=1; TYPE(IVAL)=3; ALLOWED_INPUTS(IVAL,0)='FIRST'; -ALLOWED_INPUTS(IVAL,1)='RESTART'; +ALLOWED_INPUTS(IVAL,1)='RESUME'; ALLOWED_INPUTS(IVAL,3)='ANALYZE'; ALLOWED_INPUTS(IVAL,4)='START-RNS'; ALLOWED_INPUTS(IVAL,5)='PARALLEL'; @@ -3859,7 +3859,7 @@ IPRIM=VALUE(NUM_IPRIM,1); OUTPUT IWATCH,ISTORE,IRSTRT,IPRNTP,IDAT,IPRIM; (/' DO NOT TRACK(0) OR TRACK(>0) EVERY INTERACTION:',T60,I12/ ' DO NOT STORE(0) OR STORE(1,2) INITIAL RANDOM #s:',T60,I12/ -' FIRST RUN(0),RESTARTED(1),ANALYZE(3),READ RNS(4),'/ +' FIRST RUN(0),RESUMED(1),ANALYZE(3),READ RNS(4),'/ ' PARALLEL(5):',T60,I12/ ' LIST ALL(0), SHORT PHOT(1),SPECIFIED REGIONS(2), NONE(>2):',T60,I12/ ' STORE DATA(0) OR NOT(1):',T60,I12/ @@ -4264,7 +4264,7 @@ IF(IRSTRT = 0 | IRSTRT = 5)[ "FRESH START, SET EVERYTHING TO ZERO" ] ] ELSEIF(IRSTRT ~= 4)[ - "RESTART OR STATS ANALYSIS ONLY, READ OLD DATA FROM UNIT 4" + "RESUME OR STATS ANALYSIS ONLY, READ OLD DATA FROM UNIT 4" OUTPUT;(/' START READING OLD DATA FILE'); "OPEN UNIT 4 AS AN OLD FILE" diff --git a/HEN_HOUSE/user_codes/flurznrc/flurznrc_template.egsinp b/HEN_HOUSE/user_codes/flurznrc/flurznrc_template.egsinp index 168cbd1c0..ec0a70bea 100644 --- a/HEN_HOUSE/user_codes/flurznrc/flurznrc_template.egsinp +++ b/HEN_HOUSE/user_codes/flurznrc/flurznrc_template.egsinp @@ -51,9 +51,9 @@ #yes: store initial random numbers for #each history in .egsrns #(useful for debugging) - IRESTART= first #first,restart,make,analyze,parallel; + IRESUME= first #first,resume,make,analyze,parallel; #first: first run - #restart: restart of old run (requires .egsdat file) + #resume: resume old run (requires .egsdat file) #make: just create an input file and exit #analyze: read in data from .egsdat file and # do statistical analysis and output results @@ -63,7 +63,7 @@ # analysis and output to .egslst STORE DATA ARRAYS= yes #yes,no; - #yes: output .egsdat file for restarts, parallel + #yes: output .egsdat file for resuming, parallel # post-processing, etc PRINT FLUENCE SPECTRA= specified #all,specified,none; diff --git a/HEN_HOUSE/user_codes/mevegs/mevegs.cpp b/HEN_HOUSE/user_codes/mevegs/mevegs.cpp index db1dfb2cd..208196a99 100644 --- a/HEN_HOUSE/user_codes/mevegs/mevegs.cpp +++ b/HEN_HOUSE/user_codes/mevegs/mevegs.cpp @@ -148,13 +148,13 @@ class APP_EXPORT Mevegs_Application : public EGS_AdvancedApplication { /*! Output intermediate results to the .egsdat file. This function is called at the end of each batch. We must store - the results in the file so that simulations can be restarted and results + the results in the file so that simulations can be resumed and results of parallel runs recombined. */ int outputData(); /*! Read results from a .egsdat file. - This function is used to read simulation results in restarted + This function is used to read simulation results when resuming calculations. */ int readData(); diff --git a/HEN_HOUSE/user_codes/sprrznrc/sprrznrc.mortran b/HEN_HOUSE/user_codes/sprrznrc/sprrznrc.mortran index 7632dfd22..aaae08f81 100644 --- a/HEN_HOUSE/user_codes/sprrznrc/sprrznrc.mortran +++ b/HEN_HOUSE/user_codes/sprrznrc/sprrznrc.mortran @@ -252,9 +252,9 @@ REPLACE {$VERSION} WITH { " = last (1) store the initial random number for the last history " = all (2) store all the initial random numbers " -" IRESTART +" IRESUME " = first (0) first run for this data set -" = restart (1) restart of a previous ruN +" = resume (1) resume a previous run " = analyze (3) just read in the raw data and do the statistical " analysis " = start-RNS (4) read starting random numbers from a file (E.G. for @@ -1629,10 +1629,10 @@ REPLACE {;COMIN/IODAT2/;} WITH COMMON/IODAT2/ NCASE,NCASEO,NCASET, AMASS($MAXZREG,$MAXRADII),TMCPUO,TIMMAX,STATLM,EIN, -IDAT,IRESTART,IQIN,IVAL,ISPRREG,ISPR($MXREG); +IDAT,IRESUME,IQIN,IVAL,ISPRREG,ISPR($MXREG); $LONG_INT NCASE,NCASEO,NCASET; $REAL AMASS,TMCPUO,TIMMAX,STATLM,EIN; -$INTEGER IDAT,IRESTART,IQIN,IVAL,ISPR, +$INTEGER IDAT,IRESUME,IQIN,IVAL,ISPR, ISPRREG,DATCOUNT; } "AMASS(IZ,IX) MASS OF ZONE WITH COORDINATES (IZ,IX) @@ -1644,8 +1644,8 @@ ISPRREG,DATCOUNT; "NCASE NUMBER OF HISTORIES REMAINING TO BE DONE "NCASEO NUMBER OF HISTORIES DONE IN PREVIOUS SESSIONS "NCASET NUMBER OF HISTORIES ALREADY DONE -"IRESTART = 0 => INITIAL RUN -" = 1 => RESTARTED RUN +"IRESUME = 0 => INITIAL RUN +" = 1 => RESUMED RUN " = 3 => DATA ANALYSIS ONLY " = 4 => READ STARTING RANDOM NUMBERS FROM A FILE " = 5 => ANALYZE .egsdat FILES FROM PARALLEL RUN @@ -1654,7 +1654,7 @@ ISPRREG,DATCOUNT; " = 1 TO OUTPUT SPR's BY CYLINDER AND/OR SLAB "ISPRREG(J) = 1 IF THE USER IS OUTPUTTING SPR IN REGION J OR CYLINDER J OR " SLAB J-NR -"DATCOUNT = no. of files used for analysis of parallel run (IRESTART=5) +"DATCOUNT = no. of files used for analysis of parallel run (IRESUME=5) ; REPLACE {;COMIN/USER/;} WITH {;COMIN/USER-VARIANCE-REDUCTION/;} @@ -1870,7 +1870,7 @@ $INTEGER I,J,NBATCH,IZ,IX,MEDNUM,LGLE,IBATCH,IBTCH,NOSCAT,INOCAV, $REAL EI,EKMAX,DEPTH,VOLUME,RLOW2,WEIGHT,COHFAC,ECUTMN,factor, EK0,BATCHT,XIN,YIN,ZIN,UIN,VIN,WIN,FHPG,FMASS,FHPH,TEMP1,TEMP2; -REAL*8 TSC,TSC2; "used to store data in .egsdat file for restart" +REAL*8 TSC,TSC2; "used to store data in .egsdat file for resuming" REAL SCORE_TEMP,SCORE_NORM_NUM; "used for uncertainty analysis" @@ -1932,24 +1932,24 @@ IF (ERROR_FLAG=1) [GOTO :END:;] IF( istore > 0 ) [ "We want to store the rng state in a file" rng_unit = egs_open_file(2,0,1,'.egsrns'); ] -ELSE IF( irestart = 4 ) [ "We well read RN's from a file" +ELSE IF( iresume = 4 ) [ "We well read RN's from a file" rng_unit = egs_open_datfile(2,0,1,'.egsrns'); ] "IF(ISTORE = 2)[ " "ALL INITIAL RN'S STORED" " OPEN(UNIT=2,STATUS='UNKNOWN'); "] -"ELSEIF(IRESTART = 4)[ " "RN'S READ FROM A FILE" +"ELSEIF(IRESUME = 4)[ " "RN'S READ FROM A FILE" " OPEN(UNIT=2,STATUS='OLD'); "] -IF(IRESTART=5)["post-processing for parallel run" +IF(IRESUME=5)["post-processing for parallel run" call egs_combine_runs(combine_results,'.egsdat'); NBATCH=0; "DON'T WANT IT TO RUN ANY HISTORIES" NCASET=NCASEO; "To prevent a wrong normalization if some of the " "parallel runs not available, IK, Jan 21 1999" -] "end of IRESTART = 5, PARALLEL POST-PROCESSING" +] "end of IRESUME = 5, PARALLEL POST-PROCESSING" MXNP=0; "RESET THE MAXIMUM STACK INDICATOR" @@ -2106,8 +2106,8 @@ write(iout,100) ' '; call egs_fdate(iout); write(iout,*); WRITE(IOUT,200);WRITE(6,200); "PRINT HEADER FOR EXECUTION MESSAGES" "PRINT EXECUTION MODE" -IF(IRESTART = 0)[WRITE(6,201);WRITE(IOUT,201);] -ELSEIF(IRESTART = 1)[ +IF(IRESUME = 0)[WRITE(6,201);WRITE(IOUT,201);] +ELSEIF(IRESUME = 1)[ WRITE(6,202) NCASE,NCASEO; write(6,'(21x,a,$)') 'New RNG state: '; $SHOW-RNG-STATE(6); write(6,*); @@ -2116,9 +2116,9 @@ ELSEIF(IRESTART = 1)[ $SHOW-RNG-STATE(iout); write(iout,*); ] -ELSEIF(IRESTART = 3)[WRITE(6,204);WRITE(IOUT,204);GO TO :STATS-ANAL:;] -ELSEIF(IRESTART = 4)[WRITE(6,205);WRITE(IOUT,205);] -ELSEIF(IRESTART = 5)[WRITE(6,206);WRITE(IOUT,206); GO TO :STATS-ANAL:;] +ELSEIF(IRESUME = 3)[WRITE(6,204);WRITE(IOUT,204);GO TO :STATS-ANAL:;] +ELSEIF(IRESUME = 4)[WRITE(6,205);WRITE(IOUT,205);] +ELSEIF(IRESUME = 5)[WRITE(6,206);WRITE(IOUT,206); GO TO :STATS-ANAL:;] "INITIALIZE IWATCH ROUTINE" IF(IWATCH.NE.0) CALL WATCH(-99,IWATCH); @@ -2244,7 +2244,7 @@ DO IBATCH=1,$NBATCH[ NFTIME=0; "RESET THE PHOTON FORCED INTERACTION COUNTER" "RETRIEVE STARTING RANDOM NUMBERS IF READING FROM A FILE" - IF(IRESTART = 4)[ $RETRIEVE RNG STATE FROM UNIT 2; ] + IF(IRESUME = 4)[ $RETRIEVE RNG STATE FROM UNIT 2; ] "STORE INITIAL RANDOM #S FOR EACH HISTORY IF REQUESTED" "DELETE THE FILE THAT CONTAINED THE PREVIOUS INITIAL RANDOM NUMBERS" @@ -2310,7 +2310,7 @@ DO IBATCH=1,$NBATCH[ IF(IDAT = 0)["STORE ONLY IF REQUESTED - DEFAULT" "AND RECORD THE NEW BATCH" - "IF (IBATCH ~= 1 | IRESTART = 1) [ + "IF (IBATCH ~= 1 | IRESUME = 1) [ " CLOSE(UNIT=4); " "DELETE THE OLD DATA FILE" "] "OPEN(UNIT=4,file='fort.4',STATUS='UNKNOWN');" @@ -2687,7 +2687,7 @@ $CALL_EXIT(0); ' ',79('*')/ /' SPRRZnrc(EGSnrc) '$VERSION/' on '$MACHINE' '); 201 FORMAT(/' ********* NEW INPUT FILE *********'/); -202 FORMAT(/' ********* RESTARTED INPUT FILE ********* '/ +202 FORMAT(/' ********* RESUMED INPUT FILE ********* '/ ' ',10X,I12,' NEW + ',I12,' OLD HISTORIES'/ ' ',20X,'NEW RN SEEDS=',2(1X,I12)/); 204 FORMAT(/' ********* DATA ANALYSIS ONLY *********'/); @@ -3617,7 +3617,7 @@ INTEGER NUM_TITLE, "I/O Contol" NUM_IWATCH, NUM_STRAND, - NUM_IRESTART, + NUM_IRESUME, NUM_STORE, NUM_SPRREG, NUM_SPR1, @@ -3702,13 +3702,13 @@ ALLOWED_INPUTS(IVAL,2)='ALL'; IVAL=IVAL+1; -NUM_IRESTART=IVAL; -VALUES_SOUGHT(IVAL)='IRESTART'; +NUM_IRESUME=IVAL; +VALUES_SOUGHT(IVAL)='IRESUME'; NVALUE(IVAL)=1; TYPE(IVAL)=3; DEFAULT(IVAL)=0; ALLOWED_INPUTS(IVAL,0)='FIRST'; -ALLOWED_INPUTS(IVAL,1)='RESTART'; +ALLOWED_INPUTS(IVAL,1)='RESUME'; ALLOWED_INPUTS(IVAL,3)='ANALYZE'; ALLOWED_INPUTS(IVAL,4)='START-RNS'; ALLOWED_INPUTS(IVAL,5)='PARALLEL'; @@ -3728,15 +3728,15 @@ $GET_INPUTS(NUM_IWATCH,NUM_STORE); OUTPUT;(' *** INPUT CARD IO2 ***'); IWATCH=VALUE(NUM_IWATCH,1); ISTORE=VALUE(NUM_STRAND,1); -IRESTART=VALUE(NUM_IRESTART,1); +IRESUME=VALUE(NUM_IRESUME,1); IDAT=VALUE(NUM_STORE,1); -OUTPUT IWATCH,ISTORE,IRESTART,IDAT; +OUTPUT IWATCH,ISTORE,IRESUME,IDAT; (/' DO NOT TRACK(0) OR TRACK(>0) EVERY INTERACTION:',T60,I12/ ' DO NOT STORE(0) OR STORE(1,2,3) INITIAL RANDOM #:',T60,I12/ - ' FIRST RUN(0),RESTART(1),ANALYZE(3),START RNS(4),PARALLEL(5):', + ' FIRST RUN(0),RESUME(1),ANALYZE(3),START RNS(4),PARALLEL(5):', T60,I12/ ' STORE RAW DATA(0) OR NOT(1):',T60,I12); IF(IDAT.EQ.1)[INEXT=0;]ELSE[INEXT=1;] -IF(IRESTART = 4) [ +IF(IRESUME = 4) [ IDAT=1; "DO NOT STORE OUTPUT IN THIS CASE TO AVOID BIASING" ISTORE=0; "DO NOT STORE THE STARTING RANDOM NUMBERS EITHER" ] @@ -4200,7 +4200,7 @@ IF (ERROR_FLAG=1) [GOTO :FINISHED:;] NCASEO=0;NCASET=0;TMCPUO=0; "SET PREVIOUS RUN COUNTERS" SCSTP_TMP=0; -IF(IRESTART = 0 | IRESTART=5)[ "FRESH START, SET EVERYTHING TO ZERO" +IF(IRESUME = 0 | IRESUME=5)[ "FRESH START, SET EVERYTHING TO ZERO" NNREAD=0; SCSTP=0.; SCSTP2=0.; SCSTP_LAST=0; PIISTP=0.; DO IX=1,NR[ DO IZ=1,NZ[ @@ -4220,9 +4220,9 @@ IF(IRESTART = 0 | IRESTART=5)[ "FRESH START, SET EVERYTHING TO ZERO" ] ] ] -ELSEIF(IRESTART.NE.4)[ +ELSEIF(IRESUME.NE.4)[ - "RESTART OR STATS ANALYSIS ONLY, READ OLD DATA FROM UNIT 4" + "RESUME OR STATS ANALYSIS ONLY, READ OLD DATA FROM UNIT 4" "OPEN UNIT 4 AS AN OLD FILE" OUTPUT;(//' ABOUT TO START READING STORED RAW DATA FILE: *.egsdat'/); @@ -4252,7 +4252,7 @@ ELSEIF(IRESTART.NE.4)[ CLOSE(UNIT=data_unit); ] -IF(IRESTART = 3)[NCASE=0;] +IF(IRESUME = 3)[NCASE=0;] NCASET=NCASE+NCASEO; diff --git a/HEN_HOUSE/user_codes/sprrznrc/sprrznrc_template.egsinp b/HEN_HOUSE/user_codes/sprrznrc/sprrznrc_template.egsinp index 82a2366b3..536d36da3 100644 --- a/HEN_HOUSE/user_codes/sprrznrc/sprrznrc_template.egsinp +++ b/HEN_HOUSE/user_codes/sprrznrc/sprrznrc_template.egsinp @@ -52,9 +52,9 @@ # history in .egsrns #all: store initial random numbers for each # history - IRESTART= first #first,restart,make,analyze,start-RNS; + IRESUME= first #first,resume,make,analyze,start-RNS; #first: first run - #restart: restart of old run (requires .egsdat file) + #resume: resume old run (requires .egsdat file) #make: just create an input file and exit #analyze: read in data from .egsdat file and # do statistical analysis and output results @@ -63,7 +63,7 @@ # .egsrns STORE DATA ARRAYS= yes #yes,no; - #yes: output .egsdat file for restarts, parallel + #yes: output .egsdat file for resuming, parallel # post-processing, etc SPR OUTPUT= slabs/cylinders #regions,slabs/cylinders; diff --git a/HEN_HOUSE/user_codes/tutor7pp/test1.egsinp b/HEN_HOUSE/user_codes/tutor7pp/test1.egsinp index cbadb322f..c3e8d5e25 100644 --- a/HEN_HOUSE/user_codes/tutor7pp/test1.egsinp +++ b/HEN_HOUSE/user_codes/tutor7pp/test1.egsinp @@ -88,7 +88,7 @@ ncase = 1000000 statistical accuracy sought = 1 # this input is optional max cpu hours allowed = 15 # this input is optional - #calculation = combine # could als be first or restart or analyze + #calculation = combine # could also be first or resume or analyze, # the input is optional and if missing, a # fresh calculation will be done :stop run control: diff --git a/HEN_HOUSE/user_codes/tutor7pp/tutor7pp.cpp b/HEN_HOUSE/user_codes/tutor7pp/tutor7pp.cpp index 4abce121d..51543edb0 100644 --- a/HEN_HOUSE/user_codes/tutor7pp/tutor7pp.cpp +++ b/HEN_HOUSE/user_codes/tutor7pp/tutor7pp.cpp @@ -38,7 +38,7 @@ # in the simulation. # # In addition, tutor7pp derives from the EGS_AdvancedApplication class and -# therefore automatically inherits the ability to do restarted and parallel +# therefore automatically inherits the ability to resume or run parallel # simulations, to combine the results of parallel runs or to re-analyze the # results of single/parallel runs. It also inherits the ability to run for a # user specified maximum amount of cpu time or to terminate the simulation @@ -114,7 +114,7 @@ # nbatch = number of batches to use # statistical accuracy sought = required uncertainty, in % # max cpu hours allowed = max. processor time allowed -# calculation = first | restart | combine | analyze +# calculation = first | resume | combine | analyze # # All inputs except for ncase are optional (a missing ncase key will result # in a simulation with 0 particles). @@ -233,13 +233,13 @@ class APP_EXPORT Tutor7_Application : public EGS_AdvancedApplication { /*! Output intermediate results to the .egsdat file. This function is called at the end of each batch. We must store - the results in the file so that simulations can be restarted and results + the results in the file so that simulations can be resumed and results of parallel runs recombined. */ int outputData(); /*! Read results from a .egsdat file. - This function is used to read simulation results in restarted + This function is used to read simulation results in resumed calculations. */ int readData(); diff --git a/HEN_HOUSE/utils/iaea_phsp_macros.mortran b/HEN_HOUSE/utils/iaea_phsp_macros.mortran index 9eb000e56..2796cbe2e 100644 --- a/HEN_HOUSE/utils/iaea_phsp_macros.mortran +++ b/HEN_HOUSE/utils/iaea_phsp_macros.mortran @@ -65,11 +65,11 @@ REPLACE {$IAEA_OPEN_PHSP_FOR_WRITE(#,#,#,#,#,#,#);} WITH {; "{P1}=unit number" "{P2}=file name" "{P3}=IZLAST" -"{P4}=IRESTART=0 for first run, 1 for restart" +"{P4}=IRESUME=0 for first run, 1 for resuming" "{P5}=Z position of the scoring plane" "{P6}=IMUPHSP" "{P7}=IZSCORE, set to 1 to score Z for each particle" -"note that if IRESTART=1, then nothing is done with {P3} and {P5}" +"note that if IRESUME=1, then nothing is done with {P3} and {P5}" call iaea_new_source({P1},{P2},{P4}+2,iaea_result); IF(iaea_result<0)[ diff --git a/HEN_HOUSE/utils/phsp_macros.mortran b/HEN_HOUSE/utils/phsp_macros.mortran index 297e9a528..899c702d7 100644 --- a/HEN_HOUSE/utils/phsp_macros.mortran +++ b/HEN_HOUSE/utils/phsp_macros.mortran @@ -128,7 +128,7 @@ REPLACE {;COMIN/RWPHSP/;} WITH { LATCHTMP, "modified version of LATCH to be written to phsp" WRITE_PHSP_COUNTER, "counter up to 1000 used for group write" WRITE_PHSP_SOFAR, "how many particles written so far to file" - PHSP_RESTART, "set to 1 if this is a restart" + PHSP_RESTART, "set to 1 if this is a phsp restart" PHSP_RECL, "the record length" PHSP_RECL_OLD, "saves record length" iaea_extra_ints, "array in which LATCH will be stored for iaea format" @@ -511,7 +511,7 @@ REPLACE {$WRITE_PHSP_RECORD(#,#,#,#,#:#,#,#,#);} WITH {; "first block of 1000 particles, however, it will be overwritten with nulls." "This is fine since the header info should be recalculated and rewritten at" "the top of the file after all data has been written out anyway." -"Also note that restarting with this writing scheme requires that any" +"Also note that resuming with this writing scheme requires that any" "blocks of N (N<1000) particles at the end of a phase space file from" "the previous run must immediately be read into the first N spaces of" "STRING_TEMP(_ZLAST)_OUT before continuing on with outputting the data" @@ -1098,7 +1098,7 @@ REPLACE {$BEAM_OPEN_PHSP_FOR_WRITE;} WITH {; REPLACE {$BEAM_OPEN_PHSP_FOR_READ;} WITH {; OUTPUT; - (/' Restarting after previous run, will read old data & phase-space', + (/' Resuming after previous run, will read old data & phase-space', ' files'); DO I=1,NSC_PLANES [ OUTPUT IOUTFLU(I);(//' Checking ph-sp file on logical unit ',I4); @@ -1202,13 +1202,13 @@ REPLACE {$BEAM_PHSP_BUFFER_FLUSH;} WITH {; ]"end of standard BEAMnrc format" }; -REPLACE {$BEAM_READ_PHSP_FOR_RESTART;} WITH {; +REPLACE {$BEAM_READ_PHSP_FOR_RESUME;} WITH {; DO I=1,NSC_PLANES[ OUTPUT I,NPPHSP(I); (//' PH-SP FILE',I4,': '/ ' TOTAL NO. OF PARTICLES =',I12); IF(IO_OPT=0 | IO_OPT=3)["check to see that the user has not" - "added phase space files before restarting" + "added phase space files before resuming" IF(IO_OPT=4)[ $IAEA_READ_PHSP_HEADER(IOUTFLU(I),NPPHSP(I),NPHOTPHSP(I), EKMAXPHSP(I),NINCPHSP,Z_SCORE,IZLAST1,I_MU_PHSP,IZSCORE); @@ -1216,14 +1216,14 @@ REPLACE {$BEAM_READ_PHSP_FOR_RESTART;} WITH {; IF(IZLAST=0 & IZLAST1=1)[ OUTPUT; (//' Error: Phase space file was scored with ZLAST in previous run '/ - ' but you have restarted this run with IZLAST=0. Restart with'/ + ' but you have resumed this run with IZLAST=0. Resume with'/ ' IZLAST=1.'//); STOP; ] ELSEIF(IZLAST=1 & IZLAST1=0)[ OUTPUT; (//' Error: Phase space file was scored without ZLAST in previous run '/ - ' but you have restarted this run with IZLAST=1. Restart with'/ + ' but you have resumed this run with IZLAST=1. Resume with'/ ' IZLAST=0.'//); STOP; ] @@ -1237,9 +1237,9 @@ REPLACE {$BEAM_READ_PHSP_FOR_RESTART;} WITH {; NINCSRC*(NCASEO+(NRCYCL+1)*(NPASS_ph_spO+NFAT_ph_spO))/NNPHSP)[ "files have been added" OUTPUT I;(//' ***ERROR:'/ -' Phase space file',I4,' has been added to (using beamdp?) before restarting.'/ +' Phase space file',I4,' has been added to (using beamdp?) before resuming.'/ ' The code currently does not support this. Please add phase space'/ -' files only after all runs, including restarts, are complete.'//); +' files only after all runs, including resumes, are complete.'//); "STOP;" ] ] @@ -1290,11 +1290,11 @@ REPLACE {$DOSXYZ_OPEN_PHSP_FOR_WRITE;} WITH {; "Added by T. popescu and J.Lobo to write phsps in dosxyz." "only done for IAEAphsps." "Some mods by BW." - IF(IRESTART=0) [ + IF(IRESUME=0) [ $IAEA_OPEN_PHSP_FOR_WRITE(i_unit_out,$cstring(phsp_out_fn), 0,0,z_score_tmp,i_muidx_out,1); ] - ELSEIF(IRESTART=1) [ + ELSEIF(IRESUME=1) [ $IAEA_OPEN_PHSP_FOR_WRITE(i_unit_out,$cstring(phsp_out_fn), 0,1,z_score_tmp,i_muidx_out,1); ] From c23e9c2125e332dc394a352146e780a19c993c8c Mon Sep 17 00:00:00 2001 From: Frederic Tessier Date: Sun, 3 Nov 2024 21:22:00 +0100 Subject: [PATCH 2/3] Clarify phase space file "restart" as a "rewind" Address another long-standing semantic confusion in EGSnrc. The term "restart" was used ambiguously to describe rewinding a phase space file after reaching the end, when more particles are requested. Use "rewind" to accurately reflect starting from the beginning of the file again, aligning with the programming concept of rewinding a file. --- .../pirs509a-beamnrc/inputformats/BEAM13.inp | 4 +- .../src/pirs509a-beamnrc/pirs509a-beamnrc.tex | 26 ++++----- .../inputs/egsnrc_system_considerations.tex | 2 +- .../inputs/pirs702_table_sources.tex | 2 +- .../pirs702-egsnrc-codes.tex | 8 +-- .../pirs794-dosxyznrc/inputs/dosxyznrc.inp | 4 +- .../pirs794-dosxyznrc/pirs794-dosxyznrc.tex | 26 ++++----- .../egs_phsp_source/egs_phsp_source.cpp | 4 +- .../sources/egs_phsp_source/egs_phsp_source.h | 2 +- .../iaea_phsp_source/iaea_phsp_source.cpp | 6 +- .../iaea_phsp_source/iaea_phsp_source.h | 2 +- HEN_HOUSE/omega/beamnrc/beam_lib.mortran | 2 +- HEN_HOUSE/omega/beamnrc/beamnrc.mortran | 32 +++++------ .../progs/gui/beamnrc/beamnrc_params.tcl | 6 +- .../progs/gui/dosxyznrc/xyznrc_parameters.tcl | 10 ++-- .../user_codes/dosxyznrc/dosxyznrc.mortran | 18 +++--- .../user_codes/dosxyznrc/srcxyznrc.mortran | 16 +++--- HEN_HOUSE/utils/iaea_phsp_macros.mortran | 2 +- HEN_HOUSE/utils/phsp_macros.mortran | 14 ++--- HEN_HOUSE/utils/srcrz.macros | 4 +- HEN_HOUSE/utils/srcrz.mortran | 57 +++++++++---------- 21 files changed, 122 insertions(+), 125 deletions(-) diff --git a/HEN_HOUSE/doc/src/pirs509a-beamnrc/inputformats/BEAM13.inp b/HEN_HOUSE/doc/src/pirs509a-beamnrc/inputformats/BEAM13.inp index 842ba80bb..6ea5b16a5 100644 --- a/HEN_HOUSE/doc/src/pirs509a-beamnrc/inputformats/BEAM13.inp +++ b/HEN_HOUSE/doc/src/pirs509a-beamnrc/inputformats/BEAM13.inp @@ -14,7 +14,7 @@ going on to the next particle. If NRCYCL is set <=0 then NRCYCL is automatically calculated to use the entire phase space file with no - restarts. The calculated NRCYCL does not take into + rewinds. The calculated NRCYCL does not take into account particles that are rejected because they miss the geometry. If NRCYCL is set > 0, then the user-input value is @@ -23,7 +23,7 @@ then use of NRCYCL is essential for accurate statistics. If you are unsure of how many times to recycle, use the automatically-calculated value of - NRCYCL. If this still results in many restarts + NRCYCL. If this still results in many rewinds (because of multiple passers being rejected and/or photons rejected because they fall outside the DBS splitting radius--see below) diff --git a/HEN_HOUSE/doc/src/pirs509a-beamnrc/pirs509a-beamnrc.tex b/HEN_HOUSE/doc/src/pirs509a-beamnrc/pirs509a-beamnrc.tex index 8be6f5ab0..9aafae8e8 100644 --- a/HEN_HOUSE/doc/src/pirs509a-beamnrc/pirs509a-beamnrc.tex +++ b/HEN_HOUSE/doc/src/pirs509a-beamnrc/pirs509a-beamnrc.tex @@ -1102,8 +1102,8 @@ \subsection{BEAMnrc Output Files} characteristics (number of electrons, number of photons, maximum energy, \etc) determined from those particles actually used in the simulation. Some warning messages, such as those printed when all particles in a -phase space source have been used and the source must be restarted with the -\index{restart!phase space file input} +phase space source have been used and the source must be rewinded with the +\index{rewind!phase space file input} first particle, are printed in this section. \item [Number, Fluence, Average Energy and Average Angle Results] @@ -1185,8 +1185,8 @@ \subsection{BEAMnrc Output Files} errors, occurred. When using a phase space file for the source, the log file contains a warning line every time all particles in the phase space source have been -used, necessitating a restart of the source from the beginning. -\index{phase space sources!when restarted} +used, necessitating a rewind of the source from the beginning. +\index{phase space sources!when rewinded} \item [.egsdat] This file contains all of the information required to resume a run and @@ -2849,7 +2849,7 @@ \subsection{ISOURC=21: Phase Space Source} on to the next one. If set $\leq$ 0, then BEAMnrc will automatically calculate a value of {\tt NRCYCL} based on the number of incident histories and the number of particles in the phase space file that should prevent -restarting of the phase space source. If set $>$ 0, the user-input value +rewinding of the phase space source. If set $>$ 0, the user-input value is used. See below for details. \index{NRCYCL} \item [IPARALLEL] No longer necessary if using BEAMnrc's built-in @@ -2901,28 +2901,28 @@ \subsection{ISOURC=21: Phase Space Source} uncertainty will also be governed by the latent variance of the phase space file (see the report on history by history statistics in BEAMnrc and DOSXYZnrc\cite{Wa02a}). -In addition to recycling, particles are also re-used whenever a phase space source is restarted +In addition to recycling, particles are also re-used whenever a phase space source is rewinded (which happens automatically when the simulation has used all particles in the -source). However, restarting may result in an underestimate of +source). However, rewinding may result in an underestimate of uncertainties~\cite{Wa02a}, making it important to choose a value of {\tt NRCYCL} that both ensures adequate sampling of the phase space -source and also prevents restarting. +source and also prevents rewinding. \index{NRCYCL! calculation of} If you are unsure of the value of {\tt NRCYCL} to use, set {\tt NRCYCL}$\leq$ 0 and BEAMnrc will automatically calculate its value based on the number of histories and the total number of particles in the phase space file. Even with an automatically-calculated value of -{\tt NRCYCL}, the phase space source may still restart, either because +{\tt NRCYCL}, the phase space source may still rewind, either because the algorithm used to calculate {\tt NRCYCL} has determined that setting {\tt NRCYCL}$>$ 0 will cause the phase space source to be undersampled, or because some incident particles were multiple-passers (i.e., had crossed the phase space scoring plane more than once) and were rejected from the simulation. If the -phase space source has only been restarted once and only a small fraction +phase space source has only been rewinded once and only a small fraction of it has been re-used on the second pass, the effect on uncertainty will not be significant. However, if a significant portion of the source has been -re-used on the second pass, or if the source has been restarted more than +re-used on the second pass, or if the source has been rewinded more than once, we recommend re-running the simulation with a new value of {\tt NRCYCL} given by: %\begin{footnotesize} @@ -4619,7 +4619,7 @@ \subsection{Maximum Size of Phase Space Files} the header, which will require other modifications to codes using this phase space file as a source since, currently, BEAMnrc (and other EGSnrc user codes) compares the number of histories run to {\tt NPPHSP} in order to determine whether the -source needs to be restarted from the beginning or not, or +source needs to be rewinded from the beginning or not, or \item redefine {\tt NPPSHP} as a 4-byte real variable, in the process losing precision in terms of the actual number of particles stored in the file. \end{itemize} @@ -6463,7 +6463,7 @@ \subsection{Phase Space Sources with Parallel Jobs} Note that particles may be recycled within a partition, depending on the setting of {\tt NRCYCL} (see section~\ref{phspsrcsect}). Also, if all the particles in a partition are used up during a run, the partition -is restarted at its first particle +is rewinded at its first particle (ie {\tt INPHSP = (n\_run\_chunk-1)*p\_per\_phsp\_chunk+1)}. \subsection{Combining Results from Parallel Jobs} diff --git a/HEN_HOUSE/doc/src/pirs701-egsnrc/inputs/egsnrc_system_considerations.tex b/HEN_HOUSE/doc/src/pirs701-egsnrc/inputs/egsnrc_system_considerations.tex index 74d3daca2..324cfe5d3 100644 --- a/HEN_HOUSE/doc/src/pirs701-egsnrc/inputs/egsnrc_system_considerations.tex +++ b/HEN_HOUSE/doc/src/pirs701-egsnrc/inputs/egsnrc_system_considerations.tex @@ -782,7 +782,7 @@ \subsection{Distribution / Installation of EGSnrc} % \item Many improvements to the GUI's and the entire new EGSnrcMP % environment (see Report PIRS-877\cite{Ka03} for an extensive discussion). % -% \item Fixed the ranlux RNG so that restarting a specific history is now +% \item Fixed the ranlux RNG so that rewinding a specific history is now % possible (useful for debugging purposes). % % \item Fixed a bug pointed out by Rebecca Nutbrown re normalization of diff --git a/HEN_HOUSE/doc/src/pirs702-egsnrc-codes/inputs/pirs702_table_sources.tex b/HEN_HOUSE/doc/src/pirs702-egsnrc-codes/inputs/pirs702_table_sources.tex index 762b145ee..53d7083fd 100644 --- a/HEN_HOUSE/doc/src/pirs702-egsnrc-codes/inputs/pirs702_table_sources.tex +++ b/HEN_HOUSE/doc/src/pirs702-egsnrc-codes/inputs/pirs702_table_sources.tex @@ -210,7 +210,7 @@ & & in the phase space file. If set $\leq$0,\\ & & then NRCYCL is automatically calculated to\\ & & use the entire phase space file with no\\ - & & restarts based on NCASE, incident particle\\ + & & rewinds based on NCASE, incident particle\\ & & type, and the number of particles with the\\ & & appropriate charge in the phase\\ & & space file. Note that the automatic\\ diff --git a/HEN_HOUSE/doc/src/pirs702-egsnrc-codes/pirs702-egsnrc-codes.tex b/HEN_HOUSE/doc/src/pirs702-egsnrc-codes/pirs702-egsnrc-codes.tex index a9433cbaa..a6b846e03 100644 --- a/HEN_HOUSE/doc/src/pirs702-egsnrc-codes/pirs702-egsnrc-codes.tex +++ b/HEN_HOUSE/doc/src/pirs702-egsnrc-codes/pirs702-egsnrc-codes.tex @@ -1781,22 +1781,22 @@ \subsection{How statistics are handled} \index{recycling} \index{NRCYCL} Both the batch method and the history by history method underestimate -uncertainty if a phase space source file is restarted (which happens +uncertainty if a phase space source file is rewinded (which happens automatically if all particles in the source have been used). In the case of the history by history method, this is because particles -that are re-used because of a restart are not associated with the +that are re-used because of a rewind are not associated with the same primary history as on the first pass through the source file, and thus correlations between these re-used particles are ignored. To overcome this problem, we recommend re-using each particle enough times before moving on to the next particle in the phase space source to -avoid restarting the source. This re-use of particles ``on the spot" +avoid rewinding the source. This re-use of particles ``on the spot" is called particle recycling. To facilitate particle recycling we introduced the recycling number, {\tt NRCYCL}, input with sources 21 and 22 (See Table~\ref{tab:srcrz}). Each particle in the source will be used a total of {\tt NRCYCL}+1 times before moving on to the next one. If the user sets {\tt NRCYCL}$<=$0, then {\tt NRCYCL} will automatically be calculated to sample the entire phase space source while avoiding -a restart. The particle recycling scheme is identical to that currently +a rewind. The particle recycling scheme is identical to that currently in use in BEAMnrc and DOSXYZnrc. \index{recycling} \index{NRCYCL} diff --git a/HEN_HOUSE/doc/src/pirs794-dosxyznrc/inputs/dosxyznrc.inp b/HEN_HOUSE/doc/src/pirs794-dosxyznrc/inputs/dosxyznrc.inp index 18e67e734..40fc405c6 100644 --- a/HEN_HOUSE/doc/src/pirs794-dosxyznrc/inputs/dosxyznrc.inp +++ b/HEN_HOUSE/doc/src/pirs794-dosxyznrc/inputs/dosxyznrc.inp @@ -887,7 +887,7 @@ Record SC1-20a and SC1-21a (required for sources 20 and 21) going on to the next particle. If NRCYCL is set <=0 then NRCYCL is automatically calculated to use the entire phase space file with no - restarts, unless the incident charge is +1 (positron) or + rewinds, unless the incident charge is +1 (positron) or the user filters incident particles based on their LATCH values (enflag=3), in which case NRCYCL is set to 0. The calculated NRCYCL does not take into account @@ -899,7 +899,7 @@ Record SC1-20a and SC1-21a (required for sources 20 and 21) then use of NRCYCL is essential for accurate statistics. If you are unsure of how many times to recycle, use the automatically-calculated value of NRCYCL. If this - still results in many restarts (because of many + still results in many rewinds (because of many particles missing the geometry or beyond beam field), then re-run the simulation with NRCYCL set manually to: NCASE/(NPHSP - NSMISS/NRCYCL_prev - NOUTSIDE - NRJCT - NDBSRJCT)-1 diff --git a/HEN_HOUSE/doc/src/pirs794-dosxyznrc/pirs794-dosxyznrc.tex b/HEN_HOUSE/doc/src/pirs794-dosxyznrc/pirs794-dosxyznrc.tex index bd5ee4570..f39da17ea 100644 --- a/HEN_HOUSE/doc/src/pirs794-dosxyznrc/pirs794-dosxyznrc.tex +++ b/HEN_HOUSE/doc/src/pirs794-dosxyznrc/pirs794-dosxyznrc.tex @@ -812,13 +812,13 @@ \subsection{Statistical Analysis} below that level by recycling the data a large number of times. However, one can get an artificially low statistical result which ignores this latent variance -if the phase space source is allowed to restart the phase space file +if the phase space source is allowed to rewind the phase space file instead of using the recycle option (whereby each particle is used multiple times as it is read in - see section~\ref{nrcycl}, page~\pageref{nrcycl}). Thus, in order to get accurate uncertainty estimates, -restarting the phase space file should be avoided. +rewinding the phase space file should be avoided. \indexm{NRCYCL} -\indexm{restart phase space} +\indexm{rewind phase space} \section{DOSXYZnrc Input Parameters} @@ -2627,7 +2627,7 @@ \section{Phase Space Sources} the underestimate is not significant. When using a phase space source, if the entire phase space file is read -before the requested number of histories is run, then DOSXYZnrc restarts +before the requested number of histories is run, then DOSXYZnrc rewinds the phase space file from the beginning. For the reasons discussed in section~\ref{nrcycl}, page~\pageref{nrcycl}, this is not a desirable occurrence and one should strive to avoid this by using the recycling @@ -3077,14 +3077,14 @@ \subsection{{\tt NRCYCL}} before moving on to the next particle in the source. When phase space data is sparse, then particles must be re-used to obtain adequate statistics. In addition to recycling, particles may also -be re-used whenever a phase space source is restarted +be re-used whenever a phase space source is rewinded (happens automatically when the simulation has reached -the end of the source). Restarting is not recommended, however, +the end of the source). Rewinding is not recommended, however, because it may lead to underestimates of the uncertainty in the final results~\cite{Wa02a}. We recommend setting {\tt NRCYCL} to a value that will ensure that the entire phase space source gets sampled (ie the simulation uses almost all the particles in the source) but -prevents the source from being restarted. +prevents the source from being rewinded. If you are unsure of the correct value of {\tt NRCYCL} to use, then @@ -3093,17 +3093,17 @@ \subsection{{\tt NRCYCL}} the number of particles (with appropriate charge) in the phase space source. There is a possibility that, even with the automatically calculated value of {\tt NRCYCL}, -the phase space source will restart. This may be due to particles +the phase space source will rewind. This may be due to particles that have been rejected because they missed the geometry, were multiple passers and/or were beyond the beam field defined by {\tt BEAM\_SIZE}) or else the algorithm for calculating {\tt NRCYCL} may have determined that setting {\tt NRCYCL}$>$ 0 will result in the phase space source not being sampled adequately. If the -source has only been restarted once and only a small fraction of it +source has only been rewinded once and only a small fraction of it has been covered on the second pass, this is not likely to have a significant impact on the estimated uncertainties. However, if a large portion of the -source is covered on the second pass, or if it is restarted more than once, +source is covered on the second pass, or if it is rewinded more than once, we recommend re-running the simulation with a new value of {\tt NRCYCL} calculated as: \begin{eqnarray} @@ -3136,14 +3136,14 @@ \subsection{{\tt NRCYCL}} the information required for an a-priori calculation of {\tt NRCYCL} is not available in the header of the phase space source. We recommend setting {\tt NRCYCL} manually to a ``best guess" value. Then, -if the source restarts, calculate {\tt NRCYCL} using Equation~\ref{nrcycleqn} +if the source rewinds, calculate {\tt NRCYCL} using Equation~\ref{nrcycleqn} where {\tt NRJCT} includes the number of particles rejected because they were multiple passers, the number of particles rejected because they were the wrong charge and the number of particles rejected because they did not have the right {\tt LATCH} setting. If the phase space source is stored on a remote disk, then using -{\tt NRCYCL} to avoid restarting a phase space source also has +{\tt NRCYCL} to avoid rewinding a phase space source also has the beneficial effect of reducing network traffic because it reduces the number of times that a phase space source is accessed during a run (particle data is stored in temporary @@ -3167,7 +3167,7 @@ \subsection{{\tt NRCYCL}} recycle) the first 500 particles before the simulation stops. In order to go through the entire phase space source, the user would have to set {\tt NCASE}=10000. If {\tt NCASE}$>$10000 then the phase space source -would be restarted at least once during the run. After restarting, particle +would be rewinded at least once during the run. After rewinding, particle recycling continues as before. \subsection{{\tt IRESUME}} diff --git a/HEN_HOUSE/egs++/sources/egs_phsp_source/egs_phsp_source.cpp b/HEN_HOUSE/egs++/sources/egs_phsp_source/egs_phsp_source.cpp index 63363dcd9..46ace9637 100644 --- a/HEN_HOUSE/egs++/sources/egs_phsp_source/egs_phsp_source.cpp +++ b/HEN_HOUSE/egs++/sources/egs_phsp_source/egs_phsp_source.cpp @@ -64,7 +64,7 @@ void EGS_PhspSource::init() { description = "Invalid phase space source"; Nread = 0; count = 0; - Nrestart = 0; + Nrewind = 0; Npos = 0; Nlast = 0; wmin = -veryFar; @@ -374,7 +374,7 @@ void EGS_PhspSource::readParticle() { Nlast,Nfirst); istream::off_type pos = Nfirst*recl; the_file.seekg(pos,ios::beg); - Nrestart++; + Nrewind++; Npos = Nfirst; } the_file.read(record,recl*sizeof(char)); diff --git a/HEN_HOUSE/egs++/sources/egs_phsp_source/egs_phsp_source.h b/HEN_HOUSE/egs++/sources/egs_phsp_source/egs_phsp_source.h index 07c1d3cf1..22f2a4682 100644 --- a/HEN_HOUSE/egs++/sources/egs_phsp_source/egs_phsp_source.h +++ b/HEN_HOUSE/egs++/sources/egs_phsp_source/egs_phsp_source.h @@ -251,7 +251,7 @@ class EGS_PHSP_SOURCE_EXPORT EGS_PhspSource : public EGS_BaseSource { Nlast, //!< Last record this source can use count; /*!< Particles delivered so far (may be less than Nread because some particles were rejected */ - int Nrestart; //!< Number of times the phsp file was restarted + int Nrewind; //!< Number of times the phsp file was rewinded int Nrecycle_g; //!< Number of times to recycle a photon int Nrecycle_e; //!< Number of times to recycle a charged particle int Nrecycle; //!< Number of times to recycle current particle diff --git a/HEN_HOUSE/egs++/sources/iaea_phsp_source/iaea_phsp_source.cpp b/HEN_HOUSE/egs++/sources/iaea_phsp_source/iaea_phsp_source.cpp index e4c31fd6b..eae222075 100644 --- a/HEN_HOUSE/egs++/sources/iaea_phsp_source/iaea_phsp_source.cpp +++ b/HEN_HOUSE/egs++/sources/iaea_phsp_source/iaea_phsp_source.cpp @@ -62,7 +62,7 @@ void IAEA_PhspSource::init() { description = "Invalid IAEA phase space source"; Nread = 0; count = 0; - Nrestart = 0; + Nrewind = 0; Npos = 0; Nlast = 0; wmin = -veryFar; @@ -325,9 +325,9 @@ EGS_I64 IAEA_PhspSource::getNextParticle(EGS_RandomGenerator *, int &q, Nlast,Nfirst); iaea_set_record(&iaea_fileid,&Nfirst,&iaea_iostat); if (iaea_iostat<0) { - egsFatal("IAEA_PhspSource::getNextParticle(): error restarting phase space chunk\n"); + egsFatal("IAEA_PhspSource::getNextParticle(): error rewinding phase space chunk\n"); } - Nrestart++; + Nrewind++; Npos = Nfirst; } iaea_get_particle(&iaea_fileid,&nstat,&p.q,&p.E,&p.wt,&p.x,&p.y,&p.z,&p.u,&p.v,&p.w,extrafloattemp,extrainttemp); diff --git a/HEN_HOUSE/egs++/sources/iaea_phsp_source/iaea_phsp_source.h b/HEN_HOUSE/egs++/sources/iaea_phsp_source/iaea_phsp_source.h index 0be9005a5..780bb8b28 100644 --- a/HEN_HOUSE/egs++/sources/iaea_phsp_source/iaea_phsp_source.h +++ b/HEN_HOUSE/egs++/sources/iaea_phsp_source/iaea_phsp_source.h @@ -258,7 +258,7 @@ class IAEA_PHSP_SOURCE_EXPORT IAEA_PhspSource : public EGS_BaseSource { Nlast, //!< Last record this source can use count; /*!< Particles delivered so far (may be less than Nread because some particles were rejected */ - int Nrestart; //!< Number of times the phsp file was restarted + int Nrewind; //!< Number of times the phsp file was rewinded int Nrecycle_g; //!< Number of times to recycle a photon int Nrecycle_e; //!< Number of times to recycle a charged particle int Nrecycle; //!< Number of times to recycle current particle diff --git a/HEN_HOUSE/omega/beamnrc/beam_lib.mortran b/HEN_HOUSE/omega/beamnrc/beam_lib.mortran index f8148c115..c8511eed9 100644 --- a/HEN_HOUSE/omega/beamnrc/beam_lib.mortran +++ b/HEN_HOUSE/omega/beamnrc/beam_lib.mortran @@ -83,7 +83,7 @@ REPLACE {$BEAM_OPEN_PHSP_FOR_WRITE;} WITH {;}; REPLACE {$BEAM_PHSP_BUFFER_FLUSH;} WITH {;}; -REPLACE {$BEAM_READ_PHSP_FOR_RESTART;} WITH {;}; +REPLACE {$BEAM_READ_PHSP_FOR_REWIND;} WITH {;}; REPLACE {$BEAM_CLOSE_PHSP;} WITH {;}; diff --git a/HEN_HOUSE/omega/beamnrc/beamnrc.mortran b/HEN_HOUSE/omega/beamnrc/beamnrc.mortran index fa226edeb..cb0ba1fb5 100644 --- a/HEN_HOUSE/omega/beamnrc/beamnrc.mortran +++ b/HEN_HOUSE/omega/beamnrc/beamnrc.mortran @@ -725,7 +725,7 @@ WITH {,' ',} "I> going on to the next particle. "I> If NRCYCL is set <=0 then NRCYCL is automatically "I> calculated to use the entire phase space file with no -"I> restarts. The calculated NRCYCL does not take into +"I> rewinds. The calculated NRCYCL does not take into "I> account particles that are rejected because they "I> miss the geometry. "I> If NRCYCL is set > 0, then the user-input value is @@ -734,7 +734,7 @@ WITH {,' ',} "I> then use of NRCYCL is essential for accurate "I> statistics. If you are unsure of how many times to "I> recycle, use the automatically-calculated value of -"I> NRCYCL. If this still results in many restarts +"I> NRCYCL. If this still results in many rewinds "I> (because of multiple passers being rejected and/or "I> photons rejected because they fall outside the DBS "I> splitting radius--see below) @@ -3902,7 +3902,7 @@ ELSEIF(IRESUME = 1)["Resume, read old data from unit 4" OUTPUT;(/' ***Successfully read previous dose and fluence data file ***'/); - $BEAM_READ_PHSP_FOR_RESTART; + $BEAM_READ_PHSP_FOR_REWIND; ] "end of IRESUME=1 block" @@ -5167,9 +5167,9 @@ ELSEIF(IRESUME = 4 | is_finished)[ IF(OUTCNT>0)[ OUTPUT;(//' ***WARNING***'/ - ' The phsp source was restarted at least once. This may lead'/ - ' to an underestimate of uncertainty, especially if restarted'/ - ' many times. If restarted many times, try re-running with'/ + ' The phsp source was rewinded at least once. This may lead'/ + ' to an underestimate of uncertainty, especially if rewinded'/ + ' many times. If rewinded many times, try re-running with'/ ' NRCYCL recalculated as described at top of beamnrc.mortran'//); ] IF((ISOURC=3 & i_dsb=1)|ISOURC=23)[ @@ -9076,9 +9076,9 @@ IF (NSC_PLANES > 0) [ ] IF(OUTCNT>0)[ WRITE(IOUTLIST,'(//'' ***WARNING***''/ -'' The phsp source was restarted at least once. This may lead''/ -'' to an underestimate of uncertainty, especially if restarted''/ -'' many times. If restarted many times, try re-running with''/ +'' The phsp source was rewinded at least once. This may lead''/ +'' to an underestimate of uncertainty, especially if rewinded''/ +'' many times. If rewinded many times, try re-running with''/ '' NRCYCL recalculated as described at top of beamnrc.mortran''//)'); ] @@ -12222,7 +12222,7 @@ ELSEIF(ISOURC = 21 | ISOURC=24)["Full phase space for each particle" "since that is what it is in the phase space file" #ifdef HAVE_C_COMPILER; - "output a warning if we are restarting the chunk of the phase" + "output a warning if we are rewinding the chunk of the phase" "space source" IF(n_parallel>0 & INPHSP>INPHSP_MAX)[ "rewind phsp source and output a warning" @@ -12230,7 +12230,7 @@ ELSEIF(ISOURC = 21 | ISOURC=24)["Full phase space for each particle" OUTCNT=OUTCNT+1; OUTPUT ; (///' ***WARNING*** USED ALL PARTICLES FROM CHUNK IN SOURCE FILE!'/ - ' RESTARTING FROM FIRST PARTICLE IN THIS CHUNK.'// + ' REWINDING FROM FIRST PARTICLE IN THIS CHUNK.'// /1x,79('*')// ); IF(i_iaea_in=1)[ NHSTRY=OUTCNT*NINCSRC/(n_parallel*$N_CHUNKS); "above ensures that NHSTRY is accurate" @@ -12245,7 +12245,7 @@ ELSEIF(ISOURC = 21 | ISOURC=24)["Full phase space for each particle" OUTCNT=OUTCNT+1; OUTPUT ; (///' ***WARNING*** USED ALL PARTICLES FROM PARTITION IN SOURCE FILE!'/ - ' RESTARTING FROM FIRST PARTICLE IN THIS PARTITION.'// + ' REWINDING FROM FIRST PARTICLE IN THIS PARTITION.'// /1x,79('*')// ); IF(i_iaea_in=1)[ NHSTRY=OUTCNT*NINCSRC/IPARALLEL; $IAEA_SET_PHSP_RECORD(IINSRC,INPHSP); ] @@ -12255,7 +12255,7 @@ ELSEIF(ISOURC = 21 | ISOURC=24)["Full phase space for each particle" INPHSP=1;"set the pointer back to the beginning of the ph-sp file" OUTCNT=OUTCNT+1; OUTPUT ;(///' ***WARNING*** USED ALL PARTICLES FROM SOURCE FILE!'/ - ' RESTARTING FROM FIRST PARTICLE IN FILE.'// + ' REWINDING FROM FIRST PARTICLE IN FILE.'// /1x,79('*')// ); IF(i_iaea_in=1)[ NHSTRY=OUTCNT*NINCSRC; $IAEA_SET_PHSP_RECORD(IINSRC,1); ] @@ -12272,20 +12272,20 @@ ELSEIF(ISOURC = 21 | ISOURC=24)["Full phase space for each particle" EREAD,WEIGHT,XIN,YIN,UIN,VIN); ] IF((i_iaea_in=0 & IERR_PHSP>0) | (i_iaea_in=1 & iaea_n_stat=-2))[ - "end of file encountered -restart same file" + "end of file encountered -rewind same file" IF(IPARALLEL>1 & PARNUM>0)[ INPHSP=INT((PARNUM-1)*NNPHSP/IPARALLEL)+1; OUTCNT=OUTCNT+1; OUTPUT ; (///' ***WARNING*** USED ALL PARTICLES FROM PARTITION IN SOURCE FILE!'/ - ' RESTARTING FROM FIRST PARTICLE IN THIS PARTITION.'// + ' REWINDING FROM FIRST PARTICLE IN THIS PARTITION.'// /1x,79('*')// ); ] ELSE[ INPHSP=1;"set the pointer back to the beginning of the ph-sp file" OUTCNT=OUTCNT+1; OUTPUT ;(///' ***WARNING*** USED ALL PARTICLES FROM SOURCE FILE!'/ - ' RESTARTING FROM FIRST PARTICLE IN FILE.'// + ' REWINDING FROM FIRST PARTICLE IN FILE.'// /1x,79('*')// ); ] GOTO :SOURCE_READ:; diff --git a/HEN_HOUSE/omega/progs/gui/beamnrc/beamnrc_params.tcl b/HEN_HOUSE/omega/progs/gui/beamnrc/beamnrc_params.tcl index 3fd6a3c7b..af9f98eb6 100644 --- a/HEN_HOUSE/omega/progs/gui/beamnrc/beamnrc_params.tcl +++ b/HEN_HOUSE/omega/progs/gui/beamnrc/beamnrc_params.tcl @@ -3016,10 +3016,10 @@ NRCYCL, the number of times each particle is recycled before moving on to the\ next one. Thus, each particle is used NRCYCL+1 times before moving on.\ Note that, even using NRCYCL, the total number of histories is still\ determined by the user-input value of NCASE.\ -NRCYCL is necessary to avoid restarting phase space source if phase space data\ -is sparse, since restarting may cause underestimates of the uncertainty.\ +NRCYCL is necessary to avoid rewinding phase space source if phase space data\ +is sparse, since rewinding may cause underestimates of the uncertainty.\ Set <=0 and BEAMnrc will automatically calculate a value of NRCYCL. The\ -source may restart even with automatically calculated value of NRCYCL.\ +source may rewind even with automatically calculated value of NRCYCL.\ This is not a problem if only a small fraction of the source is re-used on\ the second pass. Otherwise, we recommend re-running the simulation with\ NRCYCL re-calculated using: diff --git a/HEN_HOUSE/omega/progs/gui/dosxyznrc/xyznrc_parameters.tcl b/HEN_HOUSE/omega/progs/gui/dosxyznrc/xyznrc_parameters.tcl index 24cc7d19d..4b5bd57ff 100644 --- a/HEN_HOUSE/omega/progs/gui/dosxyznrc/xyznrc_parameters.tcl +++ b/HEN_HOUSE/omega/progs/gui/dosxyznrc/xyznrc_parameters.tcl @@ -444,14 +444,14 @@ next particle. Even with NRCYCL, the total number of histories is still\ determined by the user-input value of NCASE. NRCYCL is an essential input\ when phase space data is sparse (ie fewer particles in the source than required\ for the simulation). Choose a value of NRCYCL that will sample the source\ -fully but will prevent the source from being restarted (happens automatically\ -after the last particle gets used). This is because restarts may cause\ +fully but will prevent the source from being rewinded (happens automatically\ +after the last particle gets used). This is because rewinds may cause\ uncertainties to be underestimated. If you are unsure of the value to use,\ set NRCYCL<=0 and DOSXYZnrc will automatically calculate a value. The source\ -may restart even with an automatically-calculated value of NRCYCL. If there\ -is only one restart and only a small fraction of the source is re-used on the\ +may rewind even with an automatically-calculated value of NRCYCL. If there\ +is only one rewind and only a small fraction of the source is re-used on the\ second pass, this is unlikely to affect uncertainties. However, if a\ -significant fraction is re-used on the second pass, or if the source restarts\ +significant fraction is re-used on the second pass, or if the source rewinds\ more than once, we suggest rerunning with a recalculated value of NRCYCL, given\ by: diff --git a/HEN_HOUSE/user_codes/dosxyznrc/dosxyznrc.mortran b/HEN_HOUSE/user_codes/dosxyznrc/dosxyznrc.mortran index 69261cc36..62ab1c81b 100644 --- a/HEN_HOUSE/user_codes/dosxyznrc/dosxyznrc.mortran +++ b/HEN_HOUSE/user_codes/dosxyznrc/dosxyznrc.mortran @@ -336,7 +336,7 @@ " going on to the next particle. " If NRCYCL is set <=0 then NRCYCL is automatically " calculated to use the entire phase space file with no -" restarts, unless the incident charge is +1 (positron) or +" rewinds, unless the incident charge is +1 (positron) or " the user filters incident particles based on their LATCH " values (enflag=3), in which case NRCYCL is set to 0. " The calculated NRCYCL does not take into account @@ -348,7 +348,7 @@ " then use of NRCYCL is essential for accurate statistics. " If you are unsure of how many times to recycle, use " the automatically-calculated value of NRCYCL. If this -" still results in many restarts (because of many +" still results in many rewinds (because of many " particles missing the geometry or beyond beam field), " then re-run the simulation with NRCYCL set manually to: " NCASE/(NPHSP - NSMISS/NRCYCL_prev - NOUTSIDE - NRJCT - NDBSRJCT)-1 @@ -2153,9 +2153,9 @@ IF( isource = 2 | isource = 8 | isource = 20)["phase space source" ] IF( ISMOOTH = 1) [ OUTPUT;(/' Will redistribute phase space particles if phase space file'/ - ' restarted and/or individual particles recycled'); + ' rewinded and/or individual particles recycled'); ] - ELSE [OUTPUT;(' Restarted phase space files and recycled particles are not'/ + ELSE [OUTPUT;(' Rewinded phase space files and recycled particles are not'/ ' redistributed'); ] ] @@ -2904,7 +2904,7 @@ OUTPUT61 nnread,nhist,nsrjct,nsoutside,ndbsrjct,nsmiss, ' # of times each particle in ph-sp file recycled '/ ' (last particle may be recycled less than this) =',i12/ ' # of ph-sp particles simulated (N_used) =',i12/ - ' # of times ph-sp file restarted in this run =',i12/ + ' # of times ph-sp file rewinded in this run =',i12/ /' ********************************************************************'); ] @@ -2939,7 +2939,7 @@ OUTPUT61 NCASE,survival_ratio,compensated_NCASE,nnread,nsrjct,nsoutside, ' # of particles that got blocked by shared library modules =',i12/ ' # of particles used in DOSXYZnrc (N_used) =',i12/ ' N_used/(nnread x N_recycle) =',f12.3/ - ' # of times ph-sp file restarted in this run =',i12/ + ' # of times ph-sp file rewinded in this run =',i12/ /' ********************************************************************'); ] ELSEIF(isource=21)["BEAM simulation used as source, incident from any angle" @@ -3058,9 +3058,9 @@ IF(dose_stat=1)[ ] ELSEIF(OUTCNT>0)[ OUTPUT61;(//' ***WARNING***'/ - ' The ph-sp source was restarted at least once. This may lead'/ - ' to an underestimate of uncertainty, especially if restarted'/ - ' many times. If restarted many times, try re-running with'/ + ' The ph-sp source was rewinded at least once. This may lead'/ + ' to an underestimate of uncertainty, especially if rewinded'/ + ' many times. If rewinded many times, try re-running with'/ ' NRCYCL recalculated as described at top of dosxyznrc.mortran'//); ] DO irl = 1,irmax-1 [ diff --git a/HEN_HOUSE/user_codes/dosxyznrc/srcxyznrc.mortran b/HEN_HOUSE/user_codes/dosxyznrc/srcxyznrc.mortran index 62ca146c2..9f117b3bb 100644 --- a/HEN_HOUSE/user_codes/dosxyznrc/srcxyznrc.mortran +++ b/HEN_HOUSE/user_codes/dosxyznrc/srcxyznrc.mortran @@ -2544,7 +2544,7 @@ ELSEIF(isource = 2 | isource=8)["Full phase-space source" "------------------------------------------------------------------------" dsource = -dsource; esrc = 0; "initialize counter" - OUTCNT = 0; "initialize no. of times phsp file restarts during this run" + OUTCNT = 0; "initialize no. of times phsp file rewinds during this run" ] "------------------------------------------------------------------------" ELSEIF(isource = 3 )[ "Frontal point source" @@ -2740,7 +2740,7 @@ ELSEIF(isource = 20)["Phase Space Incident from multiple settings and " ] esrc = 0; "initialize counter" - OUTCNT = 0; "initialize no. of times phsp file restarts during this run" + OUTCNT = 0; "initialize no. of times phsp file rewinds during this run" ] "------------------------------------------------------------------------" ELSEIF(isource = 21)["Full BEAM sim. incident from multiple settings and " @@ -3597,7 +3597,7 @@ ELSEIF(isource = 2 | isource=8)[ "Full phase space for each particle" OUTCNT=OUTCNT+1; OUTPUT ; (///' ***WARNING*** USED ALL PARTICLES FROM CHUNK IN SOURCE FILE!'/ - ' RESTARTING FROM FIRST PARTICLE IN THIS CHUNK.'// + ' REWINDING FROM FIRST PARTICLE IN THIS CHUNK.'// /1x,79('*')// ); IF(i_iaea_in=1)[nhist=OUTCNT*NINCSRC/(n_parallel*$N_CHUNKS); $IAEA_SET_PHSP_RECORD(i_unit_in,nnphsp); @@ -3609,7 +3609,7 @@ ELSEIF(isource = 2 | isource=8)[ "Full phase space for each particle" OUTCNT=OUTCNT+1; OUTPUT61; (/' *** Warning *** Used all particles from partition of source file'/ - ' Restarting from first particle in this partition'/); + ' Rewinding from first particle in this partition'/); nnphsp = INT((PARNUM-1)*nshist/IPARALLEL)+1; IF(i_iaea_in=1)[nhist=OUTCNT*NINCSRC/IPARALLEL; $IAEA_SET_PHSP_RECORD(i_unit_in,nnphsp); @@ -3621,7 +3621,7 @@ ELSEIF(isource = 2 | isource=8)[ "Full phase space for each particle" OUTCNT=OUTCNT+1; OUTPUT61; (/' *** Warning *** Used all particles from source file'/ - ' Restarting from first particle in file'/); + ' Rewinding from first particle in file'/); nnphsp = 1; IF(i_iaea_in=1)[nhist=OUTCNT*NINCSRC; $IAEA_SET_PHSP_RECORD(i_unit_in,nnphsp); @@ -3843,7 +3843,7 @@ ELSEIF( isource = 20 ) [ "Phase Space Incident from multiple settings" OUTCNT=OUTCNT+1; OUTPUT ; (///' ***WARNING*** USED ALL PARTICLES FROM CHUNK IN SOURCE FILE!'/ - ' RESTARTING FROM FIRST PARTICLE IN THIS CHUNK.'// + ' REWINDING FROM FIRST PARTICLE IN THIS CHUNK.'// /1x,79('*')// ); IF(i_iaea_in=1)[nhist=OUTCNT*NINCSRC/(n_parallel*$N_CHUNKS); $IAEA_SET_PHSP_RECORD(i_unit_in,nnphsp); @@ -3854,7 +3854,7 @@ ELSEIF( isource = 20 ) [ "Phase Space Incident from multiple settings" OUTCNT=OUTCNT+1; OUTPUT61; (/' *** Warning *** Used all particles from partition of source file'/ - ' Restarting from first particle in this partition'/); + ' Rewinding from first particle in this partition'/); nnphsp = INT((PARNUM-1)*nshist/IPARALLEL)+1; IF(i_iaea_in=1)[nhist=OUTCNT*NINCSRC/IPARALLEL; $IAEA_SET_PHSP_RECORD(i_unit_in,nnphsp); @@ -3866,7 +3866,7 @@ ELSEIF( isource = 20 ) [ "Phase Space Incident from multiple settings" OUTCNT=OUTCNT+1; OUTPUT61; (/' *** Warning *** Used all particles from source file'/ - ' Restarting from first particle in file'/); + ' Rewinding from first particle in file'/); nnphsp = 1; IF(i_iaea_in=1)[nhist=OUTCNT*NINCSRC; $IAEA_SET_PHSP_RECORD(i_unit_in,nnphsp); diff --git a/HEN_HOUSE/utils/iaea_phsp_macros.mortran b/HEN_HOUSE/utils/iaea_phsp_macros.mortran index 2796cbe2e..d96604f5c 100644 --- a/HEN_HOUSE/utils/iaea_phsp_macros.mortran +++ b/HEN_HOUSE/utils/iaea_phsp_macros.mortran @@ -322,7 +322,7 @@ IF(iaea_n_stat=-1)[ $CALL_EXIT(1); ] ELSEIF(iaea_n_stat=-2)[ - WRITE(i_log,*)' WARNING: Reached end of IAEA phsp file. File restarted.'; + WRITE(i_log,*)' WARNING: Reached end of IAEA phsp file. File rewinded.'; ] ELSEIF(iaea_n_stat>=0)[ {P3}={P3}+iaea_n_stat; diff --git a/HEN_HOUSE/utils/phsp_macros.mortran b/HEN_HOUSE/utils/phsp_macros.mortran index 899c702d7..9c0dc859d 100644 --- a/HEN_HOUSE/utils/phsp_macros.mortran +++ b/HEN_HOUSE/utils/phsp_macros.mortran @@ -128,7 +128,7 @@ REPLACE {;COMIN/RWPHSP/;} WITH { LATCHTMP, "modified version of LATCH to be written to phsp" WRITE_PHSP_COUNTER, "counter up to 1000 used for group write" WRITE_PHSP_SOFAR, "how many particles written so far to file" - PHSP_RESTART, "set to 1 if this is a phsp restart" + PHSP_REWIND, "set to 1 if this is a phsp rewind" PHSP_RECL, "the record length" PHSP_RECL_OLD, "saves record length" iaea_extra_ints, "array in which LATCH will be stored for iaea format" @@ -165,7 +165,7 @@ INTEGER NUM_PHSP_TOT,PHOT_PHSP_TOT, iaea_result,iaea_n_stat,iaea_q_typ(3),iaea_typ_q(3),iaea_q_index,I_PHSP, IERR_PHSP,LATCHTMP, WRITE_PHSP_COUNTER($MAX_SC_PLANES),WRITE_PHSP_SOFAR($MAX_SC_PLANES), - PHSP_RESTART,PHSP_RECL,PHSP_RECL_OLD,iaea_extra_ints(10), + PHSP_REWIND,PHSP_RECL,PHSP_RECL_OLD,iaea_extra_ints(10), iaea_extra_int_types(10),iaea_extra_float_types(10),iaea_i_zlast, iaea_i_latch,iaea_i_muidx,iaea_n_extra_ints,iaea_n_extra_floats, i_iaea_open_for_write,iaea_i_zlast_out,iaea_i_latch_out, @@ -213,7 +213,7 @@ DO I_PHSP=1,$MAX_SC_PLANES[ WRITE_PHSP_SOFAR(I_PHSP)=0; IHSTRY_PHSP(I_PHSP)=0; ] -PHSP_RESTART=0; +PHSP_REWIND=0; PHSP_RECL_OLD=0; iaea_q_typ(1)=2;iaea_q_typ(2)=1;iaea_q_typ(3)=3; @@ -546,9 +546,9 @@ REPLACE {$WRITE_PHSP_RECORD(#,#,#,#,#:#,#,#,#);} WITH {; "{P9}=E,WT,X,Y,U,V" IF({P4}>2 & WRITE_PHSP_COUNTER({P5})=0 & WRITE_PHSP_SOFAR({P5})=0)[ - "we have a restart or its the start of a new batch" + "we have a rewind or its the start of a new batch" IF(({P4}-1)-1000*(({P4}-1)/1000)~=0)[ - "make what was the buffer flush part of the first record of the restart" + "make what was the buffer flush part of the first record of the rewind" CLOSE({P2}); IF({P1}~=0)["have ZLAST" PHSP_RECL=$RECL-FACTOR*8; @@ -579,7 +579,7 @@ IF({P4}>2 & WRITE_PHSP_COUNTER({P5})=0 & WRITE_PHSP_SOFAR({P5})=0)[ ] WRITE_PHSP_SOFAR({P5})=1000*INT(dble({P4}-1)/1000); IF(WRITE_PHSP_SOFAR({P5})>0)[ - PHSP_RESTART=1; + PHSP_REWIND=1; WRITE_PHSP_COUNTER({P5})=({P4}-1)-1000*(({P4}-1)/1000); ] ELSE[ @@ -591,7 +591,7 @@ $SET_NEGATIVE_E({P5},{P6},{P9}); $PARSE_TEMP_FOR_WRITE({P1},{P7},{P8},{P9}); -IF({P4}<=1000 & PHSP_RESTART=0)["do not use first 7/8 elements" +IF({P4}<=1000 & PHSP_REWIND=0)["do not use first 7/8 elements" IF({P1}~=0)["have ZLAST" STRING_TEMP_ZLAST_OUT({P5})(32*WRITE_PHSP_COUNTER({P5})+33: 32*WRITE_PHSP_COUNTER({P5})+64)=REC_TEMP_OUT(1:32); diff --git a/HEN_HOUSE/utils/srcrz.macros b/HEN_HOUSE/utils/srcrz.macros index e07911705..bbe3e803c 100644 --- a/HEN_HOUSE/utils/srcrz.macros +++ b/HEN_HOUSE/utils/srcrz.macros @@ -152,7 +152,7 @@ EQUIVALENCE (SPCNAM,FILSPC); " for the IPARALLEL parallel jobs (ISOURC=21,22) "CYCLNUM keeps track of how many times a particle has been recycled " (ISOURC=21,22) -"OUTCNT keeps track of how many times a phsp source has been restarted +"OUTCNT keeps track of how many times a phsp source has been rewinded " (ISOURC=21,22) "XINOLD holds XIN for recycled particles (ISOURC=21,22) "YINOLD holds YIN for recycled particles (ISOURC=21,22) @@ -178,5 +178,3 @@ EQUIVALENCE (SPCNAM,FILSPC); "i_unit_in Unit no. for phsp source (IAEA format only) "Last line in srcrz.macros " - - diff --git a/HEN_HOUSE/utils/srcrz.mortran b/HEN_HOUSE/utils/srcrz.mortran index 5a5529fae..35b73c0ba 100644 --- a/HEN_HOUSE/utils/srcrz.mortran +++ b/HEN_HOUSE/utils/srcrz.mortran @@ -787,22 +787,22 @@ save TEMP1,TEMP2,TEMP3,TEMP4,TEMP5,TEMP6,TEMP7,TEMP8,TEMP9,FNORM,IBNSOK,MODEIN, " used. " If NRCYCL is set <=0 then NRCYCL is automatically " calculated to use the entire phase space file with no -" restarts, unless INCIDENT PARTICLE= positron. +" rewinds, unless INCIDENT PARTICLE= positron. " The calculated NRCYCL does not take into " account particles that are rejected because they " miss the geometry. If the automatically-calculated -" value of still results in restarts, then use the +" value of still results in rewinds, then use the " following guideline for accurate statistics: -" 1. If there is only one restart and only a small +" 1. If there is only one rewind and only a small " fraction of the source is re-used on the second " pass, the effect on statistics is unlikely to " be significant. -" 2. If there is one restart and a significant portion +" 2. If there is one rewind and a significant portion " of the source is re-used on the second pass, set " NRCYCL=2*NRCYCL_prev+1, where NRCYCL_prev is the " previous automatically-calculated value -" 3. If the source is restarted more than once, try -" setting NRCYCL=(no. of restarts+1)*NRCYCL_prev+1 +" 3. If the source is rewinded more than once, try +" setting NRCYCL=(no. of rewinds+1)*NRCYCL_prev+1 " IPARALLEL set >1 if you are distributing the job among " IPARALLEL machines. IPARALLEL is used with PARNUM " (see below) to partition a phase space source into @@ -878,22 +878,22 @@ save TEMP1,TEMP2,TEMP3,TEMP4,TEMP5,TEMP6,TEMP7,TEMP8,TEMP9,FNORM,IBNSOK,MODEIN, " used. " If NRCYCL is set <=0 then NRCYCL is automatically " calculated to use the entire phase space file with no -" restarts, unless INCIDENT PARTICLE= positron. +" rewinds, unless INCIDENT PARTICLE= positron. " The calculated NRCYCL does not take into " account particles that are rejected because they " miss the geometry. If the automatically-calculated -" value of still results in restarts, then use the +" value of still results in rewinds, then use the " following guideline for accurate statistics: -" 1. If there is only one restart and only a small +" 1. If there is only one rewind and only a small " fraction of the source is re-used on the second " pass, the effect on statistics is unlikely to " be significant. -" 2. If there is one restart and a significant portion +" 2. If there is one rewind and a significant portion " of the source is re-used on the second pass, set " NRCYCL=2*NRCYCL_prev+1, where NRCYCL_prev is the " previous automatically-calculated value -" 3. If the source is restarted more than once, try -" setting NRCYCL=(no. of restarts+1)*NRCYCL_prev+1 +" 3. If the source is rewinded more than once, try +" setting NRCYCL=(no. of rewinds+1)*NRCYCL_prev+1 " IPARALLEL set >1 if you are distributing the job among " IPARALLEL machines. IPARALLEL is used with PARNUM " (see below) to partition a phase space source into @@ -2427,10 +2427,10 @@ ELSEIF(ISOURC = 21)["Full phase space for each particle" OUTCNT=OUTCNT+1; OUTPUT; (' ***WARNING*** Used all particles from partition in source file.'/ - ' Restarting from first particle in partition.'); + ' Rewinding from first particle in partition.'); WRITE(IOUT, '('' ***WARNING*** Used all particles from partition in source file.''/ - '' Restarting from first particle in partition.'')'); + '' Rewinding from first particle in partition.'')'); IF(i_iaea_in=1)[NHSTRY=OUTCNT*NINCSRC/IPARALLEL; $IAEA_SET_PHSP_RECORD(i_unit_in,NPHSPN); ] @@ -2441,7 +2441,7 @@ ELSEIF(ISOURC = 21)["Full phase space for each particle" OUTCNT=OUTCNT+1; OUTPUT ; (///' ***WARNING*** USED ALL PARTICLES FROM CHUNK IN SOURCE FILE!'/ - ' RESTARTING FROM FIRST PARTICLE IN THIS CHUNK.'// + ' REWINDING FROM FIRST PARTICLE IN THIS CHUNK.'// /1x,79('*')// ); IF(i_iaea_in=1)[NHSTRY=OUTCNT*NINCSRC/(n_parallel*$N_CHUNKS); $IAEA_SET_PHSP_RECORD(i_unit_in,NPHSPN); @@ -2452,19 +2452,19 @@ ELSEIF(ISOURC = 21)["Full phase space for each particle" OUTCNT=OUTCNT+1; OUTPUT; (' ***WARNING*** Used all particles from source file.'/ - ' Restarting from first particle.'); + ' Rewinding from first particle.'); WRITE(IOUT, '('' ***WARNING*** Used all particles from source file.''/ - '' Restarting from first particle.'')'); + '' Rewinding from first particle.'')'); IF(i_iaea_in=1)[NHSTRY=OUTCNT*NINCSRC; $IAEA_SET_PHSP_RECORD(i_unit_in,NPHSPN); ] ] - IF(OUTCNT>1000)["too many restart warnings" - OUTPUT;(' ***ERROR*** >1000 restart warnings.'); + IF(OUTCNT>1000)["too many rewind warnings" + OUTPUT;(' ***ERROR*** >1000 rewind warnings.'); WRITE(IOUT, - '('' ***ERROR*** >1000 restart warnings.'')'); + '('' ***ERROR*** >1000 rewind warnings.'')'); STOP; ] @@ -2636,10 +2636,10 @@ ELSEIF(ISOURC = 22)["full phase space for each particle: from side" OUTCNT=OUTCNT+1; OUTPUT; (' ***WARNING*** Used all particles from partition in source file.'/ - ' Restarting from first particle in partition.'); + ' Rewinding from first particle in partition.'); WRITE(IOUT, '('' ***WARNING*** Used all particles from partition in source file.''/ - '' Restarting from first particle in partition.'')'); + '' Rewinding from first particle in partition.'')'); IF(i_iaea_in=1)[NHSTRY=OUTCNT*NINCSRC/IPARALLEL; $IAEA_SET_PHSP_RECORD(i_unit_in,NPHSPN); ] @@ -2650,7 +2650,7 @@ ELSEIF(ISOURC = 22)["full phase space for each particle: from side" OUTCNT=OUTCNT+1; OUTPUT ; (///' ***WARNING*** USED ALL PARTICLES FROM CHUNK IN SOURCE FILE!'/ - ' RESTARTING FROM FIRST PARTICLE IN THIS CHUNK.'// + ' REWINDING FROM FIRST PARTICLE IN THIS CHUNK.'// /1x,79('*')// ); IF(i_iaea_in=1)[NHSTRY=OUTCNT*NINCSRC/(n_parallel*$N_CHUNKS); $IAEA_SET_PHSP_RECORD(i_unit_in,NPHSPN); @@ -2661,19 +2661,19 @@ ELSEIF(ISOURC = 22)["full phase space for each particle: from side" OUTCNT=OUTCNT+1; OUTPUT; (' ***WARNING*** Used all particles from source file.'/ - ' Restarting from first particle.'); + ' Rewinding from first particle.'); WRITE(IOUT, '('' ***WARNING*** Used all particles from source file.''/ - '' Restarting from first particle.'')'); + '' Rewinding from first particle.'')'); IF(i_iaea_in=1)[NHSTRY=OUTCNT*NINCSRC; $IAEA_SET_PHSP_RECORD(i_unit_in,NPHSPN); ] ] - IF(OUTCNT>1000)["too many restart warnings" - OUTPUT;(' ***ERROR*** >1000 restart warnings.'); + IF(OUTCNT>1000)["too many rewind warnings" + OUTPUT;(' ***ERROR*** >1000 rewind warnings.'); WRITE(IOUT, - '('' ***ERROR*** >1000 restart warnings.'')'); + '('' ***ERROR*** >1000 rewind warnings.'')'); STOP; ] @@ -3269,4 +3269,3 @@ return; end; #endif; "Last line in srcrz.mortran " - From adb9e3639cd7b53519f67e92dd0164531639d2e2 Mon Sep 17 00:00:00 2001 From: Frederic Tessier Date: Sun, 3 Nov 2024 21:44:34 +0100 Subject: [PATCH 3/3] Remove remaining mentions of "restart" for clarity Eliminate the last occurrences of "restart" in the EGSnrc repository. Previously, "restart" was used ambiguously to mean relaunching a process, resuming a simulation, or rewinding a phase space file. These actions are now distinctly referred to as "relaunch", "resume", and "rewind". To avoid confusion with past terminology, the generic term "restart" is no longer used in EGSnrc, as of this commit. --- HEN_HOUSE/egs++/view/image_window.cpp | 4 ++-- HEN_HOUSE/egs++/view/image_window.h | 2 +- HEN_HOUSE/egs++/view/viewcontrol.cpp | 5 ++--- HEN_HOUSE/gui/egs_configure/egs_install_conf.cpp | 1 - HEN_HOUSE/user_codes/cavrznrc/cavrznrc.mortran | 2 +- HEN_HOUSE/user_codes/cavsphnrc/cavsphnrc.mortran | 8 ++++---- HEN_HOUSE/user_codes/sprrznrc/sprrznrc.mortran | 2 +- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/HEN_HOUSE/egs++/view/image_window.cpp b/HEN_HOUSE/egs++/view/image_window.cpp index ba0cad6c9..f03f38c31 100644 --- a/HEN_HOUSE/egs++/view/image_window.cpp +++ b/HEN_HOUSE/egs++/view/image_window.cpp @@ -92,7 +92,7 @@ ImageWindow::ImageWindow(QWidget *parent, const char *name) : qRegisterMetaType>("vector"); // Initialize render worker and put it in a thread - restartWorker(); + relaunchWorker(); // disable Qt's background refill for the Widget, so we can paint // over our existing buffer when picking regions @@ -245,7 +245,7 @@ void ImageWindow::stopWorker() { } -void ImageWindow::restartWorker() { +void ImageWindow::relaunchWorker() { worker = new RenderWorker(); thread = new Thread(); worker->moveToThread(thread); diff --git a/HEN_HOUSE/egs++/view/image_window.h b/HEN_HOUSE/egs++/view/image_window.h index a98e62074..97646922f 100644 --- a/HEN_HOUSE/egs++/view/image_window.h +++ b/HEN_HOUSE/egs++/view/image_window.h @@ -69,7 +69,7 @@ public slots: void saveView(EGS_BaseGeometry *geo, int nx, int ny, QString name, QString ext); void stopWorker(); - void restartWorker(); + void relaunchWorker(); void startTransformation(); void endTransformation(); diff --git a/HEN_HOUSE/egs++/view/viewcontrol.cpp b/HEN_HOUSE/egs++/view/viewcontrol.cpp index 0fdc36395..bb556c12e 100644 --- a/HEN_HOUSE/egs++/view/viewcontrol.cpp +++ b/HEN_HOUSE/egs++/view/viewcontrol.cpp @@ -315,7 +315,7 @@ bool GeometryViewControl::loadInput(bool reloading, EGS_BaseGeometry *simGeom) { else { newGeom = simGeom; } - // restart from scratch (copied from main.cpp) + // reset (copied from main.cpp) EGS_Float xmin = -50, xmax = 50; EGS_Float ymin = -50, ymax = 50; EGS_Float zmin = -50, zmax = 50; @@ -382,7 +382,7 @@ bool GeometryViewControl::loadInput(bool reloading, EGS_BaseGeometry *simGeom) { RenderParameters &rp = gview->pars; rp.allowRegionSelection = allowRegionSelection; rp.trackIndices.assign(6,1); - gview->restartWorker(); + gview->relaunchWorker(); if (!simGeom) { setGeometry(newGeom,user_colors,xmin,xmax,ymin,ymax,zmin,zmax,reloading); origSimGeom = g; @@ -3349,4 +3349,3 @@ void GeometryViewControl::timeObjectVisibility() { } - diff --git a/HEN_HOUSE/gui/egs_configure/egs_install_conf.cpp b/HEN_HOUSE/gui/egs_configure/egs_install_conf.cpp index 04b48fa21..95b6993a1 100644 --- a/HEN_HOUSE/gui/egs_configure/egs_install_conf.cpp +++ b/HEN_HOUSE/gui/egs_configure/egs_install_conf.cpp @@ -1531,7 +1531,6 @@ void QInstallPage::timeStamp(){ #ifdef CONF_DEBUG qDebug("Time elapsed: %g s", t_elapsed); #endif - //the_time.restart(); } void QInstallPage::finalize_cpp(){ diff --git a/HEN_HOUSE/user_codes/cavrznrc/cavrznrc.mortran b/HEN_HOUSE/user_codes/cavrznrc/cavrznrc.mortran index 2c457a68a..5f3ee7302 100644 --- a/HEN_HOUSE/user_codes/cavrznrc/cavrznrc.mortran +++ b/HEN_HOUSE/user_codes/cavrznrc/cavrznrc.mortran @@ -2760,7 +2760,7 @@ DO IBATCH=1,$NBATCH[ IF( ISOURC ~= 23 ) IHSTRY = IHSTRY+1; "increment history counter" " For source 23 ihstry is set in srchst " - :CORRELATION-RESTART:; "restart here for a correlated history" + :CORRELATED-HISTORY:; "start here for correlated history" NFTIME = 0; "reset the photon forced interaction counter" diff --git a/HEN_HOUSE/user_codes/cavsphnrc/cavsphnrc.mortran b/HEN_HOUSE/user_codes/cavsphnrc/cavsphnrc.mortran index 13440105e..16ac323db 100644 --- a/HEN_HOUSE/user_codes/cavsphnrc/cavsphnrc.mortran +++ b/HEN_HOUSE/user_codes/cavsphnrc/cavsphnrc.mortran @@ -2284,7 +2284,7 @@ DO IBATCH=1,$STAT[ IHSTRY=IHSTRY+1; "INCREMENT HISTORY COUNTER" the_case = IHSTRY; - :CORRELATION-RESTART:; "RESTART HERE FOR A CORRELATED HISTORY" + :CORRELATED-HISTORY:; "START HERE FOR CORRELATED HISTORY" NFTIME = 0; "reset the photon forced interaction counter" @@ -2411,7 +2411,7 @@ DO IBATCH=1,$STAT[ INEED2=0; "ZERO THIS FLAG" IF(IDECAV.NE.0) IDECV1=IDECAV; "1ST PASS ENERGY DEPOSITION" $SWITCH-TO-PARALLEL-BEAM-SOURCE; - GO TO :CORRELATION-RESTART:; "RESTART THE HISTORY" + GO TO :CORRELATED-HISTORY:; "START HERE FOR CORRELATED HISTORY" ] ELSEIF((IFULL.EQ.3).AND.(IPTSRC.EQ.0).AND.(IPASS.EQ.0) .AND.(INEED2.EQ.1))[ @@ -2428,7 +2428,7 @@ DO IBATCH=1,$STAT[ DO IRL=2,NREG[ "SWITCH TO UNIFORM WALL MATERIAL" MED(IRL)=1;RHOR(IRL)=RHO(1); ] - GO TO :CORRELATION-RESTART:; "RESTART THE HISTORY" + GO TO :CORRELATED-HISTORY:; "START HERE FOR CORRELATED HISTORY" ] ELSEIF((IFULL.EQ.3).AND.(IPTSRC.EQ.1).AND.(IPASS.EQ.1) .AND.(INEED2.EQ.1))[ @@ -2442,7 +2442,7 @@ DO IBATCH=1,$STAT[ DO IRL=2,NREG[ "SWITCH TO UNIFORM WALL MATERIAL" MED(IRL)=1;RHOR(IRL)=RHO(1); ] - GO TO :CORRELATION-RESTART:; "RESTART THE HISTORY" + GO TO :CORRELATED-HISTORY:; "START HERE FOR CORRELATED HISTORY" ] "JAN CHANGE: IPASS.EQ.2 to IPASS.GE.1 BECAUSE OTHERWISE NO BACKUP FOR" " IFULL=3 AND IPASS=1 AND INEED2=0" diff --git a/HEN_HOUSE/user_codes/sprrznrc/sprrznrc.mortran b/HEN_HOUSE/user_codes/sprrznrc/sprrznrc.mortran index aaae08f81..14326381b 100644 --- a/HEN_HOUSE/user_codes/sprrznrc/sprrznrc.mortran +++ b/HEN_HOUSE/user_codes/sprrznrc/sprrznrc.mortran @@ -2239,7 +2239,7 @@ DO IBATCH=1,$NBATCH[ IF(ISOURC~=23) IHSTRY=IHSTRY+1; "INCREMENT HISTORY COUNTER" "incremented in srcrz for source 23" - :CORRELATION-RESTART:; "RESTART HERE FOR A CORRELATED HISTORY" + :CORRELATED-HISTORY:; "START HERE FOR CORRELATED HISTORY" NFTIME=0; "RESET THE PHOTON FORCED INTERACTION COUNTER"