Skip to content

Commit

Permalink
(1) Bugfix to set missing flag for 64bit physics for GNU and handle n…
Browse files Browse the repository at this point in the history
…etCDF variables in new new compile_cmake.sh build script

(2) Bugfix for .gitmodules
  • Loading branch information
climbfuji committed Dec 13, 2019
1 parent bffeeda commit 325de70
Show file tree
Hide file tree
Showing 35 changed files with 19 additions and 2,569 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
branch = ufs_public_release
[submodule "ccpp/framework"]
path = ccpp/framework
url = https://github.com/cliimbfuji/ccpp-framework
url = https://github.com/climbfuji/ccpp-framework
branch = ufs_public_release_update_from_dtc_20191210
[submodule "ccpp/physics"]
path = ccpp/physics
Expand Down
8 changes: 8 additions & 0 deletions ccpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -259,12 +259,20 @@ endif(MKL_DIR)

#------------------------------------------------------------------------------
# Set netCDF flags for preprocessor, compiler and linker (if defined)
# Legacy settings for old make build
if(NETCDF_DIR)
set (NETCDF_INC "-I${NETCDF_DIR}/include")
set (NETCDF_LIB "-L${NETCDF_DIR}/lib -lnetcdff -lnetcdf")
set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${NETCDF_INC} ${NETCDF_LIB}")
ADD_DEFINITIONS(-DNETCDF)
message (STATUS "Enable netCDF support")
# Settings for new cmake build
elseif (NETCDF_INC_DIR AND NETCDF_LIBDIR)
set (NETCDF_INC "-I${NETCDF_INC_DIR}")
set (NETCDF_LIB "-L${NETCDF_LIBDIR} -lnetcdff -lnetcdf")
set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${NETCDF_INC} ${NETCDF_LIB}")
ADD_DEFINITIONS(-DNETCDF)
message (STATUS "Enable netCDF support")
else(NETCDF_DIR)
message (STATUS "Disable netCDF support")
endif(NETCDF_DIR)
Expand Down
99 changes: 0 additions & 99 deletions ccpp/suites/suite_FV3_CPT_v0.xml

This file was deleted.

89 changes: 0 additions & 89 deletions ccpp/suites/suite_FV3_GFS_2017.xml

This file was deleted.

94 changes: 0 additions & 94 deletions ccpp/suites/suite_FV3_GFS_2017_csawmg.xml

This file was deleted.

Loading

0 comments on commit 325de70

Please sign in to comment.