diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1782977d2..67ca10847c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -204,13 +204,7 @@ endif()
 ###############################################################################
 if(WW3)
   if(CMAKE_Platform)
-    if(${CMAKE_Platform} STREQUAL "hera.intel")
-      set(WW3_COMP "hera")
-    elseif(${CMAKE_Platform} STREQUAL "orion.intel")
-      set(WW3_COMP "orion")
-    elseif(${CMAKE_Platform} STREQUAL "cheyenne.intel")
-      set(WW3_COMP "cheyenne")
-    elseif(${CMAKE_Platform} STREQUAL "wcoss2")
+    if(${CMAKE_Platform} STREQUAL "wcoss2")
       set(WW3_COMP "wcoss_cray")
     elseif(${CMAKE_Platform} MATCHES "linux*" OR ${CMAKE_Platform} MATCHES "macosx*")
       if (CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
diff --git a/WW3 b/WW3
index a89e2a6339..fc509248a1 160000
--- a/WW3
+++ b/WW3
@@ -1 +1 @@
-Subproject commit a89e2a6339a016522d3a84188756d0a4bb11be87
+Subproject commit fc509248a1cd397e138e65d57c1b10183fc64e2f