Merge pull request #3 from NCAR/update_cmake

changes to use new submodule repo names; updated CMakeLists with new …

gmtb-scm/case_config/twpice.nml

@@ -7,7 +7,7 @@ time_scheme = 1,
 runtime = 2138400,
 output_frequency = 600.0,
 n_levels = 64,
-output_dir = '../output_twpice',
+output_dir = 'output_twpice',
 output_file = 'output',
 thermo_forcing_type = 2,
 mom_forcing_type = 3,
@@ -23,7 +23,7 @@ $end
 
 $physics_config
 physics_suite = 'suite_scm_GFS_test',
-physics_suite_dir = '../../gmtb-ccpp/examples/',
-physics_nml = '../../gmtb-gfsphysics/input.nml',
+physics_suite_dir = '../../ccpp-framework/examples/',
+physics_nml = '../../ccpp-physics/input.nml',
 column_area = 2.0E9,
 $end

gmtb-scm/src/CMakeLists.txt

@@ -1,5 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(scm_ipd)
+PROJECT(scm)
 ENABLE_LANGUAGE(Fortran)
 
 include(CMakeForceCompiler)
@@ -9,8 +9,8 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules)
 #MESSAGE("The NETCDF env. variable is $ENV{NETCDF}")
 SET(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} $ENV{NETCDF})
 
-SET(CCPP_SRC ${CMAKE_SOURCE_DIR}/../../gmtb-ccpp)
-SET(GFSPHYSICS_SRC ${CMAKE_SOURCE_DIR}/../../gmtb-gfsphysics)
+SET(CCPP_SRC ${CMAKE_SOURCE_DIR}/../../ccpp-framework)
+SET(GFSPHYSICS_SRC ${CMAKE_SOURCE_DIR}/../../ccpp-physics)
 
 # Use rpaths on MacOSX
 set(CMAKE_MACOSX_RPATH 1)
@@ -30,8 +30,8 @@ endif()
 
 ADD_COMPILE_OPTIONS(-O0)
 
-ADD_SUBDIRECTORY(${CCPP_SRC} ${CMAKE_BINARY_DIR}/gmtb-ccpp)
-ADD_SUBDIRECTORY(${GFSPHYSICS_SRC} ${CMAKE_BINARY_DIR}/gmtb-gfsphysics)
+ADD_SUBDIRECTORY(${CCPP_SRC} ${CMAKE_BINARY_DIR}/ccpp-framework)
+ADD_SUBDIRECTORY(${GFSPHYSICS_SRC} ${CMAKE_BINARY_DIR}/ccpp-physics)
 
 SET(scm_source_files gmtb_scm.F90
             gmtb_scm_input.f90
@@ -51,8 +51,8 @@ SET(NETCDF_F90 "YES")
 FIND_PACKAGE(NetCDF)
 
 INCLUDE_DIRECTORIES(${NETCDF_INCLUDES})
-INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/gmtb-ccpp/src)
-INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/gmtb-gfsphysics)
+INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/ccpp-framework/src)
+INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/ccpp-physics)
 
 if (${CMAKE_Fortran_COMPILER_ID} MATCHES "GNU")
 #  gfortran
@@ -92,4 +92,4 @@ else(OPENMP)
 endif()
 
 ADD_EXECUTABLE(gmtb_scm ${scm_source_files})
-TARGET_LINK_LIBRARIES(gmtb_scm gfsphysics ccpp ${NETCDF_LIBRARIES})
+TARGET_LINK_LIBRARIES(gmtb_scm ccppphys ccpp ${NETCDF_LIBRARIES})