diff -Naur -X nopatch 1.24/CHANGES 1.24p1/CHANGES --- 1.24/CHANGES 2003-01-30 16:30:20.000000000 +0100 +++ 1.24p1/CHANGES 2003-10-03 09:37:26.000000000 +0200 @@ -1,4 +1,6 @@ version 1.24 + 2003 Oct 10 + Patch: workaround for Intel compiler problem with 'TC' type 2003 Jan 31 A few more fixes and workarounds (Intel and Lahey compiler) 2003 Jan 15 diff -Naur -X nopatch 1.24/whizard-src/analyze.f90 1.24p1/whizard-src/analyze.f90 --- 1.24/whizard-src/analyze.f90 2003-01-30 16:35:33.000000000 +0100 +++ 1.24p1/whizard-src/analyze.f90 2003-10-03 09:42:53.000000000 +0200 @@ -28,6 +28,7 @@ use limits, only: ANALYZE_MAX, HISTOGRAMS_MAX use limits, only: HELICITIES_MAX, FLAVORS_MAX, COLOR_FLOWS_MAX use limits, only: FILENAME_LEN, BUFFER_SIZE + use limits, only: TC use diagnostics, only: msg_level, msg_buffer use diagnostics, only: msg_message, msg_warning, msg_error use files, only: file_exists_else_default, concat @@ -35,7 +36,6 @@ use lorentz use particles use events - use decay_trees, only: TC use file_utils !NODEP! use parser ! use particles, only: particle_tex_form diff -Naur -X nopatch 1.24/whizard-src/cascades.f90 1.24p1/whizard-src/cascades.f90 --- 1.24/whizard-src/cascades.f90 2003-01-30 16:35:32.000000000 +0100 +++ 1.24p1/whizard-src/cascades.f90 2003-10-03 09:42:52.000000000 +0200 @@ -25,11 +25,12 @@ use kinds, only: default !NODEP! use file_utils !NODEP! use limits, only: BUFFER_SIZE, MAX_CASCADES, FILENAME_LEN + use limits, only: TC use files, only: file_exists_else_default use parser use particles use events, only: write_process - use decay_trees, only: TC, decay_level + use decay_trees, only: decay_level use diagnostics, only: msg_buffer, msg_message, msg_error, msg_fatal use parameters, only: parameter_set !NODEP! diff -Naur -X nopatch 1.24/whizard-src/cuts.f90 1.24p1/whizard-src/cuts.f90 --- 1.24/whizard-src/cuts.f90 2003-01-30 16:35:31.000000000 +0100 +++ 1.24p1/whizard-src/cuts.f90 2003-10-03 09:42:52.000000000 +0200 @@ -25,6 +25,7 @@ use kinds, only: default !NODEP! use limits, only: CUT_WINDOWS_MAX, CUTS_MAX, CUT_MODE_STRLEN, CUT_TEX_STRLEN use limits, only: FILENAME_LEN + use limits, only: TC use mpi90, only: mpi90_broadcast !NODEP! use files, only: concat use user, only: user_cut => cut @@ -32,7 +33,6 @@ use lorentz use particles use events - use decay_trees, only: TC use file_utils !NODEP! use diagnostics, only: msg_buffer use diagnostics, only: msg_result, msg_message, msg_warning, msg_error diff -Naur -X nopatch 1.24/whizard-src/decay_forests.f90 1.24p1/whizard-src/decay_forests.f90 --- 1.24/whizard-src/decay_forests.f90 2003-01-30 16:35:31.000000000 +0100 +++ 1.24p1/whizard-src/decay_forests.f90 2003-10-03 09:42:52.000000000 +0200 @@ -25,10 +25,10 @@ use kinds, only: default !NODEP! use limits, only: MAX_EXTERNAL, MAX_CHANNELS use limits, only: BUFFER_SIZE, DEFAULT_FILENAME, FILENAME_LEN + use limits, only: TC use mpi90, only: mpi90_broadcast !NODEP! use files, only: concat use particles - use decay_trees, decay_tree_TC => TC use mappings use file_utils !NODEP! use parser @@ -39,12 +39,13 @@ use permutations, only: component, permutation_ok use diagnostics, only: msg_buffer use diagnostics, only: msg_bug, msg_fatal, msg_error, msg_message + use decay_trees use parameters, only: parameter_set !NODEP! implicit none private - integer, parameter, public :: TC = decay_tree_TC + type, public :: decay_forest integer :: n_externals, n_internals, n_in, n_out diff -Naur -X nopatch 1.24/whizard-src/decay_trees.f90 1.24p1/whizard-src/decay_trees.f90 --- 1.24/whizard-src/decay_trees.f90 2003-01-30 16:35:36.000000000 +0100 +++ 1.24p1/whizard-src/decay_trees.f90 2003-10-03 09:42:55.000000000 +0200 @@ -22,14 +22,14 @@ module decay_trees - use limits, only: MAX_EXTERNAL + use limits, only: MAX_EXTERNAL, TC use diagnostics, only: msg_fatal use permutations, only: permutation, permute, size implicit none private - integer, parameter, public :: TC = selected_int_kind(MAX_EXTERNAL) + type, public :: decay_tree integer :: n_branches, n_externals, n_in diff -Naur -X nopatch 1.24/whizard-src/limits.f90 1.24p1/whizard-src/limits.f90 --- 1.24/whizard-src/limits.f90 2003-01-30 16:35:33.000000000 +0100 +++ 1.24p1/whizard-src/limits.f90 2003-10-03 09:42:53.000000000 +0200 @@ -39,6 +39,7 @@ real(kind=default), parameter, public :: KIREPS = 1E-6_default integer, parameter, public :: MAX_CASCADES = 99999 integer, parameter, public :: MAX_EXTERNAL = 8 + integer, parameter, public :: TC = selected_int_kind(MAX_EXTERNAL) real(kind=default), parameter, public :: & & CT_MAPPING_DEFAULT_SCALE = 1._default integer, parameter, public :: CUT_WINDOWS_MAX = 4 diff -Naur -X nopatch 1.24/whizard-src/mappings.f90 1.24p1/whizard-src/mappings.f90 --- 1.24/whizard-src/mappings.f90 2003-01-30 16:35:31.000000000 +0100 +++ 1.24p1/whizard-src/mappings.f90 2003-10-03 09:42:52.000000000 +0200 @@ -23,13 +23,12 @@ module mappings use kinds, only: default !NODEP! - use limits, only: CT_MAPPING_DEFAULT_SCALE + use limits, only: CT_MAPPING_DEFAULT_SCALE, TC use diagnostics, only: msg_fatal use constants, only: pi use parameters, only: parameter_set !NODEP! use parameters, only: write !NODEP! use particles - use decay_trees, only: TC use divisions !NODEP! implicit none diff -Naur -X nopatch 1.24/whizard-src/phase_space.f90 1.24p1/whizard-src/phase_space.f90 --- 1.24/whizard-src/phase_space.f90 2003-01-30 16:35:31.000000000 +0100 +++ 1.24p1/whizard-src/phase_space.f90 2003-10-03 09:42:52.000000000 +0200 @@ -23,6 +23,7 @@ module phase_space use kinds, only: default !NODEP! + use limits, only: TC use lorentz use constants use particles diff -Naur -X nopatch 1.24/whizard.nw 1.24p1/whizard.nw --- 1.24/whizard.nw 2003-01-30 16:34:01.000000000 +0100 +++ 1.24p1/whizard.nw 2003-10-03 09:40:57.000000000 +0200 @@ -8622,11 +8622,12 @@ <> use file_utils !NODEP! use limits, only: BUFFER_SIZE, MAX_CASCADES, FILENAME_LEN + use limits, only: TC use files, only: file_exists_else_default use parser use particles use events, only: write_process - use decay_trees, only: TC, decay_level + use decay_trees, only: decay_level use diagnostics, only: msg_buffer, msg_message, msg_error, msg_fatal <> @@ -10768,7 +10769,7 @@ module decay_trees - use limits, only: MAX_EXTERNAL + use limits, only: MAX_EXTERNAL, TC use diagnostics, only: msg_fatal use permutations, only: permutation, permute, size @@ -10889,7 +10890,7 @@ integer, parameter, public :: MAX_EXTERNAL = 8 @ %def MAX_EXTERNAL @ The code values take their own integer kind: -<>= +<>= integer, parameter, public :: TC = selected_int_kind(MAX_EXTERNAL) @ %def TC @ Permute bits in a tree binary code. If no permutation is given, @@ -11287,13 +11288,12 @@ module mappings <> - use limits, only: CT_MAPPING_DEFAULT_SCALE + use limits, only: CT_MAPPING_DEFAULT_SCALE, TC use diagnostics, only: msg_fatal use constants, only: pi <> use parameters, only: write !NODEP! use particles - use decay_trees, only: TC use divisions !NODEP! <> @@ -11753,6 +11753,7 @@ <> use limits, only: CUT_WINDOWS_MAX, CUTS_MAX, CUT_MODE_STRLEN, CUT_TEX_STRLEN use limits, only: FILENAME_LEN + use limits, only: TC use mpi90, only: mpi90_broadcast !NODEP! use files, only: concat use user, only: user_cut => cut @@ -11760,7 +11761,6 @@ use lorentz use particles use events - use decay_trees, only: TC use file_utils !NODEP! use diagnostics, only: msg_buffer use diagnostics, only: msg_result, msg_message, msg_warning, msg_error @@ -12919,10 +12919,10 @@ <> use limits, only: MAX_EXTERNAL, MAX_CHANNELS use limits, only: BUFFER_SIZE, DEFAULT_FILENAME, FILENAME_LEN + use limits, only: TC use mpi90, only: mpi90_broadcast !NODEP! use files, only: concat use particles - use decay_trees, decay_tree_TC => TC use mappings use file_utils !NODEP! use parser @@ -12933,6 +12933,7 @@ use permutations, only: component, permutation_ok use diagnostics, only: msg_buffer use diagnostics, only: msg_bug, msg_fatal, msg_error, msg_message + use decay_trees <> <> @@ -12951,12 +12952,6 @@ end module decay_forests @ %def decay_forests -@ -If we re-export this one, other modules do not need to import -[[decay_trees]]. -<>= - integer, parameter, public :: TC = decay_tree_TC -@ %def TC @ Unfortunately, this number has to be hardcoded. There is no limitation here apart from I/O. <>= @@ -13785,6 +13780,7 @@ module phase_space <> + use limits, only: TC use lorentz use constants use particles @@ -21354,6 +21350,7 @@ use limits, only: ANALYZE_MAX, HISTOGRAMS_MAX use limits, only: HELICITIES_MAX, FLAVORS_MAX, COLOR_FLOWS_MAX use limits, only: FILENAME_LEN, BUFFER_SIZE + use limits, only: TC use diagnostics, only: msg_level, msg_buffer use diagnostics, only: msg_message, msg_warning, msg_error use files, only: file_exists_else_default, concat @@ -21361,7 +21358,6 @@ use lorentz use particles use events - use decay_trees, only: TC use file_utils !NODEP! use parser ! use particles, only: particle_tex_form