Merge branch 'dev/master' into user/ksh/open_bc

NOAA-GFDL · Sep 9, 2016 · cb553eb · cb553eb
2 parents 1c00163 + 2b4a8fb
commit cb553eb
Show file tree

Hide file tree

Showing 5 changed files with 471 additions and 141 deletions.
diff --git a/config_src/dynamic/MOM_memory.h b/config_src/dynamic/MOM_memory.h
@@ -34,7 +34,9 @@
                                !    NJPROC_ is the number of processors in the
                                !  y-direction.
 
+#ifndef MAX_FIELDS_
 #define MAX_FIELDS_ 50
+#endif
                                !    The maximum permitted number (each) of
                                !  restart variables, time derivatives, etc.
                                !  This is mostly used for the size of pointer

diff --git a/src/core/MOM.F90 b/src/core/MOM.F90
@@ -1162,7 +1162,7 @@ subroutine step_MOM(fluxes, state, Time_start, time_interval, CS)
       if (Time_local + set_time(int(0.5*dt_therm)) > CS%Z_diag_time) then
         call enable_averaging(real(time_type_to_real(CS%Z_diag_interval)), &
                               CS%Z_diag_time, CS%diag)
-        call calculate_Z_diag_fields(u, v, h, CS%dt_trans, &
+        call calculate_Z_diag_fields(u, v, h, ssh, CS%dt_trans, &
                                      G, GV, CS%diag_to_Z_CSp)
         CS%Z_diag_time = CS%Z_diag_time + CS%Z_diag_interval
         call disable_averaging(CS%diag)