The two situations you describe are more accurately called multitasking and multiprocessing. The latter gives us the "MP" in "SMP".
> Concurrency: [...] There is no parallelism.
> Parallelism: [...] There is concurrency too since ...
Oops, contradiction! :)
Parallelism: the two threads are running simultaneously on two CPUs. There is concurrency too since there are multiple threads.