Merge pull request ESCOMP#37 from ekluzek/update_for_mksurfdata_esmf_…

…build



Changes needed for the mksurfdata_esmf build

Fixes ESCOMP#36

I've only tested in the context of mksurfdata_esmf so far:

I also did the following tests on izumi and they PASS:

ERS_Ld3.f19_g17.X.izumi_intel
ERS_Ld3.f45_g37_rx1.A.izumi_intel

machines/config_machines.xml

@@ -735,7 +735,7 @@ This allows using a different mpirun command to launch unit tests
         <command name="purge"/>
         <command name="load">ncarenv/1.3</command>
         <command name="load">python/3.7.9</command>
-        <command name="load">cmake</command>
+        <command name="load">cmake/3.18.2</command>
       </modules>
       <modules compiler="intel">
         <command name="load">intel/19.1.1</command>
@@ -2304,6 +2304,9 @@ This allows using a different mpirun command to launch unit tests
       <!-- The following is needed in order to run qsub from the compute nodes -->
       <env name="PATH">$ENV{PATH}:/cluster/torque/bin</env>
     </environment_variables>
+    <environment_variables compiler="intel">
+      <env name="PIO">/home/jedwards/pio/2.5.7/intel</env>
+    </environment_variables>
     <resource_limits>
       <resource name="RLIMIT_STACK">-1</resource>
     </resource_limits>