From 166ae66d2212686a226d83cf44d24c76348fcfd0 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 13 Feb 2026 11:26:07 -0500 Subject: [PATCH 1/2] v2.5: Fix missing GMI_HNO3 in NI AMIP ExtData yaml --- CHANGELOG.md | 6 ++++++ CMakeLists.txt | 2 +- .../NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.yaml | 7 +++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb3fbc44..98cb2f96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +## [v2.5.1] - 2026-02-13 + +### Fixed + +- Fix missing `GMI_HNO3` entry in `AMIP/NI2G_GridComp_ExtData.yaml` file + ## [v2.5.0] - 2026-02-05 ### Changed diff --git a/CMakeLists.txt b/CMakeLists.txt index 007e8cfb..2fef7557 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ endif() if (GOCART_STANDALONE) project ( GOCART - VERSION 2.5.0 + VERSION 2.5.1 LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}") diff --git a/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.yaml index 7d14f853..73b882f5 100644 --- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.yaml +++ b/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.yaml @@ -85,5 +85,8 @@ Exports: collection: /dev/null climNO3an3: collection: /dev/null - - + GMI_HNO3: + collection: /dev/null + regrid: CONSERVE + sample: NI2G_sample_2 + variable: GMI_HNO3 From db002c2536271f9da48ac042d0010d6c05287e72 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 17 Feb 2026 13:25:56 -0500 Subject: [PATCH 2/2] Fix start-stop --- CHANGELOG.md | 3 ++- .../NI2G_GridComp/NI2G_GridCompMod.F90 | 5 ----- .../SU2G_GridComp/SU2G_GridCompMod.F90 | 12 +----------- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98cb2f96..eba08bbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,11 +15,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added -## [v2.5.1] - 2026-02-13 +## [v2.5.1] - 2026-02-17 ### Fixed - Fix missing `GMI_HNO3` entry in `AMIP/NI2G_GridComp_ExtData.yaml` file +- Fix start-stop regression failure in SU GridComp ## [v2.5.0] - 2026-02-05 diff --git a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridCompMod.F90 b/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridCompMod.F90 index f70bbcba..83dbe9e1 100644 --- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridCompMod.F90 +++ b/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridCompMod.F90 @@ -860,11 +860,6 @@ subroutine Run2 (GC, import, export, clock, RC) thread = MAPL_get_current_thread() workspace => self%workspaces(thread) - !if (workspace%first) then - !xhno3 = MAPL_UNDEF - !workspace%first = .false. - !end if - ! Recycle HNO3 every 3 hours if (alarm_is_ringing) then xhno3 = NITRATE_HNO3 diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridCompMod.F90 b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridCompMod.F90 index d3597f77..cb5a06c2 100644 --- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridCompMod.F90 +++ b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridCompMod.F90 @@ -97,7 +97,6 @@ module SU2G_GridCompMod real :: aviation_layers(4) ! heights of the LTO, CDS and CRS layers real :: fSO4anth ! Fraction of anthropogenic emissions that are SO4 !logical :: firstRun = .true. - !real, pointer :: h2o2_init(:,:,:) ! PRC: logic for GMI coupling logical :: using_GMI @@ -533,8 +532,6 @@ subroutine Initialize (GC, IMPORT, EXPORT, CLOCK, RC) LONS = LONS, & LATS = LATS, __RC__ ) - !allocate(self%h2o2_init(size(lats,1),size(lats,2),self%km), __STAT__) - ! Is SU data driven? ! ------------------ call determine_data_driven (COMP_NAME, data_driven, __RC__) @@ -1256,13 +1253,6 @@ subroutine Run2 (GC, import, export, clock, RC) xoh = 0.0 xno3 = 0.0 - - if (workspace%firstRun) then - xh2o2 = MAPL_UNDEF - h2o2_init = MAPL_UNDEF - workspace%firstRun = .false. - end if - xh2o2 = h2o2_init call SulfateUpdateOxidants (nymd, nhms, LONS, LATS, airdens, self%km, self%cdt, & @@ -1332,7 +1322,7 @@ subroutine Run2 (GC, import, export, clock, RC) call MAPL_VarSpecGet(InternalSpec(n), SHORT_NAME=short_name, __RC__) call MAPL_GetPointer(internal, NAME=short_name, ptr=int_ptr, __RC__) call WetRemovalUFS (self%km, self%klid, n, self%cdt, 'sulfate', & - KIN, MAPL_GRAV, self%radius(n), rainout_eff, self%washout_tuning, & + KIN, MAPL_GRAV, self%radius(n), rainout_eff, self%washout_tuning, & self%wet_radius_thr, int_ptr, ple, t, airdens, pfl_lsan, pfi_lsan, SUWT, __RC__) enddo