--- MITgcm/verification/MLAdjust/input/data.diagnostics	2005/09/27 13:49:41	1.3
+++ MITgcm/verification/MLAdjust/input/data.diagnostics	2014/02/12 23:12:59	1.10
@@ -1,48 +1,64 @@
 # Diagnostic Package Choices
-#-----------------
-# for each output-stream:
-#  filename(n) : prefix of the output file name (only 8.c long) for outp.stream n
+#--------------------
+#  dumpAtLast (logical): always write output at the end of simulation (default=F)
+#  diag_mnc   (logical): write to NetCDF files (default=useMNC)
+#--for each output-stream:
+#  fileName(n) : prefix of the output file name (max 80c long) for outp.stream n
 #  frequency(n):< 0 : write snap-shot output every |frequency| seconds
 #               > 0 : write time-average output every frequency seconds
 #  timePhase(n)     : write at time = timePhase + multiple of |frequency|
+#    averagingFreq  : frequency (in s) for periodic averaging interval
+#    averagingPhase : phase     (in s) for periodic averaging interval
+#    repeatCycle    : number of averaging intervals in 1 cycle
 #  levels(:,n) : list of levels to write to file (Notes: declared as REAL)
-#                 when this entry is missing, select all common levels of this list
-#  fields(:,n) : list of diagnostics fields (8.c) (see "available_diagnostics" file
-#                 for the list of all available diag. in this particular config)
-#-----------------
- &diagnostics_list
-  diag_mnc=.TRUE.,
-  frequency(1) = 7200.,
-  fields(1,1) = 'momKE   ','momHDiv ','momVort3',
-                'Strain  ','Tension ',
-  filename(1) = 'mom',
-  frequency(2) = 7200.,
-  fields(1,2) = 'VISCAHD ','VISCA4D ','VISCAHZ ','VISCA4Z ',
-                'VAHDMAX ','VA4DMAX ','VAHZMAX ','VA4ZMAX ',
-                'VAHDMIN ','VA4DMIN ','VAHZMIN ','VA4ZMIN ',
-                'VAHDLTH ','VA4DLTH ','VAHZLTH ','VA4ZLTH ',
-                'VAHDLTHD','VA4DLTHD','VAHZLTHD','VA4ZLTHD',
-                'VAHDSMAG','VA4DSMAG','VAHZSMAG','VA4ZSMAG',
-  filename(2) = 'visc',
+#                when this entry is missing, select all common levels of this list
+#  fields(:,n) : list of selected diagnostics fields (8.c) in outp.stream n
+#                (see "available_diagnostics.log" file for the full list of diags)
+#  missing_value(n) : missing value for real-type fields in output file "n"
+#  fileFlags(n)     : specific code (8c string) for output file "n"
+#--------------------
+ &DIAGNOSTICS_LIST
+  dumpAtLast=.TRUE.,
+# diag_mnc=.FALSE.,
+#--
+  fields(1:5,1)  = 'momKE   ','momHDiv ','momVort3',
+                   'Strain  ','Tension ',
+   fileName(1) = 'momDiag',
+  frequency(1) = 864000.,
+  fields(1:24,2) = 'VISCAHD ','VISCA4D ','VISCAHZ ','VISCA4Z ',
+                   'VAHDMAX ','VA4DMAX ','VAHZMAX ','VA4ZMAX ',
+                   'VAHDMIN ','VA4DMIN ','VAHZMIN ','VA4ZMIN ',
+                   'VAHDLTH ','VA4DLTH ','VAHZLTH ','VA4ZLTH ',
+                   'VAHDLTHD','VA4DLTHD','VAHZLTHD','VA4ZLTHD',
+                   'VAHDSMAG','VA4DSMAG','VAHZSMAG','VA4ZSMAG',
+   fileName(2) = 'viscDiag',
+  frequency(2) = 864000.,
  &
 
-
+#--------------------
 # Parameter for Diagnostics of per level statistics:
-#-----------------
-# for each output-stream:
-#  stat_fname(n) : prefix of the output file name (only 8.c long) for outp.stream n
+#--------------------
+#  diagSt_mnc (logical): write stat-diags to NetCDF files (default=diag_mnc)
+#  diagSt_regMaskFile : file containing the region-mask to read-in
+#  nSetRegMskFile   : number of region-mask sets within the region-mask file
+#  set_regMask(i)   : region-mask set-index that identifies the region "i"
+#  val_regMask(i)   : region "i" identifier value in the region mask
+#--for each output-stream:
+#  stat_fName(n) : prefix of the output file name (max 80c long) for outp.stream n
 #  stat_freq(n):< 0 : write snap-shot output every |stat_freq| seconds
 #               > 0 : write time-average output every stat_freq seconds
 #  stat_phase(n)    : write at time = stat_phase + multiple of |stat_freq|
 #  stat_region(:,n) : list of "regions" (default: 1 region only=global)
-#  stat_fields(:,n) : list of diagnostics fields (8.c) (see "available_diagnostics.log"
-#                 file for the list of all available diag. in this particular config)
-#-----------------
+#  stat_fields(:,n) : list of selected diagnostics fields (8.c) in outp.stream n
+#                (see "available_diagnostics.log" file for the full list of diags)
+#--------------------
  &DIAG_STATIS_PARMS
-#- an example just to check the agreement with MONITOR output:
-#stat_fields(1,1)= 'ETAN    ','UVEL    ','VVEL    ','WVEL    ', 'THETA   ',
-#   stat_fname(1)= 'dynStDiag',
-#    stat_freq(1)= -864000.,
-#   stat_phase(1)= 0.,
+  diagSt_mnc = .FALSE.,
+ stat_fields(1:12,1) = 'ETAN    ','DETADT2 ','THETA   ','SALT    ',
+                       'UVEL    ','VVEL    ','WVEL    ','CONVADJ ',
+                       'VISCAHD ','VISCA4D ','VISCAHZ ','VISCA4Z ',
+  stat_fName(1) = 'dynStDiag',
+   stat_freq(1) = 7200.,
+# stat_phase(1) = 0.,
  &