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.

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

gsd/develop: update from NCAR master #3

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
4c9389d
Optimization/cleanup: only compile the files that are needed when sta…
climbfuji Dec 10, 2019
10f8501
Improved handling of builddir/basedir argument to ccpp_prebuild.py an…
climbfuji Dec 10, 2019
009f905
Merge pull request #245 from climbfuji/ufs_public_release_update_from…
climbfuji Dec 16, 2019
90f9fe9
Update version number to 4.0.0 and update list of authors
climbfuji Dec 26, 2019
d8b1f01
Merge pull request #247 from climbfuji/update_version_number_and_authors
climbfuji Jan 10, 2020
7daec21
scripts/mkcap.py: change the log message to match the logic for autom…
climbfuji Jan 22, 2020
745c113
scripts/metadata_parser.py: bugfix for converting optional attribute …
climbfuji Jan 23, 2020
578f8c7
scripts/mkcap.py: change the log message to match the logic for autom…
climbfuji Jan 22, 2020
8f63a19
scripts/metadata_parser.py: bugfix for converting optional attribute …
climbfuji Jan 23, 2020
826b1b9
Merge pull request #255 from climbfuji/bugfixes_optional_attributes_l…
climbfuji Jan 24, 2020
1c41a61
Merge pull request #248 from climbfuji/fix_travis_standalone_build_20…
climbfuji Jan 24, 2020
abbe8ab
Merge pull request #256 from climbfuji/update_dtc_develop_from_master
climbfuji Feb 3, 2020
9c41d33
Merge branch 'fix_log_message_unit_conversions' of https://github.com…
climbfuji Feb 3, 2020
0ea1008
Merge branch 'bugfix_metadata_optional_attribute_master' of https://g…
climbfuji Feb 3, 2020
a6e4dc6
Remove libxml2 reference in src/CMakeLists.txt
climbfuji Feb 6, 2020
eb9e33b
Merge pull request #261 from climbfuji/remove_libxml2
climbfuji Feb 6, 2020
d9cd9e6
Merge pull request #260 from climbfuji/dom_combine_prs_20200204
climbfuji Feb 6, 2020
5d5f8ec
Merge branch 'dtc/develop' of https://github.com/NCAR/ccpp-framework …
climbfuji Mar 17, 2020
f0ae2ae
set a value for cmake policy 0077 in order to not reset the STATIC va…
grantfirl Mar 18, 2020
244fb79
add comment describing CMP0077 addition
grantfirl Mar 18, 2020
d32b965
Merge pull request #268 from climbfuji/update_ncar_master_from_dtc_de…
climbfuji Mar 18, 2020
4ffb637
Merge pull request #269 from grantfirl/add_policy_0077
grantfirl Mar 19, 2020
b205427
Update of ccpp_prebuild.py and helper scripts: provide list of Fortra…
climbfuji Mar 19, 2020
3f02059
Merge branch 'master' of https://github.com/NCAR/ccpp-framework into …
climbfuji Mar 19, 2020
9675a43
Python3 compatibility for CCPP prebuild scripts
climbfuji Mar 25, 2020
762e747
Merge branch 'ccpp_prebuild_python3' of https://github.com/climbfuji/…
climbfuji Mar 25, 2020
3cd0f1e
Merge pull request #270 from climbfuji/add_rrtmgp_dom
climbfuji Mar 26, 2020
1dd453f
scripts/mkstatic.py: avoid recreating the auto-generated caps and API…
climbfuji Apr 2, 2020
a14dc34
Use code that works for both Python 2 and 3; avoid recreating the mak…
climbfuji Apr 2, 2020
7855d5d
Correct typos in scripts/ccpp_prebuild.py, remove debugging messages …
climbfuji Apr 3, 2020
303efb3
scripts/ccpp_prebuild.py: correct log messages (no code change)
climbfuji Apr 3, 2020
16b6047
Merge pull request #277 from climbfuji/avoid_recompile_without_change
climbfuji Apr 3, 2020
afde480
add cm-to-m conversion and reverse
grantfirl Apr 8, 2020
19ff305
Merge branch 'add_policy_0077' into noah_hafs
grantfirl Apr 8, 2020
c0a9d84
Merge branch 'noah_hafs' of https://github.com/grantfirl/ccpp-framewo…
climbfuji Apr 9, 2020
e38ae00
Update CMakeLists.txt: require cmake 3.0, remove legacy syntax for po…
climbfuji Apr 10, 2020
54f9b07
Merge pull request #281 from climbfuji/dtc_develop_noah_lsm_unit_conv…
climbfuji Apr 10, 2020
af414b5
Revert update of CODEOWNERS caused by the merge of dtc/develop
climbfuji Apr 14, 2020
1d54d53
conversion_tools/__init__.py: add new conversion cm<->m
climbfuji Apr 14, 2020
d678ce6
Update of schemes/check/ccpp_prebuild_config.py for Travis CI, bugfix…
climbfuji Apr 14, 2020
4b9cd89
Merge pull request #283 from climbfuji/update_master_from_dtc_develop…
climbfuji Apr 17, 2020
e311fc5
Remove CCPP dynamic build from framework
climbfuji Apr 20, 2020
092c293
Merge pull request #287 from climbfuji/remove_ccpp_dynamic_build
climbfuji Apr 23, 2020
73dfe65
Update pdf CCPP variable files for SCM v4.0 and ufs v1.0 release.
Mar 26, 2020
90d17aa
Remove unmaintained latex documentation for ccpp-framework.
Mar 26, 2020
c9325eb
Add REAMDE.md for when my memory gets worse.
Mar 26, 2020
a475528
Clarify sentence to denote that SCM and other models can be host models.
Mar 30, 2020
640afa4
Update version from 3.0.0 to 4.0.0
climbfuji May 6, 2020
2a6e41a
scripts/metadata_parser.py: add missing check for correct syntax of l…
climbfuji May 11, 2020
6890b2f
Merge pull request #289 from climbfuji/bugfixes_from_public_release
climbfuji May 11, 2020
07991bb
Fix Python 3 error in scripts/common.py, raise proper exceptions when…
climbfuji May 11, 2020
7c3673d
Merge pull request #292 from climbfuji/python3_decoding_parse_all_suites
climbfuji May 12, 2020
64def13
Merge branch 'master' of https://github.com/NCAR/ccpp-framework into …
climbfuji May 15, 2020
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
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