After merge should have been completed with Kareem's branch.
line 705 in smvgear.F90 is not in old Smvgear
same for 350 in GmiMechanism.F90