Skip to content

Updated version of python tools#23

Merged
bendudson merged 17 commits intoboutproject:masterfrom
brey:master
May 10, 2015
Merged

Updated version of python tools#23
bendudson merged 17 commits intoboutproject:masterfrom
brey:master

Conversation

@brey
Copy link
Contributor

@brey brey commented Feb 11, 2015

I have cleaned up and tested the python tools. The files are in /boututils /boutdata /pyGridGen and in /examples/elm-pb/Python. Hopefully people can use the tools now and I will try to keep developing them. A manual in tex file will be forthcoming soon.

@loeiten
Copy link
Member

loeiten commented Feb 24, 2015

Hi brey

I accidently pulled some conflicting changes after you made this merge request (sorry about that). The changes I did was basically just to put parantheses around print statements in order to make the imports python 3 compatible.

I checked breifly through the merge request as I am a heavy user of python in BOUT++ myself, and I think it looks really good :).

I have a question though:
In tools/pylib/boutdata/collect.py, why would you like to remove the xguards options? In general I think it is a good idea to have the option to exclude the collection of the guard cells if one for example want to plot a profile.

@brey
Copy link
Contributor Author

brey commented Feb 24, 2015

Hi loeiten,

it was not my intention to do that. Apparently for some reason the pull upstream master command didn't update my local collect.py file and the one from the fork/master was an old version. I don't know why this happened. I am trying to figure it out but I have no luck. Any ideas are welcome. Anyhow, I will merge your changes and adjust the routines to the latest version and issue a pull request again. Is that the proper way to proceed? (I am new to git)

@loeiten
Copy link
Member

loeiten commented Feb 26, 2015

Hi again

No worries. As you may see from my little accident I'm quite new to git myself, and I found the need to read in the big git book: http://git-scm.com/book/en/v2. The book answered a lot of my questions. Unfortunately I do not know the proper way to proceed, but maybe the book knows.

Best

@bendudson bendudson merged commit a1f07bf into boutproject:master May 10, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants