Merge pull request #11 from grantfirl/add_rl_type

Add rl type

Author: scrasmussen

scm/src/CMakeLists.txt

@@ -17,14 +17,23 @@ if(DEFINED CCPP_SUITES)
   endif()
   unset(CCPP_SUITES CACHE)
 else()
-  execute_process(
-    COMMAND scm/src/suite_info.py --fc "${CMAKE_Fortran_COMPILER_ID}"
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../..
-    OUTPUT_VARIABLE suite_string
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    set(_ccpp_suites_arg "--suites=${suite_string}")
-    message("Calling CCPP code generator (ccpp_prebuild.py) for suites listed in scm/src/suite_info.py: ${_ccpp_suites_arg}.")
+  if(DEFINED RL)
+    execute_process(
+      COMMAND scm/src/suite_info.py --fc "${CMAKE_Fortran_COMPILER_ID}" --rl ${RL}
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../..
+      OUTPUT_VARIABLE suite_string
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+  else()
+    execute_process(
+      COMMAND scm/src/suite_info.py --fc "${CMAKE_Fortran_COMPILER_ID}"
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../..
+      OUTPUT_VARIABLE suite_string
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+  endif()
+  set(_ccpp_suites_arg "--suites=${suite_string}")
+  message("Calling CCPP code generator (ccpp_prebuild.py) for suites listed in scm/src/suite_info.py: ${_ccpp_suites_arg}.")
 endif()
 # Run CCPP prebuild.py
 message (STATUS "Running ccpp_prebuild.py for CCPP")
@@ -259,7 +268,7 @@ if (${CMAKE_Fortran_COMPILER_ID} MATCHES "GNU")
   endif()
 
   set(CMAKE_C_FLAGS_RELEASE       "-O2 -fPIC" CACHE STRING "" FORCE)
-  set(CMAKE_Fortran_FLAGS_RELEASE "-O0 -fPIC" CACHE STRING "" FORCE)
+  set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fPIC" CACHE STRING "" FORCE)
   set(CMAKE_C_FLAGS_BITFORBIT       "-O2 -fPIC" CACHE STRING "" FORCE)
   set(CMAKE_Fortran_FLAGS_BITFORBIT "-O2 -fPIC" CACHE STRING "" FORCE)
 

scm/src/suite_info.py

@@ -5,6 +5,8 @@
 #DEFAULT_SUITE_BEHAVIOR = 'supported'
 DEFAULT_SUITE_BEHAVIOR = 'regression_test'
 
+DEFAULT_RUN_LIST = 'all'
+
 class suite(object):
 
     DEFAULT_MAX_TIMESTEP = 1800.0
@@ -83,12 +85,20 @@ def timestep(self, value):
 def main():
     # find which compiler is being used
     parser = argparse.ArgumentParser()
-    parser.add_argument("--fc")
+    parser.add_argument("--fc", help='Fortran compiler being used (e.g. gnu, intel, intelllvm, nvhpc)', required=False)
+    parser.add_argument("--rl", help='run list type in rt_test_cases.py (e.g. supported, dev, legacy, sp)', required=False)
     args = parser.parse_args()
-
+    
+    fc = args.fc
+    rl = args.rl
+        
+    if not rl or rl.lower() not in ['all','supported','legacy','dev', 'sp']:
+        #printing a warning will mess up the cmake process because it passes in everything printed out by this script to the '--suites' argument of ccpp_prebuild.py
+        rl = DEFAULT_RUN_LIST
+    
     #print supported suites separated by commas
     suite_string = ''
-
+    
     if DEFAULT_SUITE_BEHAVIOR == 'regression_test':
         dir_path = os.path.dirname(os.path.realpath(__file__))
         sys.path.insert(1, dir_path + '/../../test/')
@@ -98,27 +108,32 @@ def main():
         import rt_test_cases
 
         # choose correct compiler
-        if 'gnu' in args.fc.lower():
+        if 'gnu' in fc.lower():
             rttc = rt_test_cases.gnu_test_cases
-        elif 'intel' in args.fc.lower():
+        elif 'intel' in fc.lower():
             rttc = rt_test_cases.intel_test_cases
-        elif 'nvhpc' in args.fc.lower():
+        elif 'nvhpc' in fc.lower():
             rttc = rt_test_cases.nvhpc_test_cases
         else:
-            print("Warning: suite_info.py was unable to match CMAKE_Fortran_COMPILER string, using default gnu rt test cases")
+            #printing a warning will mess up the cmake process because it passes in everything printed out by this script to the '--suites' argument of ccpp_prebuild.py
+            #print("Warning: suite_info.py was unable to match CMAKE_Fortran_COMPILER string, using default gnu rt test cases")
             rttc = rt_test_cases.gnu_test_cases
 
-        for item in rttc.run_list_supported:
-            rt_suite_list.append(item.get("suite"))
+        if 'supported' in rl.lower() or 'all' in rl.lower():
+            for item in rttc.run_list_supported:
+                rt_suite_list.append(item.get("suite"))
 
-        for item in rttc.run_list_legacy:
-            rt_suite_list.append(item.get("suite"))
+        if 'legacy' in rl.lower() or 'all' in rl.lower():
+            for item in rttc.run_list_legacy:
+                rt_suite_list.append(item.get("suite"))
 
-        for item in rttc.run_list_dev:
-            rt_suite_list.append(item.get("suite"))
+        if 'dev' in rl.lower() or 'all' in rl.lower():
+            for item in rttc.run_list_dev:
+                rt_suite_list.append(item.get("suite"))
 
-        for item in rttc.run_list_sp:
-            rt_suite_list.append(item.get("suite"))
+        if 'sp' in rl.lower() or 'all' in rl.lower():
+            for item in rttc.run_list_sp:
+                rt_suite_list.append(item.get("suite"))
 
         unique_suite_list = list(set(rt_suite_list))
 

scm/src/supported_suites.py

@@ -1 +1 @@
-suites = ["SCM_GFS_v16","SCM_GFS_v16_ps","SCM_GFS_v16_RRTMGP","SCM_GFS_v17_p8_ugwpv1","SCM_HRRR_gf","SCM_WoFS_v0"]
+suites = ["SCM_GFS_v16","SCM_GFS_v16_RRTMGP","SCM_GFS_v17_p8_ugwpv1","SCM_HRRR_gf","SCM_WoFS_v0"]