GIT: resolved merge conflict

This commit is contained in:
Andrew Heather
2018-06-13 14:20:18 +01:00
148 changed files with 835 additions and 925 deletions

View File

@ -85,9 +85,8 @@ subModels
massTotal 10;
parcelsPerInjector 20000;
parcelsPerSecond 500;
parcelBasisType mass;
flowRateProfile constant 0.1;
flowRateProfile constant 1;
Umag constant 3.0;
thetaInner constant 0;
thetaOuter constant 45;