commiting for timing tests on aci
turned on omp in fem1 for now, also some update to makefile