Remove gnumake build remnants, change v16beta to v16 (NOAA-EMC#234)

* Remove gnumake files * Replace v16beta with v16 for all CCPP suites * Remove unused CCPP_INCLUDE_DIRS/CCPP_LIB_DIRS from ccpp/CMakeLists.txt
kayeekayee · Jan 29, 2021 · c2fc3de · c2fc3de
1 parent 307f001
commit c2fc3de
Show file tree

Hide file tree

Showing 16 changed files with 5 additions and 1,418 deletions.
diff --git a/ccpp/CMakeLists.txt b/ccpp/CMakeLists.txt
@@ -25,8 +25,6 @@ endif()
 # Set include directories for make, also set CCPP_... for external projects
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/framework/src)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/physics)
-SET(CCPP_INCLUDE_DIRS "${CMAKE_CURRENT_BINARY_DIR}/framework/src;${CMAKE_CURRENT_BINARY_DIR}/physics")
-SET(CCPP_LIB_DIRS "${CMAKE_CURRENT_BINARY_DIR}/framework/src;${CMAKE_CURRENT_BINARY_DIR}/physics")
 
 #------------------------------------------------------------------------------
 # Generate Compiler flags for C/CXX/Fortran - set to match NEMSfv3gfs flags

diff --git a/ccpp/build_ccpp.sh b/ccpp/build_ccpp.sh
diff --git a/ccpp/driver/makefile b/ccpp/driver/makefile
diff --git a/ccpp/set_compilers.sh b/ccpp/set_compilers.sh
diff --git a/ccpp/suites/suite_FV3_GFS_v16beta.xml → ccpp/suites/suite_FV3_GFS_v16.xml b/ccpp/suites/suite_FV3_GFS_v16beta.xml → ccpp/suites/suite_FV3_GFS_v16.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="FV3_GFS_v16beta" version="1">
+<suite name="FV3_GFS_v16" version="1">
   <!-- <init></init> -->
   <group name="fast_physics">
     <subcycle loop="1">

diff --git a/ccpp/suites/suite_FV3_GFS_v16beta_RRTMGP.xml → ccpp/suites/suite_FV3_GFS_v16_RRTMGP.xml b/ccpp/suites/suite_FV3_GFS_v16beta_RRTMGP.xml → ccpp/suites/suite_FV3_GFS_v16_RRTMGP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="FV3_GFS_v16beta_RRTMGP" version="1">
+<suite name="FV3_GFS_v16_RRTMGP" version="1">
   <!-- <init></init> -->
   <group name="fast_physics">
     <subcycle loop="1">