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

Git fork of OpenFOAM for dev

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

Reply
 
LinkBack Thread Tools Display Modes
Old   March 2, 2011, 08:27
Lightbulb Git fork of OpenFOAM for dev
  #1
New Member
 
Stefan Sicklinger
Join Date: Mar 2011
Posts: 7
Rep Power: 5
clean-energy is on a distinguished road
Hello,

I would like to deal with the following situation:

We are a Team of 6 people developing in OpenFOAM.

Is it possible to run a git server with a clone of the official release for our development team.

In other words we would like to have a server which syncs automatically with the official git repos of OpenFOAM where we can commit our changes to.

After a long internet search I am not sure what the best way would be. Is it possible to have a OpenFOAM git fork on our server which has still a link to the official release.

Thank you very much in advance!
clean-energy is offline   Reply With Quote

Old   March 3, 2011, 02:12
Default
  #2
Senior Member
 
Mark Olesen
Join Date: Mar 2009
Location: http://olesenm.github.io/
Posts: 771
Rep Power: 17
olesen will become famous soon enough
Quote:
Originally Posted by clean-energy View Post
...
In other words we would like to have a server which syncs automatically with the official git repos of OpenFOAM where we can commit our changes to.
You could easily automate a 'git fetch' with simple cron job on your local server. However, merging in the upstream 'master' branch should be left as a manual operation. Your local team would work on a separate branch and periodically merge the changes from 'master'. This is what I meant here (http://olesenm.github.com/2009/11/12...nFOAM-and-git/) about never working on tracked branches.
olesen is offline   Reply With Quote

Old   April 28, 2013, 16:43
Default How to seperate executable
  #3
Senior Member
 
Eelco van Vliet
Join Date: Mar 2009
Location: The Netherlands
Posts: 119
Rep Power: 8
eelcovv is on a distinguished road
Hi Mark,

Thanks for the information you have been putting on git and openfoam so far.

I am dealing with the same situation : I want to add solvers and libs to the OF distribution and share it with my colleagues.

There are two scenarios
1) make a new company repository containing the src, application, tutorials and run directory and add all the new stuff here. The the new stuff get in its own directory

2) make a new branch in the Openfoan 2.2.x directory and add all the changes in this branch. So all the changes are done in the orirginal OpenFOAM-2.*.x directory

I think you recommend scenario 2 and I see the advantage: you can merge the new updates from the OF 2.2.x into you own branch.

I have one concern: when compiling the new (own) branch, all executables of sources and libraries that have been change will appear with the same name in the lib and bin directory, unless you modify these names explicitly in the Make file. How do you deal with that. Do you make new lib names of libraries you have modified, or do you keep the original names such that all the other OF solvers can benefit (hopefully) from the changes.

I am still thinking of best work flow to deal with this.

Hopefully you can give some hints.

Regards
Eelco
eelcovv is offline   Reply With Quote

Old   April 29, 2013, 02:13
Default
  #4
Senior Member
 
Mark Olesen
Join Date: Mar 2009
Location: http://olesenm.github.io/
Posts: 771
Rep Power: 17
olesen will become famous soon enough
Quote:
Originally Posted by eelcovv View Post
Hi Mark,

...
I have one concern: when compiling the new (own) branch, all executables of sources and libraries that have been change will appear with the same name in the lib and bin directory, unless you modify these names explicitly in the Make file. How do you deal with that. Do you make new lib names of libraries you have modified, or do you keep the original names such that all the other OF solvers can benefit (hopefully) from the changes.
If you are only maintaining your own set of solvers/libs without needing to adjust the OPENFOAM source code itself, you don't need to work in the main OPENFOAM directory itself. Instead, just create/compile your applications as usual (eg, in your home directory) and then "publish" to a shared site location. You can either use the default WM_PROJECT_INST_DIR/site or place it elsewhere and set the WM_PROJECT_SITE env variable accordingly.

By "publishing" the applications and templates, I simply mean using a script to sync from your build directory to the "site" location. This is the workflow that we are now using for our standard applications. Of course, if you need to make changes to the OPENFOAM sources themselves, you'll still have to do this as previously described.

/mark
olesen is offline   Reply With Quote

Old   April 30, 2013, 04:47
Smile hybrid approach OpenFOAM + git
  #5
Senior Member
 
Eelco van Vliet
Join Date: Mar 2009
Location: The Netherlands
Posts: 119
Rep Power: 8
eelcovv is on a distinguished road
Mark,

Thanks for the reply. After some thoughts about it I have opted for the hybrid approach just as you recommend right now.

The standalone new solvers I have put in my own OF directory under eelco-2.2.x and put this into a repository which my colleagues can approach.

Next to that I want to make small modifications to the OF libraries in order to included more functionality I need (especially in the lagrangian lib). This I do in the OpenFOAM-2.2.x on a new branch just as you have described on you blog. This allows me to keep track of the updates of the original OF distribution and easily merge them to my own branch. This modified OF-2.2x branch I store in a separate repository.

So far the hybrid approach works for me. Thanks for the hints and the useful info you have put on your blog!

Regards
Eelco
eelcovv 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
Cross-compiling OpenFOAM 1.7.0 on Linux for Windows 32 and 64bits with Mingw-w64 wyldckat OpenFOAM Announcements from Other Sources 3 September 8, 2010 06:25
OpenFOAM 1.7.x git problem olauer OpenFOAM Installation 18 July 29, 2010 06:36
Modified OpenFOAM Forum Structure and New Mailing-List pete Site News & Announcements 0 June 29, 2009 05:56
OpenFOAM Patched Version 1.5 via git Repository OpenFOAM discussion board administrator OpenFOAM Announcements from ESI-OpenCFD 0 August 26, 2008 05:06
OpenFOAM Debian packaging current status problems and TODOs oseen OpenFOAM Installation 9 August 26, 2007 13:50


All times are GMT -4. The time now is 06:38.