Merge branch 'main' into allow-no-utilities

bmad-sim · Sep 21, 2023 · 7a9e906 · 7a9e906
2 parents 5c81031 + ce23a35
commit 7a9e906
Show file tree

Hide file tree

Showing 48 changed files with 70 additions and 152 deletions.
diff --git 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,7 +67,9 @@ jobs:
  - name: Assemble Tarball
  run: |
  mkdir -p ~/bmad_dist;
- tar -cjf ~/bmad_dist/bmad_dist.tar.gz -C $GITHUB_WORKSPACE .
+ mkdir ~/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 }}
 
 
  - name: Create Release - ${{ steps.release_name.outputs.version }}
@@ -106,4 +109,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 }}
+ SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
diff --git 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,45 @@ 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/*/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
+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
diff --git 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 <https://wiki.classe.cornell.edu/ACC/ACL/OffsiteDoc>. 
+
+Or if you want to compile Bmad directly:
+- 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 <https://wiki.classe.cornell.edu/ACC/ACL/OffsiteDoc>.
+
 ## 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 

diff --git 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/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))
 
 !
 

diff --git a/regression_tests/bookkeeper_test/m b/regression_tests/bookkeeper_test/m
diff --git a/regression_tests/bookkeeper_test/r b/regression_tests/bookkeeper_test/r
diff --git a/regression_tests/bookkeeper_test/rt b/regression_tests/bookkeeper_test/rt
diff --git a/regression_tests/em_field_test/m b/regression_tests/em_field_test/m
diff --git a/regression_tests/em_field_test/r b/regression_tests/em_field_test/r
diff --git a/regression_tests/em_field_test/rt b/regression_tests/em_field_test/rt
diff --git a/regression_tests/fringe_test/m b/regression_tests/fringe_test/m
diff --git a/regression_tests/fringe_test/r b/regression_tests/fringe_test/r
diff --git a/regression_tests/fringe_test/rt b/regression_tests/fringe_test/rt
diff --git a/regression_tests/hdf5_test/m b/regression_tests/hdf5_test/m
diff --git a/regression_tests/hdf5_test/rt b/regression_tests/hdf5_test/rt
diff --git a/regression_tests/mat6_calc_method_test/m b/regression_tests/mat6_calc_method_test/m
diff --git a/regression_tests/mat6_calc_method_test/r b/regression_tests/mat6_calc_method_test/r
diff --git a/regression_tests/mat6_calc_method_test/rt b/regression_tests/mat6_calc_method_test/rt
diff --git a/regression_tests/multipass_test/m b/regression_tests/multipass_test/m
diff --git a/regression_tests/multipass_test/r b/regression_tests/multipass_test/r
diff --git a/regression_tests/multipass_test/rt b/regression_tests/multipass_test/rt
diff --git a/regression_tests/particle_species_test/m b/regression_tests/particle_species_test/m
diff --git a/regression_tests/particle_species_test/r b/regression_tests/particle_species_test/r
diff --git a/regression_tests/particle_species_test/rt b/regression_tests/particle_species_test/rt
diff --git a/regression_tests/reverse_test/m b/regression_tests/reverse_test/m
diff --git a/regression_tests/reverse_test/r b/regression_tests/reverse_test/r
diff --git a/regression_tests/reverse_test/rt b/regression_tests/reverse_test/rt
diff --git a/regression_tests/slice_test/m b/regression_tests/slice_test/m
diff --git a/regression_tests/slice_test/r b/regression_tests/slice_test/r
diff --git a/regression_tests/slice_test/rt b/regression_tests/slice_test/rt
diff --git a/regression_tests/spin_general_test/m b/regression_tests/spin_general_test/m
diff --git a/regression_tests/spin_general_test/r b/regression_tests/spin_general_test/r
diff --git a/regression_tests/spin_general_test/rt b/regression_tests/spin_general_test/rt
diff --git a/regression_tests/spin_map_test/m b/regression_tests/spin_map_test/m
diff --git a/regression_tests/spin_map_test/r b/regression_tests/spin_map_test/r
diff --git a/regression_tests/spin_map_test/rt b/regression_tests/spin_map_test/rt
diff --git a/regression_tests/synrad3d_test/rt b/regression_tests/synrad3d_test/rt
diff --git a/regression_tests/time_runge_kutta_test/m b/regression_tests/time_runge_kutta_test/m
diff --git a/regression_tests/time_runge_kutta_test/r b/regression_tests/time_runge_kutta_test/r
diff --git a/regression_tests/time_runge_kutta_test/rt b/regression_tests/time_runge_kutta_test/rt
diff --git a/regression_tests/tracking_method_test/m b/regression_tests/tracking_method_test/m
diff --git a/regression_tests/tracking_method_test/r b/regression_tests/tracking_method_test/r
diff --git a/regression_tests/tracking_method_test/rt b/regression_tests/tracking_method_test/rt
diff --git 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
@@ -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
@@ -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
diff --git 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