Merge branch 'jgfouca/rm_gnu9' into next (PR #6328)

Remove gnu9 1-off This was a 1-off for mappy that needed two gnu toolchains. Now that we have 11.2, we don't need this. [BFB]
E3SM-Project · Apr 5, 2024 · eda29ea · eda29ea
2 parents 59da0f1 + 686b5c1
commit eda29ea
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 43 deletions.
diff --git a/cime_config/machines/cmake_macros/gnu9.cmake b/cime_config/machines/cmake_macros/gnu9.cmake
diff --git a/cime_config/machines/cmake_macros/gnu9_mappy.cmake b/cime_config/machines/cmake_macros/gnu9_mappy.cmake
diff --git a/cime_config/machines/config_machines.xml b/cime_config/machines/config_machines.xml
@@ -1779,7 +1779,7 @@
     <NODENAME_REGEX>mappy</NODENAME_REGEX>
     <OS>LINUX</OS>
     <PROXY>proxy.sandia.gov:80</PROXY>
-    <COMPILERS>gnu,gnu9,intel</COMPILERS>
+    <COMPILERS>gnu</COMPILERS>
     <MPILIBS>openmpi</MPILIBS>
     <SAVE_TIMING_DIR>/sems-data-store/ACME/mappy/timings</SAVE_TIMING_DIR>
     <SAVE_TIMING_DIR_PROJECTS>.*</SAVE_TIMING_DIR_PROJECTS>