Merge pull request #136 from JCSDA-internal/release/mpas-1.0

Release/mpas 1.0
JCSDA · Sep 21, 2021 · 3090207 · 3090207
2 parents 9683ef9 + c2ac560
commit 3090207
Show file tree

Hide file tree

Showing 293 changed files with 23,778 additions and 15,608 deletions.
diff --git a/CI/CMakeLists.txt b/CI/CMakeLists.txt
@@ -29,6 +29,12 @@ ecbuild_bundle( PROJECT jedicmake GIT "https://github.com/JCSDA-internal/jedi-cm
 ecbuild_bundle( PROJECT oops GIT "https://github.com/JCSDA-internal/oops.git" )
 ecbuild_bundle( PROJECT saber GIT "https://github.com/JCSDA-internal/saber.git" )
 
+# saber-data
+find_branch_name(REPO_DIR_NAME saber)
+if( NOT DEFINED ENV{LOCAL_PATH_JEDI_TESTFILES} AND NOT DEFINED ${GIT_TAG_FUNC} )
+  ecbuild_bundle( PROJECT saber-data GIT "https://github.com/JCSDA-internal/saber-data.git" )
+endif()
+
 ecbuild_bundle_finalize()
 
 include(cmake/cdash-integration.cmake)

diff --git a/CI/buildspec_clang.yml b/CI/buildspec_clang.yml
@@ -54,6 +54,7 @@ phases:
       - echo ${CODEBUILD_GIT_BRANCH} > /jcsda/artifacts/branch_name.txt
       - echo ${CODEBUILD_RESOLVED_SOURCE_VERSION} > /jcsda/artifacts/commit_sha.txt
 
+      # initialization
       - git lfs install
       - cd CI
 
@@ -62,16 +63,19 @@ phases:
 
       # oops
       - ./clone.sh $GIT_USER $GIT_PASS jcsda-internal/oops $CODEBUILD_GIT_BRANCH oops /jcsda/saber-bundle develop
+
       # saber
       - ./clone.sh $GIT_USER $GIT_PASS jcsda-internal/saber $CODEBUILD_GIT_BRANCH saber /jcsda/saber-bundle develop
 
-      - cp CMakeLists.txt /jcsda/saber-bundle
+      # saber-data
+      - ./clone.sh $GIT_USER $GIT_PASS jcsda-internal/saber-data $CODEBUILD_GIT_BRANCH saber-data /jcsda/saber-bundle develop
 
       # move CMakeLists.txt
       - cp CMakeLists.txt /jcsda/saber-bundle
       - cp -r cmake /jcsda/saber-bundle/
       - cp /jcsda/saber-bundle/cmake/CTestConfig.cmake /jcsda/saber-bundle
 
+      # print list
       - cd /jcsda/saber-bundle
       - ls
 
@@ -92,7 +96,7 @@ phases:
       - sed -i 's/saber-bundle/saber-bundle\/saber/' DartConfiguration.tcl
       - sed -i 's/build_container/build_container\/saber/' DartConfiguration.tcl
       - cat DartConfiguration.tcl
-      - make -j4
+      - ctest -C RelWithDebInfo -D ExperimentalBuild -j4
 
       - if [ "$CODEBUILD_BUILD_SUCCEEDING" = "1" ];
         then export BUILD_STATUS="1";

diff --git a/CI/buildspec_gnu.yml b/CI/buildspec_gnu.yml
@@ -46,21 +46,27 @@ phases:
       - echo ${CODEBUILD_GIT_BRANCH} > /jcsda/artifacts/branch_name.txt
       - echo ${CODEBUILD_RESOLVED_SOURCE_VERSION} > /jcsda/artifacts/commit_sha.txt
 
+      # initialization
       - cd CI
 
       # jedi-cmake
       - ./clone.sh $GIT_USER $GIT_PASS jcsda-internal/jedi-cmake $CODEBUILD_GIT_BRANCH jedicmake /jcsda/saber-bundle develop
+
       # oops
       - ./clone.sh $GIT_USER $GIT_PASS jcsda-internal/oops $CODEBUILD_GIT_BRANCH oops /jcsda/saber-bundle develop
+
       # saber
       - ./clone.sh $GIT_USER $GIT_PASS jcsda-internal/saber $CODEBUILD_GIT_BRANCH saber /jcsda/saber-bundle develop
 
+      # saber-data
+      - ./clone.sh $GIT_USER $GIT_PASS jcsda-internal/saber-data $CODEBUILD_GIT_BRANCH saber-data /jcsda/saber-bundle develop
+
       # move CMakeLists.txt
       - cp CMakeLists.txt /jcsda/saber-bundle
       - cp -r cmake /jcsda/saber-bundle/
+
       # cdash upload setup
       - cp /jcsda/saber-bundle/cmake/CTestConfig.cmake /jcsda/saber-bundle/
-
       - chmod -R 777 /jcsda/saber-bundle
 
   build:
@@ -85,7 +91,7 @@ phases:
         && sed -i 's/saber-bundle/saber-bundle\/saber/' DartConfiguration.tcl
         && sed -i 's/jedi/jedi\/saber/' DartConfiguration.tcl
         && cat DartConfiguration.tcl
-        && make -j4"
+        && ctest -C RelWithDebInfo -V -D ExperimentalBuild -j4"
 
       - if [ "$CODEBUILD_BUILD_SUCCEEDING" = "1" ];
         then export BUILD_STATUS="1";

diff --git a/CI/buildspec_intel.yml b/CI/buildspec_intel.yml
@@ -51,23 +51,31 @@ phases:
       - echo ${CODEBUILD_GIT_BRANCH} > /jcsda/artifacts/branch_name.txt
       - echo ${CODEBUILD_RESOLVED_SOURCE_VERSION} > /jcsda/artifacts/commit_sha.txt
 
+      # initialization
       - cd CI
       - . /etc/profile.d/intel.sh
 
       # jedi-cmake
       - ./clone.sh $GIT_USER $GIT_PASS jcsda-internal/jedi-cmake $CODEBUILD_GIT_BRANCH jedicmake /jcsda/saber-bundle develop
+
       # oops
       - ./clone.sh $GIT_USER $GIT_PASS jcsda-internal/oops $CODEBUILD_GIT_BRANCH oops /jcsda/saber-bundle develop
+
       # saber
       - ./clone.sh $GIT_USER $GIT_PASS jcsda-internal/saber $CODEBUILD_GIT_BRANCH saber /jcsda/saber-bundle develop
 
+      # saber-data
+      - ./clone.sh $GIT_USER $GIT_PASS jcsda-internal/saber-data $CODEBUILD_GIT_BRANCH saber-data /jcsda/saber-bundle develop
+
       # move CMakeLists.txt from saber/CI to bundle directory
       - cp CMakeLists.txt /jcsda/saber-bundle
       - cp -r cmake /jcsda/saber-bundle/
+
       # cdash upload setup
       - cp /jcsda/saber-bundle/cmake/CTestConfig.cmake /jcsda/saber-bundle/
       - chmod 777 -R /jcsda/saber-bundle
 
+      # print list
       - cd /jcsda/saber-bundle
       - ls
 
@@ -94,10 +102,10 @@ phases:
         && export PATH=/usr/local/lib:$PATH
         && cd /home/jedi/saber
         && cp ../DartConfiguration.tcl .
-        && sed -i 's/saber-bundle/saber\/saber-jedi/' DartConfiguration.tcl
-        && sed -i 's/home\/jedi/home\/jedi\/saber-jedi/' DartConfiguration.tcl
+        && sed -i 's/saber-bundle/saber-bundle\/saber/' DartConfiguration.tcl
+        && sed -i 's/jedi/jedi\/saber/' DartConfiguration.tcl
         && cat DartConfiguration.tcl
-        && make -j4"
+        && ctest -C RelWithDebInfo -V -D ExperimentalBuild -j4"
 
       - if [ "$CODEBUILD_BUILD_SUCCEEDING" = "1" ];
         then export BUILD_STATUS="1";

diff --git a/CI/cdash-url.sh b/CI/cdash-url.sh
@@ -4,5 +4,5 @@ dir=$1
 tag=$(head -1 $dir/TAG)
 Done=$(cat $dir/$tag/Done.xml)
 buildID=$(echo $Done | grep -o -P '(?<=buildId>).*(?=</build)')
-URL=https://cdash.jcsda.org/viewTest.php?buildid=$buildID
+URL=https://cdash.jcsda.org/buildSummary.php?buildid=$buildID
 echo $URL
diff --git a/CI/clone.sh b/CI/clone.sh
@@ -1,8 +1,8 @@
-#!/bin/bash 
+#!/bin/bash
 
 # clones specific branch of a given repo
 # if branch does not exist clones develop
- 
+
 git_user=$1
 git_token=$2
 org_repo_name=$3

diff --git a/CI/cmake/cdash-integration.cmake b/CI/cmake/cdash-integration.cmake
@@ -1,5 +1,5 @@
 # This CMake script customizes the site and build names for CDash
-# By default, it tries to autodetect the system hostname, compiler, 
+# By default, it tries to autodetect the system hostname, compiler,
 # and if you are in a Charliecloud environment. Then, it sets
 # the ctest/cdash variables SITE and BUILDNAME based on a combination
 # of auto-detected values and user overrides.

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,7 @@
 
 cmake_minimum_required( VERSION 3.12 )
 
-project( saber VERSION 1.1.0 LANGUAGES CXX Fortran )
+project( saber VERSION 1.2.0 LANGUAGES CXX Fortran )
 
 ## Ecbuild integration
 find_package( ecbuild QUIET )

diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@ FROM jcsda/docker-gnu-openmpi-dev:latest
 
 RUN touch /env.txt
 RUN printenv > /env.txt
-  
+
 RUN mkdir -p /var/run/sshd \
     && ssh-keygen -A \
     && sed -i 's/#PermitRootLogin yes/PermitRootLogin yes/g' /etc/ssh/sshd_config \

diff --git a/LICENSE → LICENSE.md b/LICENSE → LICENSE.md
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2019 UCAR
+   Copyright 2019-2021 UCAR
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/README.md b/README.md
@@ -1,7 +1,10 @@
-GNU: [![AWS-gnu](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiV2dVMmxFVENKL2dCVzN5UlgyZHJuSmhvbTV6dDhOalYwTEJDaXdZWGFDbXp2YlU4VzdsV3ZRNm9mT25mRnM3NlVYWXE2R2pmYVlZbWhxbHJ1OXFpdzVjPSIsIml2UGFyYW1ldGVyU3BlYyI6Ilp2T04vNnBRR0xFYmQ3UzAiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://us-east-1.console.aws.amazon.com/codesuite/codebuild/projects/automated-testing-saber-gnu/history)
-INTEL: [![AWS-intel](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiYUROTE5DZVdranpBQTBKbTlBam1vb2pVWXJteDdEMk1RLzhWdmlQU2NUQUhueFF2UnhINWxDcGZ1eWFqcFpBUVRDMGpYdVhzSWdmazNYcmRDeUdOd0xRPSIsIml2UGFyYW1ldGVyU3BlYyI6IjhqZnUxOHpObWFGSnFtUzYiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://us-east-1.console.aws.amazon.com/codesuite/codebuild/projects/automated-testing-saber-intel/history?region=us-east-1)
-CLANG: [![AWS-Clang](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiL3NrZ05zdXQzbmlhOTJOT0RVanBwKzhocXhIb0tpdnFFMzAzdjd6RmN4V0FpRTJMVkdYcGJoVS9CTlE0L3dXS3JvclZxZU12U0lVWjdBb3krZ2xzODBBPSIsIml2UGFyYW1ldGVyU3BlYyI6IklHcGQ0VUJNOWdzNHNyWE0iLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://us-east-1.console.aws.amazon.com/codesuite/codebuild/projects/automated-testing-saber-clang/history?region=us-east-1)
-[![codecov](https://codecov.io/gh/JCSDA/saber/branch/develop/graph/badge.svg?token=UZCHDL6Y4B)](https://codecov.io/gh/JCSDA/saber)
+### Continuous integration:
+| Platform      |  JCSDA-internal       | JCSDA      |
+| ------------- | ------------- |------------- |
+| GNU           | [![AWS-gnu](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoieXA5WFFUZk5NMDVvV0ZkZVBQUDRVeFN3VDk5aVkvZHJ0K3ZWaEl6RlVZNGdCTEI0Y283QU5TTzVTS0k0N0hNYjl4allwY21SRlFWVjJYTEFjSlJUUlZVPSIsIml2UGFyYW1ldGVyU3BlYyI6ImxZNTZLc3VXcGNVYktCeVQiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/saber-internal-gnu/history) | [![AWS-gnu](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiV2dVMmxFVENKL2dCVzN5UlgyZHJuSmhvbTV6dDhOalYwTEJDaXdZWGFDbXp2YlU4VzdsV3ZRNm9mT25mRnM3NlVYWXE2R2pmYVlZbWhxbHJ1OXFpdzVjPSIsIml2UGFyYW1ldGVyU3BlYyI6Ilp2T04vNnBRR0xFYmQ3UzAiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/automated-testing-saber-gnu/history)
+| Intel         | [![AWS-intel](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoidC9ZWmlyNU8xZmdjd0kxbFJzcGVNTlhJSDdBcFJ4RUdwNjNmcnFzQ1VWUUNaMWFEZkwvbHlkZUxTaTZIZlQyWWxOMGtvVzRaTlpRNGdjbFVUK0ZaRDFvPSIsIml2UGFyYW1ldGVyU3BlYyI6IllwQlZTb2JNdnJjOEo5TlgiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/saber-internal-intel/history) | [![AWS-intel](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiYUROTE5DZVdranpBQTBKbTlBam1vb2pVWXJteDdEMk1RLzhWdmlQU2NUQUhueFF2UnhINWxDcGZ1eWFqcFpBUVRDMGpYdVhzSWdmazNYcmRDeUdOd0xRPSIsIml2UGFyYW1ldGVyU3BlYyI6IjhqZnUxOHpObWFGSnFtUzYiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/automated-testing-saber-intel/history)
+| CLANG         | [![AWS-clang](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoicnRqWEh6YUg1UEx2OWE5QVpXb2RjVDFCeitJV3ROaEkxVGVnYnRNYWMzR0J0Z2xPZFhTZlEvVUFiL1BoUjJzcVh3V3BSaTRaSVFnK2dSdGtMcnd5S2o4PSIsIml2UGFyYW1ldGVyU3BlYyI6IjFVTEtZRTNpQXJMR0NYRCsiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/saber-internal-clang/history) | [![AWS-clang](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiL3NrZ05zdXQzbmlhOTJOT0RVanBwKzhocXhIb0tpdnFFMzAzdjd6RmN4V0FpRTJMVkdYcGJoVS9CTlE0L3dXS3JvclZxZU12U0lVWjdBb3krZ2xzODBBPSIsIml2UGFyYW1ldGVyU3BlYyI6IklHcGQ0VUJNOWdzNHNyWE0iLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/automated-testing-saber-clang/history)
+| Code Coverage | [![codecov](https://codecov.io/gh/JCSDA-internal/saber/branch/develop/graph/badge.svg?token=GKZ5TMF2GW)](https://codecov.io/gh/JCSDA-internal/saber) |
 
 # SABER
 &copy; Copyright 2019 UCAR

diff --git a/cmake/compiler_flags_Clang_CXX.cmake b/cmake/compiler_flags_Clang_CXX.cmake
@@ -1,7 +1,7 @@
 # (C) Copyright 2019 UCAR
-# 
+#
 # This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. 
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
 
 ####################################################################
 # FLAGS COMMON TO ALL BUILD TYPES
@@ -37,4 +37,4 @@ set( CMAKE_CXX_LINK_FLAGS        "" )
 
 # Meaning of flags
 # ----------------
-# todo 
+# todo
diff --git a/cmake/compiler_flags_Cray_CXX.cmake b/cmake/compiler_flags_Cray_CXX.cmake
@@ -1,7 +1,7 @@
 # (C) Copyright 2019 UCAR
-# 
+#
 # This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. 
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
 
 ####################################################################
 # FLAGS COMMON TO ALL BUILD TYPES

diff --git a/cmake/compiler_flags_Cray_Fortran.cmake b/cmake/compiler_flags_Cray_Fortran.cmake
@@ -1,7 +1,7 @@
 # (C) Copyright 2019 UCAR
-# 
+#
 # This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. 
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
 
 ####################################################################
 # FLAGS COMMON TO ALL BUILD TYPES

diff --git a/cmake/compiler_flags_GNU_CXX.cmake b/cmake/compiler_flags_GNU_CXX.cmake
@@ -1,7 +1,7 @@
 # (C) Copyright 2019 UCAR
-# 
+#
 # This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. 
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
 
 ####################################################################
 # FLAGS COMMON TO ALL BUILD TYPES
@@ -38,4 +38,4 @@ set( CMAKE_CXX_LINK_FLAGS        "" )
 # Meaning of flags
 # ----------------
 # todo
-  
+
diff --git a/cmake/compiler_flags_GNU_Fortran.cmake b/cmake/compiler_flags_GNU_Fortran.cmake
@@ -1,7 +1,7 @@
 # (C) Copyright 2019 UCAR
-# 
+#
 # This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. 
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
 
 ####################################################################
 # FLAGS COMMON TO ALL BUILD TYPES
@@ -38,4 +38,4 @@ set( CMAKE_Fortran_LINK_FLAGS    "" )
 # -fstack-arrays     : Allocate automatic arrays on the stack (needs large stacksize!!!)
 # -funroll-all-loops : Unroll all loops
 # -fcheck=bounds     : Bounds checking
-  
+
diff --git a/cmake/compiler_flags_Intel_CXX.cmake b/cmake/compiler_flags_Intel_CXX.cmake
@@ -1,7 +1,7 @@
 # (C) Copyright 2019 UCAR
-# 
+#
 # This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. 
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
 
 ####################################################################
 # FLAGS COMMON TO ALL BUILD TYPES
@@ -36,4 +36,4 @@ set( CMAKE_CXX_LINK_FLAGS        "" )
 # Meaning of flags
 # ----------------
 # todo
-  
+
diff --git a/cmake/compiler_flags_Intel_Fortran.cmake b/cmake/compiler_flags_Intel_Fortran.cmake
@@ -1,7 +1,7 @@
 # (C) Copyright 2019 UCAR
-# 
+#
 # This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. 
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
 
 ####################################################################
 # FLAGS COMMON TO ALL BUILD TYPES
@@ -36,4 +36,4 @@ set( CMAKE_Fortran_LINK_FLAGS    "" )
 # Meaning of flags
 # ----------------
 # todo
-  
+
diff --git a/cmake/compiler_flags_XL_CXX.cmake b/cmake/compiler_flags_XL_CXX.cmake
@@ -1,7 +1,7 @@
 # (C) Copyright 2019 UCAR
-# 
+#
 # This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. 
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
 
 ####################################################################
 # FLAGS COMMON TO ALL BUILD TYPES

diff --git a/cmake/compiler_flags_XL_Fortran.cmake b/cmake/compiler_flags_XL_Fortran.cmake
@@ -1,7 +1,7 @@
 # (C) Copyright 2019 UCAR
-# 
+#
 # This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. 
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
 
 
 # WARNING!!

diff --git a/cmake/saber_compiler_flags.cmake b/cmake/saber_compiler_flags.cmake
@@ -1,7 +1,7 @@
 # (C) Copyright 2019 UCAR
-# 
+#
 # This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. 
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
 
 if( NOT CMAKE_BUILD_TYPE MATCHES "Debug" )
   add_definitions( -DNDEBUG )

diff --git a/docs/Doxyfile.in b/docs/Doxyfile.in
@@ -1126,13 +1126,6 @@ VERBATIM_HEADERS       = YES
 
 ALPHABETICAL_INDEX     = YES
 
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
 # In case all classes in a project start with a common prefix, all classes will
 # be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
 # can be used to specify a prefix (or a list of prefixes) that should be ignored

diff --git a/src/saber/bump/CMakeLists.txt b/src/saber/bump/CMakeLists.txt
@@ -8,7 +8,6 @@ list(APPEND bump_src_files_list
 tools_fit.fypp
 tools_func.c
 tools_func.fypp
-tools_samp.fypp
 type_avg_blk.fypp
 type_avg.fypp
 type_bpar.fypp
@@ -39,14 +38,15 @@ type_tree.fypp
 type_var.fypp
 type_vbal_blk.fypp
 type_vbal.fypp
+type_wind.fypp
 
 )
 
 if( oops_FOUND )
     list(APPEND bump_src_files_list
 
     type_bump.h
-    type_bump_interface.F90 
+    type_bump_interface.F90
 
     )
 endif()