Merge pull request #457 from GEOS-ESM/hotfix/mathomp4/#443-fix-scm

Fixes #443. Fix for CFMIP cases.
GEOS-ESM · Jun 23, 2020 · ec4b36e · ec4b36e
2 parents 5f73fe9 + 022307d
commit ec4b36e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Removed
 
+## [2.2.4] - 2020-06-23
+
+### Fixed
+
+- Fix to `sun.H` to allow CFMIP SCM cases to run
+
 ## [2.2.3] - 2020-06-23
 
 ### Added

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)
 
 project (
   MAPL
-  VERSION 2.2.3
+  VERSION 2.2.4
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/ESMA_cmake)

diff --git a/base/sun.H b/base/sun.H
@@ -309,17 +309,17 @@
          case(10)
             SLR = 0.3278
             ZTH = 0.6087247
-            _ASSERT(.not.present(ZTHP),'ZTHP not implemented for TIME_ == 10') 
+            ZTP = ZTH
 
          case(11)
             SLR = 0.3449
             ZTH = 0.5962
-            _ASSERT(.not.present(ZTHP),'ZTHP not implemented for TIME_ == 11') 
+            ZTP = ZTH
 
          case(12)
             SLR = 0.3461
             ZTH = 0.5884
-            _ASSERT(.not.present(ZTHP),'ZTHP not implemented for TIME_ == 12') 
+            ZTP = ZTH
 
          end select