COMP: git merge with master conflict resolution

This commit is contained in:
andy
2010-10-27 14:47:24 +01:00
28 changed files with 1020 additions and 61 deletions

View File

@ -83,7 +83,10 @@ functions
fields (p U k);
// Cells particles can travel before being removed
lifeTime 1000;
lifeTime 10000;
// Number of steps per cell (estimate). Set to 1 to disable subcycling.
nSubCycle 5;
// Cloud name to use
cloudName particleTracks;

View File

@ -85,7 +85,10 @@ functions
fields (p k U);
// Cells particles can travel before being removed
lifeTime 1000;
lifeTime 10000;
// Number of steps per cell (estimate). Set to 1 to disable subcycling.
nSubCycle 5;
// Cloud name to use
cloudName particleTracks;