Skip to content

GitFlow: Merge develop into main for release #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mathomp4 merged 11 commits into from
Sep 9, 2025
Merged

GitFlow: Merge develop into main for release #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1e5c6d8
prc: enforce OCS mechanism is turned on in ACHEM
pcolarco Apr 25, 2024
e603eca
prc: updates for Hunga
pcolarco Apr 26, 2024
5ccb4fa
Capture the changes put in place for the Hunga experiments
mmanyin Jan 9, 2025
d5da6c4
Merge pull request #290 from GEOS-ESM/feature/mmanyin/add_HUNGA_edits
mmanyin Jan 21, 2025
7eac72c
Merge branch 'main' into develop
mathomp4 Jan 23, 2025
7ff50ae
Merge branch 'main' into develop
mathomp4 Jan 23, 2025
0bf3171
Merge branch 'main' into develop
mathomp4 Jan 23, 2025
48987e7
Port fix from pre-split achem
mathomp4 Apr 7, 2025
f2b07d9
Merge pull request #1 from GEOS-ESM/feature/split-chem-v12
sdrabenh Apr 14, 2025
341e043
Update Changelog
mathomp4 Sep 9, 2025
e828d78
Merge pull request #2 from GEOS-ESM/feature/sdrabenh/gcm_v12
mathomp4 Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions ACHEM_GridCompMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1327,16 +1327,9 @@ subroutine Run_(GC, IMPORT, EXPORT, CLOCK, rc)
! -----------------------------------
call MAPL_GetObjectFromGC(GC, mgState, __RC__)

call MAPL_TimerOn(mgState, 'TOTAL', __RC__)
call MAPL_TimerOn(mgState, 'RUN', __RC__)

! Get parameters from generic state
! ----------------------------------
call MAPL_Get(mgState, LONS=lons, LATS=lats, RunAlarm=run_alarm, __RC__)


! If it is time, update AChem state
! ---------------------------------
call MAPL_Get(mgState, runAlarm=run_alarm, _RC)
run_alarm_ringing = ESMF_AlarmIsRinging(run_alarm, __RC__)

if (run_alarm_ringing) then
Expand All @@ -1345,6 +1338,12 @@ subroutine Run_(GC, IMPORT, EXPORT, CLOCK, rc)
RETURN_(ESMF_SUCCESS)
endif

call MAPL_TimerOn(mgState, 'TOTAL', __RC__)
call MAPL_TimerOn(mgState, 'RUN', __RC__)

! Get parameters from generic state
! ----------------------------------
call MAPL_Get(mgState, LONS=lons, LATS=lats, __RC__)

! Extract relevant runtime information
! ------------------------------------
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Deprecated

## [1.0.1] - 2025-09-09

### Fixed

- Port fix from split chem runs in v12. Mainly moves a timer

## [1.0.0] - 2023-08-25

### Added
Expand Down