Made all functions that only return 0s void in grid
Merge branch 'master' of https://github.com/microhh/microhh into masterupstream
Use the void types in the cuda code
Renamed functions in grid
Completed renaming grid functions
Use the updated grid functions
Use the new naming convention in master
Cleaned up master class
Renamed all the thermo class names
Compiling thermo code
Fixed the erroneous edit of calcdiff
Compiling thermo in CUDA
Merge remote branch 'upstream/master' into cuda

Conflicts:
	src/advec_2.cu
	src/advec_4.cu
	src/advec_4m.cu
	src/boundary_surface.cu
	src/boundary_surface.cxx
	src/budget.cxx
	src/diff_les2s.cu
	src/diff_les2s.cxx
	src/fields.cu
	src/fields.cxx
	src/force.cu
	src/model.cxx
	src/pres_2.cu
	src/pres_4.cu
	src/thermo_buoy.cxx
	src/thermo_buoy_slope.cxx
	src/thermo_dry.cxx
	src/thermo_moist.cxx