From 5be2337ce402e18a911c168a162f1ffdb3f5a00e Mon Sep 17 00:00:00 2001 From: mlee03 Date: Wed, 16 Aug 2023 14:26:11 -0400 Subject: [PATCH] update rest --- CI.md | 22 ++++++++-------------- CMakeLists.txt | 3 +-- configure.ac | 2 +- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/CI.md b/CI.md index 89b4db256e..225b25129b 100644 --- a/CI.md +++ b/CI.md @@ -8,30 +8,24 @@ Required CI for pull requests are listed first. ## Pull Request CI and checks ### Build libFMS with autotools - Required GNU build test for all pull requests/pushes. Runs `make distcheck` after configuring via GNU autotools. -Runs on a container image with spack installed dependencies, on top a rocky linux base. - -Dockerfile for image is stored at .github/workflows/Dockerfile.gnu for more specific information on the CI environment. - Container environment: -gcc v12.3.0 -mpich v4.0.2 -netcdf v4.9.0 -netcdf-fortran v4.6.0 +gcc v7.3.0 +mpich v3.3a2 +netcdf v4.6.0 +netcdf-fortran v4.4.4 autoconf v2.69 -libyaml v0.2.5 -`./configure` flags tested: +container hosted at [noaagfdl/ubuntu_libfms_gnu:latest](https://hub.docker.com/r/noaagfdl/ubuntu_libfms_gnu) + +`./configure` flags: +- `--enable-openmp` - `--disable-openmp` - `--enable-mixed-mode` -- `--with-mpi=no` (disables unit testing) - `--disable-setting-flags` - `--with-yaml` -- `--enable-test-input=/home/unit_tests_input` - ### Build libfms with cmake Required GNU build test for all pull requests/pushes. diff --git a/CMakeLists.txt b/CMakeLists.txt index 5597ca3d43..7bda3b1d1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ set(CMAKE_Fortran_FLAGS_DEBUG) # Define the CMake project project(FMS - VERSION 2023.02.0 + VERSION 2023.01.0 DESCRIPTION "GFDL FMS Library" HOMEPAGE_URL "https://www.gfdl.noaa.gov/fms" LANGUAGES C Fortran) @@ -196,7 +196,6 @@ list(APPEND fms_fortran_src_files # Collect FMS C source files list(APPEND fms_c_src_files affinity/affinity.c - fms/fms_stacksize.c mosaic/create_xgrid.c mosaic/gradient_c2l.c mosaic/interp.c diff --git a/configure.ac b/configure.ac index a45d6042a1..39e726046e 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ AC_PREREQ([2.69]) # Initialize with name, version, and support email address. AC_INIT([GFDL FMS Library], - [2023.02.00-dev], + [2023.01.00-dev], [gfdl.climate.model.info@noaa.gov], [FMS], [https://www.github.com/NOAA-GFDL/FMS])