Merge branch 'develop' into moreblockallocations #7061

Job	Run time
classicmode_1d_3dgrid	4m 27s
classicmode_3d	7m 59s
kilonova_1d_1dgrid	4m 52s
kilonova_1d_3dgrid	5m 2s
kilonova_2d_2dgrid	6m 47s
kilonova_2d_2dgrid_barnesthermalisation	5m 34s
kilonova_2d_2dgrid_expansionopac	5m 5s
kilonova_2d_2dgrid_xcomgammaphotoion	5m 21s
kilonova_2d_3dgrid	6m 55s
nebular_1d_3dgrid	11m 50s
nebular_1d_3dgrid_limitbfest	13m 53s
classicmode_1d_3dgrid testmode ON	16m 17s
classicmode_3d testmode ON	23m 50s
kilonova_1d_1dgrid testmode ON	10m 15s
kilonova_1d_3dgrid testmode ON	11m 4s
kilonova_2d_2dgrid testmode ON	18m 31s
kilonova_2d_2dgrid_barnesthermalisation testmode ON	16m 33s
kilonova_2d_2dgrid_expansionopac testmode ON	14m 44s
kilonova_2d_2dgrid_xcomgammaphotoion testmode ON	15m 51s
kilonova_2d_3dgrid testmode ON	19m 44s
nebular_1d_3dgrid testmode ON	25m 41s
nebular_1d_3dgrid_limitbfest testmode ON	28m 13s
combine_checksums	18s
	4h 38m 46s

Provide feedback