Submitted to Applied Energy