cleanup of fieldmaps (removed "s"), move tmp fields from "sd" to "atmp" to allow automatic copies of diagnostic fields to GPU, without always having 4 tmp fields (we only need 2)
GPU and CPU versions working again with new fieldmap containers
Minor cleanup
GPU version leak free