From a3e595edb4712c057de7e398900c762f785e26bc Mon Sep 17 00:00:00 2001 From: rem1776 Date: Tue, 6 Oct 2020 10:40:03 -0400 Subject: [PATCH 1/6] Updated for release --- CHANGELOG.md | 31 +++++++++++++++++++++++++++++++ CMakeLists.txt | 2 +- configure.ac | 2 +- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 784b036ee7..244b8a634c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,37 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0), and this project uses `yyyy.rr[.pp]`, where `yyyy` is the year a patch is released, `rr` is a sequential release number (starting from `01`), and an optional two-digit sequential patch number (starting from `01`). +## [2020.03] - 2020-10-? +### Added +- FMS2_IO: Adds header_buffer_val to the fms2io namelist which sets the netcdf header size in bytes. The default value is 16kb +- FMS2_IO: Adds netcdf_default_format to the fms2io namelist which allows the user to change the netcdf file type. The default value is 64bit. +- FMS2_IO: Adds support to read netcdf string global attributes +- FMS2_IO: Adds an optional argument to open_file, `dont_add_res_to_filename`, which indicates that the filename should not be modified (default adds .res to restart file name) +- FMS2_IO: Modifies the `register_variable_attribute` and `register_global_attribute` interfaces by adding str_len as an argument. This is a workaround to get fms2io to work with PGI because they don't support class (*) with len=*. +- FMS2_IO: Adds unit test that tests `write_data` and `read_data` when using a domain with a mask table +- FMS2_IO: Adds fms2io’s version of get_mosaic_tile_grid +- MPP_IO: Adds `-Duse_mpp_io` compile option for data_override, interpolator, amip_interp, diag_manager, topography, and xgrid to select using mpp_io instead of fms2_io +- MPP_INIT: Adds unit tests for routines/functions that are called in mpp_init +- CMAKE: A cmake build system has been added with a CI build using cmake +### Changed +- FMS2_IO: Improves performance of previous release by gathering the domain decomposed data into one global buffer and doing one write rather than doing multiple reads +- DATA_OVERRIDE: Changes line in time_interp_external2 to enable 3D overrides + +### Fixed +- DATA_OVERRIDE[2]: Fixes a crash when doing ongrid data_override calls with a domain with halos +- DIAG_MANAGER[2]: Fixes an issue where time_bnds were written incorrectly for the last time stamp +- DIAG_MANAGER: Regional diagnostics with a mask table now work +- FMS2_IO: Unit test includes fms2io_init call to improve functionality +- MPP: BOZ literals that are used in variable declaration are converted to integers using the int() function. +- MPP_DOMAINS2: Fixed unit test +- FMS_IO: Changes the logic in get_tile_string to fix bug where tile numbers 9 and 99 produce an inappropriate error + +### Tag Commit Hashes +- 2020.03-beta1 (f7f1c1c73c1f478a53e84caee6aff2fa840ad086) +- 2020.03-beta2 (3dae0dfa405d555ecc09bbd2d60a1be24461f69e) +- 2020.03-beta3 (521a15135a99d1f2da7d82f238353945f82ce1dd) +- 2020.03-beta4 (4d38679c1e18e920feb03d69f8a9762eb6a047aa) + ## [2020.02] - 2020-05-01 ### Added diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b30f670b4..7fc27f48d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ cmake_minimum_required(VERSION 3.7...3.15 FATAL_ERROR) # Define the CMake project project(FMS - VERSION 2020.02 + VERSION 2020.03 DESCRIPTION "GFDL FMS Library" HOMEPAGE_URL "https://www.gfdl.noaa.gov/fms" LANGUAGES C Fortran) diff --git a/configure.ac b/configure.ac index eb32bc80cd..427f0eb314 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ AC_PREREQ([2.59]) # Initialize with name, version, and support email address. AC_INIT([GFDL FMS Library], - [2020.02-dev], + [2020.03], [gfdl.climate.model.info@noaa.gov], [FMS], [https://www.gfdl.noaa.gov/fms]) From 7dd88c1e3dc388d691f002bb16de6f7de76860c8 Mon Sep 17 00:00:00 2001 From: rem1776 <35538242+rem1776@users.noreply.github.com> Date: Thu, 8 Oct 2020 09:02:31 -0400 Subject: [PATCH 2/6] Update date --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 244b8a634c..99327a999e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0), and this project uses `yyyy.rr[.pp]`, where `yyyy` is the year a patch is released, `rr` is a sequential release number (starting from `01`), and an optional two-digit sequential patch number (starting from `01`). -## [2020.03] - 2020-10-? + +## [2020.03] - 2020-10-08 ### Added - FMS2_IO: Adds header_buffer_val to the fms2io namelist which sets the netcdf header size in bytes. The default value is 16kb - FMS2_IO: Adds netcdf_default_format to the fms2io namelist which allows the user to change the netcdf file type. The default value is 64bit. @@ -36,7 +37,6 @@ sequential patch number (starting from `01`). - 2020.03-beta3 (521a15135a99d1f2da7d82f238353945f82ce1dd) - 2020.03-beta4 (4d38679c1e18e920feb03d69f8a9762eb6a047aa) - ## [2020.02] - 2020-05-01 ### Added - FMS2_IO: An fms2_io_nml namelist has been created. It includes the variable ncchksz. This is the replacement for the environment variable NC_BLKSZ set in model run scripts and used by mpp_io. The default value is 64 KB. Any time a file is opened in fms2_io (nf90_open or nf90_create), the optional argument `chunksize=ncchksz` is passed to the NetCDF library. NetCDF attempts to use this value to control the blocksize utilized for reads and writes of data from the filesystem. From adab9b3f2fa527621ec4d7a0e61c2a19c6eda307 Mon Sep 17 00:00:00 2001 From: rem1776 <35538242+rem1776@users.noreply.github.com> Date: Thu, 8 Oct 2020 10:01:51 -0400 Subject: [PATCH 3/6] Added alpha hash --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99327a999e..fb6647b50f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,11 +32,13 @@ sequential patch number (starting from `01`). - FMS_IO: Changes the logic in get_tile_string to fix bug where tile numbers 9 and 99 produce an inappropriate error ### Tag Commit Hashes +- 2020.03-alpha1 (2dd30b7ca0ac75a4a38b969e4a6d446eb395b4dd) - 2020.03-beta1 (f7f1c1c73c1f478a53e84caee6aff2fa840ad086) - 2020.03-beta2 (3dae0dfa405d555ecc09bbd2d60a1be24461f69e) - 2020.03-beta3 (521a15135a99d1f2da7d82f238353945f82ce1dd) - 2020.03-beta4 (4d38679c1e18e920feb03d69f8a9762eb6a047aa) + ## [2020.02] - 2020-05-01 ### Added - FMS2_IO: An fms2_io_nml namelist has been created. It includes the variable ncchksz. This is the replacement for the environment variable NC_BLKSZ set in model run scripts and used by mpp_io. The default value is 64 KB. Any time a file is opened in fms2_io (nf90_open or nf90_create), the optional argument `chunksize=ncchksz` is passed to the NetCDF library. NetCDF attempts to use this value to control the blocksize utilized for reads and writes of data from the filesystem. From 4d6ec7014d8a59683461ac17b6ef1f1f5531a1aa Mon Sep 17 00:00:00 2001 From: rem1776 <35538242+rem1776@users.noreply.github.com> Date: Thu, 8 Oct 2020 14:56:41 -0400 Subject: [PATCH 4/6] Changed order of commit hashes --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb6647b50f..0f9727778e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,10 +33,10 @@ sequential patch number (starting from `01`). ### Tag Commit Hashes - 2020.03-alpha1 (2dd30b7ca0ac75a4a38b969e4a6d446eb395b4dd) -- 2020.03-beta1 (f7f1c1c73c1f478a53e84caee6aff2fa840ad086) -- 2020.03-beta2 (3dae0dfa405d555ecc09bbd2d60a1be24461f69e) -- 2020.03-beta3 (521a15135a99d1f2da7d82f238353945f82ce1dd) - 2020.03-beta4 (4d38679c1e18e920feb03d69f8a9762eb6a047aa) +- 2020.03-beta3 (521a15135a99d1f2da7d82f238353945f82ce1dd) +- 2020.03-beta2 (3dae0dfa405d555ecc09bbd2d60a1be24461f69e) +- 2020.03-beta1 (f7f1c1c73c1f478a53e84caee6aff2fa840ad086) ## [2020.02] - 2020-05-01 From d634d939057af2f5d8bd36f1dc8e5dc4f69ca7b0 Mon Sep 17 00:00:00 2001 From: rem1776 <35538242+rem1776@users.noreply.github.com> Date: Thu, 8 Oct 2020 15:03:45 -0400 Subject: [PATCH 5/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f9727778e..b39f7810fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,11 +32,11 @@ sequential patch number (starting from `01`). - FMS_IO: Changes the logic in get_tile_string to fix bug where tile numbers 9 and 99 produce an inappropriate error ### Tag Commit Hashes -- 2020.03-alpha1 (2dd30b7ca0ac75a4a38b969e4a6d446eb395b4dd) - 2020.03-beta4 (4d38679c1e18e920feb03d69f8a9762eb6a047aa) - 2020.03-beta3 (521a15135a99d1f2da7d82f238353945f82ce1dd) - 2020.03-beta2 (3dae0dfa405d555ecc09bbd2d60a1be24461f69e) - 2020.03-beta1 (f7f1c1c73c1f478a53e84caee6aff2fa840ad086) +- 2020.03-alpha1 (2dd30b7ca0ac75a4a38b969e4a6d446eb395b4dd) ## [2020.02] - 2020-05-01 From fbfcbf575aed5f746afa8e92eb884a329b9e1a6e Mon Sep 17 00:00:00 2001 From: rem1776 Date: Thu, 8 Oct 2020 15:24:16 -0400 Subject: [PATCH 6/6] Incremented version number --- libFMS/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libFMS/Makefile.am b/libFMS/Makefile.am index 523e576406..2d2fdf24fe 100644 --- a/libFMS/Makefile.am +++ b/libFMS/Makefile.am @@ -28,7 +28,7 @@ lib_LTLIBRARIES = libFMS.la # These linker flags specify libtool version info. # See http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning # for information regarding incrementing `-version-info`. -libFMS_la_LDFLAGS = -version-info 4:0:0 +libFMS_la_LDFLAGS = -version-info 5:0:0 # Add the convenience libraries to the FMS library. libFMS_la_LIBADD = ${top_builddir}/platform/libplatform.la