I have been getting the update
 

I have been getting the updates for 1.5 from the git repository since it was opened up. Now I am seeing references to a 1.5-dev (http://www.cfd-online.com/cgi-bin/Op...0391#POST30391) which seem to indicate a split in development.

What is 1.5-dev, where can it be found ,and which version is considered the "official" version?

thanks
Dennis

Hi OpenFOAM-1.5-dev: htt
 

Hi

OpenFOAM-1.5-dev:

http://powerlab.fsb.hr/ped/kturbo/OpenFOAM/release/

Bye
Thomas

Thanks for the link, can you t
 

Thanks for the link, can you tell me which version 1.5-dev or 1.5.x git is the best place to pull 1.5 updates from? Or why I would want to switch from the 1.5.x git repository?

Both seem to have different sets of bug-fixes and maybe even different sets of priorities.

Dennis

Hi, I am also confused abou
 

Hi,

I am also confused about it, why there is two different version of OF, sorry.

Maybe Prof. Hrvoje Jasak can give us some details?

Bye
Thomas

Search this message board!
 

Search this message board!

1.5.x is released and supported by openCFD. This version contains only features of which openCFD is certain that it can provide support.

1.5-dev is maintained by prof. Hrvoje Jasak. This version contains the complete 1.5.x plus a lot of improvements, more models and more features.

Regards, Frank

1.5-dev is maintained by prof.
 

1.5-dev is maintained by prof. Hrvoje Jasak. This version contains the complete 1.5.x plus a lot of improvements, more models and more features.

No, there are definitely some (old) bugfixes from 1.5.x that are not contained in 2.5-dev. I have at least one.

BastiL

That would mean it is a bug it
 

That would mean it is a bug itself or that I've missed it in the merge. Can you give more details so that I can add the fix?

Hrv

It is the fix made to the Nast
 

It is the fix made to the NastranReader. This has not been included into the 1.5-dev (06/01/2009):
"triSurface Nastran reader: bugfix and enhancement"
"minor correction to prevsious commit"

Maybe this has already been done. So your idea is t o have all fixes from 1.5.x in 1.5-dev?

Regards BastiL

This is already done. It is a
 

This is already done. It is a shame we cannot keep multiple SVN logs together, but this may happen in the future...

If you have any other bug fixes that i hould check, please let me know. The idea is that ALL bug fixes, enhancements, contributions (and good will from all parties) is welcome.

Hrv

This is already done. It is a
 

This is already done. It is a shame we cannot keep multiple SVN logs together, but this may happen in the future...

If you have any other bug fixes that I should check, please let me know. The idea is that ALL bug fixes, enhancements, contributions (and good will from all parties) is welcome.

Hrv

I might be missing something,
 

I might be missing something, but last time I check, I couldn't find the svn repository for 1.5-dev. Now that a snapshot has been released on http://powerlab.fsb.hr/ped/kturbo/OpenFOAM/release/, is there a date at which the svn will be available ?
Again, sorry for asking that kind of question, it is just that we are planning to implement an auto-retrieving/building process for the svn at the laboratory.

This is already done -> Thanks
 

This is already done -> Thanks.

However it is still missing in 1.5-dev (20090112). Maybe it will be in the next snapshot.

Regards BastiL

It is also not in current svn
 

It is also not in current svn (20/01/2009) I do nto know how to upload it to there but simply compare file:
src/triSurface/triSurface/interfaces/NAS/readNAS.C
with current git version...

Regards.

It is also not in current svn
 

It is also not in current svn (20/01/2009) I do nto know how to upload it to there but simply compare file:
src/triSurface/triSurface/interfaces/NAS/readNAS.C
with current git version...

Regards.

Done. Do you have any more of
 

Done. Do you have any more of those - I must have diffed the wrong file.

Git fixes will be updated regularly by hand until we get an automatic merge mechanism in place.

Please let me know,

Hrv

Hi Hrv Can't you use git-sv
 

Hi Hrv

Can't you use git-svn to mirror your SVN repository, add another remote which points to the "upstream" git repository and then periodically pull from there, resolve the conflicts and then push the changes back into SVN? Not fully automatic, but this way at least you don't miss any patches.

Michael

I would like to, but do not kn
 

I would like to, but do not know how - can you help?

Hrv

Hi Hrv, Have you looked at
 

Hi Hrv,

Have you looked at GForge and the Cruse Control (Build Automation) module? This is something we're looking at for doing our own internal repository and automated build.

Eric

I tried it with the following:
 

I tried it with the following:

Mirror the SVN repository (only the OpenFOAM-1.5-dev part) in git (may take a long time):
git svn clone https://openfoam-extend.svn.sourceforge.net/svnroot/openfoam-extend/trunk/Core/O penFOAM-1.5-dev

Add the OpenFOAM-1.5.x repository as a remote:
git remote add upstream git://repo.or.cz/OpenFOAM-1.5.x.git

Theoretically it should then be possible to do a merge:
git merge upstream/master

However, that left me with a rather largish number of conflicts (4165 to be exact). Most of them seem to be due to the copyright notice in the head-comment ("Copyright (C) 1991-2008 OpenCFD Ltd." vs. "Copyright held by original author"). Resolving those should be feasible using some simple shell script.

I will further investigate the thing, but have to leave office now...

HTH

Michael

The script is in OpenFOAM-1.5-
 

The script is in OpenFOAM-1.5-dev/bin. However, the number of changes sounds about right, it will be several thousand... On top of that we have some additional functionality, so a direct merge will not be good. What I would like is a git diff between two versions of 1.5.x, transferred across and complaining about conflicts that have to be sorted out by hand.

Thaks for looking into this,

Hrv