diff --git a/CDEPS-interface/CMakeLists.txt b/CDEPS-interface/CMakeLists.txt
index 97601de507..f7c823edaf 100644
--- a/CDEPS-interface/CMakeLists.txt
+++ b/CDEPS-interface/CMakeLists.txt
@@ -2,13 +2,13 @@
 if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
   set(CMAKE_Fortran_FLAGS "-g -fbacktrace -ffree-line-length-none")
   if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
-    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -ffree-line-length-none -fallow-argument-mismatch -fallow-invalid-boz -ffree-line-length-512 -DCPRGNU")
+    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-argument-mismatch -fallow-invalid-boz -DCPRGNU")
   endif()
   set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
   set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -fcheck=bounds -ffpe-trap=invalid,zero,overflow,underflow" )
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
   set(CMAKE_Fortran_FLAGS "-g -traceback")
-  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O -assume realloc_lhs")
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O -assume realloc_lhs -DCPRINTEL")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fp-model precise")
   set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check -check noarg_temp_created -check nopointer -fpe0 -ftrapuv -init=snan,arrays")
 else()
diff --git a/CDEPS-interface/ufs/cdeps_share/shr_assert_mod.F90 b/CDEPS-interface/ufs/cdeps_share/shr_assert_mod.F90
index 487ea6470f..6e7c897a1f 100644
--- a/CDEPS-interface/ufs/cdeps_share/shr_assert_mod.F90
+++ b/CDEPS-interface/ufs/cdeps_share/shr_assert_mod.F90
@@ -11,7 +11,8 @@ module shr_assert_mod
      r4 => shr_kind_r4, &
      r8 => shr_kind_r8, &
      i4 => shr_kind_i4, &
-     i8 => shr_kind_i8
+     i8 => shr_kind_i8, &
+     CL => shr_kind_CL
 
 use shr_sys_mod, only: &
      shr_sys_abort
@@ -35,7 +36,7 @@ module shr_assert_mod
 ! Assert that a numerical value satisfies certain constraints.
 public :: shr_assert_in_domain
 
-# 33 "shr_assert_mod.F90.in"
+# 34 "shr_assert_mod.F90.in"
 interface shr_assert_all
    module procedure shr_assert
    ! DIMS 1,2,3,4,5,6,7
@@ -54,7 +55,7 @@ module shr_assert_mod
    module procedure shr_assert_all_7d
 end interface
 
-# 39 "shr_assert_mod.F90.in"
+# 40 "shr_assert_mod.F90.in"
 interface shr_assert_any
    module procedure shr_assert
    ! DIMS 1,2,3,4,5,6,7
@@ -73,7 +74,7 @@ module shr_assert_mod
    module procedure shr_assert_any_7d
 end interface
 
-# 45 "shr_assert_mod.F90.in"
+# 46 "shr_assert_mod.F90.in"
 interface shr_assert_in_domain
    ! TYPE double,real,int,long
    ! DIMS 0,1,2,3,4,5,6,7
@@ -175,7 +176,7 @@ module shr_assert_mod
 
 ! Private utilities.
 
-# 53 "shr_assert_mod.F90.in"
+# 54 "shr_assert_mod.F90.in"
 interface print_bad_loc
    ! TYPE double,real,int,long
    ! DIMS 0,1,2,3,4,5,6,7
@@ -275,7 +276,7 @@ module shr_assert_mod
    module procedure print_bad_loc_7d_long
 end interface
 
-# 59 "shr_assert_mod.F90.in"
+# 60 "shr_assert_mod.F90.in"
 interface find_first_loc
    ! DIMS 0,1,2,3,4,5,6,7
    module procedure find_first_loc_0d
@@ -295,7 +296,7 @@ module shr_assert_mod
    module procedure find_first_loc_7d
 end interface
 
-# 64 "shr_assert_mod.F90.in"
+# 65 "shr_assert_mod.F90.in"
 interface within_tolerance
    ! TYPE double,real,int,long
    module procedure within_tolerance_double
@@ -307,10 +308,10 @@ module shr_assert_mod
    module procedure within_tolerance_long
 end interface
 
-# 69 "shr_assert_mod.F90.in"
+# 70 "shr_assert_mod.F90.in"
 contains
 
-# 71 "shr_assert_mod.F90.in"
+# 72 "shr_assert_mod.F90.in"
 subroutine shr_assert(var, msg, file, line)
 
   ! Logical being asserted
@@ -322,8 +323,8 @@ subroutine shr_assert(var, msg, file, line)
   character(len=*), intent(in), optional :: file
   integer         , intent(in), optional :: line
 
-  character(len=:), allocatable :: full_msg
-  
+  character(len=CL) :: full_msg
+
   full_msg = ''
   if (.not. var) then
      full_msg = 'ERROR'
@@ -339,11 +340,11 @@ subroutine shr_assert(var, msg, file, line)
      call shr_sys_abort(full_msg)
   end if
 
-# 99 "shr_assert_mod.F90.in"
+# 100 "shr_assert_mod.F90.in"
 end subroutine shr_assert
 
 ! DIMS 1,2,3,4,5,6,7
-# 102 "shr_assert_mod.F90.in"
+# 103 "shr_assert_mod.F90.in"
 subroutine shr_assert_all_1d(var, msg, file, line)
 
   ! Logical being asserted
@@ -357,10 +358,10 @@ subroutine shr_assert_all_1d(var, msg, file, line)
 
   call shr_assert(all(var), msg=msg, file=file, line=line)
 
-# 115 "shr_assert_mod.F90.in"
+# 116 "shr_assert_mod.F90.in"
 end subroutine shr_assert_all_1d
 ! DIMS 1,2,3,4,5,6,7
-# 102 "shr_assert_mod.F90.in"
+# 103 "shr_assert_mod.F90.in"
 subroutine shr_assert_all_2d(var, msg, file, line)
 
   ! Logical being asserted
@@ -374,10 +375,10 @@ subroutine shr_assert_all_2d(var, msg, file, line)
 
   call shr_assert(all(var), msg=msg, file=file, line=line)
 
-# 115 "shr_assert_mod.F90.in"
+# 116 "shr_assert_mod.F90.in"
 end subroutine shr_assert_all_2d
 ! DIMS 1,2,3,4,5,6,7
-# 102 "shr_assert_mod.F90.in"
+# 103 "shr_assert_mod.F90.in"
 subroutine shr_assert_all_3d(var, msg, file, line)
 
   ! Logical being asserted
@@ -391,10 +392,10 @@ subroutine shr_assert_all_3d(var, msg, file, line)
 
   call shr_assert(all(var), msg=msg, file=file, line=line)
 
-# 115 "shr_assert_mod.F90.in"
+# 116 "shr_assert_mod.F90.in"
 end subroutine shr_assert_all_3d
 ! DIMS 1,2,3,4,5,6,7
-# 102 "shr_assert_mod.F90.in"
+# 103 "shr_assert_mod.F90.in"
 subroutine shr_assert_all_4d(var, msg, file, line)
 
   ! Logical being asserted
@@ -408,10 +409,10 @@ subroutine shr_assert_all_4d(var, msg, file, line)
 
   call shr_assert(all(var), msg=msg, file=file, line=line)
 
-# 115 "shr_assert_mod.F90.in"
+# 116 "shr_assert_mod.F90.in"
 end subroutine shr_assert_all_4d
 ! DIMS 1,2,3,4,5,6,7
-# 102 "shr_assert_mod.F90.in"
+# 103 "shr_assert_mod.F90.in"
 subroutine shr_assert_all_5d(var, msg, file, line)
 
   ! Logical being asserted
@@ -425,10 +426,10 @@ subroutine shr_assert_all_5d(var, msg, file, line)
 
   call shr_assert(all(var), msg=msg, file=file, line=line)
 
-# 115 "shr_assert_mod.F90.in"
+# 116 "shr_assert_mod.F90.in"
 end subroutine shr_assert_all_5d
 ! DIMS 1,2,3,4,5,6,7
-# 102 "shr_assert_mod.F90.in"
+# 103 "shr_assert_mod.F90.in"
 subroutine shr_assert_all_6d(var, msg, file, line)
 
   ! Logical being asserted
@@ -442,10 +443,10 @@ subroutine shr_assert_all_6d(var, msg, file, line)
 
   call shr_assert(all(var), msg=msg, file=file, line=line)
 
-# 115 "shr_assert_mod.F90.in"
+# 116 "shr_assert_mod.F90.in"
 end subroutine shr_assert_all_6d
 ! DIMS 1,2,3,4,5,6,7
-# 102 "shr_assert_mod.F90.in"
+# 103 "shr_assert_mod.F90.in"
 subroutine shr_assert_all_7d(var, msg, file, line)
 
   ! Logical being asserted
@@ -459,11 +460,11 @@ subroutine shr_assert_all_7d(var, msg, file, line)
 
   call shr_assert(all(var), msg=msg, file=file, line=line)
 
-# 115 "shr_assert_mod.F90.in"
+# 116 "shr_assert_mod.F90.in"
 end subroutine shr_assert_all_7d
 
 ! DIMS 1,2,3,4,5,6,7
-# 118 "shr_assert_mod.F90.in"
+# 119 "shr_assert_mod.F90.in"
 subroutine shr_assert_any_1d(var, msg, file, line)
 
   ! Logical being asserted
@@ -477,10 +478,10 @@ subroutine shr_assert_any_1d(var, msg, file, line)
 
   call shr_assert(any(var), msg=msg, file=file, line=line)
 
-# 131 "shr_assert_mod.F90.in"
+# 132 "shr_assert_mod.F90.in"
 end subroutine shr_assert_any_1d
 ! DIMS 1,2,3,4,5,6,7
-# 118 "shr_assert_mod.F90.in"
+# 119 "shr_assert_mod.F90.in"
 subroutine shr_assert_any_2d(var, msg, file, line)
 
   ! Logical being asserted
@@ -494,10 +495,10 @@ subroutine shr_assert_any_2d(var, msg, file, line)
 
   call shr_assert(any(var), msg=msg, file=file, line=line)
 
-# 131 "shr_assert_mod.F90.in"
+# 132 "shr_assert_mod.F90.in"
 end subroutine shr_assert_any_2d
 ! DIMS 1,2,3,4,5,6,7
-# 118 "shr_assert_mod.F90.in"
+# 119 "shr_assert_mod.F90.in"
 subroutine shr_assert_any_3d(var, msg, file, line)
 
   ! Logical being asserted
@@ -511,10 +512,10 @@ subroutine shr_assert_any_3d(var, msg, file, line)
 
   call shr_assert(any(var), msg=msg, file=file, line=line)
 
-# 131 "shr_assert_mod.F90.in"
+# 132 "shr_assert_mod.F90.in"
 end subroutine shr_assert_any_3d
 ! DIMS 1,2,3,4,5,6,7
-# 118 "shr_assert_mod.F90.in"
+# 119 "shr_assert_mod.F90.in"
 subroutine shr_assert_any_4d(var, msg, file, line)
 
   ! Logical being asserted
@@ -528,10 +529,10 @@ subroutine shr_assert_any_4d(var, msg, file, line)
 
   call shr_assert(any(var), msg=msg, file=file, line=line)
 
-# 131 "shr_assert_mod.F90.in"
+# 132 "shr_assert_mod.F90.in"
 end subroutine shr_assert_any_4d
 ! DIMS 1,2,3,4,5,6,7
-# 118 "shr_assert_mod.F90.in"
+# 119 "shr_assert_mod.F90.in"
 subroutine shr_assert_any_5d(var, msg, file, line)
 
   ! Logical being asserted
@@ -545,10 +546,10 @@ subroutine shr_assert_any_5d(var, msg, file, line)
 
   call shr_assert(any(var), msg=msg, file=file, line=line)
 
-# 131 "shr_assert_mod.F90.in"
+# 132 "shr_assert_mod.F90.in"
 end subroutine shr_assert_any_5d
 ! DIMS 1,2,3,4,5,6,7
-# 118 "shr_assert_mod.F90.in"
+# 119 "shr_assert_mod.F90.in"
 subroutine shr_assert_any_6d(var, msg, file, line)
 
   ! Logical being asserted
@@ -562,10 +563,10 @@ subroutine shr_assert_any_6d(var, msg, file, line)
 
   call shr_assert(any(var), msg=msg, file=file, line=line)
 
-# 131 "shr_assert_mod.F90.in"
+# 132 "shr_assert_mod.F90.in"
 end subroutine shr_assert_any_6d
 ! DIMS 1,2,3,4,5,6,7
-# 118 "shr_assert_mod.F90.in"
+# 119 "shr_assert_mod.F90.in"
 subroutine shr_assert_any_7d(var, msg, file, line)
 
   ! Logical being asserted
@@ -579,7 +580,7 @@ subroutine shr_assert_any_7d(var, msg, file, line)
 
   call shr_assert(any(var), msg=msg, file=file, line=line)
 
-# 131 "shr_assert_mod.F90.in"
+# 132 "shr_assert_mod.F90.in"
 end subroutine shr_assert_any_7d
 
 !--------------------------------------------------------------------------
@@ -587,7 +588,7 @@ end subroutine shr_assert_any_7d
 
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_0d_double(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -783,11 +784,11 @@ subroutine shr_assert_in_domain_0d_double(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_0d_double
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_1d_double(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -983,11 +984,11 @@ subroutine shr_assert_in_domain_1d_double(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_1d_double
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_2d_double(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -1183,11 +1184,11 @@ subroutine shr_assert_in_domain_2d_double(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_2d_double
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_3d_double(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -1383,11 +1384,11 @@ subroutine shr_assert_in_domain_3d_double(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_3d_double
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_4d_double(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -1583,11 +1584,11 @@ subroutine shr_assert_in_domain_4d_double(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_4d_double
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_5d_double(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -1783,11 +1784,11 @@ subroutine shr_assert_in_domain_5d_double(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_5d_double
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_6d_double(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -1983,11 +1984,11 @@ subroutine shr_assert_in_domain_6d_double(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_6d_double
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_7d_double(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -2183,11 +2184,11 @@ subroutine shr_assert_in_domain_7d_double(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_7d_double
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_0d_real(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -2383,11 +2384,11 @@ subroutine shr_assert_in_domain_0d_real(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_0d_real
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_1d_real(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -2583,11 +2584,11 @@ subroutine shr_assert_in_domain_1d_real(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_1d_real
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_2d_real(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -2783,11 +2784,11 @@ subroutine shr_assert_in_domain_2d_real(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_2d_real
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_3d_real(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -2983,11 +2984,11 @@ subroutine shr_assert_in_domain_3d_real(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_3d_real
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_4d_real(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -3183,11 +3184,11 @@ subroutine shr_assert_in_domain_4d_real(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_4d_real
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_5d_real(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -3383,11 +3384,11 @@ subroutine shr_assert_in_domain_5d_real(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_5d_real
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_6d_real(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -3583,11 +3584,11 @@ subroutine shr_assert_in_domain_6d_real(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_6d_real
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_7d_real(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -3783,11 +3784,11 @@ subroutine shr_assert_in_domain_7d_real(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_7d_real
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_0d_int(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -3983,11 +3984,11 @@ subroutine shr_assert_in_domain_0d_int(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_0d_int
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_1d_int(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -4183,11 +4184,11 @@ subroutine shr_assert_in_domain_1d_int(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_1d_int
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_2d_int(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -4383,11 +4384,11 @@ subroutine shr_assert_in_domain_2d_int(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_2d_int
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_3d_int(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -4583,11 +4584,11 @@ subroutine shr_assert_in_domain_3d_int(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_3d_int
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_4d_int(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -4783,11 +4784,11 @@ subroutine shr_assert_in_domain_4d_int(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_4d_int
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_5d_int(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -4983,11 +4984,11 @@ subroutine shr_assert_in_domain_5d_int(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_5d_int
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_6d_int(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -5183,11 +5184,11 @@ subroutine shr_assert_in_domain_6d_int(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_6d_int
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_7d_int(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -5383,11 +5384,11 @@ subroutine shr_assert_in_domain_7d_int(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_7d_int
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_0d_long(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -5583,11 +5584,11 @@ subroutine shr_assert_in_domain_0d_long(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_0d_long
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_1d_long(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -5783,11 +5784,11 @@ subroutine shr_assert_in_domain_1d_long(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_1d_long
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_2d_long(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -5983,11 +5984,11 @@ subroutine shr_assert_in_domain_2d_long(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_2d_long
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_3d_long(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -6183,11 +6184,11 @@ subroutine shr_assert_in_domain_3d_long(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_3d_long
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_4d_long(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -6383,11 +6384,11 @@ subroutine shr_assert_in_domain_4d_long(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_4d_long
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_5d_long(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -6583,11 +6584,11 @@ subroutine shr_assert_in_domain_5d_long(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_5d_long
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_6d_long(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -6783,11 +6784,11 @@ subroutine shr_assert_in_domain_6d_long(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_6d_long
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 138 "shr_assert_mod.F90.in"
+# 139 "shr_assert_mod.F90.in"
 subroutine shr_assert_in_domain_7d_long(var, varname, msg, &
      is_nan, lt, gt, le, ge, eq, ne, abs_tol)
 
@@ -6983,7 +6984,7 @@ subroutine shr_assert_in_domain_7d_long(var, varname, msg, &
 #undef GEN_SIZE
 #undef GEN_ALL
 
-# 333 "shr_assert_mod.F90.in"
+# 334 "shr_assert_mod.F90.in"
 end subroutine shr_assert_in_domain_7d_long
 
 !--------------------------------------------------------------------------
@@ -6991,7 +6992,7 @@ end subroutine shr_assert_in_domain_7d_long
 
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_0d_double(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7022,11 +7023,11 @@ subroutine print_bad_loc_0d_double(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_0d_double
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_1d_double(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7057,11 +7058,11 @@ subroutine print_bad_loc_1d_double(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_1d_double
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_2d_double(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7093,11 +7094,11 @@ subroutine print_bad_loc_2d_double(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_2d_double
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_3d_double(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7130,11 +7131,11 @@ subroutine print_bad_loc_3d_double(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_3d_double
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_4d_double(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7168,11 +7169,11 @@ subroutine print_bad_loc_4d_double(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_4d_double
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_5d_double(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7207,11 +7208,11 @@ subroutine print_bad_loc_5d_double(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_5d_double
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_6d_double(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7247,11 +7248,11 @@ subroutine print_bad_loc_6d_double(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_6d_double
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_7d_double(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7288,11 +7289,11 @@ subroutine print_bad_loc_7d_double(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_7d_double
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_0d_real(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7323,11 +7324,11 @@ subroutine print_bad_loc_0d_real(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_0d_real
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_1d_real(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7358,11 +7359,11 @@ subroutine print_bad_loc_1d_real(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_1d_real
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_2d_real(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7394,11 +7395,11 @@ subroutine print_bad_loc_2d_real(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_2d_real
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_3d_real(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7431,11 +7432,11 @@ subroutine print_bad_loc_3d_real(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_3d_real
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_4d_real(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7469,11 +7470,11 @@ subroutine print_bad_loc_4d_real(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_4d_real
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_5d_real(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7508,11 +7509,11 @@ subroutine print_bad_loc_5d_real(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_5d_real
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_6d_real(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7548,11 +7549,11 @@ subroutine print_bad_loc_6d_real(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_6d_real
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_7d_real(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7589,11 +7590,11 @@ subroutine print_bad_loc_7d_real(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_7d_real
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_0d_int(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7624,11 +7625,11 @@ subroutine print_bad_loc_0d_int(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_0d_int
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_1d_int(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7659,11 +7660,11 @@ subroutine print_bad_loc_1d_int(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_1d_int
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_2d_int(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7695,11 +7696,11 @@ subroutine print_bad_loc_2d_int(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_2d_int
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_3d_int(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7732,11 +7733,11 @@ subroutine print_bad_loc_3d_int(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_3d_int
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_4d_int(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7770,11 +7771,11 @@ subroutine print_bad_loc_4d_int(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_4d_int
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_5d_int(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7809,11 +7810,11 @@ subroutine print_bad_loc_5d_int(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_5d_int
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_6d_int(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7849,11 +7850,11 @@ subroutine print_bad_loc_6d_int(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_6d_int
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_7d_int(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7890,11 +7891,11 @@ subroutine print_bad_loc_7d_int(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_7d_int
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_0d_long(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7925,11 +7926,11 @@ subroutine print_bad_loc_0d_long(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_0d_long
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_1d_long(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7960,11 +7961,11 @@ subroutine print_bad_loc_1d_long(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_1d_long
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_2d_long(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -7996,11 +7997,11 @@ subroutine print_bad_loc_2d_long(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_2d_long
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_3d_long(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -8033,11 +8034,11 @@ subroutine print_bad_loc_3d_long(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_3d_long
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_4d_long(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -8071,11 +8072,11 @@ subroutine print_bad_loc_4d_long(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_4d_long
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_5d_long(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -8110,11 +8111,11 @@ subroutine print_bad_loc_5d_long(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_5d_long
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_6d_long(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -8150,11 +8151,11 @@ subroutine print_bad_loc_6d_long(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_6d_long
 ! TYPE double,real,int,long
 ! DIMS 0,1,2,3,4,5,6,7
-# 340 "shr_assert_mod.F90.in"
+# 341 "shr_assert_mod.F90.in"
 subroutine print_bad_loc_7d_long(var, loc_vec, varname)
   ! Print information about a bad location in an variable.
   ! For scalars, just print value.
@@ -8191,14 +8192,14 @@ subroutine print_bad_loc_7d_long(var, loc_vec, varname)
   if (.false.) write(*,*) loc_vec
 #endif
 
-# 370 "shr_assert_mod.F90.in"
+# 371 "shr_assert_mod.F90.in"
 end subroutine print_bad_loc_7d_long
 
 !--------------------------------------------------------------------------
 !--------------------------------------------------------------------------
 
 ! DIMS 0,1,2,3,4,5,6,7
-# 376 "shr_assert_mod.F90.in"
+# 377 "shr_assert_mod.F90.in"
 pure function find_first_loc_0d(mask) result (loc_vec)
   ! Inefficient but simple subroutine for finding the location of
   ! the first .true. value in an array.
@@ -8227,10 +8228,10 @@ pure function find_first_loc_0d(mask) result (loc_vec)
 
 #endif
 
-# 404 "shr_assert_mod.F90.in"
+# 405 "shr_assert_mod.F90.in"
 end function find_first_loc_0d
 ! DIMS 0,1,2,3,4,5,6,7
-# 376 "shr_assert_mod.F90.in"
+# 377 "shr_assert_mod.F90.in"
 pure function find_first_loc_1d(mask) result (loc_vec)
   ! Inefficient but simple subroutine for finding the location of
   ! the first .true. value in an array.
@@ -8259,10 +8260,10 @@ pure function find_first_loc_1d(mask) result (loc_vec)
 
 #endif
 
-# 404 "shr_assert_mod.F90.in"
+# 405 "shr_assert_mod.F90.in"
 end function find_first_loc_1d
 ! DIMS 0,1,2,3,4,5,6,7
-# 376 "shr_assert_mod.F90.in"
+# 377 "shr_assert_mod.F90.in"
 pure function find_first_loc_2d(mask) result (loc_vec)
   ! Inefficient but simple subroutine for finding the location of
   ! the first .true. value in an array.
@@ -8292,10 +8293,10 @@ pure function find_first_loc_2d(mask) result (loc_vec)
 
 #endif
 
-# 404 "shr_assert_mod.F90.in"
+# 405 "shr_assert_mod.F90.in"
 end function find_first_loc_2d
 ! DIMS 0,1,2,3,4,5,6,7
-# 376 "shr_assert_mod.F90.in"
+# 377 "shr_assert_mod.F90.in"
 pure function find_first_loc_3d(mask) result (loc_vec)
   ! Inefficient but simple subroutine for finding the location of
   ! the first .true. value in an array.
@@ -8326,10 +8327,10 @@ pure function find_first_loc_3d(mask) result (loc_vec)
 
 #endif
 
-# 404 "shr_assert_mod.F90.in"
+# 405 "shr_assert_mod.F90.in"
 end function find_first_loc_3d
 ! DIMS 0,1,2,3,4,5,6,7
-# 376 "shr_assert_mod.F90.in"
+# 377 "shr_assert_mod.F90.in"
 pure function find_first_loc_4d(mask) result (loc_vec)
   ! Inefficient but simple subroutine for finding the location of
   ! the first .true. value in an array.
@@ -8361,10 +8362,10 @@ pure function find_first_loc_4d(mask) result (loc_vec)
 
 #endif
 
-# 404 "shr_assert_mod.F90.in"
+# 405 "shr_assert_mod.F90.in"
 end function find_first_loc_4d
 ! DIMS 0,1,2,3,4,5,6,7
-# 376 "shr_assert_mod.F90.in"
+# 377 "shr_assert_mod.F90.in"
 pure function find_first_loc_5d(mask) result (loc_vec)
   ! Inefficient but simple subroutine for finding the location of
   ! the first .true. value in an array.
@@ -8397,10 +8398,10 @@ pure function find_first_loc_5d(mask) result (loc_vec)
 
 #endif
 
-# 404 "shr_assert_mod.F90.in"
+# 405 "shr_assert_mod.F90.in"
 end function find_first_loc_5d
 ! DIMS 0,1,2,3,4,5,6,7
-# 376 "shr_assert_mod.F90.in"
+# 377 "shr_assert_mod.F90.in"
 pure function find_first_loc_6d(mask) result (loc_vec)
   ! Inefficient but simple subroutine for finding the location of
   ! the first .true. value in an array.
@@ -8434,10 +8435,10 @@ pure function find_first_loc_6d(mask) result (loc_vec)
 
 #endif
 
-# 404 "shr_assert_mod.F90.in"
+# 405 "shr_assert_mod.F90.in"
 end function find_first_loc_6d
 ! DIMS 0,1,2,3,4,5,6,7
-# 376 "shr_assert_mod.F90.in"
+# 377 "shr_assert_mod.F90.in"
 pure function find_first_loc_7d(mask) result (loc_vec)
   ! Inefficient but simple subroutine for finding the location of
   ! the first .true. value in an array.
@@ -8472,11 +8473,11 @@ pure function find_first_loc_7d(mask) result (loc_vec)
 
 #endif
 
-# 404 "shr_assert_mod.F90.in"
+# 405 "shr_assert_mod.F90.in"
 end function find_first_loc_7d
 
 ! TYPE double,real,int,long
-# 407 "shr_assert_mod.F90.in"
+# 408 "shr_assert_mod.F90.in"
 elemental function within_tolerance_double(expected, actual, tolerance) &
      result(is_in_tol)
   ! Precondition: tolerance must be >= 0.
@@ -8504,10 +8505,10 @@ elemental function within_tolerance_double(expected, actual, tolerance) &
      end if
   end if
 
-# 434 "shr_assert_mod.F90.in"
+# 435 "shr_assert_mod.F90.in"
 end function within_tolerance_double
 ! TYPE double,real,int,long
-# 407 "shr_assert_mod.F90.in"
+# 408 "shr_assert_mod.F90.in"
 elemental function within_tolerance_real(expected, actual, tolerance) &
      result(is_in_tol)
   ! Precondition: tolerance must be >= 0.
@@ -8535,10 +8536,10 @@ elemental function within_tolerance_real(expected, actual, tolerance) &
      end if
   end if
 
-# 434 "shr_assert_mod.F90.in"
+# 435 "shr_assert_mod.F90.in"
 end function within_tolerance_real
 ! TYPE double,real,int,long
-# 407 "shr_assert_mod.F90.in"
+# 408 "shr_assert_mod.F90.in"
 elemental function within_tolerance_int(expected, actual, tolerance) &
      result(is_in_tol)
   ! Precondition: tolerance must be >= 0.
@@ -8566,10 +8567,10 @@ elemental function within_tolerance_int(expected, actual, tolerance) &
      end if
   end if
 
-# 434 "shr_assert_mod.F90.in"
+# 435 "shr_assert_mod.F90.in"
 end function within_tolerance_int
 ! TYPE double,real,int,long
-# 407 "shr_assert_mod.F90.in"
+# 408 "shr_assert_mod.F90.in"
 elemental function within_tolerance_long(expected, actual, tolerance) &
      result(is_in_tol)
   ! Precondition: tolerance must be >= 0.
@@ -8597,7 +8598,7 @@ elemental function within_tolerance_long(expected, actual, tolerance) &
      end if
   end if
 
-# 434 "shr_assert_mod.F90.in"
+# 435 "shr_assert_mod.F90.in"
 end function within_tolerance_long
 
 end module shr_assert_mod
diff --git a/CDEPS-interface/ufs/cdeps_share/shr_frz_mod.F90 b/CDEPS-interface/ufs/cdeps_share/shr_frz_mod.F90
index d925c9301b..94c95bbf13 100644
--- a/CDEPS-interface/ufs/cdeps_share/shr_frz_mod.F90
+++ b/CDEPS-interface/ufs/cdeps_share/shr_frz_mod.F90
@@ -41,13 +41,13 @@ module shr_frz_mod
   !===============================================================================
 
 # 37 "shr_frz_mod.F90.in"
-  subroutine shr_frz_freezetemp_init(tfreeze_option, mastertask)
+  subroutine shr_frz_freezetemp_init(tfreeze_option, maintask)
 
     implicit none
 
     character(len=*),parameter :: subname = "(shr_frz_freezetemp_init) "
     character(CS),intent(in)  :: tfreeze_option ! option for computing freezing point
-    logical, intent(in)  :: mastertask ! for io
+    logical, intent(in)  :: maintask ! for io
     ! minus1p8 is constant -1.8C
     ! linear_salt is linear equation
     ! mushy for CICE mushy-layer nonlinear equation
@@ -56,13 +56,13 @@ subroutine shr_frz_freezetemp_init(tfreeze_option, mastertask)
     ! Check tfreeze_option
     !---------------------------------------------------------------
     if (trim(tfreeze_option) == 'minus1p8') then
-       if (mastertask .and. shr_log_level>0) write(s_logunit,*) ' tfreeze_option is minus1p8'
+       if (maintask .and. shr_log_level>0) write(s_logunit,*) ' tfreeze_option is minus1p8'
        tfrz_option = TFREEZE_OPTION_MINUS1P8
     elseif (trim(tfreeze_option) == 'linear_salt') then
-       if (mastertask .and. shr_log_level>0) write(s_logunit,*) ' tfreeze_option is linear_salt'
+       if (maintask .and. shr_log_level>0) write(s_logunit,*) ' tfreeze_option is linear_salt'
        tfrz_option = TFREEZE_OPTION_LINEAR_SALT
     elseif (trim(tfreeze_option) == 'mushy') then
-       if (mastertask .and. shr_log_level>0) write(s_logunit,*) ' tfreeze_option is mushy'
+       if (maintask .and. shr_log_level>0) write(s_logunit,*) ' tfreeze_option is mushy'
        tfrz_option = TFREEZE_OPTION_MUSHY
     else
        call shr_sys_abort(subname//' ERROR: not a valid tfreeze_option '//trim(tfreeze_option))
diff --git a/CDEPS-interface/ufs/cdeps_share/shr_infnan_mod.F90 b/CDEPS-interface/ufs/cdeps_share/shr_infnan_mod.F90
index 19f1ac824d..0ceecfaaf2 100644
--- a/CDEPS-interface/ufs/cdeps_share/shr_infnan_mod.F90
+++ b/CDEPS-interface/ufs/cdeps_share/shr_infnan_mod.F90
@@ -3,7 +3,6 @@
 ! DO NOT EDIT THIS FILE, it was generated using genf90.pl
 ! Any changes you make to this file may be lost
 !===================================================
-#define CPRINTEL 1
 ! Flag representing compiler support of Fortran 2003's
 ! ieee_arithmetic intrinsic module.
 #if defined CPRIBM || defined CPRPGI || defined CPRINTEL ||  defined CPRCRAY || defined CPRNAG
@@ -72,7 +71,7 @@ module shr_infnan_mod
 
 ! Locally defined isnan.
 #ifndef HAVE_IEEE_ARITHMETIC
-# 70 "shr_infnan_mod.F90.in"
+# 69 "shr_infnan_mod.F90.in"
 interface shr_infnan_isnan
    ! TYPE double,real
    module procedure shr_infnan_isnan_double
@@ -81,7 +80,7 @@ module shr_infnan_mod
 end interface
 #endif
 
-# 76 "shr_infnan_mod.F90.in"
+# 75 "shr_infnan_mod.F90.in"
 interface shr_infnan_isinf
    ! TYPE double,real
    module procedure shr_infnan_isinf_double
@@ -89,7 +88,7 @@ module shr_infnan_mod
    module procedure shr_infnan_isinf_real
 end interface
 
-# 81 "shr_infnan_mod.F90.in"
+# 80 "shr_infnan_mod.F90.in"
 interface shr_infnan_isposinf
    ! TYPE double,real
    module procedure shr_infnan_isposinf_double
@@ -97,7 +96,7 @@ module shr_infnan_mod
    module procedure shr_infnan_isposinf_real
 end interface
 
-# 86 "shr_infnan_mod.F90.in"
+# 85 "shr_infnan_mod.F90.in"
 interface shr_infnan_isneginf
    ! TYPE double,real
    module procedure shr_infnan_isneginf_double
@@ -125,7 +124,7 @@ module shr_infnan_mod
 end type shr_infnan_inf_type
 
 ! Allow assigning reals to NaN or Inf.
-# 111 "shr_infnan_mod.F90.in"
+# 110 "shr_infnan_mod.F90.in"
 interface assignment(=)
    ! TYPE double,real
    ! DIMS 0,1,2,3,4,5,6,7
@@ -226,13 +225,13 @@ module shr_infnan_mod
 end interface
 
 ! Conversion functions.
-# 121 "shr_infnan_mod.F90.in"
+# 120 "shr_infnan_mod.F90.in"
 interface shr_infnan_to_r8
    module procedure nan_r8
    module procedure inf_r8
 end interface
 
-# 126 "shr_infnan_mod.F90.in"
+# 125 "shr_infnan_mod.F90.in"
 interface shr_infnan_to_r4
    module procedure nan_r4
    module procedure inf_r4
@@ -273,7 +272,7 @@ module shr_infnan_mod
 integer(i8), parameter :: dneginf_pat = ibset(dposinf_pat,bit_size(1_i8)-1)
 #endif
 
-# 166 "shr_infnan_mod.F90.in"
+# 165 "shr_infnan_mod.F90.in"
 contains
 
 !---------------------------------------------------------------------
@@ -283,24 +282,24 @@ module shr_infnan_mod
 !---------------------------------------------------------------------
 
 ! TYPE double,real
-# 175 "shr_infnan_mod.F90.in"
+# 174 "shr_infnan_mod.F90.in"
 elemental function shr_infnan_isinf_double(x) result(isinf)
   real(r8), intent(in) :: x
   logical :: isinf
 
   isinf = shr_infnan_isposinf(x) .or. shr_infnan_isneginf(x)
 
-# 181 "shr_infnan_mod.F90.in"
+# 180 "shr_infnan_mod.F90.in"
 end function shr_infnan_isinf_double
 ! TYPE double,real
-# 175 "shr_infnan_mod.F90.in"
+# 174 "shr_infnan_mod.F90.in"
 elemental function shr_infnan_isinf_real(x) result(isinf)
   real(r4), intent(in) :: x
   logical :: isinf
 
   isinf = shr_infnan_isposinf(x) .or. shr_infnan_isneginf(x)
 
-# 181 "shr_infnan_mod.F90.in"
+# 180 "shr_infnan_mod.F90.in"
 end function shr_infnan_isinf_real
 
 #ifdef HAVE_IEEE_ARITHMETIC
@@ -312,7 +311,7 @@ end function shr_infnan_isinf_real
 !---------------------------------------------------------------------
 
 ! TYPE double,real
-# 192 "shr_infnan_mod.F90.in"
+# 191 "shr_infnan_mod.F90.in"
 elemental function shr_infnan_isposinf_double(x) result(isposinf)
   use, intrinsic :: ieee_arithmetic, only: &
        ieee_class, &
@@ -323,10 +322,10 @@ elemental function shr_infnan_isposinf_double(x) result(isposinf)
 
   isposinf = (ieee_positive_inf == ieee_class(x))
 
-# 202 "shr_infnan_mod.F90.in"
+# 201 "shr_infnan_mod.F90.in"
 end function shr_infnan_isposinf_double
 ! TYPE double,real
-# 192 "shr_infnan_mod.F90.in"
+# 191 "shr_infnan_mod.F90.in"
 elemental function shr_infnan_isposinf_real(x) result(isposinf)
   use, intrinsic :: ieee_arithmetic, only: &
        ieee_class, &
@@ -337,11 +336,11 @@ elemental function shr_infnan_isposinf_real(x) result(isposinf)
 
   isposinf = (ieee_positive_inf == ieee_class(x))
 
-# 202 "shr_infnan_mod.F90.in"
+# 201 "shr_infnan_mod.F90.in"
 end function shr_infnan_isposinf_real
 
 ! TYPE double,real
-# 205 "shr_infnan_mod.F90.in"
+# 204 "shr_infnan_mod.F90.in"
 elemental function shr_infnan_isneginf_double(x) result(isneginf)
   use, intrinsic :: ieee_arithmetic, only: &
        ieee_class, &
@@ -352,10 +351,10 @@ elemental function shr_infnan_isneginf_double(x) result(isneginf)
 
   isneginf = (ieee_negative_inf == ieee_class(x))
 
-# 215 "shr_infnan_mod.F90.in"
+# 214 "shr_infnan_mod.F90.in"
 end function shr_infnan_isneginf_double
 ! TYPE double,real
-# 205 "shr_infnan_mod.F90.in"
+# 204 "shr_infnan_mod.F90.in"
 elemental function shr_infnan_isneginf_real(x) result(isneginf)
   use, intrinsic :: ieee_arithmetic, only: &
        ieee_class, &
@@ -366,7 +365,7 @@ elemental function shr_infnan_isneginf_real(x) result(isneginf)
 
   isneginf = (ieee_negative_inf == ieee_class(x))
 
-# 215 "shr_infnan_mod.F90.in"
+# 214 "shr_infnan_mod.F90.in"
 end function shr_infnan_isneginf_real
 
 #else
@@ -375,24 +374,24 @@ end function shr_infnan_isneginf_real
 #ifdef CPRGNU
 ! NaN testing on gfortran.
 ! TYPE double,real
-# 223 "shr_infnan_mod.F90.in"
+# 222 "shr_infnan_mod.F90.in"
 elemental function shr_infnan_isnan_double(x) result(is_nan)
   real(r8), intent(in) :: x
   logical :: is_nan
 
   is_nan = isnan(x)
 
-# 229 "shr_infnan_mod.F90.in"
+# 228 "shr_infnan_mod.F90.in"
 end function shr_infnan_isnan_double
 ! TYPE double,real
-# 223 "shr_infnan_mod.F90.in"
+# 222 "shr_infnan_mod.F90.in"
 elemental function shr_infnan_isnan_real(x) result(is_nan)
   real(r4), intent(in) :: x
   logical :: is_nan
 
   is_nan = isnan(x)
 
-# 229 "shr_infnan_mod.F90.in"
+# 228 "shr_infnan_mod.F90.in"
 end function shr_infnan_isnan_real
 ! End GNU section.
 #endif
@@ -403,7 +402,7 @@ end function shr_infnan_isnan_real
 !---------------------------------------------------------------------
 
 ! TYPE double,real
-# 239 "shr_infnan_mod.F90.in"
+# 238 "shr_infnan_mod.F90.in"
 elemental function shr_infnan_isposinf_double(x) result(isposinf)
   real(r8), intent(in) :: x
   logical :: isposinf
@@ -415,10 +414,10 @@ elemental function shr_infnan_isposinf_double(x) result(isposinf)
 
   isposinf = (x == transfer(posinf_pat,x))
 
-# 250 "shr_infnan_mod.F90.in"
+# 249 "shr_infnan_mod.F90.in"
 end function shr_infnan_isposinf_double
 ! TYPE double,real
-# 239 "shr_infnan_mod.F90.in"
+# 238 "shr_infnan_mod.F90.in"
 elemental function shr_infnan_isposinf_real(x) result(isposinf)
   real(r4), intent(in) :: x
   logical :: isposinf
@@ -430,11 +429,11 @@ elemental function shr_infnan_isposinf_real(x) result(isposinf)
 
   isposinf = (x == transfer(posinf_pat,x))
 
-# 250 "shr_infnan_mod.F90.in"
+# 249 "shr_infnan_mod.F90.in"
 end function shr_infnan_isposinf_real
 
 ! TYPE double,real
-# 253 "shr_infnan_mod.F90.in"
+# 252 "shr_infnan_mod.F90.in"
 elemental function shr_infnan_isneginf_double(x) result(isneginf)
   real(r8), intent(in) :: x
   logical :: isneginf
@@ -446,10 +445,10 @@ elemental function shr_infnan_isneginf_double(x) result(isneginf)
 
   isneginf = (x == transfer(neginf_pat,x))
 
-# 264 "shr_infnan_mod.F90.in"
+# 263 "shr_infnan_mod.F90.in"
 end function shr_infnan_isneginf_double
 ! TYPE double,real
-# 253 "shr_infnan_mod.F90.in"
+# 252 "shr_infnan_mod.F90.in"
 elemental function shr_infnan_isneginf_real(x) result(isneginf)
   real(r4), intent(in) :: x
   logical :: isneginf
@@ -461,7 +460,7 @@ elemental function shr_infnan_isneginf_real(x) result(isneginf)
 
   isneginf = (x == transfer(neginf_pat,x))
 
-# 264 "shr_infnan_mod.F90.in"
+# 263 "shr_infnan_mod.F90.in"
 end function shr_infnan_isneginf_real
 
 ! End ieee_arithmetic conditional.
@@ -485,7 +484,7 @@ end function shr_infnan_isneginf_real
 
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 287 "shr_infnan_mod.F90.in"
+# 286 "shr_infnan_mod.F90.in"
 pure subroutine set_nan_0d_double(output, nan)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -524,11 +523,11 @@ pure subroutine set_nan_0d_double(output, nan)
 
   output = tmp
 
-# 325 "shr_infnan_mod.F90.in"
+# 324 "shr_infnan_mod.F90.in"
 end subroutine set_nan_0d_double
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 287 "shr_infnan_mod.F90.in"
+# 286 "shr_infnan_mod.F90.in"
 pure subroutine set_nan_1d_double(output, nan)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -567,11 +566,11 @@ pure subroutine set_nan_1d_double(output, nan)
 
   output = tmp
 
-# 325 "shr_infnan_mod.F90.in"
+# 324 "shr_infnan_mod.F90.in"
 end subroutine set_nan_1d_double
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 287 "shr_infnan_mod.F90.in"
+# 286 "shr_infnan_mod.F90.in"
 pure subroutine set_nan_2d_double(output, nan)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -610,11 +609,11 @@ pure subroutine set_nan_2d_double(output, nan)
 
   output = tmp
 
-# 325 "shr_infnan_mod.F90.in"
+# 324 "shr_infnan_mod.F90.in"
 end subroutine set_nan_2d_double
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 287 "shr_infnan_mod.F90.in"
+# 286 "shr_infnan_mod.F90.in"
 pure subroutine set_nan_3d_double(output, nan)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -653,11 +652,11 @@ pure subroutine set_nan_3d_double(output, nan)
 
   output = tmp
 
-# 325 "shr_infnan_mod.F90.in"
+# 324 "shr_infnan_mod.F90.in"
 end subroutine set_nan_3d_double
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 287 "shr_infnan_mod.F90.in"
+# 286 "shr_infnan_mod.F90.in"
 pure subroutine set_nan_4d_double(output, nan)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -696,11 +695,11 @@ pure subroutine set_nan_4d_double(output, nan)
 
   output = tmp
 
-# 325 "shr_infnan_mod.F90.in"
+# 324 "shr_infnan_mod.F90.in"
 end subroutine set_nan_4d_double
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 287 "shr_infnan_mod.F90.in"
+# 286 "shr_infnan_mod.F90.in"
 pure subroutine set_nan_5d_double(output, nan)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -739,11 +738,11 @@ pure subroutine set_nan_5d_double(output, nan)
 
   output = tmp
 
-# 325 "shr_infnan_mod.F90.in"
+# 324 "shr_infnan_mod.F90.in"
 end subroutine set_nan_5d_double
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 287 "shr_infnan_mod.F90.in"
+# 286 "shr_infnan_mod.F90.in"
 pure subroutine set_nan_6d_double(output, nan)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -782,11 +781,11 @@ pure subroutine set_nan_6d_double(output, nan)
 
   output = tmp
 
-# 325 "shr_infnan_mod.F90.in"
+# 324 "shr_infnan_mod.F90.in"
 end subroutine set_nan_6d_double
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 287 "shr_infnan_mod.F90.in"
+# 286 "shr_infnan_mod.F90.in"
 pure subroutine set_nan_7d_double(output, nan)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -825,11 +824,11 @@ pure subroutine set_nan_7d_double(output, nan)
 
   output = tmp
 
-# 325 "shr_infnan_mod.F90.in"
+# 324 "shr_infnan_mod.F90.in"
 end subroutine set_nan_7d_double
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 287 "shr_infnan_mod.F90.in"
+# 286 "shr_infnan_mod.F90.in"
 pure subroutine set_nan_0d_real(output, nan)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -868,11 +867,11 @@ pure subroutine set_nan_0d_real(output, nan)
 
   output = tmp
 
-# 325 "shr_infnan_mod.F90.in"
+# 324 "shr_infnan_mod.F90.in"
 end subroutine set_nan_0d_real
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 287 "shr_infnan_mod.F90.in"
+# 286 "shr_infnan_mod.F90.in"
 pure subroutine set_nan_1d_real(output, nan)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -911,11 +910,11 @@ pure subroutine set_nan_1d_real(output, nan)
 
   output = tmp
 
-# 325 "shr_infnan_mod.F90.in"
+# 324 "shr_infnan_mod.F90.in"
 end subroutine set_nan_1d_real
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 287 "shr_infnan_mod.F90.in"
+# 286 "shr_infnan_mod.F90.in"
 pure subroutine set_nan_2d_real(output, nan)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -954,11 +953,11 @@ pure subroutine set_nan_2d_real(output, nan)
 
   output = tmp
 
-# 325 "shr_infnan_mod.F90.in"
+# 324 "shr_infnan_mod.F90.in"
 end subroutine set_nan_2d_real
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 287 "shr_infnan_mod.F90.in"
+# 286 "shr_infnan_mod.F90.in"
 pure subroutine set_nan_3d_real(output, nan)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -997,11 +996,11 @@ pure subroutine set_nan_3d_real(output, nan)
 
   output = tmp
 
-# 325 "shr_infnan_mod.F90.in"
+# 324 "shr_infnan_mod.F90.in"
 end subroutine set_nan_3d_real
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 287 "shr_infnan_mod.F90.in"
+# 286 "shr_infnan_mod.F90.in"
 pure subroutine set_nan_4d_real(output, nan)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -1040,11 +1039,11 @@ pure subroutine set_nan_4d_real(output, nan)
 
   output = tmp
 
-# 325 "shr_infnan_mod.F90.in"
+# 324 "shr_infnan_mod.F90.in"
 end subroutine set_nan_4d_real
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 287 "shr_infnan_mod.F90.in"
+# 286 "shr_infnan_mod.F90.in"
 pure subroutine set_nan_5d_real(output, nan)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -1083,11 +1082,11 @@ pure subroutine set_nan_5d_real(output, nan)
 
   output = tmp
 
-# 325 "shr_infnan_mod.F90.in"
+# 324 "shr_infnan_mod.F90.in"
 end subroutine set_nan_5d_real
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 287 "shr_infnan_mod.F90.in"
+# 286 "shr_infnan_mod.F90.in"
 pure subroutine set_nan_6d_real(output, nan)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -1126,11 +1125,11 @@ pure subroutine set_nan_6d_real(output, nan)
 
   output = tmp
 
-# 325 "shr_infnan_mod.F90.in"
+# 324 "shr_infnan_mod.F90.in"
 end subroutine set_nan_6d_real
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 287 "shr_infnan_mod.F90.in"
+# 286 "shr_infnan_mod.F90.in"
 pure subroutine set_nan_7d_real(output, nan)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -1169,12 +1168,12 @@ pure subroutine set_nan_7d_real(output, nan)
 
   output = tmp
 
-# 325 "shr_infnan_mod.F90.in"
+# 324 "shr_infnan_mod.F90.in"
 end subroutine set_nan_7d_real
 
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 329 "shr_infnan_mod.F90.in"
+# 328 "shr_infnan_mod.F90.in"
 pure subroutine set_inf_0d_double(output, inf)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -1213,11 +1212,11 @@ pure subroutine set_inf_0d_double(output, inf)
 
   output = tmp
 
-# 367 "shr_infnan_mod.F90.in"
+# 366 "shr_infnan_mod.F90.in"
 end subroutine set_inf_0d_double
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 329 "shr_infnan_mod.F90.in"
+# 328 "shr_infnan_mod.F90.in"
 pure subroutine set_inf_1d_double(output, inf)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -1256,11 +1255,11 @@ pure subroutine set_inf_1d_double(output, inf)
 
   output = tmp
 
-# 367 "shr_infnan_mod.F90.in"
+# 366 "shr_infnan_mod.F90.in"
 end subroutine set_inf_1d_double
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 329 "shr_infnan_mod.F90.in"
+# 328 "shr_infnan_mod.F90.in"
 pure subroutine set_inf_2d_double(output, inf)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -1299,11 +1298,11 @@ pure subroutine set_inf_2d_double(output, inf)
 
   output = tmp
 
-# 367 "shr_infnan_mod.F90.in"
+# 366 "shr_infnan_mod.F90.in"
 end subroutine set_inf_2d_double
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 329 "shr_infnan_mod.F90.in"
+# 328 "shr_infnan_mod.F90.in"
 pure subroutine set_inf_3d_double(output, inf)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -1342,11 +1341,11 @@ pure subroutine set_inf_3d_double(output, inf)
 
   output = tmp
 
-# 367 "shr_infnan_mod.F90.in"
+# 366 "shr_infnan_mod.F90.in"
 end subroutine set_inf_3d_double
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 329 "shr_infnan_mod.F90.in"
+# 328 "shr_infnan_mod.F90.in"
 pure subroutine set_inf_4d_double(output, inf)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -1385,11 +1384,11 @@ pure subroutine set_inf_4d_double(output, inf)
 
   output = tmp
 
-# 367 "shr_infnan_mod.F90.in"
+# 366 "shr_infnan_mod.F90.in"
 end subroutine set_inf_4d_double
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 329 "shr_infnan_mod.F90.in"
+# 328 "shr_infnan_mod.F90.in"
 pure subroutine set_inf_5d_double(output, inf)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -1428,11 +1427,11 @@ pure subroutine set_inf_5d_double(output, inf)
 
   output = tmp
 
-# 367 "shr_infnan_mod.F90.in"
+# 366 "shr_infnan_mod.F90.in"
 end subroutine set_inf_5d_double
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 329 "shr_infnan_mod.F90.in"
+# 328 "shr_infnan_mod.F90.in"
 pure subroutine set_inf_6d_double(output, inf)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -1471,11 +1470,11 @@ pure subroutine set_inf_6d_double(output, inf)
 
   output = tmp
 
-# 367 "shr_infnan_mod.F90.in"
+# 366 "shr_infnan_mod.F90.in"
 end subroutine set_inf_6d_double
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 329 "shr_infnan_mod.F90.in"
+# 328 "shr_infnan_mod.F90.in"
 pure subroutine set_inf_7d_double(output, inf)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -1514,11 +1513,11 @@ pure subroutine set_inf_7d_double(output, inf)
 
   output = tmp
 
-# 367 "shr_infnan_mod.F90.in"
+# 366 "shr_infnan_mod.F90.in"
 end subroutine set_inf_7d_double
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 329 "shr_infnan_mod.F90.in"
+# 328 "shr_infnan_mod.F90.in"
 pure subroutine set_inf_0d_real(output, inf)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -1557,11 +1556,11 @@ pure subroutine set_inf_0d_real(output, inf)
 
   output = tmp
 
-# 367 "shr_infnan_mod.F90.in"
+# 366 "shr_infnan_mod.F90.in"
 end subroutine set_inf_0d_real
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 329 "shr_infnan_mod.F90.in"
+# 328 "shr_infnan_mod.F90.in"
 pure subroutine set_inf_1d_real(output, inf)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -1600,11 +1599,11 @@ pure subroutine set_inf_1d_real(output, inf)
 
   output = tmp
 
-# 367 "shr_infnan_mod.F90.in"
+# 366 "shr_infnan_mod.F90.in"
 end subroutine set_inf_1d_real
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 329 "shr_infnan_mod.F90.in"
+# 328 "shr_infnan_mod.F90.in"
 pure subroutine set_inf_2d_real(output, inf)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -1643,11 +1642,11 @@ pure subroutine set_inf_2d_real(output, inf)
 
   output = tmp
 
-# 367 "shr_infnan_mod.F90.in"
+# 366 "shr_infnan_mod.F90.in"
 end subroutine set_inf_2d_real
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 329 "shr_infnan_mod.F90.in"
+# 328 "shr_infnan_mod.F90.in"
 pure subroutine set_inf_3d_real(output, inf)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -1686,11 +1685,11 @@ pure subroutine set_inf_3d_real(output, inf)
 
   output = tmp
 
-# 367 "shr_infnan_mod.F90.in"
+# 366 "shr_infnan_mod.F90.in"
 end subroutine set_inf_3d_real
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 329 "shr_infnan_mod.F90.in"
+# 328 "shr_infnan_mod.F90.in"
 pure subroutine set_inf_4d_real(output, inf)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -1729,11 +1728,11 @@ pure subroutine set_inf_4d_real(output, inf)
 
   output = tmp
 
-# 367 "shr_infnan_mod.F90.in"
+# 366 "shr_infnan_mod.F90.in"
 end subroutine set_inf_4d_real
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 329 "shr_infnan_mod.F90.in"
+# 328 "shr_infnan_mod.F90.in"
 pure subroutine set_inf_5d_real(output, inf)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -1772,11 +1771,11 @@ pure subroutine set_inf_5d_real(output, inf)
 
   output = tmp
 
-# 367 "shr_infnan_mod.F90.in"
+# 366 "shr_infnan_mod.F90.in"
 end subroutine set_inf_5d_real
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 329 "shr_infnan_mod.F90.in"
+# 328 "shr_infnan_mod.F90.in"
 pure subroutine set_inf_6d_real(output, inf)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -1815,11 +1814,11 @@ pure subroutine set_inf_6d_real(output, inf)
 
   output = tmp
 
-# 367 "shr_infnan_mod.F90.in"
+# 366 "shr_infnan_mod.F90.in"
 end subroutine set_inf_6d_real
 ! TYPE double,real
 ! DIMS 0,1,2,3,4,5,6,7
-# 329 "shr_infnan_mod.F90.in"
+# 328 "shr_infnan_mod.F90.in"
 pure subroutine set_inf_7d_real(output, inf)
 #ifdef HAVE_IEEE_ARITHMETIC
   use, intrinsic :: ieee_arithmetic, only: &
@@ -1858,7 +1857,7 @@ pure subroutine set_inf_7d_real(output, inf)
 
   output = tmp
 
-# 367 "shr_infnan_mod.F90.in"
+# 366 "shr_infnan_mod.F90.in"
 end subroutine set_inf_7d_real
 
 !---------------------------------------------------------------------
@@ -1867,44 +1866,44 @@ end subroutine set_inf_7d_real
 ! Function methods to get reals from nan/inf types.
 !---------------------------------------------------------------------
 
-# 375 "shr_infnan_mod.F90.in"
+# 374 "shr_infnan_mod.F90.in"
 pure function nan_r8(nan) result(output)
   class(shr_infnan_nan_type), intent(in) :: nan
   real(r8) :: output
 
   output = nan
 
-# 381 "shr_infnan_mod.F90.in"
+# 380 "shr_infnan_mod.F90.in"
 end function nan_r8
 
-# 383 "shr_infnan_mod.F90.in"
+# 382 "shr_infnan_mod.F90.in"
 pure function nan_r4(nan) result(output)
   class(shr_infnan_nan_type), intent(in) :: nan
   real(r4) :: output
 
   output = nan
 
-# 389 "shr_infnan_mod.F90.in"
+# 388 "shr_infnan_mod.F90.in"
 end function nan_r4
 
-# 391 "shr_infnan_mod.F90.in"
+# 390 "shr_infnan_mod.F90.in"
 pure function inf_r8(inf) result(output)
   class(shr_infnan_inf_type), intent(in) :: inf
   real(r8) :: output
 
   output = inf
 
-# 397 "shr_infnan_mod.F90.in"
+# 396 "shr_infnan_mod.F90.in"
 end function inf_r8
 
-# 399 "shr_infnan_mod.F90.in"
+# 398 "shr_infnan_mod.F90.in"
 pure function inf_r4(inf) result(output)
   class(shr_infnan_inf_type), intent(in) :: inf
   real(r4) :: output
 
   output = inf
 
-# 405 "shr_infnan_mod.F90.in"
+# 404 "shr_infnan_mod.F90.in"
 end function inf_r4
 
 end module shr_infnan_mod
diff --git a/CMEPS-interface/CMakeLists.txt b/CMEPS-interface/CMakeLists.txt
index 268d0485ad..27354594ab 100644
--- a/CMEPS-interface/CMakeLists.txt
+++ b/CMEPS-interface/CMakeLists.txt
@@ -5,7 +5,7 @@
 if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
   set(CMAKE_Fortran_FLAGS "-g -fbacktrace -ffree-line-length-none")
   if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
-    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-argument-mismatch -fallow-invalid-boz")
+    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-argument-mismatch -fallow-invalid-boz -DCPRGNU")
   endif()
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
@@ -13,7 +13,7 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
   set(CMAKE_Fortran_LINK_FLAGS "")
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
   set(CMAKE_Fortran_FLAGS "-g -traceback")
-  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O -assume realloc_lhs")
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O -assume realloc_lhs -DCPRINTEL")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fp-model precise")
   set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check -check noarg_temp_created -check nopointer -fpe0 -ftrapuv -init=snan,arrays")
   set(CMAKE_Fortran_LINK_FLAGS "")