Incorporating scientific analysis and problem-solving skills into a physics and engineering summer course