Merge branch 'nicjhan-diagnostic-tests' into dev/master

NOAA-GFDL · May 4, 2015 · 66d58c3 · 66d58c3
2 parents 67a04e5 + 0b468a2
commit 66d58c3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/SIS_diag_mediator.F90 b/SIS_diag_mediator.F90
@@ -108,7 +108,7 @@ module SIS_diag_mediator
   real, dimension(:,:,:), pointer :: mask3dCuC => null()
   real, dimension(:,:,:), pointer :: mask3dCvC => null()
 
-#define MAX_NUM_DIAGNOSTICS 400
+#define MAX_NUM_DIAGNOSTICS 1000
   type(maskContainer), dimension(MAX_NUM_DIAGNOSTICS) :: maskList
 
   !default missing value to be sent to ALL diagnostics registerations 

diff --git a/ice_model.F90 b/ice_model.F90
@@ -1085,7 +1085,8 @@ subroutine do_update_ice_model_fast( Atmos_boundary, Ice, IST, G )
     drdt      ! The derivative of the upward radiative heat flux with surface
               ! temperature (i.e. d(flux)/d(surf_temp) in W m-2 K-1.
   real, dimension(G%isc:G%iec,G%jsc:G%jec) :: &
-    diurnal_factor, cosz_alb, tmp_diag
+    diurnal_factor, cosz_alb
+  real, dimension(SZI_(G), SZJ_(G)) :: tmp_diag
   real, dimension(0:G%NkIce) :: T_col ! The temperature of a column of ice and snow in degC.
   real, dimension(G%NkIce)   :: S_col ! The thermodynamic salinity of a column of ice, in g/kg.
   real, dimension(0:G%NkIce) :: enth_col   ! The enthalpy of a column of snow and ice, in enth_unit (J/kg?).
@@ -1379,15 +1380,15 @@ subroutine do_update_ice_model_fast( Atmos_boundary, Ice, IST, G )
                              IST%part_size(isc:iec,jsc:jec,:), IST%diag, mask=Ice%mask)
 
   if (IST%id_sw_abs_sfc>0) call post_avg(IST%id_sw_abs_sfc, IST%sw_abs_sfc, &
-                                   IST%part_size, IST%diag, G=G, mask=G%Lmask2dT)
+                                   IST%part_size(:,:,1:), IST%diag, G=G, mask=G%Lmask2dT)
   if (IST%id_sw_abs_snow>0) call post_avg(IST%id_sw_abs_snow, IST%sw_abs_snow, &
-                                   IST%part_size, IST%diag, G=G, mask=G%Lmask2dT)
+                                   IST%part_size(:,:,1:), IST%diag, G=G, mask=G%Lmask2dT)
   do m=1,G%NkIce
     if (IST%id_sw_abs_ice(m)>0) call post_avg(IST%id_sw_abs_ice(m), IST%sw_abs_ice(:,:,:,m), &
-                                     IST%part_size, IST%diag, G=G, mask=G%Lmask2dT)
+                                     IST%part_size(:,:,1:), IST%diag, G=G, mask=G%Lmask2dT)
   enddo
   if (IST%id_sw_abs_ocn>0) call post_avg(IST%id_sw_abs_ocn, IST%sw_abs_ocn, &
-                                   IST%part_size, IST%diag, G=G, mask=G%Lmask2dT)
+                                   IST%part_size(:,:,1:), IST%diag, G=G, mask=G%Lmask2dT)
 
   if (IST%id_sw_pen>0) then
     tmp_diag(:,:) = 0.0