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

OpenFOAM 1.6-ext git installation

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

Reply
 
LinkBack Thread Tools Display Modes
Old   November 4, 2011, 04:54
Default OpenFOAM 1.6-ext git installation
  #1
Senior Member
 
Attesz's Avatar
 
Attesz
Join Date: Mar 2009
Posts: 355
Rep Power: 8
Attesz is an unknown quantity at this point
Hi Foamers,

I'm following this manual: http://www.tfd.chalmers.se/~hani/kurser/OS_CFD/OpenFOAMonYourOwnLaptop.html

but at the following commands I got errors:

Quote:
attila@ubuntu:~/OpenFOAM/OpenFOAM-1.6-ext$ git merge remotes/origin/hotfix/ThirdParty_scripts
Auto-merging etc/settings.csh
CONFLICT (content): Merge conflict in etc/settings.csh
Auto-merging etc/settings.sh
Automatic merge failed; fix conflicts and then commit the result.
attila@ubuntu:~/OpenFOAM/OpenFOAM-1.6-ext$ git merge remotes/origin/hotfix/ThirdParty_scripts
fatal: 'merge' is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>' as
appropriate to mark resolution and make a commit, or use 'git commit -a'.
Do you know what's the problem? Where can I find a description about git install of 1.6-ext for dummies?

Thank you,
Attila
__________________
CFD= Cleverly Formatted Data
Attesz is offline   Reply With Quote

Old   November 4, 2011, 12:53
Default
  #2
Senior Member
 
Elvis
Join Date: Mar 2009
Location: Sindelfingen, Germany
Posts: 579
Blog Entries: 5
Rep Power: 13
elvis is on a distinguished road
Hi,

i had a similar problem with "settings.sh" i think i just "renamed or removed" that file
and went back to ~/OpenFOAM/OpenFOAM-1.6-ext
and made a
git pull

http://www.extend-project.de/user-fo...ation-openfoam might be a useful thread
elvis is offline   Reply With Quote

Old   November 5, 2011, 11:56
Default
  #3
Senior Member
 
Attesz's Avatar
 
Attesz
Join Date: Mar 2009
Posts: 355
Rep Power: 8
Attesz is an unknown quantity at this point
I renamed that file as you suggested but it doesn't work...

Thanks,
Attila
__________________
CFD= Cleverly Formatted Data
Attesz is offline   Reply With Quote

Old   November 10, 2011, 07:58
Default
  #4
New Member
 
Wei Zhao
Join Date: Mar 2010
Posts: 28
Rep Power: 7
zhaowei is on a distinguished road
just ignore this message. try it
zhaowei is offline   Reply With Quote

Reply

Tags
1.6-ext, git, install, openfoam

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
Sample Utility not working in OpenFoam 1.6 titio OpenFOAM Post-Processing 6 November 15, 2014 19:04
OpenFoam 2.0.0 installation Jan_Peters OpenFOAM Installation 86 April 27, 2012 05:32
OpenFOAM Installation rclprice OpenFOAM Installation 1 July 21, 2011 16:31
Installing OpenFOAM 1.6 on Ubuntu 10.4 sda OpenFOAM Installation 5 May 27, 2010 20:19
kOmegaSST in openfoam 1.6 Gearb0x OpenFOAM 2 March 3, 2010 07:02


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