rebase to cime master

Author: jedwards4b

config/cesm/machines/config_compilers.xml

@@ -906,15 +906,15 @@ using a fortran linker.
 
 <compiler MACH="casper" COMPILER="intel">
   <CFLAGS>
-    <append> -qopt-report -xCORE_AVX2 -no-fma</append>
+    <append> -qopt-report -xCORE_AVX2 -no-fma </append>
   </CFLAGS>
   <FFLAGS>
     <append> -qopt-report -xCORE_AVX2 -no-fma</append>
   </FFLAGS>
   <LDFLAGS>
     <!-- the path to gcc should match that used in building the SmartRedis lib -->
     <append>-Wl,-rpath /glade/u/apps/dav/opt/gnu/9.1.0/lib64 </append>
-  </LDFLAGS>
+  </LDFLAGS> 
   <CMAKE_OPTS>
     <append DEBUG="TRUE"> -DPIO_ENABLE_LOGGING=ON </append>
   </CMAKE_OPTS>

config/cesm/machines/config_machines.xml

@@ -496,6 +496,9 @@ This allows using a different mpirun command to launch unit tests
       <env name="CESMDATAROOT">/glade/p/cesmdata/cseg</env>
       <env name="NETCDF_PATH">$ENV{NETCDF}</env>
     </environment_variables>
+    <environment_variables compiler="intel">
+      <env name="PATH">/glade/u/apps/dav/opt/gnu/9.1.0/bin/:$ENV{PATH}</env>
+    </environment_variables>
     <resource_limits>
       <resource name="RLIMIT_STACK">-1</resource>
     </resource_limits>

scripts/lib/CIME/test_scheduler.py

@@ -803,6 +803,7 @@ def _run_phase(self, test):
         else:
             # SmartSim test needs a wrapper to submit
             if testmods and "drv/smartsim" in testmods:
+                self._log_output(test, "Runnning smartsim launch script")
                 cmd = os.path.join(self._cime_root, "tools", "smartsim", "launch.py")
             else:
                 cmd = "./case.submit"