yade-dev team mailing list archive

[Anton Gladky <gladky.anton@xxxxxxxxx>]

Bruno, I think a better idea will be to create just a diff between
your branch and the current trunk branch.
Then we can just apply this diff to a current trunk like a separate commit.

I remember, there were some problems with merging.

Anton




On Tue, Apr 26, 2011 at 11:25 AM, Bruno Chareyre
<bruno.chareyre@xxxxxxxxxxx> wrote:
> I'll commit last version in a moment (still struggling with
> commit/merge/push...).
>
> Bruno
>
> On 26/04/11 11:10, Bruno Chareyre wrote:
>>> Please, do not hurry up with merging. Let's test it.
>> Sure.
>> I've played with it quite a bit and couldn't find any problem, but let
>> you test it too.
>> The only tricky thing is to define good default settings, since
>> different settings are "best" depending on the number of bodies, number
>> of threads, and velocities (e.g. Sergei's benchmark script has fast
>> bodies, triaxial tests have slow bodies).
>> I'll summarize good settings for the different cases.
>>
>> B.
>>
>> _______________________________________________
>> Mailing list: https://launchpad.net/~yade-dev
>> Post to     : yade-dev@xxxxxxxxxxxxxxxxxxx
>> Unsubscribe : https://launchpad.net/~yade-dev
>> More help   : https://help.launchpad.net/ListHelp
>>
>
>
> --
> _______________
> Bruno Chareyre
> Associate Professor
> ENSE³ - Grenoble INP
> Lab. 3SR
> BP 53 - 38041, Grenoble cedex 9 - France
> Tél : +33 4 56 52 86 21
> Fax : +33 4 76 82 70 43
> ________________
>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~yade-dev
> Post to     : yade-dev@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~yade-dev
> More help   : https://help.launchpad.net/ListHelp
>