made new file to collate global results, fixed the global raster calc to make sure that the slices overlap
implementing conduction, also changed notation to make it more consistent with the notation in the derivation document
c