Adjust eol spaces, remove leftover merge markers

nrc-cnrc · Apr 12, 2021 · c71955d · c71955d
1 parent 66fea4b
commit c71955d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 27 deletions.
diff --git a/HEN_HOUSE/egs++/egs_run_control.h b/HEN_HOUSE/egs++/egs_run_control.h
@@ -24,6 +24,7 @@
 #  Author:          Iwan Kawrakow, 2005
 #
 #  Contributors:    Frederic Tessier
+#                   Ernesto Mainegra-Hing
 #
 ###############################################################################
 */

diff --git a/HEN_HOUSE/scripts/egs-jobsub-xargs b/HEN_HOUSE/scripts/egs-jobsub-xargs
@@ -29,6 +29,8 @@
 #                   Blake Walters
 #
 ###############################################################################
+
+
 #
 # Check enough arguments provided
 #
@@ -38,9 +40,9 @@ if test $# -lt 3; then
 
 Usage: $my_name app inp pegs|pegsless [p=N] [config=xxx] [eh=xxx] [hh=xxx] [cpu_t=t] [email=xxx]
 
-$my_name runs app using inp as input file (use two double quotes if 
+$my_name runs app using inp as input file (use two double quotes if
 there is no input file needed) and pegs as pegs4 data file.
-Using config=xxx you can use a configuration different from the one 
+Using config=xxx you can use a configuration different from the one
 specified by the environment variable EGS_CONFIG.
 
 For parallel job submission one needs to pass the number of jobs
@@ -51,7 +53,7 @@ EOF
 fi
 
 
-# 
+#
 # Initialization
 #
 app=$1
@@ -139,7 +141,7 @@ if test "x$egs_home" = x; then
        cat >&2 <<EOF
 
 The environment variable EGS_HOME is not set. You have to either
-define EGS_HOME to point to a valid location or you must run this 
+define EGS_HOME to point to a valid location or you must run this
 script as
     $my_name ... eh=path_to_work_area
 
@@ -338,7 +340,7 @@ if test $n_parallel -gt 0; then
 #$ -v EGS_HOME=$egs_home
 #$ -v TZ=America/Toronto
 # Call your program
-for i in \$(seq $job $top_job);do 
+for i in \$(seq $job $top_job);do
     echo \$i;
 done | xargs -P${cpus} -n1 -I{} sh -c '$command -j \$1 -f $first_job'  - {}
 EOF
@@ -364,7 +366,7 @@ EOF
 #$ -v EGS_HOME=$egs_home
 #$ -v TZ=America/Toronto
 # Call your program
-for i in \$(seq $job $top_job);do 
+for i in \$(seq $job $top_job);do
     echo \$i;
 done | xargs -P${cpus} -n1 -I{} sh -c '$command -j \$1 -f $first_job'  - {}
 EOF
@@ -413,7 +415,7 @@ else
 
  # Call your program
 
-$command 
+$command
 EOF
     fi
 fi

diff --git a/HEN_HOUSE/src/egs_parallel.mortran b/HEN_HOUSE/src/egs_parallel.mortran
@@ -25,6 +25,7 @@
 "                                                                             "
 "  Contributors:    Blake Walters                                             "
 "                   Frederic Tessier                                          "
+"                   Ernesto Mainegra-Hing                                     "
 "                                                                             "
 "#############################################################################"
 "                                                                             "
@@ -181,7 +182,7 @@ save first_time,n_last;
 /*********************************/
 IF( is_uniform_run ) [
     IF (first_time)[
-       n_run = ncase/n_parallel; 
+       n_run = ncase/n_parallel;
        first_time = .false.;
     ]
     ELSE[
@@ -339,12 +340,12 @@ character control_string*256;
 /****************************/
 IF( is_uniform_run )[
     IF( i_parallel = n_parallel )[
-      n_job = 0;"I am the last job!!!"  
+      n_job = 0;"I am the last job!!!"
       goto :complete_calculation:;
     ]
     ELSE ["nothing to do here"
       n_job = 1;"Only last job allowed to finish!"
-      return;  
+      return;
     ]
 ]
 

diff --git a/HEN_HOUSE/user_codes/cavrznrc/cavrznrc_template.egsinp b/HEN_HOUSE/user_codes/cavrznrc/cavrznrc_template.egsinp
@@ -299,7 +299,7 @@ Brems cross sections= BH           # BH (default),NIST;
                                    # BH: Bethe-Heitler cross-sections used
                                    # NIST: NIST cross-sections used
 
-Atomic relaxations= Off            # On (EADL) or Off 
+Atomic relaxations= Off            # On (EADL) or Off
 
 Bound Compton scattering= Off      # Off, On, simple or norej (default);
                                    # Off: Klein-Nishina used for Compton

diff --git a/HEN_HOUSE/user_codes/dosrznrc/dosrznrc.mortran b/HEN_HOUSE/user_codes/dosrznrc/dosrznrc.mortran
@@ -1358,16 +1358,8 @@ REPLACE {$VERSION} WITH {
 "  ESAVEIN             (R)  If ELECTRON RANGE REJECTION is on, discard an
 "                           electron  when E< ESAVEIN and RANGE < CDIST
 "                           where CDIST is closest distance to region of
-<<<<<<< HEAD
-"                           interest specified below (ignores bremsstrahlung
-"                           losses below ESAVEIN).
-||||||| merged common ancestors
-"                           interest specified below. This ignores bremsstrahlung
-"                           losses below ESAVEIN.
-=======
 "                           interest specified. This ignores bremsstrahlung
 "                           losses below ESAVEIN.
->>>>>>> Changes to Mortran apps for URC implementation
 "                           This parameter must be input even if not used.
 "                           ESAVEIN is a total energy.
 "
@@ -3821,7 +3813,7 @@ ELSEIF(IFULL = 3)["score scattered dose separately"
       ]
    ]
    ELSE IF( iarg = 24 ) [ "Raylegh scattering has occured"
-     latch(NP) = IBSET(latch(NP),7);  
+     latch(NP) = IBSET(latch(NP),7);
    ] "end iarg = 24 block"
 ] " end IFULL=3 "
 
@@ -3855,7 +3847,7 @@ IF (IKERMA = 1) ["want to score KERMA"
 
     "depositing sub-threshold energy for PE & Compton"
     "Auger only"
-    IF( iarg = 33 | iarg = 34 ) [  
+    IF( iarg = 33 | iarg = 34 ) [
         "33=>sub-threshold fluorescence being deposited"
         "34=>sub-threshold Auger being deposited"
         "if as a result of pe or compt this is k.e. transferred to e-"
@@ -5080,13 +5072,7 @@ nbr_split =VALUE(NUM_BREMPEVEN,1);
 IF(IBRSPL = 1)["brems splitting requested"
     "default bremsstrahlung splitting to maximum"
     "IF((nbr_split  <= 0) | (nbr_split  > $MAXBRSPLIT)) nbr_split =$MAXBRSPLIT;"
-<<<<<<< HEAD
-    "Now allows bremsstrahlung and annihilation radiation to be turned off"
-||||||| merged common ancestors
-    "Changed to allow bremsstrahlung and annihilation radiation to be turned off"
-=======
     "To allow bremsstrahlung and annihilation radiation to be turned off"
->>>>>>> Changes to Mortran apps for URC implementation
     IF((nbr_split  > $MAXBRSPLIT)) nbr_split =$MAXBRSPLIT;"
 ]
 ELSE ["no bremsstrahlung splitting" nbr_split = 1;]