From cc1bae1c6034c1dbeb42c9fdd7958fa5b9eb5c2a Mon Sep 17 00:00:00 2001
From: "Grant.Firl" <Grant.Firl@noaa.gov>
Date: Tue, 27 Mar 2018 09:41:46 -0600
Subject: [PATCH] changes to use new submodule repo names; updated CMakeLists
 with new paths and ccppphys dependency (rather than gfsphysics); updated case
 config file for new paths

---
 ccpp-framework                  |  2 +-
 ccpp-physics                    |  2 +-
 gmtb-scm/case_config/twpice.nml |  6 +++---
 gmtb-scm/src/CMakeLists.txt     | 16 ++++++++--------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ccpp-framework b/ccpp-framework
index 5648b1c1..30d98766 160000
--- a/ccpp-framework
+++ b/ccpp-framework
@@ -1 +1 @@
-Subproject commit 5648b1c1fcf0d5e4d849ac0dd2b90046cbd2b705
+Subproject commit 30d98766ded0c8af56bf98a051cc4eb4834c52a4
diff --git a/ccpp-physics b/ccpp-physics
index daafe952..8f119094 160000
--- a/ccpp-physics
+++ b/ccpp-physics
@@ -1 +1 @@
-Subproject commit daafe9523f7c0cff874eb7a67356c8031b314055
+Subproject commit 8f119094a7664aa854afdf1c8564d0f23758c04b
diff --git a/gmtb-scm/case_config/twpice.nml b/gmtb-scm/case_config/twpice.nml
index 88ef857c..4b51bb17 100644
--- a/gmtb-scm/case_config/twpice.nml
+++ b/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
diff --git a/gmtb-scm/src/CMakeLists.txt b/gmtb-scm/src/CMakeLists.txt
index 4d368d07..b8b70ad5 100644
--- a/gmtb-scm/src/CMakeLists.txt
+++ b/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})