Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Mar 27, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ccpp-framework
Open in desktop
Submodule ccpp-framework updated 2 files
+1 −1 examples/suite_scm_GFS_test.xml
+42 −42 scripts/ccpp_prebuild_config_SCM.py
2 changes: 1 addition & 1 deletion ccpp-physics
Open in desktop
Submodule ccpp-physics updated 1 files
+6 −6 CMakeLists.txt
6 changes: 3 additions & 3 deletions gmtb-scm/case_config/twpice.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
16 changes: 8 additions & 8 deletions gmtb-scm/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
PROJECT(scm_ipd)
PROJECT(scm)
ENABLE_LANGUAGE(Fortran)

include(CMakeForceCompiler)
Expand All @@ -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)
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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})