Skip to content

Commit

Permalink
[vecsizeFIX] partial revert of MR mg5amcnlo#23 (see madgraph5/madgrap…
Browse files Browse the repository at this point in the history
…h4gpu#629)

Revert "[vecsize] add comments to all 'include vector.inc' as agreed with Olivier"
This reverts commit 4e9a0d7.
  • Loading branch information
valassi committed Apr 11, 2023
1 parent 8512c16 commit 02c1451
Show file tree
Hide file tree
Showing 13 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Template/LO/Source/setrun.f
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ subroutine setrun
include 'PDF/pdf.inc'
include 'run.inc'
include 'alfas.inc'
include 'vector.inc' ! needed by coupl.inc (defines VECSIZE_MEMMAX)
include 'vector.inc'
include 'MODEL/coupl.inc'

double precision D
Expand Down
2 changes: 1 addition & 1 deletion Template/LO/SubProcesses/genps.f
Original file line number Diff line number Diff line change
Expand Up @@ -1772,7 +1772,7 @@ double precision function get_channel_cut(p, config)
include 'nexternal.inc'
include 'genps.inc'
include 'maxamps.inc'
include 'vector.inc' ! needed by coupl.inc (defines VECSIZE_MEMMAX)
include 'vector.inc'
include 'coupl.inc'
c include 'run.inc'
Expand Down
2 changes: 1 addition & 1 deletion Template/LO/SubProcesses/idenparts.f
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ subroutine idenparts(iden_part,itree,sprop,forcebw,prwidth)
c
c Global
c
include 'vector.inc' ! needed by coupl.inc (defines VECSIZE_MEMMAX)
include 'vector.inc'
include 'coupl.inc' !Mass and width info
double precision stot
common/to_stot/stot
Expand Down
4 changes: 2 additions & 2 deletions Template/LO/SubProcesses/myamp.f
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ logical function cut_bw(p)
logical OnBW(-nexternal:0) !Set if event is on B.W.
common/to_BWEvents/ OnBW

include 'vector.inc' ! needed by coupl.inc (defines VECSIZE_MEMMAX)
include 'vector.inc'
include 'coupl.inc'

integer idup(nexternal,maxproc,maxsproc)
Expand Down Expand Up @@ -286,7 +286,7 @@ subroutine set_peaks
double precision stot,m1,m2
common/to_stot/stot,m1,m2

include 'vector.inc' ! needed by coupl.inc (defines VECSIZE_MEMMAX)
include 'vector.inc'
include 'coupl.inc'
include 'cuts.inc'
C
Expand Down
4 changes: 2 additions & 2 deletions Template/LO/SubProcesses/reweight.f
Original file line number Diff line number Diff line change
Expand Up @@ -1790,7 +1790,7 @@ subroutine update_scale_coupling(p, wgt)
include 'genps.inc'
include 'run.inc'
include 'nexternal.inc'
include 'vector.inc' ! needed by coupl.inc (defines VECSIZE_MEMMAX)
include 'vector.inc'
include 'coupl.inc'
C include 'maxparticles.inc'

Expand All @@ -1817,7 +1817,7 @@ subroutine update_scale_coupling_vec(all_p, all_wgt,all_q2fact, VECSIZE_USED)
include 'genps.inc'
include 'run.inc'
include 'nexternal.inc'
include 'vector.inc' ! needed by coupl.inc (defines VECSIZE_MEMMAX)
include 'vector.inc'
include 'coupl.inc'
C include 'maxparticles.inc'

Expand Down
2 changes: 1 addition & 1 deletion Template/LO/SubProcesses/setcuts.f
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SUBROUTINE SETCUTS
c
include 'genps.inc'
include 'nexternal.inc'
include 'vector.inc' ! needed by coupl.inc (defines VECSIZE_MEMMAX)
include 'vector.inc'
include 'coupl.inc'
include 'run.inc'
include 'cuts.inc'
Expand Down
4 changes: 2 additions & 2 deletions Template/LO/SubProcesses/setscales.f
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ subroutine set_ren_scale(P,rscale)
c
include 'genps.inc'
include 'nexternal.inc'
include 'vector.inc' ! needed by coupl.inc (defines VECSIZE_MEMMAX)
include 'vector.inc'
include 'coupl.inc'

integer i
Expand Down Expand Up @@ -106,7 +106,7 @@ subroutine set_fac_scale(P,q2factorization)
c
include 'genps.inc'
include 'nexternal.inc'
include 'vector.inc' ! needed by coupl.inc (defines VECSIZE_MEMMAX)
include 'vector.inc'
include 'coupl.inc'
include 'run.inc'
c--masses and poles
Expand Down
2 changes: 1 addition & 1 deletion Template/LO/SubProcesses/unwgt.f
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ subroutine Zoom_Event(wgt,p)
double precision xzoomfact
common/to_zoom/ xzoomfact
include 'run.inc'
include 'vector.inc' ! needed by coupl.inc (defines VECSIZE_MEMMAX)
include 'vector.inc'
include 'coupl.inc'
c
c DATA
Expand Down
6 changes: 3 additions & 3 deletions madgraph/iolibs/template_files/auto_dsig_v4.inc
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ C Keep track of whether cuts already calculated for this event
LOGICAL cutsdone,cutspassed
COMMON/TO_CUTSDONE/cutsdone,cutspassed
%(define_subdiag_lines)s
include '../../Source/vector.inc' ! needed to define VECSIZE_MEMMAX
include '../../Source/vector.inc'
include 'run.inc'
C Common blocks
CHARACTER*7 PDLABEL,EPA_LABEL
Expand Down Expand Up @@ -205,7 +205,7 @@ C ****************************************************
C
C CONSTANTS
C
include '../../Source/vector.inc' ! needed to define VECSIZE_MEMMAX
include '../../Source/vector.inc'
include 'genps.inc'
include 'nexternal.inc'
include 'maxconfigs.inc'
Expand Down Expand Up @@ -406,7 +406,7 @@ C
implicit none

include 'nexternal.inc'
include '../../Source/vector.inc' ! needed to define VECSIZE_MEMMAX
include '../../Source/vector.inc'
include 'maxamps.inc'
INTEGER NCOMB
PARAMETER ( NCOMB=%(ncomb)d)
Expand Down
2 changes: 1 addition & 1 deletion madgraph/iolibs/template_files/madevent_driver.f
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Program DRIVER
c integer ncols,ncolflow(maxamps),ncolalt(maxamps),ic
c common/to_colstats/ncols,ncolflow,ncolalt,ic

include 'vector.inc' ! needed by coupl.inc (defines VECSIZE_MEMMAX)
include 'vector.inc'
include 'coupl.inc'
INTEGER VECSIZE_USED
DATA VECSIZE_USED/VECSIZE_MEMMAX/ ! can be changed at runtime
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ c /* ********************************************************* *
parameter (eva_pi = 3.141592653589793d0)
parameter (eva_sqr2 = 1.414213562373095d0)
include '../vector.inc' ! needed by coupl.inc (defines VECSIZE_MEMMAX)
include '../vector.inc'
include '../MODEL/coupl.inc'
logical first
Expand Down
6 changes: 3 additions & 3 deletions madgraph/iolibs/template_files/super_auto_dsig_group_v4.inc
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ C Common blocks
data nb_spin_state /%(nb_spin_state1)i,%(nb_spin_state2)i/
common /nb_hel_state/ nb_spin_state
include 'vector.inc' ! needed by coupl.inc (defines VECSIZE_MEMMAX)
include 'vector.inc'
include 'coupl.inc'
include 'run.inc'
C ICONFIG has this config number
Expand Down Expand Up @@ -726,7 +726,7 @@ C ****************************************************
include 'maxconfigs.inc'
INCLUDE 'nexternal.inc'
INCLUDE 'maxamps.inc'
include 'vector.inc' ! needed by coupl.inc (defines VECSIZE_MEMMAX)
include 'vector.inc'
INCLUDE 'coupl.inc'
INCLUDE 'run.inc'
C
Expand Down Expand Up @@ -859,7 +859,7 @@ C ****************************************************
include 'maxconfigs.inc'
INCLUDE 'nexternal.inc'
INCLUDE 'maxamps.inc'
include 'vector.inc' ! needed by coupl.inc (defines VECSIZE_MEMMAX)
include 'vector.inc'
INCLUDE 'coupl.inc'
INCLUDE 'run.inc'
C
Expand Down
2 changes: 1 addition & 1 deletion models/template_files/fortran/printout.f
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
subroutine printout
implicit none

include '../vector.inc' ! needed by coupl.inc (defines VECSIZE_MEMMAX)
include '../vector.inc'
include 'coupl.inc'
include 'input.inc'

Expand Down

0 comments on commit 02c1451

Please # to comment.