From e451ba0be77a4bd6ee24ad4c4bc1c0dd99da7c91 Mon Sep 17 00:00:00 2001 From: Benjamin Auer Date: Thu, 28 Apr 2022 13:04:11 -0400 Subject: [PATCH 1/3] fixes #181 --- GEOSachem_GridComp/GEOS_AChemGridCompMod.F90 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/GEOSachem_GridComp/GEOS_AChemGridCompMod.F90 b/GEOSachem_GridComp/GEOS_AChemGridCompMod.F90 index 7bf82e7d..cc681521 100644 --- a/GEOSachem_GridComp/GEOS_AChemGridCompMod.F90 +++ b/GEOSachem_GridComp/GEOS_AChemGridCompMod.F90 @@ -411,6 +411,7 @@ subroutine SetServices(GC, RC) UNITS = 'mol mol-1', & DIMS = MAPL_DimsHorzVert, & VLOCATION = MAPL_VLocationCenter, & + RESTART = MAPL_RestartSkip, & __RC__) call MAPL_AddImportSpec(GC, & @@ -419,6 +420,7 @@ subroutine SetServices(GC, RC) UNITS = 'mol mol-1', & DIMS = MAPL_DimsHorzVert, & VLOCATION = MAPL_VLocationCenter, & + RESTART = MAPL_RestartSkip, & __RC__) call MAPL_AddImportSpec(GC, & @@ -427,6 +429,7 @@ subroutine SetServices(GC, RC) UNITS = 'kg kg-1', & DIMS = MAPL_DimsHorzVert, & VLOCATION = MAPL_VLocationCenter, & + RESTART = MAPL_RestartSkip, & __RC__) call MAPL_AddImportSpec(GC, & @@ -435,6 +438,7 @@ subroutine SetServices(GC, RC) UNITS = 'nmol L-1-1', & DIMS = MAPL_DimsHorzOnly, & VLOCATION = MAPL_VLocationNone, & + RESTART = MAPL_RestartSkip, & __RC__) call MAPL_AddImportSpec(GC, & @@ -443,6 +447,7 @@ subroutine SetServices(GC, RC) UNITS = 'kg m-2 s-1', & DIMS = MAPL_DimsHorzOnly, & VLOCATION = MAPL_VLocationNone, & + RESTART = MAPL_RestartSkip, & __RC__) call MAPL_AddImportSpec(GC, & @@ -451,6 +456,7 @@ subroutine SetServices(GC, RC) UNITS = 'kg m-2 s-1', & DIMS = MAPL_DimsHorzOnly, & VLOCATION = MAPL_VLocationNone, & + RESTART = MAPL_RestartSkip, & __RC__) call MAPL_AddImportSpec(GC, & @@ -459,6 +465,7 @@ subroutine SetServices(GC, RC) UNITS = 'kg m-2 s-1', & DIMS = MAPL_DimsHorzOnly, & VLOCATION = MAPL_VLocationNone, & + RESTART = MAPL_RestartSkip, & __RC__) call MAPL_AddImportSpec(GC, & @@ -467,6 +474,7 @@ subroutine SetServices(GC, RC) UNITS = 'kg m-2 s-1', & DIMS = MAPL_DimsHorzOnly, & VLOCATION = MAPL_VLocationNone, & + RESTART = MAPL_RestartSkip, & __RC__) call MAPL_AddImportSpec(GC, & @@ -475,6 +483,7 @@ subroutine SetServices(GC, RC) UNITS = 'kg m-2 s-1', & DIMS = MAPL_DimsHorzOnly, & VLOCATION = MAPL_VLocationNone, & + RESTART = MAPL_RestartSkip, & __RC__) call MAPL_AddImportSpec(GC, & @@ -483,6 +492,7 @@ subroutine SetServices(GC, RC) UNITS = 'kg m-2 s-1', & DIMS = MAPL_DimsHorzOnly, & VLOCATION = MAPL_VLocationNone, & + RESTART = MAPL_RestartSkip, & __RC__) call MAPL_AddImportSpec(GC, & @@ -491,6 +501,7 @@ subroutine SetServices(GC, RC) UNITS = 'kg m-2 s-1', & DIMS = MAPL_DimsHorzOnly, & VLOCATION = MAPL_VLocationNone, & + RESTART = MAPL_RestartSkip, & __RC__) call MAPL_AddImportSpec(GC, & @@ -499,6 +510,7 @@ subroutine SetServices(GC, RC) UNITS = 'kg m-2 s-1', & DIMS = MAPL_DimsHorzOnly, & VLOCATION = MAPL_VLocationNone, & + RESTART = MAPL_RestartSkip, & __RC__) call MAPL_AddImportSpec(GC, & @@ -507,6 +519,7 @@ subroutine SetServices(GC, RC) UNITS = 'kg m-2 s-1', & DIMS = MAPL_DimsHorzOnly, & VLOCATION = MAPL_VLocationNone, & + RESTART = MAPL_RestartSkip, & __RC__) call MAPL_AddImportSpec(GC, & @@ -515,6 +528,7 @@ subroutine SetServices(GC, RC) UNITS = 'm-2 s-1', & DIMS = MAPL_DimsHorzOnly, & VLOCATION = MAPL_VLocationNone, & + RESTART = MAPL_RestartSkip, & __RC__) end if OPTIONAL_CHEM_IMPORT @@ -530,6 +544,7 @@ subroutine SetServices(GC, RC) UNITS = 'mol mol-1', & DIMS = MAPL_DimsHorzVert, & VLOCATION = MAPL_VLocationCenter, & + RESTART = MAPL_RestartSkip, & __RC__) end if @@ -539,6 +554,7 @@ subroutine SetServices(GC, RC) UNITS = 'kg m-2 s-1', & DIMS = MAPL_DimsHorzOnly, & VLOCATION = MAPL_VLocationNone, & + RESTART = MAPL_RestartSkip, & __RC__) call MAPL_AddImportSpec(GC, & @@ -547,6 +563,7 @@ subroutine SetServices(GC, RC) UNITS = 'kg m-2 s-1', & DIMS = MAPL_DimsHorzOnly, & VLOCATION = MAPL_VLocationNone, & + RESTART = MAPL_RestartSkip, & __RC__) call MAPL_AddImportSpec(GC, & @@ -555,6 +572,7 @@ subroutine SetServices(GC, RC) UNITS = 'kg m-2 s-1', & DIMS = MAPL_DimsHorzOnly, & VLOCATION = MAPL_VLocationNone, & + RESTART = MAPL_RestartSkip, & __RC__) end if OPTIONAL_VOC_IMPORTS @@ -1397,6 +1415,7 @@ subroutine Run_(GC, IMPORT, EXPORT, CLOCK, rc) call MAPL_GetPointer(import, co_bf_voc, 'CO_BF_VOC', __RC__) call MAPL_GetPointer(import, co_fs_voc, 'CO_FS_VOC', __RC__) end if + if (mapL_am_i_root()) write(*,*)"bmaa0 ",maxval(q_oh) ! Get Exports ! ------------- @@ -1550,6 +1569,7 @@ subroutine Run_(GC, IMPORT, EXPORT, CLOCK, rc) night_time = 86400.0 - day_time + if (mapl_am_I_root()) write(*,*)"bmaa doy ",doy,f_hour call solar_zenith_angle(doy, f_hour, (180.0/pi)*lons, (180.0/pi)*lats, sza, cos_sza) where(sum_cos_sza > 0) From 4a17367216d5ec838962d45757c26fff38f0e26b Mon Sep 17 00:00:00 2001 From: Benjamin Auer Date: Thu, 28 Apr 2022 13:12:28 -0400 Subject: [PATCH 2/3] updated changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61968a02..c567c05e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed + +- Fixed bug in GEOS_Achem, variables being provided via ExtData did not have restart skip + ## [1.9.1] - 2022-03-18 ### Changed From 4882f17e594531b2f5ca5f82a6e86e0b41a6969a Mon Sep 17 00:00:00 2001 From: Benjamin Auer Date: Thu, 28 Apr 2022 13:20:13 -0400 Subject: [PATCH 3/3] remove debug prints --- GEOSachem_GridComp/GEOS_AChemGridCompMod.F90 | 2 -- 1 file changed, 2 deletions(-) diff --git a/GEOSachem_GridComp/GEOS_AChemGridCompMod.F90 b/GEOSachem_GridComp/GEOS_AChemGridCompMod.F90 index cc681521..ff268d89 100644 --- a/GEOSachem_GridComp/GEOS_AChemGridCompMod.F90 +++ b/GEOSachem_GridComp/GEOS_AChemGridCompMod.F90 @@ -1415,7 +1415,6 @@ subroutine Run_(GC, IMPORT, EXPORT, CLOCK, rc) call MAPL_GetPointer(import, co_bf_voc, 'CO_BF_VOC', __RC__) call MAPL_GetPointer(import, co_fs_voc, 'CO_FS_VOC', __RC__) end if - if (mapL_am_i_root()) write(*,*)"bmaa0 ",maxval(q_oh) ! Get Exports ! ------------- @@ -1569,7 +1568,6 @@ subroutine Run_(GC, IMPORT, EXPORT, CLOCK, rc) night_time = 86400.0 - day_time - if (mapl_am_I_root()) write(*,*)"bmaa doy ",doy,f_hour call solar_zenith_angle(doy, f_hour, (180.0/pi)*lons, (180.0/pi)*lats, sza, cos_sza) where(sum_cos_sza > 0)