Merge branch 'mahf708/ig/compy-intel'(PR #6603)

Updates Compy's intel compiler from 19.0.5 to 20.0.4

Updates intel compiler to 20.0.0 and intel mpi to 2020 on compy.

* mahf708/ig/compy-intel:
  Updates cprnc version to match the new compiler version
  update compy intel compiler

Author: singhbalwinder

cime_config/machines/config_machines.xml

@@ -3865,7 +3865,7 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
     <DIN_LOC_ROOT_CLMFORC>/compyfs/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
     <DOUT_S_ROOT>/compyfs/$USER/e3sm_scratch/archive/$CASE</DOUT_S_ROOT>
     <BASELINE_ROOT>/compyfs/e3sm_baselines/$COMPILER</BASELINE_ROOT>
-    <CCSM_CPRNC>/compyfs/e3sm_baselines/cprnc/cprnc</CCSM_CPRNC>
+    <CCSM_CPRNC>/compyfs/e3sm_baselines/cprnc/cprnc.intel.v20.0.04/cprnc</CCSM_CPRNC>
     <GMAKE_J>8</GMAKE_J>
     <TESTS>e3sm_integration</TESTS>
     <NTEST_PARALLEL_JOBS>4</NTEST_PARALLEL_JOBS>
@@ -3912,7 +3912,7 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
       </modules>
       <modules compiler="intel">
         <command name="load">gcc/8.1.0</command>
-        <command name="load">intel/19.0.5</command>
+        <command name="load">intel/20.0.0</command>
       </modules>
       <modules compiler="pgi">
         <command name="load">pgi/19.10</command>
@@ -3921,7 +3921,7 @@ commented out until "*** No rule to make target '.../libadios2pio-nm-lib.a'" iss
         <command name="load">mvapich2/2.3.1</command>
       </modules>
       <modules mpilib="impi" compiler="intel">
-	<command name="load">intelmpi/2019u4</command>
+	<command name="load">intelmpi/2020</command>
       </modules>
       <modules mpilib="impi" compiler="pgi">
 	<command name="load">intelmpi/2019u3</command>