dev/master/2015.04.20 does not compile with -openmp

[nikizadehgfdl]

ftn -DINTERNAL_FILE_NML -g -traceback -D_USE_GENERIC_TRACER -D_FILE_VERSION="`git-version-string /lustre/f1/unswept/Niki.Zadeh/ulm_mom6_2015.04.20/MOM6_SIS_libs_compile/src/mom6/src/MOM6/src/ALE/MOM_remapping.F90`"  -fpp -Wp,-w -I/opt/cray/netcdf/4.2.0/intel/120/include -fno-alias -auto -safe-cray-ptr -ftz -assume byterecl -i4 -r8 -nowarn -sox -traceback -I/opt/cray/netcdf/4.2.0/intel/120/include -O3 -debug minimal -fp-model source -override-limits -openmp -I/lustre/f1/unswept/Niki.Zadeh/ulm_mom6_2015.04.20/MOM6_SIS_libs_compile/ncrc2.intel-prod-openmp/exec/ocean_shared -I/lustre/f1/unswept/Niki.Zadeh/ulm_mom6_2015.04.20/MOM6_SIS_libs_compile/ncrc2.intel-prod-openmp/exec/fms  -c -I/lustre/f1/unswept/Niki.Zadeh/ulm_mom6_2015.04.20/MOM6_SIS_libs_compile/src/mom6/src/MOM6/config_src/dynamic -I/lustre/f1/unswept/Niki.Zadeh/ulm_mom6_2015.04.20/MOM6_SIS_libs_compile/src/mom6/src/MOM6/src/framework    /lustre/f1/unswept/Niki.Zadeh/ulm_mom6_2015.04.20/MOM6_SIS_libs_compile/src/mom6/src/MOM6/src/ALE/MOM_remapping.F90

/lustre/f1/unswept/Niki.Zadeh/ulm_mom6_2015.04.20/MOM6_SIS_libs_compile/src/mom6/src/MOM6/src/ALE/MOM_remapping.F90(170): error #7626: An OpenMP* directive block starts in one F95 block and ends in another.
!$OMP end parallel
----------^
compilation aborted for /lustre/f1/unswept/Niki.Zadeh/ulm_mom6_2015.04.20/MOM6_SIS_libs_compile/src/mom6/src/MOM6/src/ALE/MOM_remapping.F90 (code 1)
make[1]: *** [MOM_remapping.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make[1]: Leaving directory `/lustre/f1/unswept/Niki.Zadeh/ulm_mom6_2015.04.20/MOM6_SIS_libs_compile/ncrc2.intel-prod-openmp/exec/mom6'
make: *** [mom6/libmom6.a] Error 2
if ( 2 == 0 ) then
if ( 1 ) unset echo
unset echo

There may be more errors once this one is fixed.