Tests

tests/2exec/comp2exec

@@ -97,8 +97,8 @@ ADDASPAOCL="./../../src/ocl/adda_spa_ocl" # this combination is not yet supporte
 # Currently formulated to compare 1.5* with 1.4.0 (more specific exceptions are added in parsing of command lines)
 # These variables must be updated whenever new features are added to ADDA
 
-CMDIGNORE="coated2|superellipsoid|-h anisotr|-h int|-h pol|-h rect_dip|-h scat|-int igt_so"
-OLDIGNORE="^ADDA v\.|^Copyright \(C\) 2006-20|^  coated2|^  superellipsoid|^  -int|^  -pol|^  -scat"
+CMDIGNORE="coated2|superellipsoid|-h anisotr|-h int|-h pol|-h rect_dip|-h scat|-int igt_so|-h beam|-bessel"
+OLDIGNORE="^ADDA v\.|^Copyright \(C\) 2006-20|^  coated2|^  superellipsoid|^  -int|^  -pol|^  -scat|^Incident beam center position:|^Incident beam: point dipole|^  -beam_center|Center position:|^parameters of predefined shapes"
 
 # Path to reference binaries, examples: "." or "./../../win64". 
 # This may work out of the box on Windows, but requires changes for other systems

tests/2exec/suite

@@ -75,14 +75,14 @@ all -h beam
 all -h beam plane
 all -beam plane ;mgn;
 all -h beam lminus
-all -beam lminus 2 1 2 3 ;mgn;
+all -beam lminus 2 -beam_center 1 2 3 ;mgn;
 all -h beam davis3
-all -beam davis3 2 1 2 3 ;mgn;
+all -beam davis3 2 -beam_center 1 2 3 ;mgn;
 all -beam davis3 2 ;mg9n;
 all -h beam barton5
-all -beam barton5 2 1 2 3 ;mgn;
+all -beam barton5 2 -beam_center 1 2 3 ;mgn;
 all -beam barton5 2 ;mg9n;
-all -beam dipole 3 2 1 ;p; ;mgn;
+all -beam dipole -beam_center 3 2 1 ;p; ;mgn;
 all -h beam read
 all -beam read IncBeam-Y IncBeam-X ;se; ;mgn;
 
@@ -376,8 +376,8 @@ all -surf 4 2 0 ;mgn;
 all -surf 4 3 4 ;p; ;mgn;
 all -surf 4 3 4 -prop 1 2 -3 ;se; ;mgn;
 all -surf 4 inf -prop 1 2 -3 ;se; ;mgn;
-all -surf 4 2 1 -beam dipole 3 2 1 ;p; ;mgn;
-all -surf 4 inf -beam dipole 3 2 1 ;p; ;mgn;
+all -surf 4 2 1 -beam dipole -beam_center 3 2 1 ;p; ;mgn;
+all -surf 4 inf -beam dipole -beam_center 3 2 1 ;p; ;mgn;
 all -surf 4 2 0 -no_reduced_fft ;mgn;
 !mpi,!mpi_seq -surf 4 2 0 -iter cgnr -no_reduced_fft ;mgn;
 

tests/2exec/suite_rd

@@ -78,15 +78,15 @@ all -h beam
 all -h beam plane
 all -beam plane ;mgn;
 all -h beam lminus
-all -beam lminus 2 1 2 3 ;mgn;
+all -beam lminus 2 -beam_center 1 2 3 ;mgn;
 all -h beam davis3
-all -beam davis3 2 1 2 3 ;mgn;
+all -beam davis3 2 -beam_center 1 2 3 ;mgn;
 all -beam davis3 2 ;mg9n;
 all -h beam barton5
-all -beam barton5 2 1 2 3 ;mgn;
+all -beam barton5 2 -beam_center 1 2 3 ;mgn;
 all -beam barton5 2 ;mg9n;
-!RD_TRICKY -beam dipole 3 2 1 ;p; ;mgn;
-&RD_TRICKY -beam dipole 3 2 1 ;smg12n;
+!RD_TRICKY -beam dipole -beam_center 3 2 1 ;p; ;mgn;
+&RD_TRICKY -beam dipole -beam_center 3 2 1 ;smg12n;
 all -h beam read
 #all -beam read IncBeam-Y IncBeam-X ;se; ;mgn;
 
@@ -340,10 +340,10 @@ all -surf 4 2 0 ;mgn;
 !RD_TRICKY -surf 4 3 4 -prop 1 2 -3 ;se; ;mgn;
 !RD_TRICKY -surf 4 inf -prop 1 2 -3 ;se; ;mgn;
 &RD_TRICKY -surf 4 inf -prop 1 2 -3 ;se; ;m; ;n; -size 5 -grid 12
-!RD_TRICKY -surf 4 2 1 -beam dipole 3 2 1 ;p; ;mgn;
-&RD_TRICKY -surf 4 2 1 -beam dipole 3 2 1 ;p; ;smg12n;
-!RD_TRICKY -surf 4 inf -beam dipole 3 2 1 ;p; ;mgn;
-&RD_TRICKY -surf 4 2 1 -beam dipole 3 2 1 ;p; ;smg12n;
+!RD_TRICKY -surf 4 2 1 -beam dipole -beam_center 3 2 1 ;p; ;mgn;
+&RD_TRICKY -surf 4 2 1 -beam dipole -beam_center 3 2 1 ;p; ;smg12n;
+!RD_TRICKY -surf 4 inf -beam dipole -beam_center 3 2 1 ;p; ;mgn;
+&RD_TRICKY -surf 4 2 1 -beam dipole -beam_center 3 2 1 ;p; ;smg12n;
 all -surf 4 2 0 -no_reduced_fft ;mgn;
 !mpi,!mpi_seq -surf 4 2 0 -iter cgnr -no_reduced_fft ;mgn; 
 

tests/2exec/suite_sparse

@@ -56,14 +56,14 @@ all -h beam
 all -h beam plane
 all -beam plane ;mgn;
 all -h beam lminus
-all -beam lminus 2 1 2 3 ;mgn;
+all -beam lminus 2 -beam_center 1 2 3 ;mgn;
 all -h beam davis3
-all -beam davis3 2 1 2 3 ;mgn;
+all -beam davis3 2 -beam_center 1 2 3 ;mgn;
 all -beam davis3 2 ;mg9n;
 all -h beam barton5
-all -beam barton5 2 1 2 3 ;mgn;
+all -beam barton5 2 -beam_center 1 2 3 ;mgn;
 all -beam barton5 2 ;mg9n;
-all -beam dipole 3 2 1 ;p; ;mgn;
+all -beam dipole 3 -beam_center 2 1 ;p; ;mgn;
 all -h beam read
 all -beam read IncBeam-Y IncBeam-X ;se; ;mn;
 
@@ -356,8 +356,8 @@ all -surf 4 2 0 ;mgn;
 all -surf 4 3 4 ;p; ;ss; ;mn;
 all -surf 4 3 4 -prop 1 2 -3 ;se; ;mn;
 all -surf 4 inf -prop 1 2 -3 ;se; ;mn;
-all -surf 4 2 1 -beam dipole 3 2 1 ;p; ;ss; ;mn;
-all -surf 4 inf -beam dipole 3 2 1 ;p; ;ss; ;mn;
+all -surf 4 2 1 -beam dipole -beam_center 3 2 1 ;p; ;ss; ;mn;
+all -surf 4 inf -beam dipole -beam_center 3 2 1 ;p; ;ss; ;mn;
 all -surf 4 2 0 -no_reduced_fft ;mgn;
 !mpi,!mpi_seq -surf 4 2 0 -iter cgnr -no_reduced_fft ;mgn;
 

tests/2exec/suite_surf

@@ -78,14 +78,14 @@ all -h beam
 all -h beam plane
 all -beam plane ;mgn;
 all -h beam lminus
-#all -beam lminus 2 1 2 3 ;mgn;
+#all -beam lminus 2 -beam_center 1 2 3 ;mgn;
 all -h beam davis3
-#all -beam davis3 2 1 2 3 ;mgn;
+#all -beam davis3 2 -beam_center 1 2 3 ;mgn;
 #all -beam davis3 2 ;mg9n;
 all -h beam barton5
-#all -beam barton5 2 1 2 3 ;mgn;
+#all -beam barton5 2 -beam_center 1 2 3 ;mgn;
 #all -beam barton5 2 ;mg9n;
-all -beam dipole 3 2 1 ;p; ;mgn;
+all -beam dipole -beam_center 3 2 1 ;p; ;mgn;
 all -h beam read
 all -beam read IncBeam-Y IncBeam-X ;se; ;mgn;