revert the compiler setup in env_mach_specific.edison

scripts/ccsm_utils/Machines/env_mach_specific.edison

@@ -7,12 +7,12 @@
 if (-e /opt/modules/default/init/csh) then
   source /opt/modules/default/init/csh
   module rm PrgEnv-intel
-  module rm PrgEnv-cray 
+  module rm PrgEnv-cray
   module rm PrgEnv-gnu
   module rm intel
   module rm cce
   module rm cray-parallel-netcdf
-  module rm cray-parallel-hdf5 
+  module rm cray-parallel-hdf5
   module rm pmi
   module rm cray-libsci
   module rm cray-mpich2
@@ -26,7 +26,8 @@ if (-e /opt/modules/default/init/csh) then
 endif
 
 if ( $COMPILER == "intel" ) then
-    module load PrgEnv-intel 
+    module load PrgEnv-intel
+    module switch intel      intel/13.1.3.192
     module rm cray-libsci
     setenv MKL "-mkl=cluster"
     module use /global/project/projectdirs/ccsm1/modulefiles/edison
@@ -35,15 +36,15 @@ if ( $COMPILER == "intel" ) then
     else
          module load esmf/6.2.0-defio-mpi-O
     endif
-endif    
+endif
 if ( $COMPILER == "cray" ) then
     module load PrgEnv-cray
     module switch cce      cce/8.1.9
-endif    
+endif
 if ( $COMPILER == "gnu" ) then
     module load PrgEnv-gnu
     module switch gcc       gcc/4.8.0
-endif    
+endif
 
 module swap craype craype/2.1.1
 module load craype-ivybridge
@@ -74,13 +75,12 @@ limit coredumpsize unlimited
 limit stacksize unlimited
 
 # The environment variable below increase the stack size, which is necessary for
-# CICE to run threaded on this machine.  
+# CICE to run threaded on this machine.
 setenv OMP_STACKSIZE 64M
 
-# Capture logical to physics PE assignment and active environment variable 
+# Capture logical to physics PE assignment and active environment variable
 # settings
 setenv MPICH_ENV_DISPLAY 1
 setenv MPICH_VERSION_DISPLAY 1
 setenv MPICH_CPUMASK_DISPLAY 1
 # setenv MPICH_RANK_REORDER_DISPLAY 1
-