Addressed some of Mark's issues.

Split opencl.cat into opencl.cat and opencl_total.cat for the time being, one with partial SC, the other with total SC. Renamed "tc X" to "tch X" and renamed "S X" to "X.S".