Adding energy norm convergence test

Tracker item:3497
Merge branch 'energyNorm' of https://github.com/xyan075/cm into energyNorm

Conflicts:
	src/problem_routines.f90

Tracker item: 3497