Category Archives: Computing

Git/GitHub conflict resolution

I keep forgetting how to resolve conflicts in git. This stackoverflow question seems to explain things quite nicely. If there is a conflict git puts some lines in the conflicting file highlighting the conflict. You can open that file manually resolve the conflict. Manually resolving the conflict means editing the file to leave it as… Read More »

Organising Computational Projects

As computational projects grow the folder structure of scripts, configuration files and outputs can often become bloated and confused. You can help prevent this by spending some time early on to get the folder structure right. This is a useful guide to organising computational projects:  http://www.ploscompbiol.org/article/info%3Adoi%2F10.1371%2Fjournal.pcbi.1000424 I often got lost trying to find “that simulation”… Read More »

OOMMF 1.2a5 cygtel/wintel error

My windows installation of OOMMF 1.2a5 was giving an error* about my platform not being ‘cygtel’, and then failing to run. To get around this error and allow OOMMF to actually run I just changed the filename of ‘cygtel.tcl’ (found in ‘/oommf/config/names/’) to ‘wintel.tcl’. I left the contents of the file the same. Since there… Read More »

Labtalk plotting in Origin

Useful link for scripting the plotting of data in Origin. http://wiki.originlab.com/~originla/wiki2/index.php?title=X-Function:Plotxy e.g. plotxy iy:=(13,20) plot:=200 o:=[Graph6]; Image: Martinez Zea; Some rights reserved