From 3450ee52c09ca6b5dfcad7de16e8bec3152376a3 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 9 Aug 2023 11:18:59 -0700 Subject: [PATCH] Examples: New AMReX Multi-Line Continuation --- examples/chicane/input_chicane.in | 2 +- examples/fodo_rf/input_fodo_rf.in | 2 +- examples/iota_lattice/input_iotalattice.in | 26 +++++------ examples/rfcavity/input_rfcavity.in | 52 +++++++++++----------- 4 files changed, 39 insertions(+), 43 deletions(-) diff --git a/examples/chicane/input_chicane.in b/examples/chicane/input_chicane.in index 8ad64ef67..6f88fcd15 100644 --- a/examples/chicane/input_chicane.in +++ b/examples/chicane/input_chicane.in @@ -21,7 +21,7 @@ beam.mutpt = 0.999999961419755 ############################################################################### # Beamline: lattice elements and segments ############################################################################### -lattice.elements = monitor sbend1 dipedge1 drift1 dipedge2 sbend2 drift2 +lattice.elements = monitor sbend1 dipedge1 drift1 dipedge2 sbend2 drift2 \ sbend2 dipedge2 drift1 dipedge1 sbend1 drift3 monitor lattice.nslice = 25 diff --git a/examples/fodo_rf/input_fodo_rf.in b/examples/fodo_rf/input_fodo_rf.in index 5294b58f7..e0b8e3cda 100644 --- a/examples/fodo_rf/input_fodo_rf.in +++ b/examples/fodo_rf/input_fodo_rf.in @@ -21,7 +21,7 @@ beam.mutpt = 0.0 ############################################################################### # Beamline: lattice elements and segments ############################################################################### -lattice.elements = monitor quad1 drift1 shortrf1 drift1 quad2 drift1 +lattice.elements = monitor quad1 drift1 shortrf1 drift1 quad2 drift1 \ shortrf1 drift1 quad1 monitor monitor.type = beam_monitor diff --git a/examples/iota_lattice/input_iotalattice.in b/examples/iota_lattice/input_iotalattice.in index e26025d25..945d1c063 100644 --- a/examples/iota_lattice/input_iotalattice.in +++ b/examples/iota_lattice/input_iotalattice.in @@ -22,28 +22,24 @@ beam.mutpt = 0.0 # Beamline: lattice elements and segments ############################################################################### lattice.periods = 5 -lattice.elements = monitor - first_half - qe3 - second_half - monitor +lattice.elements = monitor first_half qe3 second_half monitor # lines first_half.type = line -first_half.elements = dra1 qa1 dra2 qa2 dra3 qa3 dra4 qa4 dra5 - edge30 sbend30 edge30 drb1 qb1 drb2 qb2 drb2 qb3 - drb3 dnll drb3 qb4 drb2 qb5 drb2 qb6 drb4 - edge60 sbend60 edge60 drc1 qc1 drc2 qc2 drc2 qc3 drc1 - edge60 sbend60 edge60 drd1 qd1 drd2 qd2 drd3 qd3 drd2 qd4 drd4 +first_half.elements = dra1 qa1 dra2 qa2 dra3 qa3 dra4 qa4 dra5 \ + edge30 sbend30 edge30 drb1 qb1 drb2 qb2 drb2 qb3 \ + drb3 dnll drb3 qb4 drb2 qb5 drb2 qb6 drb4 \ + edge60 sbend60 edge60 drc1 qc1 drc2 qc2 drc2 qc3 drc1 \ + edge60 sbend60 edge60 drd1 qd1 drd2 qd2 drd3 qd3 drd2 qd4 drd4 \ edge30 sbend30 edge30 dre1 qe1 dre2 qe2 dre3 second_half.type = line second_half.reverse = true -second_half.elements = dra1 qa1 dra2 qa2 dra3 qa3 dra4 qa4 dra5 - edge30 sbend30 edge30 drb1 qb1 drb2 qb2 drb2 qb3 - drb3 dnll drb3 qb4 drb2 qb5 drb2 qb6 drb4 - edge60 sbend60 edge60 drc1 qc1 drc2 qc2 drc2 qc3 drc1 - edge60 sbend60 edge60 drd1 qd1 drd2 qd2 drd3 qd3 drd2 qd4 drd4 +second_half.elements = dra1 qa1 dra2 qa2 dra3 qa3 dra4 qa4 dra5 \ + edge30 sbend30 edge30 drb1 qb1 drb2 qb2 drb2 qb3 \ + drb3 dnll drb3 qb4 drb2 qb5 drb2 qb6 drb4 \ + edge60 sbend60 edge60 drc1 qc1 drc2 qc2 drc2 qc3 drc1 \ + edge60 sbend60 edge60 drd1 qd1 drd2 qd2 drd3 qd3 drd2 qd4 drd4 \ edge30 sbend30 edge30 dre1 qe1 dre2 qe2 dre3 # thick element splitting for space charge diff --git a/examples/rfcavity/input_rfcavity.in b/examples/rfcavity/input_rfcavity.in index d05ab7ff8..53c6ef284 100644 --- a/examples/rfcavity/input_rfcavity.in +++ b/examples/rfcavity/input_rfcavity.in @@ -41,33 +41,33 @@ rf.freq = 1.3e9 rf.phase = 85.5 rf.mapsteps = 100 rf.nslice = 4 -rf.cos_coefficients = - 0.1644024074311037 - -0.1324009958969339 - 4.3443060026047219e-002 - 8.5602654094946495e-002 - -0.2433578169042885 - 0.5297150596779437 - 0.7164884680963959 - -5.2579522442877296e-003 - -5.5025369142193678e-002 - 4.6845673335028933e-002 - -2.3279346335638568e-002 - 4.0800777539657775e-003 - 4.1378326533752169e-003 - -2.5040533340490805e-003 - -4.0654981400000964e-003 - 9.6630592067498289e-003 - -8.5275895985990214e-003 - -5.8078747006425020e-002 - -2.4044337836660403e-002 - 1.0968240064697212e-002 - -3.4461179858301418e-003 - -8.1201564869443749e-004 - 2.1438992904959380e-003 - -1.4997753525697276e-003 +rf.cos_coefficients = \ + 0.1644024074311037 \ + -0.1324009958969339 \ + 4.3443060026047219e-002 \ + 8.5602654094946495e-002 \ + -0.2433578169042885 \ + 0.5297150596779437 \ + 0.7164884680963959 \ + -5.2579522442877296e-003 \ + -5.5025369142193678e-002 \ + 4.6845673335028933e-002 \ + -2.3279346335638568e-002 \ + 4.0800777539657775e-003 \ + 4.1378326533752169e-003 \ + -2.5040533340490805e-003 \ + -4.0654981400000964e-003 \ + 9.6630592067498289e-003 \ + -8.5275895985990214e-003 \ + -5.8078747006425020e-002 \ + -2.4044337836660403e-002 \ + 1.0968240064697212e-002 \ + -3.4461179858301418e-003 \ + -8.1201564869443749e-004 \ + 2.1438992904959380e-003 \ + -1.4997753525697276e-003 \ 1.8685171825676386e-004 -rf.sin_coefficients = 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +rf.sin_coefficients = 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 \ 0 0 0 0 0 0 0