From 2b3c90310d2593b0a296281f0b504e34c83604dd Mon Sep 17 00:00:00 2001
From: Francis Vitt <fvitt@ucar.edu>
Date: Tue, 21 Nov 2023 10:06:19 -0700
Subject: [PATCH] derecho updates -- emsf lib for waccmx and intel compiler
 flags for ERP tests

        modified:   config/cesm/machines/config_compilers.xml
        modified:   config/cesm/machines/config_machines.xml
---
 config/cesm/machines/config_compilers.xml | 9 ++++++++-
 config/cesm/machines/config_machines.xml  | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/config/cesm/machines/config_compilers.xml b/config/cesm/machines/config_compilers.xml
index 9328b265139..fae1ab4f95f 100644
--- a/config/cesm/machines/config_compilers.xml
+++ b/config/cesm/machines/config_compilers.xml
@@ -755,7 +755,14 @@ using a fortran linker.
     <append> -lnetcdff -lnetcdf </append>
   </SLIBS>
 </compiler>
-
+<compiler MACH="derecho" COMPILER="intel">
+  <CFLAGS>
+    <append> -march=core-avx2 -no-fma</append>
+  </CFLAGS>
+  <FFLAGS>
+    <append> -march=core-avx2 -no-fma</append>
+  </FFLAGS>
+</compiler>
 
 <compiler MACH="eastwind" COMPILER="intel">
   <CFLAGS>
diff --git a/config/cesm/machines/config_machines.xml b/config/cesm/machines/config_machines.xml
index 35c9037a622..f08e40033ac 100644
--- a/config/cesm/machines/config_machines.xml
+++ b/config/cesm/machines/config_machines.xml
@@ -1174,6 +1174,10 @@ This allows using a different mpirun command to launch unit tests
 	<command name="load">parallel-netcdf/1.12.3</command>
       </modules>
 
+      <modules>
+        <command name="load">esmf/8.5.0</command>
+      </modules>
+
     </module_system>
 
     <environment_variables>