From 396e66d67e90b209d4f82d8f4c9849569a716a9d Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Thu, 21 Mar 2024 08:30:05 -0400 Subject: [PATCH 1/3] Fixes #2663 - port to nag 7.201 Subtle. --- gridcomps/MAPL_GridComps.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gridcomps/MAPL_GridComps.F90 b/gridcomps/MAPL_GridComps.F90 index 1e413ef4296a..a44ad5e84beb 100644 --- a/gridcomps/MAPL_GridComps.F90 +++ b/gridcomps/MAPL_GridComps.F90 @@ -1,6 +1,5 @@ module MAPL_GridCompsMod use mapl_CapMod - use mapl_CapOptionsMod use mapl_externalGCStorage #ifdef USE_FLAP use mapl_FlapCLIMod @@ -8,5 +7,6 @@ module MAPL_GridCompsMod #ifdef USE_FARGPARSE use mapl_FargParseCLIMod #endif + use mapl_CapOptionsMod implicit none end module MAPL_GridCompsMod From 43eefefc909f605e13181c44a6255b1bfa576da5 Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Thu, 21 Mar 2024 08:33:03 -0400 Subject: [PATCH 2/3] Forgot CHANGELOG. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7eb05aea36da..2e58d1363327 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- Minor workaround to enable NAG 7.2.01 to compile. (Reproducer submitted to NAG.) - Fixed bug with split restart files - Removed unnecessary memory allocation for tile reads. This is critical for high res runs on SCU17 - Fixes to allow SCM model to run From 01e92e41d648e487f010218c51c82e338df9b46e Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Thu, 21 Mar 2024 09:03:18 -0400 Subject: [PATCH 3/3] Undoing old workaround that now breaks intel. --- docs/tutorial/driver_app/Example_Driver.F90 | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/tutorial/driver_app/Example_Driver.F90 b/docs/tutorial/driver_app/Example_Driver.F90 index b967506b94c0..f974d002a624 100644 --- a/docs/tutorial/driver_app/Example_Driver.F90 +++ b/docs/tutorial/driver_app/Example_Driver.F90 @@ -5,7 +5,6 @@ program Example_Driver use MPI use MAPL - use mapl_CapOptionsMod, only: MAPL_CapOptions implicit none type (MAPL_Cap) :: cap