From 752fdfabbb57f71a0ad5bcdcc12379e012fd6137 Mon Sep 17 00:00:00 2001 From: Haipeng Lin Date: Tue, 8 Aug 2023 13:27:44 -0400 Subject: [PATCH 1/4] Limit GC_72_EDGE_SIGMA variable to 135 columns per Fortran-90 spec. This will make compile compatible with the nvhpc compiler. This was reported downstream from ESCOMP/CAM#871 and at HEMCO#233. Reported-by: Jian Sun @sjsprecious Signed-off-by: Haipeng Lin --- src/Core/hcoio_read_std_mod.F90 | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/Core/hcoio_read_std_mod.F90 b/src/Core/hcoio_read_std_mod.F90 index 7bfb6b5a..e5b79efe 100644 --- a/src/Core/hcoio_read_std_mod.F90 +++ b/src/Core/hcoio_read_std_mod.F90 @@ -62,7 +62,20 @@ MODULE HCOIO_Read_Mod REAL(dp), PRIVATE, PARAMETER :: EPSILON = 1.0e-5_dp #if defined( MODEL_CESM ) || defined( MODEL_WRF ) - REAL(hp), PRIVATE :: GC_72_EDGE_SIGMA(73) = (/1.000000E+00, 9.849998E-01, 9.699136E-01, 9.548285E-01, 9.397434E-01, 9.246593E-01, 9.095741E-01, 8.944900E-01, 8.794069E-01, 8.643237E-01, 8.492406E-01, 8.341584E-01, 8.190762E-01, 7.989697E-01, 7.738347E-01, 7.487007E-01, 7.235727E-01, 6.984446E-01, 6.733175E-01, 6.356319E-01, 5.979571E-01, 5.602823E-01, 5.226252E-01, 4.849751E-01, 4.473417E-01, 4.097261E-01, 3.721392E-01, 3.345719E-01, 2.851488E-01, 2.420390E-01, 2.055208E-01, 1.746163E-01, 1.484264E-01, 1.261653E-01, 1.072420E-01, 9.115815E-02, 7.748532E-02, 6.573205E-02, 5.565063E-02, 4.702097E-02, 3.964964E-02, 3.336788E-02, 2.799704E-02, 2.341969E-02, 1.953319E-02, 1.624180E-02, 1.346459E-02, 1.112953E-02, 9.171478E-03, 7.520355E-03, 6.135702E-03, 4.981002E-03, 4.023686E-03, 3.233161E-03, 2.585739E-03, 2.057735E-03, 1.629410E-03, 1.283987E-03, 1.005675E-03, 7.846040E-04, 6.089317E-04, 4.697755E-04, 3.602270E-04, 2.753516E-04, 2.082408E-04, 1.569208E-04, 1.184308E-04, 8.783617E-05, 6.513694E-05, 4.737232E-05, 3.256847E-05, 1.973847E-05, 9.869233E-06/) + REAL(hp), PRIVATE :: GC_72_EDGE_SIGMA(73) = (/ & + 1.000000E+00, 9.849998E-01, 9.699136E-01, 9.548285E-01, 9.397434E-01, 9.246593E-01, & + 9.095741E-01, 8.944900E-01, 8.794069E-01, 8.643237E-01, 8.492406E-01, 8.341584E-01, & + 8.190762E-01, 7.989697E-01, 7.738347E-01, 7.487007E-01, 7.235727E-01, 6.984446E-01, & + 6.733175E-01, 6.356319E-01, 5.979571E-01, 5.602823E-01, 5.226252E-01, 4.849751E-01, & + 4.473417E-01, 4.097261E-01, 3.721392E-01, 3.345719E-01, 2.851488E-01, 2.420390E-01, & + 2.055208E-01, 1.746163E-01, 1.484264E-01, 1.261653E-01, 1.072420E-01, 9.115815E-02, & + 7.748532E-02, 6.573205E-02, 5.565063E-02, 4.702097E-02, 3.964964E-02, 3.336788E-02, & + 2.799704E-02, 2.341969E-02, 1.953319E-02, 1.624180E-02, 1.346459E-02, 1.112953E-02, & + 9.171478E-03, 7.520355E-03, 6.135702E-03, 4.981002E-03, 4.023686E-03, 3.233161E-03, & + 2.585739E-03, 2.057735E-03, 1.629410E-03, 1.283987E-03, 1.005675E-03, 7.846040E-04, & + 6.089317E-04, 4.697755E-04, 3.602270E-04, 2.753516E-04, 2.082408E-04, 1.569208E-04, & + 1.184308E-04, 8.783617E-05, 6.513694E-05, 4.737232E-05, 3.256847E-05, 1.973847E-05, & + 9.869233E-06/) #endif CONTAINS From 068e0671d92a831e2ef22921ce91b632cb447eb0 Mon Sep 17 00:00:00 2001 From: Lizzie Lundgren Date: Fri, 15 Sep 2023 14:06:56 -0400 Subject: [PATCH 2/4] Update changelog Signed-off-by: Lizzie Lundgren --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85d6abca..8846ccae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased 3.6.3] - TBD +### Fixed +- Fixed nvhpc compiler error in CESM by reducing line length of `GC_72_EDGE_SIGMA` assignment + ## [3.6.2] - 2023-03-02 ### Added - Added `.github/config.yml` with settings for the issue chooser page From 7b7e3883a11084573c36e34206e0213c2a4466d8 Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Fri, 15 Sep 2023 15:04:39 -0400 Subject: [PATCH 3/4] Update CHANGELOG.md and version numbers for 3.6.3 release CHANGELOG.md - Added 3.6.3 release date CMakeLists.txt docs/source/conf.py src/Core/hco_error_mod.F90 - Updated version numbers from 3.6.2 to 3.6.3 Signed-off-by: Bob Yantosca --- CHANGELOG.md | 2 +- CMakeLists.txt | 2 +- docs/source/conf.py | 2 +- src/Core/hco_error_mod.F90 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8846ccae..067d3ecf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased 3.6.3] - TBD +## [Unreleased 3.6.3] - 2023-09-15 ### Fixed - Fixed nvhpc compiler error in CESM by reducing line length of `GC_72_EDGE_SIGMA` assignment diff --git a/CMakeLists.txt b/CMakeLists.txt index adcce7b9..bab5d514 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # HEMCO/CMakeLists.txt cmake_minimum_required(VERSION 3.5) -project(HEMCO VERSION 3.6.2 LANGUAGES Fortran) +project(HEMCO VERSION 3.6.3 LANGUAGES Fortran) # Reminder: Make sure to also update version in src/Core/hco_error_mod.F90 #----------------------------------------------------------------------------- diff --git a/docs/source/conf.py b/docs/source/conf.py index 41606aba..b184e242 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -23,7 +23,7 @@ author = 'GEOS-Chem Support Team' # The full version, including alpha/beta/rc tags -release = '3.6.2' +release = '3.6.3' # -- General configuration --------------------------------------------------- diff --git a/src/Core/hco_error_mod.F90 b/src/Core/hco_error_mod.F90 index 838a62e4..c3c1b116 100644 --- a/src/Core/hco_error_mod.F90 +++ b/src/Core/hco_error_mod.F90 @@ -105,7 +105,7 @@ MODULE HCO_Error_Mod #endif ! HEMCO version number. - CHARACTER(LEN=12), PARAMETER, PUBLIC :: HCO_VERSION = '3.6.2' + CHARACTER(LEN=12), PARAMETER, PUBLIC :: HCO_VERSION = '3.6.3' INTERFACE HCO_Error MODULE PROCEDURE HCO_ErrorNoErr From 8b4f4c848ebaabbc4499641a4459017bfdb4735b Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Fri, 15 Sep 2023 15:11:39 -0400 Subject: [PATCH 4/4] Final edit to CHANGELOG.md for 3.6.3 release CHANGELOG.md - Change "[Unreleased 3.6.3]" to "[3.6.3]" Signed-off-by: Bob Yantosca --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 067d3ecf..4d0119ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased 3.6.3] - 2023-09-15 +## [3.6.3] - 2023-09-15 ### Fixed - Fixed nvhpc compiler error in CESM by reducing line length of `GC_72_EDGE_SIGMA` assignment