Skip to content

Commit

Permalink
Merge pull request #3 from climbfuji/update_gsd_develop_from_master
Browse files Browse the repository at this point in the history
gsd/develop: update from NCAR master
  • Loading branch information
DomHeinzeller authored May 20, 2020
2 parents 463a72c + 64def13 commit d5ddd17
Show file tree
Hide file tree
Showing 75 changed files with 661 additions and 9,137 deletions.
100 changes: 0 additions & 100 deletions .travis.yml

This file was deleted.

41 changes: 8 additions & 33 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,48 +5,29 @@ if(NOT PROJECT)
endif (NOT PROJECT)

#------------------------------------------------------------------------------
cmake_minimum_required(VERSION 2.8.11)
cmake_minimum_required(VERSION 3.0)

project(ccpp
VERSION 4.0.0
LANGUAGES C CXX Fortran)

# Use rpaths on MacOSX
set(CMAKE_MACOSX_RPATH 1)

if(POLICY CMP0048)
cmake_policy(SET CMP0048 NEW)
project(ccpp VERSION 3.0.0)
else(POLICY CMP0048)
project(ccpp)
set(PROJECT_VERSION 3.0.0)
set(PROJECT_VERSION_MAJOR 3)
set(PROJECT_VERSION_MINOR 0)
set(PROJECT_VERSION_PATCH 0)
endif(POLICY CMP0048)

if(POLICY CMP0042)
cmake_policy(SET CMP0042 NEW)
endif(POLICY CMP0042)

#------------------------------------------------------------------------------
# Enable Fortran
enable_language(Fortran)

#------------------------------------------------------------------------------
# Set package definitions
set(PACKAGE "ccpp-framework")
set(AUTHORS "Dom Heinzeller" "Timothy Brown" "David Gill")
set(AUTHORS "Dom Heinzeller" "Grant Firl" "Laurie Carson")
string(TIMESTAMP YEAR "%Y")

#------------------------------------------------------------------------------
# CMake Modules
# Set the CMake module path
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

#------------------------------------------------------------------------------
# Static or dynamic CCPP, default is dynamic; standalone build can only be dynamic
option(STATIC "Build a static CCPP" OFF)
if (PROJECT STREQUAL "Unknown" AND STATIC)
message(FATAL_ERROR "ccpp-framework standalone build can only be dynamic")
endif(PROJECT STREQUAL "Unknown" AND STATIC)

#------------------------------------------------------------------------------
# Set OpenMP flags for C/C++/Fortran
if (OPENMP)
Expand Down Expand Up @@ -93,12 +74,8 @@ if ("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "PGI")
endif()

#------------------------------------------------------------------------------
# By default we want a shared library (unless a static build is requested)
if(STATIC)
option(BUILD_SHARED_LIBS "Build a static library" OFF)
else(STATIC)
option(BUILD_SHARED_LIBS "Build a shared library" ON)
endif(STATIC)
# Request a static build
option(BUILD_SHARED_LIBS "Build a static library" OFF)

#------------------------------------------------------------------------------
# Enable code coverage
Expand All @@ -117,8 +94,6 @@ enable_testing()
add_subdirectory(src)
# Documentation
add_subdirectory(doc)
# All schemes
add_subdirectory(schemes)

#------------------------------------------------------------------------------
# Configure and enable packaging
Expand Down
Binary file modified doc/DevelopersGuide/CCPP_VARIABLES_FV3.pdf
Binary file not shown.
Binary file modified doc/DevelopersGuide/CCPP_VARIABLES_SCM.pdf
Binary file not shown.
15 changes: 0 additions & 15 deletions doc/DevelopersGuide/Makefile

This file was deleted.

12 changes: 12 additions & 0 deletions doc/DevelopersGuide/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# CCPP Framework Developers Guide

The PDF files in this directory are generated in the following manner:

When the ``ccpp_prebuild.py`` script is run for a host model, such as a single
column model (SCM) or the UFS Weather Model, a file named ``CCPP_VARIABLES_SCM.tex`` or
``CCPP_VARIABLES_FV3.tex`` is created in this directory.

To create the PDF files, the latex to pdf converter is necessary:

``pdflatex CCPP_VARIABLES_SCM.tex``
``pdflatex CCPP_VARIABLES_FV3.tex``
23 changes: 0 additions & 23 deletions doc/DevelopersGuide/acknow.tex

This file was deleted.

2 changes: 0 additions & 2 deletions doc/DevelopersGuide/chap_appendix.tex

This file was deleted.

Loading

0 comments on commit d5ddd17

Please sign in to comment.