Skip to content

andreagalle/pigcasso

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

3 Commits
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

Pigcasso

Inspired by the world-renowned Painting Pig – Pigcasso – is a Python utility plotting data from .vtk files (tipically the output of CFD simulations) to many other formats – such as .eps or .png – everything rely on matplotlib, thus for the moment just the possibility to plot 2D and 1D figures is available.

drawing

Rescued from the slaughterhouse in May 2016, Pigcasso is one fine, fortunate swine

At almost 2000 pounds, it's the heavy-weight Abstarct Expressionist of the World! Have a look at its masterpieces.

The repo workflow is organised as follows:

branch
master where it goes the code validated after the production phase
dev where it goes the code deployed after testing ready for production
backport where it goes the code backported from other container repos

To use pigcasso we recommend to install it "cloning" its content within a container repo – the one providing for the data to be plotted – and the best way to do this is by merging it as a subtree. Have a look at this guide (and the following git 2.9 updates within the comments, there below) if not refer to the GitHub official guide.

How to get updates from pigcasso?

Assuming you are getting an update from the subtree’s remote, according to the guide, after checking out your feature branch, on the container repo, most of the times git merge -s subtree --allow-unrelated-histories --squash pigcasso/backport will be enough, if not opt for the default strategy (recursive) with an explicit prefix through its subtree option:

git merge -X subtree=3rd-party/pigcasso/ --allow-unrelated-histories --squash pigcasso/backport

and eventually solve any conflict that may arise. It can happen that the heuristics used by the subtree merge strategy to figure out the subdirectory prefix get confused.

How to backport to pigcasso?

To backport it's quite an easy task, according to the guide, after pushing "the" commit (to backport here) on the container repo, you will have to follow these steps:

git stash
git remote add -f pigcasso https://github.com/andreagalle/pigcasso.git
git checkout -b oink pigcasso/backport
git cherry-pick -x --strategy=subtree HEAD^
git show HEAD --stat
git push pigcasso oink:backport
git checkout HEAD^
git stash apply

of course the git show HEAD --stat command is not neccessary, but advised to check everything before pushing upstream here. To check in more detail git log --graph --decorate --oneline and git show HEAD are always the best options.