Merge pull request #1411 from GEOS-ESM/hotfix/atrayano/#1410_varspec_eq

Fixes #1410. Reverted VarSpec.F90 to revision b02e8ff
GEOS-ESM · Mar 7, 2022 · 5020c80 · 5020c80
2 parents e7f8eea + c173bf5
commit 5020c80
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Fixed the alarms in the couplers to account if they are called before ESMF_ClockAdvance is called
+- Reverted generic/VarSpec.F90 to hash b02e8ff (fix for #1410)
 
 ## [2.18.0] - 2022-02-23
 

diff --git a/generic/VarSpec.F90 b/generic/VarSpec.F90
@@ -1363,8 +1363,8 @@ function MAPL_VarSpecEQ(s1, s2)
            S2%SPECPtr%ACCMLT_INTERVAL /= 0) then
 
          if (S1%SPECPtr%ACCMLT_INTERVAL /= S2%SPECPtr%ACCMLT_INTERVAL ) RETURN
+         if (S1%SPECPtr%COUPLE_INTERVAL /= S2%SPECPtr%COUPLE_INTERVAL ) RETURN
       end if
-      if (S1%SPECPtr%COUPLE_INTERVAL /= S2%SPECPtr%COUPLE_INTERVAL ) RETURN
 
       MAPL_VarSpecEQ = .TRUE.
       RETURN