| Chunk |
|---|
| Conflicting content |
|---|
(e.g. check if Gauss law is fulfilled.)
*/
<<<<<<< HEAD
// Copy current generators from Settings.
currentGenerators = settings.getCurrentGenerators();
=======
/**
* In order to read out the initial state without specifying the Unext(t = at/2) links by hand we calculate them
* according to the equations of motion from the electric fields at t = 0 and gauge links U(t = -at/2). We also
* compute both internal and external currents at t = -at/2 from the given particle velocities (specified also
* at t = -at/2) and determine new velocities at t = at/2.
*/
grid.updateLinks(tstep);
interpolation.interpolateToParticle(particles, grid);
interpolation.interpolateToGrid(particles, grid, tstep);
// Generate external currents on the grid!!
/*
for (int c = 0; c < currentGenerators.size(); c++)
{
currentGenerators.get(c).applyCurrent(this);
}
*/
>>>>>>> 5f5a23a58dc2bf5c79eab3a06a11eca112ea1761
//updateVelocities(); TODO: Write this method!!
|
| Solution content |
|---|
(e.g. check if Gauss law is fulfilled.)
*/
// Copy current generators from Settings.
currentGenerators = settings.getCurrentGenerators();
/**
* In order to read out the initial state without specifying the Unext(t = at/2) links by hand we calculate them
* according to the equations of motion from the electric fields at t = 0 and gauge links U(t = -at/2). We also
*/
{
grid.updateLinks(tstep);
interpolation.interpolateToParticle(particles, grid);
currentGenerators.get(c).applyCurrent(this);
}
interpolation.interpolateToGrid(particles, grid, tstep);
// Generate external currents on the grid!!
for (int c = 0; c < currentGenerators.size(); c++)
* compute both internal and external currents at t = -at/2 from the given particle velocities (specified also
* at t = -at/2) and determine new velocities at t = at/2.
//updateVelocities(); TODO: Write this method!!
|
| File |
|---|
| Simulation.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
*/
public void step() throws FileNotFoundException,IOException {
<<<<<<< HEAD
grid.storeFields();
//reassignParticles(); TODO: Write this method!!
grid.resetCurrent();
interpolation.interpolateToGrid(particles, grid, tstep);
// Generate external currents on the grid!!
=======
//Link and particle reassignment
grid.storeFields();
//reassignParticles(); TODO: Write this method!!
//Generation of internal and external currents
interpolation.interpolateToGrid(particles, grid, tstep);
// Generate external currents on the grid!!
/*
>>>>>>> 5f5a23a58dc2bf5c79eab3a06a11eca112ea1761
for (int c = 0; c < currentGenerators.size(); c++)
{
currentGenerators.get(c).applyCurrent(this); |
| Solution content |
|---|
*/
public void step() throws FileNotFoundException,IOException {
//Link and particle reassignment
grid.storeFields();
//reassignParticles(); TODO: Write this method!!
//Generation of internal and external currents
grid.resetCurrent();
interpolation.interpolateToGrid(particles, grid, tstep);
// Generate external currents on the grid!!
for (int c = 0; c < currentGenerators.size(); c++)
{
currentGenerators.get(c).applyCurrent(this); |
| File |
|---|
| Simulation.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
{
currentGenerators.get(c).applyCurrent(this);
}
<<<<<<< HEAD
=======
*/
//Combined update of gauge links and fields
>>>>>>> 5f5a23a58dc2bf5c79eab3a06a11eca112ea1761
grid.updateGrid(tstep);
//updatePositions(); TODO: Write this method!! |
| Solution content |
|---|
{
currentGenerators.get(c).applyCurrent(this);
}
//Combined update of gauge links and fields
grid.updateGrid(tstep); |
| File |
|---|
| Simulation.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
<<<<<<< HEAD ======= //Output in text files >>>>>>> 5f5a23a58dc2bf5c79eab3a06a11eca112ea1761 runDiagnostics(); } totalSimulationSteps++; totalSimulationTime = totalSimulationSteps * tstep; |
| Solution content |
|---|
totalSimulationSteps++; totalSimulationTime = totalSimulationSteps * tstep; //Output in text files runDiagnostics(); } |
| File |
|---|
| Simulation.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
*/
public void updateGrid(double tstep) {
getFsolver().step(this, tstep);
<<<<<<< HEAD
=======
}
/**
* This method advances the link variables on the grid by one time step:
* It calls the FieldSolver to solve the equations of motion for the links only for one time step.
*
* @param tstep size of the time step
*/
public void updateLinks(double tstep) {
getFsolver().stepLinks(this, tstep);
>>>>>>> 5f5a23a58dc2bf5c79eab3a06a11eca112ea1761
}
/** |
| Solution content |
|---|
public void updateGrid(double tstep) {
getFsolver().step(this, tstep);
}
/**
* This method advances the link variables on the grid by one time step:
*/
* It calls the FieldSolver to solve the equations of motion for the links only for one time step.
*
* @param tstep size of the time step
*/
public void updateLinks(double tstep) {
getFsolver().stepLinks(this, tstep);
}
/** |
| File |
|---|
| Grid.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Method signature |