--- MITgcm/verification/lab_sea/input_ad/data.diagnostics	2010/04/03 22:33:07	1.3
+++ MITgcm/verification/lab_sea/input_ad/data.diagnostics	2010/12/19 00:37:15	1.4
@@ -1,115 +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)
-#-----------------
-# This example dumps all KPP diagnostics as
-# a snapshot after ten time steps
- &diagnostics_list
-#
-   dumpatlast  = .TRUE.,
-#
+#                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"
+#--------------------
+# This example dumps EXF diagnostics as snapshot after 10 time-steps
+# Note: EXF air-sea fluxes over Sea-Ice are wrong
+ &DIAGNOSTICS_LIST
+   dumpAtLast  = .TRUE.,
+#--
+  fields(1:11,1) = 'EXFtaux ','EXFtauy ','EXFqnet ','EXFempmr',
+                   'EXFhl   ','EXFhs   ','EXFswnet','EXFlwnet',
+                   'EXFuwind','EXFvwind','EXFatemp',
+   fileName(1) = 'diagsEXF',
   frequency(1) = -36000.,
-   fields(1,1) = 'EXFtaux ',
-   filename(1) = 'EXFtaux ',
-#
-  frequency(2) = -36000.,
-   fields(1,2) = 'EXFtauy ',
-   filename(2) = 'EXFtauy ',
-#
-  frequency(3) = -36000.,
-   fields(1,3) = 'EXFqnet ',
-   filename(3) = 'EXFqnet ',
-#
-  frequency(4) = -36000.,
-   fields(1,4) = 'EXFempmr',
-   filename(4) = 'EXFempmr',
-#
-  frequency(5) = -36000.,
-   fields(1,5) = 'EXFhl   ',
-   filename(5) = 'EXFhl   ',
-#
-  frequency(6) = -36000.,
-   fields(1,6) = 'EXFhs   ',
-   filename(6) = 'EXFhs   ',
-#
-  frequency(7) = -36000.,
-   fields(1,7) = 'EXFswnet',
-   filename(7) = 'EXFswnet',
-#
-  frequency(8) = -36000.,
-   fields(1,8) = 'EXFlwnet',
-   filename(8) = 'EXFlwnet',
-#
-  frequency(9) = -36000.,
-   fields(1,9) = 'EXFuwind',
-   filename(9) = 'EXFuwind',
-#
-  frequency(10) = -36000.,
-   fields(1,10) = 'EXFvwind',
-   filename(10) = 'EXFvwind',
-#
-  frequency(11) = -36000.,
-   fields(1,11) = 'EXFatemp',
-   filename(11) = 'EXFatemp',
-#
-  frequency(12) = 36000.,
-   fields(1,12) = 'SIarea  ',
-   filename(12) = 'SIarea  ',
-#
-  frequency(13) = 36000.,
-   fields(1,13) = 'SIheff  ',
-   filename(13) = 'SIheff  ',
-#
-  frequency(14) = 36000.,
-   fields(1,14) = 'SIhsnow ',
-   filename(14) = 'SIhsnow ',
-#
-  frequency(15) = 36000.,
-   fields(1,15) = 'SIuice  ',
-   filename(15) = 'SIuice  ',
-#
-  frequency(16) = 36000.,
-   fields(1,16) = 'SIvice  ',
-   filename(16) = 'SIvice  ',
-#
-  frequency(17) = 36000.,
-   fields(1,17) = 'KPPhbl  ',
-   filename(17) = 'KPPhbl  ',
-#
-  frequency(18) = 36000.,
-   fields(1,18) = 'MXLDEPTH',
-   filename(18) = 'MXLDEPTH',
-#
-  frequency(19) = 36000.,
-   fields(1,19) = 'KPPghatK',
-   filename(19) = 'KPPghatK',
-#
+
+  fields(1:5,2)  = 'SIarea  ','SIheff  ','SIhsnow ',
+                   'SIuice  ','SIvice  ',
+   fileName(2) = 'diagsSI',
+  frequency(2) =  36000.,
+
+  fields(1:3,3)  = 'MXLDEPTH','KPPhbl  ','KPPghatK',
+   fileName(3) = 'diagsKPP',
+  frequency(3) =  36000.,
  &
 
+#--------------------
 # 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)= -36000.,
-#   stat_phase(1)= 0.,
+#stat_fields(1:5,1)  = 'ETAN    ','UVEL    ','VVEL    ','WVEL    ', 'THETA   ',
+# stat_fName(1) = 'dynStDiag',
+#  stat_freq(1) = -36000.,
+# stat_phase(1) = 0.,
  &