From 7c47d2dc83b5391bd3514d283a1a28ec333eef51 Mon Sep 17 00:00:00 2001 From: David Sagan Date: Mon, 18 Sep 2023 17:51:07 -0400 Subject: [PATCH 01/12] Fix momentum dependence in track_a_foil. --- .gitignore | 60 +++++++++++++++++++++------------ README.md | 1 + bmad/low_level/track_a_foil.f90 | 13 ++++--- 3 files changed, 47 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 3369bf7ce7..ded4e939cd 100644 --- a/.gitignore +++ b/.gitignore @@ -13,28 +13,7 @@ plplot/* xraylib/* gnu_utilities_src/* packages/* -production/* -bmad/production/* -bsim/production/* -code_examples/production/* -cpp_bmad_interface/production/* -forest/production/* -lux/production/* -regression_tests/production/* -sim_utils/production/* -tao/production/* -util_programs/production/* -debug/* -bmad/debug/* -bsim/debug/* -code_examples/debug/* -cpp_bmad_interface/debug/* -forest/debug/* -lux/debug/* -regression_tests/debug/* -sim_utils/debug/* -tao/debug/* -util_programs/productdebugion/* + bmad-doc/tutorial_bmad_tao/doc/2www.pl bmad-doc/tutorial_bmad_tao/doc/tutorial_bmad_tao.aux bmad-doc/tutorial_bmad_tao/doc/tutorial_bmad_tao.bbl @@ -51,4 +30,41 @@ bmad-doc/cookbook_bmad_tao/doc/cookbook_bmad_tao.out bmad-doc/cookbook_bmad_tao/doc/cookbook_bmad_tao.pdf bmad-doc/cookbook_bmad_tao/doc/cookbook_bmad_tao.toc bmad-doc/tao_examples/csr_beam_tracking/csr_wake.dat + +regression_tests/*/output.now +regression_tests/bbu_test/bunch_vec.txt +regression_tests/bookkeeper_test/lat2.bmad +regression_tests/envelope_ibs_test/emit_from_integrals.out +regression_tests/envelope_ibs_test/emit_vs_turn.out +regression_tests/envelope_ibs_test/one_turn_mat_from_slices.diag +regression_tests/envelope_ibs_test/sigma_finish.out +regression_tests/envelope_ibs_test/sigma_start.out +regression_tests/hdf5_test/bunch.h5 +regression_tests/hdf5_test/grid_field.h5 +regression_tests/multipass_test/lat1.bmad +regression_tests/multipass_test/lat2.bmad +regression_tests/parse_test/c2.bmad +regression_tests/parse_test/com2.bmad +regression_tests/parse_test/g1.grid_field.h5 +regression_tests/parse_test/m1.cylindrical_map +regression_tests/parse_test/overlap_out.bmad +regression_tests/parse_test/q1.cartesian_map +regression_tests/parse_test/q4.cartesian_map +regression_tests/parse_test/sbend0.grid_field.h5 +regression_tests/parse_test/wall_cap +regression_tests/parse_test/wall_m2 +regression_tests/parse_test/write_parser_test.bmad +regression_tests/parse_test/z.bmad +regression_tests/parse_test/z2.bmad +regression_tests/regression.results +regression_tests/sad_test/sler_1689.bmad +regression_tests/twiss_track_test/digested.file +regression_tests/twiss_track_test/rad_int_no_wig_cache.dat +regression_tests/twiss_track_test/rad_int_no_wig_no_cache.dat +regression_tests/twiss_track_test/rad_int_wig_cache.dat +regression_tests/twiss_track_test/rad_int_wig_no_cache.dat +regression_tests/twiss_track_test/twiss.out + *.digested* +production +debug \ No newline at end of file diff --git a/README.md b/README.md index aed801f349..0bbec71206 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # bmad-ecosystem repository Bmad toolkit (library) for the simulation of charged particles and X-rays in accelerators and storage rings. +**Bmad web site at: [https://www.classe.cornell.edu/bmad/](https://www.classe.cornell.edu/bmad/)** diff --git a/bmad/low_level/track_a_foil.f90 b/bmad/low_level/track_a_foil.f90 index 2ea6ea8c19..c67270cdee 100644 --- a/bmad/low_level/track_a_foil.f90 +++ b/bmad/low_level/track_a_foil.f90 @@ -3,6 +3,11 @@ ! ! Bmad_standard tracking through an foil element. ! +! From Eq. (6) in +! Approximations to Multiple Coulomb Scattering +! Gerald R. Lynch and Orin Dahl +! Nuclear Insturments and methods in Physics Research B58 (7991) 6-10. +! ! Input: ! orbit -- Coord_struct: Starting position. ! ele -- ele_struct: foil element. @@ -27,8 +32,8 @@ subroutine track_a_foil (orbit, ele, param, mat6, make_matrix) type (lat_param_struct) :: param real(rp), optional :: mat6(6,6) -real(rp) x0, xx0, sigma, z, rnd(2), density, p -real(rp), parameter :: S2 = 13.6, epsilon = 0.088 +real(rp) x0, xx0, sigma, z, rnd(2), density +real(rp), parameter :: S2 = 13.6e6_dp, epsilon = 0.088 ! Factor of 1e6 is due to original formula using MeV/c for momentum integer material, atomic_num @@ -53,9 +58,7 @@ subroutine track_a_foil (orbit, ele, param, mat6, make_matrix) z = atomic_number(orbit%species) xx0 = ele%value(thickness$) / (x0 / density) -p = (1.0_rp + orbit%vec(6)) * orbit%p0c -! Factor of 1e6 is due to original formula using MeV/c for momentum -sigma = 1.0e6_rp * S2 * z * sqrt(xx0) / (p * orbit%beta) * (1.0_rp + epsilon * log10(xx0*z*z/orbit%beta**2)) +sigma = S2 * z * sqrt(xx0) / (orbit%p0c * orbit%beta) * (1.0_rp + epsilon * log10(xx0*z*z/orbit%beta**2)) ! From 877f7acd83e78bdabf895d7f813b128cad4f20df Mon Sep 17 00:00:00 2001 From: David Sagan Date: Mon, 18 Sep 2023 23:06:00 -0400 Subject: [PATCH 02/12] Removed test script files. --- regression_tests/bookkeeper_test/m | 5 ----- regression_tests/bookkeeper_test/r | 1 - regression_tests/bookkeeper_test/rt | 1 - regression_tests/em_field_test/m | 3 --- regression_tests/em_field_test/r | 3 --- regression_tests/em_field_test/rt | 2 -- regression_tests/fringe_test/m | 5 ----- regression_tests/fringe_test/r | 3 --- regression_tests/fringe_test/rt | 1 - regression_tests/hdf5_test/m | 5 ----- regression_tests/hdf5_test/rt | 1 - regression_tests/mat6_calc_method_test/m | 5 ----- regression_tests/mat6_calc_method_test/r | 3 --- regression_tests/mat6_calc_method_test/rt | 2 -- regression_tests/multipass_test/m | 5 ----- regression_tests/multipass_test/r | 3 --- regression_tests/multipass_test/rt | 2 -- regression_tests/particle_species_test/m | 3 --- regression_tests/particle_species_test/r | 3 --- regression_tests/particle_species_test/rt | 2 -- regression_tests/reverse_test/m | 3 --- regression_tests/reverse_test/r | 3 --- regression_tests/reverse_test/rt | 1 - regression_tests/slice_test/m | 5 ----- regression_tests/slice_test/r | 2 -- regression_tests/slice_test/rt | 1 - regression_tests/spin_general_test/m | 5 ----- regression_tests/spin_general_test/r | 3 --- regression_tests/spin_general_test/rt | 2 -- regression_tests/spin_map_test/m | 5 ----- regression_tests/spin_map_test/r | 3 --- regression_tests/spin_map_test/rt | 2 -- regression_tests/synrad3d_test/rt | 2 -- regression_tests/time_runge_kutta_test/m | 3 --- regression_tests/time_runge_kutta_test/r | 3 --- regression_tests/time_runge_kutta_test/rt | 2 -- regression_tests/tracking_method_test/m | 5 ----- regression_tests/tracking_method_test/r | 3 --- regression_tests/tracking_method_test/rt | 1 - 39 files changed, 112 deletions(-) delete mode 100755 regression_tests/bookkeeper_test/m delete mode 100755 regression_tests/bookkeeper_test/r delete mode 100755 regression_tests/bookkeeper_test/rt delete mode 100755 regression_tests/em_field_test/m delete mode 100755 regression_tests/em_field_test/r delete mode 100755 regression_tests/em_field_test/rt delete mode 100755 regression_tests/fringe_test/m delete mode 100755 regression_tests/fringe_test/r delete mode 100755 regression_tests/fringe_test/rt delete mode 100755 regression_tests/hdf5_test/m delete mode 100755 regression_tests/hdf5_test/rt delete mode 100755 regression_tests/mat6_calc_method_test/m delete mode 100755 regression_tests/mat6_calc_method_test/r delete mode 100755 regression_tests/mat6_calc_method_test/rt delete mode 100755 regression_tests/multipass_test/m delete mode 100755 regression_tests/multipass_test/r delete mode 100755 regression_tests/multipass_test/rt delete mode 100755 regression_tests/particle_species_test/m delete mode 100755 regression_tests/particle_species_test/r delete mode 100755 regression_tests/particle_species_test/rt delete mode 100755 regression_tests/reverse_test/m delete mode 100755 regression_tests/reverse_test/r delete mode 100755 regression_tests/reverse_test/rt delete mode 100755 regression_tests/slice_test/m delete mode 100755 regression_tests/slice_test/r delete mode 100755 regression_tests/slice_test/rt delete mode 100755 regression_tests/spin_general_test/m delete mode 100755 regression_tests/spin_general_test/r delete mode 100755 regression_tests/spin_general_test/rt delete mode 100755 regression_tests/spin_map_test/m delete mode 100755 regression_tests/spin_map_test/r delete mode 100755 regression_tests/spin_map_test/rt delete mode 100755 regression_tests/synrad3d_test/rt delete mode 100755 regression_tests/time_runge_kutta_test/m delete mode 100755 regression_tests/time_runge_kutta_test/r delete mode 100755 regression_tests/time_runge_kutta_test/rt delete mode 100755 regression_tests/tracking_method_test/m delete mode 100755 regression_tests/tracking_method_test/r delete mode 100755 regression_tests/tracking_method_test/rt diff --git a/regression_tests/bookkeeper_test/m b/regression_tests/bookkeeper_test/m deleted file mode 100755 index acc9efd5a4..0000000000 --- a/regression_tests/bookkeeper_test/m +++ /dev/null @@ -1,5 +0,0 @@ -cd ../../bmad -mkd -j99 -cd ../regression_tests -mkd bookkeeper_test-exe -cd bookkeeper_test \ No newline at end of file diff --git a/regression_tests/bookkeeper_test/r b/regression_tests/bookkeeper_test/r deleted file mode 100755 index a8824d000e..0000000000 --- a/regression_tests/bookkeeper_test/r +++ /dev/null @@ -1 +0,0 @@ -../../debug/bin/bookkeeper_test "$@" diff --git a/regression_tests/bookkeeper_test/rt b/regression_tests/bookkeeper_test/rt deleted file mode 100755 index 78865a730f..0000000000 --- a/regression_tests/bookkeeper_test/rt +++ /dev/null @@ -1 +0,0 @@ -totalview ../../debug/bin/bookkeeper_test -a "$@" diff --git a/regression_tests/em_field_test/m b/regression_tests/em_field_test/m deleted file mode 100755 index 2689933c7d..0000000000 --- a/regression_tests/em_field_test/m +++ /dev/null @@ -1,3 +0,0 @@ -cd .. -mkd em_field_test-exe -cd em_field_test \ No newline at end of file diff --git a/regression_tests/em_field_test/r b/regression_tests/em_field_test/r deleted file mode 100755 index 9d8c8b25dd..0000000000 --- a/regression_tests/em_field_test/r +++ /dev/null @@ -1,3 +0,0 @@ -rm output.now -../../debug/bin/em_field_test lat.bmad -#cat output.now diff --git a/regression_tests/em_field_test/rt b/regression_tests/em_field_test/rt deleted file mode 100755 index 86e0848070..0000000000 --- a/regression_tests/em_field_test/rt +++ /dev/null @@ -1,2 +0,0 @@ -totalview ../../debug/bin/em_field_test -a lat.bmad - diff --git a/regression_tests/fringe_test/m b/regression_tests/fringe_test/m deleted file mode 100755 index 286b1e010e..0000000000 --- a/regression_tests/fringe_test/m +++ /dev/null @@ -1,5 +0,0 @@ -cd ../../bmad -mkd -j99 -cd ../regression_tests -mkd fringe_test-exe -cd fringe_test \ No newline at end of file diff --git a/regression_tests/fringe_test/r b/regression_tests/fringe_test/r deleted file mode 100755 index 22cc05ff19..0000000000 --- a/regression_tests/fringe_test/r +++ /dev/null @@ -1,3 +0,0 @@ -#rm output.now -../../debug/bin/fringe_test -cat output.now diff --git a/regression_tests/fringe_test/rt b/regression_tests/fringe_test/rt deleted file mode 100755 index 48cc0914bd..0000000000 --- a/regression_tests/fringe_test/rt +++ /dev/null @@ -1 +0,0 @@ -totalview ../../debug/bin/fringe_test diff --git a/regression_tests/hdf5_test/m b/regression_tests/hdf5_test/m deleted file mode 100755 index 591cb424ee..0000000000 --- a/regression_tests/hdf5_test/m +++ /dev/null @@ -1,5 +0,0 @@ -cd ../../bmad -mkd -j99 -cd ../regression_tests -mkd hdf5_test-exe -cd hdf5_test \ No newline at end of file diff --git a/regression_tests/hdf5_test/rt b/regression_tests/hdf5_test/rt deleted file mode 100755 index 850f5ee43c..0000000000 --- a/regression_tests/hdf5_test/rt +++ /dev/null @@ -1 +0,0 @@ -totalview ../../debug/bin/hdf5_test diff --git a/regression_tests/mat6_calc_method_test/m b/regression_tests/mat6_calc_method_test/m deleted file mode 100755 index 95ecce581d..0000000000 --- a/regression_tests/mat6_calc_method_test/m +++ /dev/null @@ -1,5 +0,0 @@ -cd ../../bmad -mkd -cd ../regression_tests -mkd mat6_calc_method_test-exe -cd mat6_calc_method_test \ No newline at end of file diff --git a/regression_tests/mat6_calc_method_test/r b/regression_tests/mat6_calc_method_test/r deleted file mode 100755 index e712253004..0000000000 --- a/regression_tests/mat6_calc_method_test/r +++ /dev/null @@ -1,3 +0,0 @@ -rm output.now -../../debug/bin/mat6_calc_method_test lat.bmad -cat output.now diff --git a/regression_tests/mat6_calc_method_test/rt b/regression_tests/mat6_calc_method_test/rt deleted file mode 100755 index f88425cc57..0000000000 --- a/regression_tests/mat6_calc_method_test/rt +++ /dev/null @@ -1,2 +0,0 @@ -totalview ../../debug/bin/mat6_calc_method_test -a lat.bmad - diff --git a/regression_tests/multipass_test/m b/regression_tests/multipass_test/m deleted file mode 100755 index 47a6434939..0000000000 --- a/regression_tests/multipass_test/m +++ /dev/null @@ -1,5 +0,0 @@ -cd ../../bmad -mkd -j99 -cd ../regression_tests -mkd multipass_test-exe -cd multipass_test \ No newline at end of file diff --git a/regression_tests/multipass_test/r b/regression_tests/multipass_test/r deleted file mode 100755 index 245cf58a89..0000000000 --- a/regression_tests/multipass_test/r +++ /dev/null @@ -1,3 +0,0 @@ -rm output.now -../../debug/bin/multipass_test lat.bmad -cat output.now diff --git a/regression_tests/multipass_test/rt b/regression_tests/multipass_test/rt deleted file mode 100755 index e90ac87abf..0000000000 --- a/regression_tests/multipass_test/rt +++ /dev/null @@ -1,2 +0,0 @@ -totalview ../../debug/bin/multipass_test -a lat.bmad - diff --git a/regression_tests/particle_species_test/m b/regression_tests/particle_species_test/m deleted file mode 100755 index eac1f7eef6..0000000000 --- a/regression_tests/particle_species_test/m +++ /dev/null @@ -1,3 +0,0 @@ -cd .. -mkd particle_species_test-exe -cd - diff --git a/regression_tests/particle_species_test/r b/regression_tests/particle_species_test/r deleted file mode 100755 index 0949fd266f..0000000000 --- a/regression_tests/particle_species_test/r +++ /dev/null @@ -1,3 +0,0 @@ -rm output.now -../../debug/bin/particle_species_test -#cat output.now diff --git a/regression_tests/particle_species_test/rt b/regression_tests/particle_species_test/rt deleted file mode 100755 index 2635bd3f3a..0000000000 --- a/regression_tests/particle_species_test/rt +++ /dev/null @@ -1,2 +0,0 @@ -totalview ../../debug/bin/particle_species_test - diff --git a/regression_tests/reverse_test/m b/regression_tests/reverse_test/m deleted file mode 100755 index cce0dd2842..0000000000 --- a/regression_tests/reverse_test/m +++ /dev/null @@ -1,3 +0,0 @@ -cd .. -mkd reverse_test-exe -cd reverse_test \ No newline at end of file diff --git a/regression_tests/reverse_test/r b/regression_tests/reverse_test/r deleted file mode 100755 index 5a2b740755..0000000000 --- a/regression_tests/reverse_test/r +++ /dev/null @@ -1,3 +0,0 @@ -rm output.now -../../debug/bin/reverse_test lat.bmad $1 -cat output.now diff --git a/regression_tests/reverse_test/rt b/regression_tests/reverse_test/rt deleted file mode 100755 index 6acc352109..0000000000 --- a/regression_tests/reverse_test/rt +++ /dev/null @@ -1 +0,0 @@ -totalview ../../debug/bin/reverse_test -a lat.bmad $1 diff --git a/regression_tests/slice_test/m b/regression_tests/slice_test/m deleted file mode 100755 index f6ef4acd80..0000000000 --- a/regression_tests/slice_test/m +++ /dev/null @@ -1,5 +0,0 @@ -cd ../../bmad/ -mkd -j99 -cd ../regression_tests -mkd slice_test-exe -cd slice_test \ No newline at end of file diff --git a/regression_tests/slice_test/r b/regression_tests/slice_test/r deleted file mode 100755 index 38915ca836..0000000000 --- a/regression_tests/slice_test/r +++ /dev/null @@ -1,2 +0,0 @@ -rm output.now -../../debug/bin/slice_test lat.bmad diff --git a/regression_tests/slice_test/rt b/regression_tests/slice_test/rt deleted file mode 100755 index 3ff149cbca..0000000000 --- a/regression_tests/slice_test/rt +++ /dev/null @@ -1 +0,0 @@ -totalview ../../debug/bin/slice_test -a lat.bmad diff --git a/regression_tests/spin_general_test/m b/regression_tests/spin_general_test/m deleted file mode 100755 index 3cfacd8157..0000000000 --- a/regression_tests/spin_general_test/m +++ /dev/null @@ -1,5 +0,0 @@ -cd ../../bmad -mkd -j99 -cd ../regression_tests -mkd spin_general_test-exe -cd spin_general_test diff --git a/regression_tests/spin_general_test/r b/regression_tests/spin_general_test/r deleted file mode 100755 index 1f41180e75..0000000000 --- a/regression_tests/spin_general_test/r +++ /dev/null @@ -1,3 +0,0 @@ -rm output.now -../../debug/bin/spin_general_test -cat output.now diff --git a/regression_tests/spin_general_test/rt b/regression_tests/spin_general_test/rt deleted file mode 100755 index f1c7863165..0000000000 --- a/regression_tests/spin_general_test/rt +++ /dev/null @@ -1,2 +0,0 @@ -totalview ../../debug/bin/spin_general_test - diff --git a/regression_tests/spin_map_test/m b/regression_tests/spin_map_test/m deleted file mode 100755 index 3c6632f188..0000000000 --- a/regression_tests/spin_map_test/m +++ /dev/null @@ -1,5 +0,0 @@ -cd ../../bmad -mkd -cd ../regression_tests/ -mkd spin_map_test-exe -cd spin_map_test \ No newline at end of file diff --git a/regression_tests/spin_map_test/r b/regression_tests/spin_map_test/r deleted file mode 100755 index 683bf89719..0000000000 --- a/regression_tests/spin_map_test/r +++ /dev/null @@ -1,3 +0,0 @@ -rm output.now -../../debug/bin/spin_map_test -cat output.now diff --git a/regression_tests/spin_map_test/rt b/regression_tests/spin_map_test/rt deleted file mode 100755 index bba7f49d62..0000000000 --- a/regression_tests/spin_map_test/rt +++ /dev/null @@ -1,2 +0,0 @@ -totalview ../../debug/bin/spin_map_test - diff --git a/regression_tests/synrad3d_test/rt b/regression_tests/synrad3d_test/rt deleted file mode 100755 index eba7693090..0000000000 --- a/regression_tests/synrad3d_test/rt +++ /dev/null @@ -1,2 +0,0 @@ -totalview ../../debug/bin/synrad3d_test - diff --git a/regression_tests/time_runge_kutta_test/m b/regression_tests/time_runge_kutta_test/m deleted file mode 100755 index a73e574c58..0000000000 --- a/regression_tests/time_runge_kutta_test/m +++ /dev/null @@ -1,3 +0,0 @@ -cd .. -mkd time_runge_kutta_test-exe -cd - diff --git a/regression_tests/time_runge_kutta_test/r b/regression_tests/time_runge_kutta_test/r deleted file mode 100755 index 66f3b44b1e..0000000000 --- a/regression_tests/time_runge_kutta_test/r +++ /dev/null @@ -1,3 +0,0 @@ -rm output.now -../../debug/bin/time_runge_kutta_test -cat output.now diff --git a/regression_tests/time_runge_kutta_test/rt b/regression_tests/time_runge_kutta_test/rt deleted file mode 100755 index 63cb25a72c..0000000000 --- a/regression_tests/time_runge_kutta_test/rt +++ /dev/null @@ -1,2 +0,0 @@ -totalview ../../debug/bin/time_runge_kutta_test - diff --git a/regression_tests/tracking_method_test/m b/regression_tests/tracking_method_test/m deleted file mode 100755 index 70913408bf..0000000000 --- a/regression_tests/tracking_method_test/m +++ /dev/null @@ -1,5 +0,0 @@ -cd ../../bmad -mkd -j99 -cd ../regression_tests -mkd tracking_method_test-exe -cd tracking_method_test \ No newline at end of file diff --git a/regression_tests/tracking_method_test/r b/regression_tests/tracking_method_test/r deleted file mode 100755 index dc93954f1b..0000000000 --- a/regression_tests/tracking_method_test/r +++ /dev/null @@ -1,3 +0,0 @@ -#rm output.now -../../debug/bin/tracking_method_test lat.bmad #1 -#cat output.now diff --git a/regression_tests/tracking_method_test/rt b/regression_tests/tracking_method_test/rt deleted file mode 100755 index dc863dc66b..0000000000 --- a/regression_tests/tracking_method_test/rt +++ /dev/null @@ -1 +0,0 @@ -totalview ../../debug/bin/tracking_method_test -a lat.bmad $1 From 2ddffa3ea648e5514751d8a59708b06efe4364c6 Mon Sep 17 00:00:00 2001 From: David Sagan Date: Mon, 18 Sep 2023 23:06:36 -0400 Subject: [PATCH 03/12] Added test script files. --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index ded4e939cd..cf8b06275c 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,10 @@ bmad-doc/cookbook_bmad_tao/doc/cookbook_bmad_tao.toc bmad-doc/tao_examples/csr_beam_tracking/csr_wake.dat regression_tests/*/output.now +regression_tests/*/lat.bmad +regression_tests/*/r +regression_tests/*/rt +regression_tests/*/m regression_tests/bbu_test/bunch_vec.txt regression_tests/bookkeeper_test/lat2.bmad regression_tests/envelope_ibs_test/emit_from_integrals.out From 8a115df1c01a9d05cfa4e487bd9922967befef74 Mon Sep 17 00:00:00 2001 From: "J. Scott Berg" Date: Tue, 19 Sep 2023 14:20:12 -0400 Subject: [PATCH 04/12] Only attempt to build subdirectories that are present Allows to link against system libraries instead --- util/Distribution_User_Utility_Wrapper | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/util/Distribution_User_Utility_Wrapper b/util/Distribution_User_Utility_Wrapper index a885024182..b416630a83 100755 --- a/util/Distribution_User_Utility_Wrapper +++ b/util/Distribution_User_Utility_Wrapper @@ -26,8 +26,11 @@ if ( [[ "${CONDA_BUILD}" ]] ) ; then [ "${ACC_PLOT_PACKAGE}" == "plplot" ] && DIRLIST=( plplot ${DIRLIST[*]} ) else # List of Project Directories - Order here matters! - DIRLIST=( ${ACC_PLOT_PACKAGE_DIR} hdf5 fftw lapack lapack95 gsl fgsl forest xraylib sim_utils bmad tao cpp_bmad_interface code_examples bsim util_programs lux regression_tests ) - + DIRLIST=(${ACC_PLOT_PACKAGE_DIR}) + for d in hdf5 fftw lapack lapack95 gsl fgsl forest xraylib sim_utils bmad tao cpp_bmad_interface code_examples bsim util_programs lux regression_tests + do + [ -d "$DIST_BASE_DIR/$d" ] && DIRLIST=(${DIRLIST[*]} $d) + done # Build OpenMPI, if requested [ "${ACC_ENABLE_MPI}" == "Y" ] && DIRLIST=( openmpi ${DIRLIST[*]} ) fi From 2e0825fb8948a50de611452f77dc94bf0ebd8f19 Mon Sep 17 00:00:00 2001 From: David Sagan Date: Tue, 19 Sep 2023 16:12:05 -0400 Subject: [PATCH 05/12] Tao version updated to Git. --- bmad/doc/macros.tex | 1 - tao/code/tao_show_this.f90 | 3 +-- tao/doc/command-list.tex | 4 ---- tao/version/tao_version_mod.f90 | 3 +-- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/bmad/doc/macros.tex b/bmad/doc/macros.tex index db5dd32b75..6540e1bcce 100644 --- a/bmad/doc/macros.tex +++ b/bmad/doc/macros.tex @@ -172,7 +172,6 @@ \newcommand{\Eq}[1]{{Eq.~(\protect\ref{#1})}} \newcommand{\Eqs}[1]{{Eqs.~(\protect\ref{#1})}} -\newcommand{\svn}{\vn{Subversion}\xspace} \newcommand{\sref}[1]{$\S$\ref{#1}} \newcommand{\Sref}[1]{Sec.~\sref{#1}} \newcommand{\cref}[1]{Chapter~\ref{#1}} diff --git a/tao/code/tao_show_this.f90 b/tao/code/tao_show_this.f90 index 3b3fd3294c..8c229716be 100644 --- a/tao/code/tao_show_this.f90 +++ b/tao/code/tao_show_this.f90 @@ -6079,8 +6079,7 @@ subroutine tao_show_this (what, result_id, lines, nl) case ('version') - nl=nl+1; lines(nl) = 'Version: ' // tao_svn_version - nl=nl+1; lines(nl) = 'Date: ' // tao_svn_date + nl=nl+1; lines(nl) = 'Date: ' // tao_version_date !---------------------------------------------------------------------- ! wake_elements diff --git a/tao/doc/command-list.tex b/tao/doc/command-list.tex index 1bb57a9c65..272ed2ddf9 100644 --- a/tao/doc/command-list.tex +++ b/tao/doc/command-list.tex @@ -3474,10 +3474,6 @@ \subsection{show version} defined. Generally, \vn{TAO_DIR} will be defined if the appropriate \bmad setup script has been run. For ``Bmad Distributions'', this is the same setup script used to setup a distribution. See your local \bmad guru for details.\footnote - { -For developers who use SVN to update their Distributions: The version string is not updated when -you update your Distribution (the version file is not in the SVN repository). - } %% show wake_elements -------------------------------------------------------------- diff --git a/tao/version/tao_version_mod.f90 b/tao/version/tao_version_mod.f90 index aadabe4a79..0b17baeef6 100644 --- a/tao/version/tao_version_mod.f90 +++ b/tao/version/tao_version_mod.f90 @@ -6,6 +6,5 @@ !- module tao_version_mod -character(*), parameter :: tao_svn_version = "54996" -character(*), parameter :: tao_svn_date = "2023-07-26 05:54:28" +character(*), parameter :: tao_version_date = "2023/09/18_23:06:36" end module From 66c34b36dbfc6a65e8f3290ffe3fe778b9d7f026 Mon Sep 17 00:00:00 2001 From: David Sagan Date: Wed, 20 Sep 2023 13:19:37 -0400 Subject: [PATCH 06/12] Update README.md --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index f75bcb130d..604792f774 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,14 @@ Bmad toolkit (library) for the simulation of charged particles and X-rays in acc **Bmad web site at: [https://www.classe.cornell.edu/bmad/](https://www.classe.cornell.edu/bmad/)** +## Bmad Setup + +Two possibilities for setting up Bmad: +- Use **conda-forge** (a Python package manager). Instructions at . + +Or if you want to compile Bmad directly: +- Download a **Release** (click on link on right hand side of this page) and follow the setup instructions at . + ## Contributing to Bmad: Pull Requests What is a Pull Request? A Pull Request (PR) is a mechanism for requesting that changes that you have made From 33d13c0c4aa22b230a737542974300f8514df56b Mon Sep 17 00:00:00 2001 From: David Sagan Date: Wed, 20 Sep 2023 14:32:15 -0400 Subject: [PATCH 07/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 604792f774..e99651b5c6 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Two possibilities for setting up Bmad: - Use **conda-forge** (a Python package manager). Instructions at . Or if you want to compile Bmad directly: -- Download a **Release** (click on link on right hand side of this page) and follow the setup instructions at . +- Download a **Release** (click on link on right hand side of this page and download the **bmad_dist.tar.gz** file [Ignore the *source code* files.]) and follow the setup instructions at . ## Contributing to Bmad: Pull Requests From ae2a62ba30b66e8d2b3d07dda5006bc3099961c4 Mon Sep 17 00:00:00 2001 From: David Sagan Date: Wed, 20 Sep 2023 19:25:00 -0400 Subject: [PATCH 08/12] Update release.yml Correct bmad_dist.tar.gz to use gzip and not use bzip2. --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6c456b1f4a..2bd1120629 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,7 +66,7 @@ jobs: - name: Assemble Tarball run: | mkdir -p ~/bmad_dist; - tar -cjf ~/bmad_dist/bmad_dist.tar.gz -C $GITHUB_WORKSPACE . + tar -czf ~/bmad_dist/bmad_dist.tar.gz -C $GITHUB_WORKSPACE . - name: Create Release - ${{ steps.release_name.outputs.version }} @@ -106,4 +106,4 @@ jobs: message_format: ':tada: *{workflow}* produced a new release of Bmad (${{ steps.release_name.outputs.version }}). Check it out at <${{ steps.create_release.outputs.html_url }}|{repo}>.' footer: '' env: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} \ No newline at end of file + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} From db191cae8ec8e5837df0893ac254a8cbae80ec0b Mon Sep 17 00:00:00 2001 From: David Sagan Date: Wed, 20 Sep 2023 20:28:51 -0400 Subject: [PATCH 09/12] Update release.yml Fix tar spaming problem. --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2bd1120629..2d6dd26fa5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,6 +66,8 @@ jobs: - name: Assemble Tarball run: | mkdir -p ~/bmad_dist; + mkdir ~/bmad_dist/${{ steps.release_name.outputs.version }}; + mv ~/bmad_dist/* ~/bmad_dist/${{ steps.release_name.outputs.version }}/; tar -czf ~/bmad_dist/bmad_dist.tar.gz -C $GITHUB_WORKSPACE . From 4c750915fe0ba889e7918f94e0cf00831ef2b1e9 Mon Sep 17 00:00:00 2001 From: David Sagan Date: Wed, 20 Sep 2023 20:43:43 -0400 Subject: [PATCH 10/12] Update release.yml Correct last checkin --- .github/workflows/release.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2d6dd26fa5..612b4823a2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,6 +58,7 @@ jobs: - name: Extract dependencies run: | + echo "GITHUB_WORKSPACE: $GITHUB_WORKSPACE" for dep in ~/external_deps/*.tar.gz; \ do \ tar xzvf $dep -C $GITHUB_WORKSPACE/; \ @@ -66,9 +67,9 @@ jobs: - name: Assemble Tarball run: | mkdir -p ~/bmad_dist; - mkdir ~/bmad_dist/${{ steps.release_name.outputs.version }}; - mv ~/bmad_dist/* ~/bmad_dist/${{ steps.release_name.outputs.version }}/; - tar -czf ~/bmad_dist/bmad_dist.tar.gz -C $GITHUB_WORKSPACE . + mkdir ~/bmad_dist_${{ steps.release_name.outputs.version }}; + mv $GITHUB_WORKSPACE ~/bmad_dist_${{ steps.release_name.outputs.version }}/; + tar -czf ~/bmad_dist/bmad_dist.tar.gz ~/bmad_dist_${{ steps.release_name.outputs.version }} - name: Create Release - ${{ steps.release_name.outputs.version }} From 82b39dc9feae2381225be2152af1f07d4eb37617 Mon Sep 17 00:00:00 2001 From: David Sagan Date: Wed, 20 Sep 2023 20:59:29 -0400 Subject: [PATCH 11/12] Update release.yml Try again. --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 612b4823a2..2318880bd9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -69,7 +69,7 @@ jobs: mkdir -p ~/bmad_dist; mkdir ~/bmad_dist_${{ steps.release_name.outputs.version }}; mv $GITHUB_WORKSPACE ~/bmad_dist_${{ steps.release_name.outputs.version }}/; - tar -czf ~/bmad_dist/bmad_dist.tar.gz ~/bmad_dist_${{ steps.release_name.outputs.version }} + tar -czf ~/bmad_dist/bmad_dist.tar.gz -C ~/ bmad_dist_${{ steps.release_name.outputs.version }} - name: Create Release - ${{ steps.release_name.outputs.version }} From ce23a3506a257b8a398adee985e4522afb54ea82 Mon Sep 17 00:00:00 2001 From: David Sagan Date: Wed, 20 Sep 2023 21:57:51 -0400 Subject: [PATCH 12/12] Update release.yml Try again. --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2318880bd9..4f0b9d7d62 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -68,7 +68,7 @@ jobs: run: | mkdir -p ~/bmad_dist; mkdir ~/bmad_dist_${{ steps.release_name.outputs.version }}; - mv $GITHUB_WORKSPACE ~/bmad_dist_${{ steps.release_name.outputs.version }}/; + cp -r $GITHUB_WORKSPACE ~/bmad_dist_${{ steps.release_name.outputs.version }}/; tar -czf ~/bmad_dist/bmad_dist.tar.gz -C ~/ bmad_dist_${{ steps.release_name.outputs.version }}