No commit message

No commit message

.gitattributes

@@ -86,6 +86,15 @@ RegressionTests/DCGun-Cornell-2/reference/DCGun-Cornell-2.out.md5 -text
 RegressionTests/DCGun-Cornell-2/reference/DCGun-Cornell-2.stat -text
 RegressionTests/DCGun-Cornell-2/reference/DCGun-Cornell-2.stat.md5 -text
 RegressionTests/Degrader-1/Degrader-1.in -text
+RegressionTests/Degrader-1/Degrader-1.local -text
+RegressionTests/Degrader-1/Degrader-1.rt -text
+RegressionTests/Degrader-1/Degrader-1.sge -text
+RegressionTests/Degrader-1/reference/Degrader-1.lbal -text
+RegressionTests/Degrader-1/reference/Degrader-1.lbal.md5 -text
+RegressionTests/Degrader-1/reference/Degrader-1.out -text
+RegressionTests/Degrader-1/reference/Degrader-1.out.md5 -text
+RegressionTests/Degrader-1/reference/Degrader-1.stat -text
+RegressionTests/Degrader-1/reference/Degrader-1.stat.md5 -text
 RegressionTests/Distribution-Binomial-1/Distribution-Binomial-1.in -text
 RegressionTests/Distribution-Binomial-1/Distribution-Binomial-1.local -text
 RegressionTests/Distribution-Binomial-1/Distribution-Binomial-1.rt -text

RegressionTests/Degrader-1/Degrader-1.in

@@ -17,7 +17,7 @@ VALUE,{gamma,brho,Edes,beta,gambet};
 
 DEGPHYS: SURFACEPHYSICS, TYPE="DEGRADER", MATERIAL="Graphite";
 
-DEG1: DEGRADER, L=0.3, ELEMEDGE=0.02, ZSIZE=0.01, OUTFN="DEG1.h5", SURFACEPHYSICS=DEGPHYS;
+DEG1: DEGRADER, L=0.01, ELEMEDGE=0.02, OUTFN="DEG1.h5", SURFACEPHYSICS=DEGPHYS;
 
 M0: Monitor, L=0.001, ELEMEDGE=0.010, OUTFN="M0.h5";
 M1: Monitor, L=0.001, ELEMEDGE=0.035, OUTFN="M1.h5";
@@ -35,11 +35,11 @@ FS1:FIELDSOLVER, FSTYPE=NONE, MX=64, MY=64, MT=64,
                  BCFFTX=open, BCFFTY=open, BCFFTT=open, 
                  BBOXINCR=1, GREENSF=STANDARD;
 
-BEAM1: BEAM, PARTICLE=PROTON, PC=P0, NPART=100000, BCURRENT=2.0e-03, BFREQ=rf, CHARGE=1;
+BEAM1: BEAM, PARTICLE=PROTON, PC=P0, NPART=1E5, BCURRENT=2.0e-03, BFREQ=rf, CHARGE=1;
 
 SELECT, LINE=DEGTEST;
 
-TRACK, LINE=DEGTEST, BEAM=BEAM1, MAXSTEPS=500, DT=1.0e-12;
+TRACK, LINE=DEGTEST, BEAM=BEAM1, MAXSTEPS=230, DT=1.0e-12;
  RUN, METHOD = "PARALLEL-T", BEAM=BEAM1, FIELDSOLVER=FS1, DISTRIBUTION=D1;
 ENDTRACK;
 

RegressionTests/Degrader-1/Degrader-1.local

+#!/bin/bash
+mpirun -np 4 $OPAL_EXE_PATH/opal Degrader-1.in --info 9 --warn 0 2>&1 | tee Degrader-1.out

RegressionTests/Degrader-1/Degrader-1.rt

+"Simple slab of carbon as degrader of a 72 MeV proton beam"
+out "Ekin" last 1E-15
+out "rms beam size" last 1E-04
+out "rms emittance" last 1E-07

RegressionTests/Degrader-1/Degrader-1.sge

+#!/bin/bash
+#$ -cwd
+#$ -j y
+#$ -pe orte 4
+#$ -N Degrader-1-RT
+#$ -v LD_LIBRARY_PATH,OPAL_EXE_PATH,OPENMPI,REG_TEST_DIR
+
+MACHINE_FILE=$TMPDIR/machinefile
+awk '/^felsim/ {print $1" slots="$2}' $PE_HOSTFILE > $MACHINE_FILE 
+cp $MACHINE_FILE machinefile.last
+
+cd $REG_TEST_DIR
+OPAL="$OPAL_EXE_PATH/opal Degrader-1.in --commlib mpi --info 0 --warn 0 2>&1"
+CMD="$OPENMPI/bin/mpirun -x LD_LIBRARY_PATH -machinefile $MACHINE_FILE -np $NSLOTS $OPAL "
+$CMD

RegressionTests/Degrader-1/reference/Degrader-1.lbal

+# 4
+24921         	25133         	25252         	24694         	
+24921         	25133         	25252         	24694         	
+24921         	25133         	25252         	24694         	
+24921         	25133         	25252         	24694         	
+24921         	25133         	25252         	24694         	
+24921         	25133         	25252         	24694         	
+24921         	25133         	25252         	24694         	
+24921         	25133         	25252         	24694         	
+24921         	25133         	25252         	24694         	
+24921         	25133         	25252         	24694         	
+24921         	25133         	25252         	24694         	
+24921         	25133         	25252         	24694         	
+24921         	25133         	25252         	24694         	
+20930         	21152         	21130         	20742         	
+2620         	2797         	2669         	2740         	
+42         	44         	50         	46         	
+7977         	7361         	7825         	7041         	
+24764         	23372         	24773         	22716         	
+25986         	24395         	25964         	23669         	
+26112         	24296         	26019         	23588         	
+26208         	24195         	26097         	23517         	
+26205         	24053         	26269         	23491         	
+26235         	23891         	26433         	23459         	
+26284         	23732         	26555         	23447         	

RegressionTests/Degrader-1/reference/Degrader-1.lbal.md5

+e3c30f8e0a98667013928fdaffa20ef3  Degrader-1.lbal

RegressionTests/Degrader-1/reference/Degrader-1.out.md5

+f19ca52239179e68ca3a0609ffcdb237  Degrader-1.out

RegressionTests/Degrader-1/reference/Degrader-1.stat.md5

+284f99eb7c3fa56d4e38e9b08361ba2b  Degrader-1.stat