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

separate chgres_cube doxygen build from rest of UFS_UTILS, fix remaining chgres_cube doxygen warnings, turn on WARN_AS_ERROR for chgres_cube #395

Merged
merged 7 commits into from
Mar 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions .github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-1.3.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ jobs:

- name: build-ufs-utils
run: |
set -x
pwd
export ESMFMKFILE=~/esmf/lib/esmf.mk
cd ufs_utils
mkdir build && cd build
Expand Down
14 changes: 9 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,15 @@ if(EMC_EXEC_DIR)
set(exec_dir exec)
endif()

# If doxygen documentation we enabled, build it. This must come before
# adding the source code directories; the main documentation build
# must happen before any of the utility document builds.
if(ENABLE_DOCS)
find_package(Doxygen REQUIRED)
set(abs_top_srcdir "${CMAKE_SOURCE_DIR}")
add_subdirectory(docs)
endif()

add_subdirectory(sorc)

# Run unit tests.
Expand All @@ -79,8 +88,3 @@ if(BUILD_TESTING)
add_subdirectory(tests)
endif()

# If doxygen documentation we enabled, build it.
if(ENABLE_DOCS)
find_package(Doxygen REQUIRED)
add_subdirectory(docs)
endif()
4 changes: 2 additions & 2 deletions docs/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# This is the CMake file for building the docs directory of NCEPLIBS-ip.
# This is the CMake file for building the docs directory of NCEPLIBS
# UFS_UTILS project.
#
# Ed Hartnett 10/5/20

# Create doxyfile.
set(abs_top_srcdir "${CMAKE_SOURCE_DIR}")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)

# Build documentation with target all.
Expand Down
2 changes: 1 addition & 1 deletion docs/Doxyfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,7 @@ RECURSIVE = YES
# Note that relative paths are relative to the directory from which doxygen is
# run.

EXCLUDE = @abs_top_srcdir@/sorc/fre-nctools.fd @abs_top_srcdir@/sorc/nst_tf_chg.fd
EXCLUDE = @abs_top_srcdir@/sorc/fre-nctools.fd @abs_top_srcdir@/sorc/chgres_cube.fd

# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded
Expand Down
4 changes: 2 additions & 2 deletions docs/user_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ https://github.com/NOAA-EMC/UFS_UTILS.

## The Utilities

- chgres_cube - Creates cold start initial conditions for FV3 model
runs.
- <a href="chgres_cube/index.html">chgres_cube</a> - Creates cold
start initial conditions for FV3 model runs.

- emcsfc_ice_blend - Blends National Ice Center sea ice cover and EMC
sea ice concentration data to create a global sea ice analysis used
Expand Down
6 changes: 6 additions & 0 deletions sorc/chgres_cube.fd/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,9 @@ if(OpenMP_Fortran_FOUND)
endif()

install(TARGETS ${exe_name} RUNTIME DESTINATION ${exec_dir})

# If doxygen documentation we enabled, build it.
if(ENABLE_DOCS)
add_subdirectory(docs)
endif()

4 changes: 3 additions & 1 deletion sorc/chgres_cube.fd/atmosphere.F90
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,9 @@ end subroutine convert_winds
!! PS REAL (IX) SURFACE PRESSURE (PA)
!! OUTPUT ARGUMENT LIST:
!! PM REAL (IX,KM) MID-LAYER PRESSURE (PA)
!! DP REAL (IX,KM) LAYER DELTA PRESSURE (PA)
!! DP REAL (IX,KM) LAYER DELTA PRESSURE (PA)
!!
!! @param localpet ESMF local persistent execution thread
!!
!! @author HANN_MING HENRY JUANG, JUANG, Fanglin Yang, S. Moorthi
subroutine newpr1(localpet)
Expand Down
15 changes: 15 additions & 0 deletions sorc/chgres_cube.fd/docs/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# This is the CMake file for building the docs directory of UFS_UTILS
# utility chgres_cube.
#
# Ed Hartnett 3/8/21

# Create doxyfile.
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)

# Build documentation with target all.
add_custom_target(chgres_cube_doc ALL
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Generating API Documentation with Doxygen" VERBATIM)


Loading