CFD Online Logo CFD Online URL
www.cfd-online.com
[Sponsors]
Home > Forums > OpenFOAM Installation

Which version is current development line for 15

Register Blogs Members List Search Today's Posts Mark Forums Read

Reply
 
LinkBack Thread Tools Display Modes
Old   January 12, 2009, 09:15
Default I have been getting the update
  #1
Member
 
Dennis Kingsley
Join Date: Mar 2009
Location: USA
Posts: 45
Rep Power: 8
dkingsley is on a distinguished road
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
dkingsley is offline   Reply With Quote

Old   January 12, 2009, 09:21
Default Hi OpenFOAM-1.5-dev: htt
  #2
Senior Member
 
Tian
Join Date: Mar 2009
Posts: 101
Rep Power: 8
tian is on a distinguished road
Hi

OpenFOAM-1.5-dev:

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

Bye
Thomas
__________________
BIM HVACTool
tian is offline   Reply With Quote

Old   January 12, 2009, 09:38
Default Thanks for the link, can you t
  #3
Member
 
Dennis Kingsley
Join Date: Mar 2009
Location: USA
Posts: 45
Rep Power: 8
dkingsley is on a distinguished road
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
dkingsley is offline   Reply With Quote

Old   January 12, 2009, 09:59
Default Hi, I am also confused abou
  #4
Senior Member
 
Tian
Join Date: Mar 2009
Posts: 101
Rep Power: 8
tian is on a distinguished road
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
__________________
BIM HVACTool
tian is offline   Reply With Quote

Old   January 12, 2009, 10:04
Default Search this message board!
  #5
Senior Member
 
Frank Bos
Join Date: Mar 2009
Location: The Netherlands
Posts: 338
Rep Power: 9
lr103476 is on a distinguished road
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
__________________
Frank Bos
lr103476 is offline   Reply With Quote

Old   January 12, 2009, 16:10
Default 1.5-dev is maintained by prof.
  #6
Senior Member
 
BastiL
Join Date: Mar 2009
Posts: 471
Rep Power: 11
bastil is on a distinguished road
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
bastil is offline   Reply With Quote

Old   January 12, 2009, 17:13
Default That would mean it is a bug it
  #7
Senior Member
 
Hrvoje Jasak
Join Date: Mar 2009
Location: London, England
Posts: 1,758
Rep Power: 21
hjasak will become famous soon enough
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
__________________
Hrvoje Jasak
Providing commercial FOAM/OpenFOAM and CFD Consulting: http://wikki.co.uk
hjasak is offline   Reply With Quote

Old   January 13, 2009, 06:16
Default It is the fix made to the Nast
  #8
Senior Member
 
BastiL
Join Date: Mar 2009
Posts: 471
Rep Power: 11
bastil is on a distinguished road
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
bastil is offline   Reply With Quote

Old   January 13, 2009, 17:07
Default This is already done. It is a
  #9
Senior Member
 
Hrvoje Jasak
Join Date: Mar 2009
Location: London, England
Posts: 1,758
Rep Power: 21
hjasak will become famous soon enough
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
__________________
Hrvoje Jasak
Providing commercial FOAM/OpenFOAM and CFD Consulting: http://wikki.co.uk
hjasak is offline   Reply With Quote

Old   January 13, 2009, 17:08
Default This is already done. It is a
  #10
Senior Member
 
Hrvoje Jasak
Join Date: Mar 2009
Location: London, England
Posts: 1,758
Rep Power: 21
hjasak will become famous soon enough
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
__________________
Hrvoje Jasak
Providing commercial FOAM/OpenFOAM and CFD Consulting: http://wikki.co.uk
hjasak is offline   Reply With Quote

Old   January 14, 2009, 04:44
Default I might be missing something,
  #11
Senior Member
 
John Deas
Join Date: Mar 2009
Posts: 160
Rep Power: 8
johndeas is on a distinguished road
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.
johndeas is offline   Reply With Quote

Old   January 17, 2009, 07:17
Default This is already done -> Thanks
  #12
Senior Member
 
BastiL
Join Date: Mar 2009
Posts: 471
Rep Power: 11
bastil is on a distinguished road
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
bastil is offline   Reply With Quote

Old   January 20, 2009, 18:55
Default It is also not in current svn
  #13
Senior Member
 
BastiL
Join Date: Mar 2009
Posts: 471
Rep Power: 11
bastil is on a distinguished road
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.
bastil is offline   Reply With Quote

Old   January 20, 2009, 18:58
Default It is also not in current svn
  #14
Senior Member
 
BastiL
Join Date: Mar 2009
Posts: 471
Rep Power: 11
bastil is on a distinguished road
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.
bastil is offline   Reply With Quote

Old   January 20, 2009, 19:01
Default Done. Do you have any more of
  #15
Senior Member
 
Hrvoje Jasak
Join Date: Mar 2009
Location: London, England
Posts: 1,758
Rep Power: 21
hjasak will become famous soon enough
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
__________________
Hrvoje Jasak
Providing commercial FOAM/OpenFOAM and CFD Consulting: http://wikki.co.uk
hjasak is offline   Reply With Quote

Old   January 21, 2009, 07:02
Default Hi Hrv Can't you use git-sv
  #16
Member
 
Michael Wild
Join Date: Mar 2009
Location: Bern, Switzerland
Posts: 79
Rep Power: 8
mwild is on a distinguished road
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
mwild is offline   Reply With Quote

Old   January 21, 2009, 07:35
Default I would like to, but do not kn
  #17
Senior Member
 
Hrvoje Jasak
Join Date: Mar 2009
Location: London, England
Posts: 1,758
Rep Power: 21
hjasak will become famous soon enough
I would like to, but do not know how - can you help?

Hrv
__________________
Hrvoje Jasak
Providing commercial FOAM/OpenFOAM and CFD Consulting: http://wikki.co.uk
hjasak is offline   Reply With Quote

Old   January 21, 2009, 08:49
Default Hi Hrv, Have you looked at
  #18
egp
Senior Member
 
egp's Avatar
 
Eric Paterson
Join Date: Mar 2009
Location: Blacksburg, VA
Posts: 197
Blog Entries: 1
Rep Power: 9
egp is on a distinguished road
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
egp is offline   Reply With Quote

Old   January 21, 2009, 09:54
Default I tried it with the following:
  #19
Member
 
Michael Wild
Join Date: Mar 2009
Location: Bern, Switzerland
Posts: 79
Rep Power: 8
mwild is on a distinguished road
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
mwild is offline   Reply With Quote

Old   January 21, 2009, 10:38
Default The script is in OpenFOAM-1.5-
  #20
Senior Member
 
Hrvoje Jasak
Join Date: Mar 2009
Location: London, England
Posts: 1,758
Rep Power: 21
hjasak will become famous soon enough
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
__________________
Hrvoje Jasak
Providing commercial FOAM/OpenFOAM and CFD Consulting: http://wikki.co.uk
hjasak is offline   Reply With Quote

Reply

Thread Tools
Display Modes

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is On
HTML code is Off
Trackbacks are On
Pingbacks are On
Refbacks are On


Similar Threads
Thread Thread Starter Forum Replies Last Post
Which version is current development line for 15 dkingsley OpenFOAM Installation 0 January 12, 2009 09:18
Development version download guillaume OpenFOAM Installation 30 October 15, 2008 00:59
Current development of overset grid/recommendation CH Main CFD Forum 1 October 23, 2006 00:57
NEKTON is integrated in current FLUENT version???? daniel Main CFD Forum 1 April 4, 2006 00:17
Cells of current line in three dimensionnal flow GACEM_hatem Phoenics 2 June 18, 2001 09:38


All times are GMT -4. The time now is 23:53.