← Back to branch summary

~madteam/mg5amcnlo/series2.0

~madteam/mg5amcnlo/series2.0

« back to all changes in this revision

Viewing changes to input/.mg5_configuration_default.txt

Committer: olivier Mattelaer
Date: 2012-09-27 21:47:26 UTC
mfrom: (147.13.15 transfer_file_on_exit)
mto: (147.16.5 new_history)
mto: This revision was merged to the branch mainline in revision 223.
Revision ID: olivier.mattelaer@uclouvain.be-20120927214726-8jn3hdm0jiulk14r

merge lp:~maddevelopers/madgraph5/transfer_on_exit

files added:
madgraph/various/combine_runs.py

files removed:
Template/Source/combine_runs.f

files modified:
Template/Source/PDF/opendata.f

Template/Source/PDF/pdfwrap_lhapdf.f

UpdateNotes.txt

input/.mg5_configuration_default.txt

madgraph/VERSION

madgraph/interface/extended_cmd.py

madgraph/interface/madevent_interface.py

madgraph/interface/madgraph_interface.py

madgraph/iolibs/export_v4.py

madgraph/iolibs/template_files/madevent_makefile_source

madgraph/various/cluster.py

madgraph/various/misc.py

madgraph/various/sum_html.py

models/template_files/fortran/rw_para.f

tests/acceptance_tests/test_cmd.py

Show diffs side-by-side

added added

removed removed

input/.mg5_configuration_default.txt

88

88

#cluster_type = condor

89

89

#cluster_queue = madgraph

90

90

91

# Path to a node directory to avoid direct writting on the central disk

92

#Note that condor cluster avoid direct writting by default (therefore this

93

#options didn't modify condor cluster)

94

95

#cluster_temp_path = None

96

91

97

# Nb_core to use (None = all) This is use only for multicore run

92

98

93

99

#nb_core = None

Older »