From 595da2daf56e114f522f7b80efebe34b41a37a1a Mon Sep 17 00:00:00 2001 From: mattsignorelli Date: Tue, 26 Nov 2024 17:44:15 -0500 Subject: [PATCH] increase file name size to 400 --- .vscode/settings.json | 3 +++ bmad/output/write_bmad_lattice_file.f90 | 2 +- bmad/parsing/bmad_parser_mod.f90 | 2 +- bsim/modules/lt_tracking_mod.f90 | 6 +++--- sim_utils/file/directory_mod.f90 | 2 +- tao/code/tao_init_data_mod.f90 | 2 +- tao/code/tao_init_mod.f90 | 6 +++--- tao/code/tao_init_variables_mod.f90 | 2 +- tao/code/tao_pipe_cmd.f90 | 2 +- tao/code/tao_show_cmd.f90 | 5 +++-- tao/code/tao_show_this.f90 | 2 +- tao/code/tao_top10_mod.f90 | 2 +- tao/code/tao_write_cmd.f90 | 2 +- 13 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000..355279822c --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "cmake.sourceDirectory": "/Users/mgs255/Software/bmad/bmad-ecosystem/bmad" +} \ No newline at end of file diff --git a/bmad/output/write_bmad_lattice_file.f90 b/bmad/output/write_bmad_lattice_file.f90 index b43aadc000..58ba7fe0e8 100644 --- a/bmad/output/write_bmad_lattice_file.f90 +++ b/bmad/output/write_bmad_lattice_file.f90 @@ -73,7 +73,7 @@ subroutine write_bmad_lattice_file (bmad_file, lat, err, output_form, orbit0) character(*) bmad_file character(4000) line character(2000) line2 -character(200) file_name, path, basename, fname +character(400) file_name, path, basename, fname character(120), allocatable :: list(:) character(60) alias character(40) name, look_for, attrib_name diff --git a/bmad/parsing/bmad_parser_mod.f90 b/bmad/parsing/bmad_parser_mod.f90 index f3880e03aa..8dc60c21d9 100644 --- a/bmad/parsing/bmad_parser_mod.f90 +++ b/bmad/parsing/bmad_parser_mod.f90 @@ -322,7 +322,7 @@ subroutine parser_file_stack (how, file_name_in, finished, err, open_file) integer, pointer :: i_level character(*) how character(*), optional :: file_name_in -character(200) file_name, basename, file_name2 +character(400) file_name, basename, file_name2 logical, optional :: finished, err, open_file logical found_it, is_relative, valid, err_flag diff --git a/bsim/modules/lt_tracking_mod.f90 b/bsim/modules/lt_tracking_mod.f90 index d61f0a6e51..cb6764ec75 100644 --- a/bsim/modules/lt_tracking_mod.f90 +++ b/bsim/modules/lt_tracking_mod.f90 @@ -717,7 +717,7 @@ function ltt_per_particle_file_name (lttp, ix_bunch, ix_particle, n_bunch, n_par type (ltt_params_struct) lttp integer ix_bunch, ix_particle, n_bunch, n_particle, np, ih, ix -character(200) file_name +character(400) file_name character(16) fmt, str ! @@ -1577,7 +1577,7 @@ subroutine ltt_run_beam_mode (lttp, ltt_com, ix_start_turn, ix_end_turn, beam) logical err_flag character(16) prefix_str -character(200) file_name +character(400) file_name character(*), parameter :: r_name = 'ltt_run_beam_mode' ! Init @@ -1947,7 +1947,7 @@ subroutine write_this_data (lttp, ltt_com, who, base_name, bunch, i_turn, ix_bun integer i_turn, ix_bunch, n_bunch, j, ix, iu, ip logical wrote_header, error character(*) who, base_name -character(200) file_name +character(400) file_name character(40) str, fmt ! diff --git a/sim_utils/file/directory_mod.f90 b/sim_utils/file/directory_mod.f90 index a30904d1d5..87a9bb69fb 100644 --- a/sim_utils/file/directory_mod.f90 +++ b/sim_utils/file/directory_mod.f90 @@ -28,7 +28,7 @@ function dir_list (dir_name, file_list) result (ok) character(*) dir_name character(*), allocatable :: file_list(:) -character(200) file_name +character(400) file_name integer i, n logical ok diff --git a/tao/code/tao_init_data_mod.f90 b/tao/code/tao_init_data_mod.f90 index 5066f75740..e25bffada1 100644 --- a/tao/code/tao_init_data_mod.f90 +++ b/tao/code/tao_init_data_mod.f90 @@ -42,7 +42,7 @@ subroutine tao_init_data (data_file) character(*) data_file character(40) :: r_name = 'tao_init_data' -character(200) file_name +character(400) file_name character(40) name, universe, d_typ, use_same_lat_eles_as character(40) default_merit_type, default_data_source, def_merit_type, def_data_source character(200) search_for_lat_eles diff --git a/tao/code/tao_init_mod.f90 b/tao/code/tao_init_mod.f90 index 1930f8c39d..39641e1441 100644 --- a/tao/code/tao_init_mod.f90 +++ b/tao/code/tao_init_mod.f90 @@ -33,7 +33,7 @@ subroutine tao_init_global (init_file) character(*) init_file character(*), parameter :: r_name = 'tao_init_global' -character(200) file_name +character(400) file_name character(40) name, universe character(100) line @@ -162,7 +162,7 @@ subroutine tao_init_beams (init_file) character(*) init_file character(40) track_start, track_end, beam_track_start, beam_track_end -character(200) file_name +character(400) file_name character(200) beam0_file, beam_init_file_name, beam_position0_file ! Very old style syntax character(200) beam_saved_at, beam_dump_at, beam_dump_file character(200) saved_at, dump_at, dump_file @@ -424,7 +424,7 @@ subroutine tao_init_dynamic_aperture(init_file) integer :: ix_universe, ios, iu, i, j, n_pz, n_da character(*) init_file -character(200) file_name +character(400) file_name character(*), parameter :: r_name = 'tao_init_dynamic_aperture' namelist / tao_dynamic_aperture / ix_universe, da_param, pz, a_emit, b_emit, ellipse_scale diff --git a/tao/code/tao_init_variables_mod.f90 b/tao/code/tao_init_variables_mod.f90 index 0cfa08e146..567ca6b721 100644 --- a/tao/code/tao_init_variables_mod.f90 +++ b/tao/code/tao_init_variables_mod.f90 @@ -47,7 +47,7 @@ subroutine tao_init_variables (var_file) character(40) name, universe, default_universe character(40) default_merit_type, default_attribute character(40) use_same_lat_eles_as -character(200) file_name +character(400) file_name character(200) line, search_for_lat_eles logical default_key_bound, default_good_user diff --git a/tao/code/tao_pipe_cmd.f90 b/tao/code/tao_pipe_cmd.f90 index 359f85383c..2355e94f11 100644 --- a/tao/code/tao_pipe_cmd.f90 +++ b/tao/code/tao_pipe_cmd.f90 @@ -184,7 +184,7 @@ subroutine tao_pipe_cmd (input_str) character(n_char_show), pointer :: li_ptr(:) character(n_char_show) li2 character(300), allocatable :: name_arr(:) -character(200) file_name, all_who, tail_str +character(400) file_name, all_who, tail_str character(40) imt, jmt, rmt, lmt, amt, amt2, iamt, vamt, rmt2, ramt, cmt, label_name character(40) who, max_loc, ele_name, name1(40), name2(40), a_name, name, attrib_name, command character(40), allocatable :: str_arr(:) diff --git a/tao/code/tao_show_cmd.f90 b/tao/code/tao_show_cmd.f90 index a616b5ff3a..e7acfd2394 100644 --- a/tao/code/tao_show_cmd.f90 +++ b/tao/code/tao_show_cmd.f90 @@ -19,7 +19,7 @@ subroutine tao_show_cmd (what) integer :: n_write_file = 0 ! used for indexing 'show write' files character(*) what -character(200) file_name, fname +character(500) file_name, fname character(100) result_id character(20) switch character(len(what)) what2 @@ -50,6 +50,7 @@ subroutine tao_show_cmd (what) err_out = .false. case ('-append', '-write') + call tao_next_word(what2, file_name) ix = index(file_name, '*') @@ -57,7 +58,7 @@ subroutine tao_show_cmd (what) n_write_file = n_write_file + 1 write (file_name, '(a, i3.3, a)') file_name(1:ix-1), n_write_file, trim(file_name(ix+1:)) endif - + print *, file_name iu = lunget() call fullfilename(file_name, fname, valid) if (.not. valid) then diff --git a/tao/code/tao_show_this.f90 b/tao/code/tao_show_this.f90 index b94328e61d..3fa0a5f21e 100644 --- a/tao/code/tao_show_this.f90 +++ b/tao/code/tao_show_this.f90 @@ -172,7 +172,7 @@ subroutine tao_show_this (what, result_id, lines, nl) character(40) replacement_for_blank, component, s_fmt character(60) aname, myname character(100) :: word1, word2, fmt, fmt2, fmt3, switch, why_invalid -character(200) header, str, attrib0, file_name, name, excite_zero(3), veto +character(400) header, str, attrib0, file_name, name, excite_zero(3), veto character(200), allocatable :: alloc_lines(:) character(400) attrib_list(20), attrib, sub_name diff --git a/tao/code/tao_top10_mod.f90 b/tao/code/tao_top10_mod.f90 index 59d0d92987..4085dc18d9 100644 --- a/tao/code/tao_top10_mod.f90 +++ b/tao/code/tao_top10_mod.f90 @@ -539,7 +539,7 @@ subroutine tao_var_write (out_file, show_good_opt_only, tao_format) integer i, j, iu, iu2, ix, ios, ix_hash character(*) out_file -character(200) file_name, file_name2 +character(400) file_name, file_name2 character(20) :: r_name = 'tao_var_write' character(200) str(1) diff --git a/tao/code/tao_write_cmd.f90 b/tao/code/tao_write_cmd.f90 index d224ff2c68..3384f7835d 100644 --- a/tao/code/tao_write_cmd.f90 +++ b/tao/code/tao_write_cmd.f90 @@ -53,7 +53,7 @@ subroutine tao_write_cmd (what) character(40), allocatable :: z(:) character(100) str character(200) line, switch, header1, header2, aname -character(200) file_name0, file_name, what2 +character(400) file_name0, file_name, what2 character(200) :: word(12) character(*), parameter :: r_name = 'tao_write_cmd'