Index: /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/CONFIG/SHARED/field_def_bgc.xml
===================================================================
--- /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/CONFIG/SHARED/field_def_bgc.xml	(revision 9384)
+++ /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/CONFIG/SHARED/field_def_bgc.xml	(revision 9385)
@@ -75,56 +75,69 @@
 
       <!-- MEDUSA : variables available with key_medusa -->
-       <field id="CHN"      long_name="Chl-a concentration in non-diatom phytoplankton"   unit="mg Chl/m3" />
-       <field id="CHN_E3T"  long_name="CHN * E3T"                                         unit="mg Chl/m2"  > CHN * e3t </field > 
-       <field id="CHN_INV"  field_ref="CHN_E3T"                                           unit="mg Chl/m2"   grid_ref="vert_sum" />
-       <field id="SURF_CHN" field_ref="CHN"                                               unit="mg Chl/m3"   grid_ref="grid_T_surface_extract" />
-       <field id="CHD"      long_name="Chl-a concentration in     diatom phytoplankton"   unit="mg Chl/m3" />
-       <field id="CHD_E3T"  long_name="CHD * E3T"                                         unit="mg Chl/m2"  > CHD * e3t </field >
-       <field id="CHD_INV"  field_ref="CHD_E3T"                                           unit="mg Chl/m2"   grid_ref="vert_sum" />
-       <field id="SURF_CHD" field_ref="CHD"                                               unit="mg Chl/m3"   grid_ref="grid_T_surface_extract" />
+       <field id="CHN"      long_name="Chl-a concentration in non-diatom phytoplankton"   unit="mg-Chl/m3" />
+       <field id="CHN_E3T"  long_name="CHN * E3T"                                         unit="mg-Chl/m2"  > CHN * e3t </field > 
+       <field id="CHN_INV"  field_ref="CHN_E3T"   long_name="CHN Inventory"               unit="mg-Chl/m2"   grid_ref="vert_sum" />
+       <field id="SURF_CHN" field_ref="CHN"       long_name="CHN Surface concentration"   unit="mg-Chl/m3"   grid_ref="grid_T_surface_extract" />
+       <field id="CHD"      long_name="Chl-a concentration in     diatom phytoplankton"   unit="mg-Chl/m3" />
+       <field id="CHD_E3T"  long_name="CHD * E3T"                                         unit="mg-Chl/m2"  > CHD * e3t </field >
+       <field id="CHD_INV"  field_ref="CHD_E3T"   long_name="CHD Inventory"               unit="mg-Chl/m2"   grid_ref="vert_sum" />
+       <field id="SURF_CHD" field_ref="CHD"       long_name="CHD Surface concentration"   unit="mg-Chl/m3"   grid_ref="grid_T_surface_extract" />
        <field id="PHN"      long_name="non-diatom phytoplankton"                          unit="mmol-N/m3" />
        <field id="PHN_E3T"  long_name="PHN * E3T"                                         unit="mmol-N/m2"  > PHN * e3t </field >
-       <field id="PHN_INV"  field_ref="PHN_E3T"                                           unit="mmol-N/m2"   grid_ref="vert_sum" />
+       <field id="PHN_INV"  field_ref="PHN_E3T"   long_name="PHN Inventory"               unit="mmol-N/m2"   grid_ref="vert_sum" />
+       <field id="SURF_PHN" field_ref="PHN"       long_name="PHN Surface concentration"   unit="mmol-N/m3"   grid_ref="grid_T_surface_extract" />
        <field id="PHD"      long_name="diatom     phytoplankton"                          unit="mmol-N/m3" />
        <field id="PHD_E3T"  long_name="PHD * E3T"                                         unit="mmol-N/m2"  > PHD * e3t </field >
-       <field id="PHD_INV"  field_ref="PHD_E3T"                                           unit="mmol-N/m2"   grid_ref="vert_sum" />
+       <field id="PHD_INV"  field_ref="PHD_E3T"   long_name="PHD Inventory"               unit="mmol-N/m2"   grid_ref="vert_sum" />
+       <field id="SURF_PHD" field_ref="PHD"       long_name="PHD Surface concentration"   unit="mmol-N/m3"   grid_ref="grid_T_surface_extract" />
        <field id="ZMI"      long_name="micro zooplankton"                                 unit="mmol-N/m3" />
        <field id="ZMI_E3T"  long_name="ZMI * E3T"                                         unit="mmol-N/m2"  > ZMI * e3t </field >
-       <field id="ZMI_INV"  field_ref="ZMI_E3T"                                           unit="mmol-N/m2"   grid_ref="vert_sum" />
+       <field id="ZMI_INV"  field_ref="ZMI_E3T"   long_name="ZMI Inventory"               unit="mmol-N/m2"   grid_ref="vert_sum" />
+       <field id="SURF_ZMI" field_ref="ZMI"       long_name="ZMI Surface concentration"   unit="mmol-N/m3"   grid_ref="grid_T_surface_extract" />
        <field id="ZME"      long_name="meso  zooplankton"                                 unit="mmol-N/m3" />
        <field id="ZME_E3T"  long_name="ZME * E3T"                                         unit="mmol-N/m2"  > ZME * e3t </field >
-       <field id="ZME_INV"  field_ref="ZME_E3T"                                           unit="mmol-N/m2"   grid_ref="vert_sum" />
+       <field id="ZME_INV"  field_ref="ZME_E3T"   long_name="ZME Inventory"               unit="mmol-N/m2"   grid_ref="vert_sum" />
+       <field id="SURF_ZME" field_ref="ZME"       long_name="ZME Surface concentration"   unit="mmol-N/m3"   grid_ref="grid_T_surface_extract" />
        <field id="DIN"      long_name="dissolved inorganic nitrogen"                      unit="mmol-N/m3" />
        <field id="DIN_E3T"  long_name="DIN * E3T"                                         unit="mmol-N/m2"  > DIN * e3t </field >
-       <field id="DIN_INV"  field_ref="DIN_E3T"                                           unit="mmol-N/m2"   grid_ref="vert_sum" />
-       <field id="SIL"      long_name="dissolved silicic acid"                            unit="mmolSi/m3" />
-       <field id="SIL_E3T"  long_name="SIL * E3T"                                         unit="mmolSi/m2"  > SIL * e3t </field >
-       <field id="SIL_INV"  field_ref="SIL_E3T"                                           unit="mmolSi/m2"   grid_ref="vert_sum" />
-       <field id="FER"      long_name="dissolved iron"                                    unit="mmolFe/m3" />
-       <field id="FER_E3T"  long_name="FER * E3T"                                         unit="mmolFe/m2"  > FER * e3t </field >
-       <field id="FER_INV"  field_ref="FER_E3T"                                           unit="mmolFe/m2"   grid_ref="vert_sum" />
+       <field id="DIN_INV"  field_ref="DIN_E3T"   long_name="DIN Inventory"               unit="mmol-N/m2"   grid_ref="vert_sum" />
+       <field id="SURF_DIN" field_ref="DIN"       long_name="DIN Surface concentration"   unit="mmol-N/m3"   grid_ref="grid_T_surface_extract" />
+       <field id="SIL"      long_name="dissolved silicic acid"                            unit="mmol-Si/m3" />
+       <field id="SIL_E3T"  long_name="SIL * E3T"                                         unit="mmol-Si/m2"  > SIL * e3t </field >
+       <field id="SIL_INV"  field_ref="SIL_E3T"   long_name="SIL Inventory"               unit="mmol-Si/m2"   grid_ref="vert_sum" />
+       <field id="SURF_SIL" field_ref="SIL"       long_name="SIL Surface concentration"   unit="mmol-Si/m3"   grid_ref="grid_T_surface_extract" />
+       <field id="FER"      long_name="dissolved iron"                                    unit="mmol-Fe/m3" />
+       <field id="FER_E3T"  long_name="FER * E3T"                                         unit="mmol-Fe/m2"  > FER * e3t </field >
+       <field id="FER_INV"  field_ref="FER_E3T"   long_name="FER Inventory"               unit="mmol-Fe/m2"   grid_ref="vert_sum" />
+       <field id="SURF_FER" field_ref="FER"       long_name="FER Surface concentration"   unit="mmol-Fe/m3"   grid_ref="grid_T_surface_extract" />
        <field id="DET"      long_name="detrital nitrogen"                                 unit="mmol-N/m3" />
        <field id="DET_E3T"  long_name="DET * E3T"                                         unit="mmol-N/m2"  > DET * e3t </field >
-       <field id="DET_INV"  field_ref="DET_E3T"                                           unit="mmol-N/m2"   grid_ref="vert_sum" />
-       <field id="PDS"      long_name="biogenic silicon in diatom phytoplankton"          unit="mmolSi/m3" />
-       <field id="PDS_E3T"  long_name="PDS * E3T"                                         unit="mmolSi/m2"  > PDS * e3t </field >
-       <field id="PDS_INV"  field_ref="PDS_E3T"                                           unit="mmolSi/m2"   grid_ref="vert_sum" />
+       <field id="DET_INV"  field_ref="DET_E3T"   long_name="DET Inventory"               unit="mmol-N/m2"   grid_ref="vert_sum" />
+       <field id="SURF_DET" field_ref="DET"       long_name="DET Surface concentration"   unit="mmol-N/m3"   grid_ref="grid_T_surface_extract" />
+       <field id="PDS"      long_name="biogenic silicon in diatom phytoplankton"          unit="mmol-Si/m3" />
+       <field id="PDS_E3T"  long_name="PDS * E3T"                                         unit="mmol-Si/m2"  > PDS * e3t </field >
+       <field id="PDS_INV"  field_ref="PDS_E3T"   long_name="PDS Inventory"               unit="mmol-Si/m2"   grid_ref="vert_sum" />
+       <field id="SURF_PDS" field_ref="PDS"       long_name="PDS Surface concentration"   unit="mmol-Si/m3"   grid_ref="grid_T_surface_extract" />
        <field id="DTC"      long_name="detrital carbon"                                   unit="mmol-C/m3" />
        <field id="DTC_E3T"  long_name="DTC * E3T"                                         unit="mmol-C/m2"  > DTC * e3t </field >
-       <field id="DTC_INV"  field_ref="DTC_E3T"                                           unit="mmol-C/m2"   grid_ref="vert_sum" />
+       <field id="DTC_INV"  field_ref="DTC_E3T"   long_name="DTC Inventory"               unit="mmol-C/m2"   grid_ref="vert_sum" />
+       <field id="SURF_DTC" field_ref="DTC"       long_name="DTC Surface concentration"   unit="mmol-C/m3"   grid_ref="grid_T_surface_extract" />
        <field id="DiC"      long_name="dissolved inorganic carbon"                        unit="mmol-C/m3" />
        <field id="DiC_E3T"  long_name="DiC * E3T"                                         unit="mmol-C/m2"  > DiC * e3t </field >
-       <field id="DiC_INV"  field_ref="DiC_E3T"                                           unit="mmol-C/m2"   grid_ref="vert_sum" />
+       <field id="DiC_INV"  field_ref="DiC_E3T"   long_name="DiC Inventory"               unit="mmol-C/m2"   grid_ref="vert_sum" />
+       <field id="SURF_DiC" field_ref="DiC"       long_name="DiC Surface concentration"   unit="mmol-C/m3"   grid_ref="grid_T_surface_extract" />
        <field id="ALK"      long_name="alkalinity"                                        unit="meq/m3"    />
        <field id="ALK_E3T"  long_name="ALK * E3T"                                         unit="meq/m2"     > ALK * e3t </field >
-       <field id="ALK_INV"  field_ref="ALK_E3T"                                           unit="meq/m2"      grid_ref="vert_sum" />
-       <field id="OXY"      long_name="dissolved oxygen"                                  unit="mmolO2/m3" />
-       <field id="OXY_E3T"  long_name="OXY * E3T"                                         unit="mmolO2/m2"  > OXY * e3t </field >
-       <field id="OXY_INV"  field_ref="OXY_E3T"                                           unit="mmolO2/m2"   grid_ref="vert_sum" />
+       <field id="ALK_INV"  field_ref="ALK_E3T"   long_name="ALK Inventory"               unit="meq/m2"      grid_ref="vert_sum" />
+       <field id="SURF_ALK" field_ref="ALK"       long_name="ALK Surface concentration"   unit="meq/m3"   grid_ref="grid_T_surface_extract" />
+       <field id="OXY"      long_name="dissolved oxygen"                                  unit="mmol-O2/m3" />
+       <field id="OXY_E3T"  long_name="OXY * E3T"                                         unit="mmol-O2/m2"  > OXY * e3t </field >
+       <field id="OXY_INV"  field_ref="OXY_E3T"   long_name="OXY Inventory"               unit="mmol-O2/m2"   grid_ref="vert_sum" />
+       <field id="SURF_OXY" field_ref="OXY"       long_name="OXY Surface concentration"   unit="mmol-O2/m3"   grid_ref="grid_T_surface_extract" />
 
       <!-- Ideal traceurs : variables available with key_idtra -->
        <field id="IDTRA"       long_name="Ideal traceur concentration "             unit="mmol/m3"    />
        <field id="IDTRA_E3T"   long_name="IDTRA * E3T"                              unit="mmol/m2"  > IDTRA * e3t </field >
-       <field id="IDTRA_INV"   field_ref="IDTRA_E3T"                                unit="mmol/m2"   grid_ref="vert_sum" />
+       <field id="IDTRA_INV"   field_ref="IDTRA_E3T"   long_name="Age Inventory"    unit="mmol/m2"   grid_ref="vert_sum" />
 
        <!-- PISCES with Kriest parametisation : variables available with key_kriest -->
@@ -141,21 +154,21 @@
        <field id="CFC11"       long_name="CFC-11 Concentration"                     unit="umol/m3" />
        <field id="CFC11_E3T"   long_name="CFC11 * E3T"                              unit="umol/m2"  > CFC11 * e3t </field >
-       <field id="CFC11_INV"   field_ref="CFC11_E3T"                                unit="umol/m2"   grid_ref="vert_sum" />
+       <field id="CFC11_INV"   field_ref="CFC11_E3T"   long_name="Age Inventory"    unit="umol/m2"   grid_ref="vert_sum" />
        <!-- CFC12 : variables available with key_cfc -->
        <field id="CFC12"       long_name="CFC-12 Concentration"                     unit="umol/m3" />
        <field id="CFC12_E3T"   long_name="CFC12 * E3T"                              unit="umol/m2"  > CFC12 * e3t </field >
-       <field id="CFC12_INV"   field_ref="CFC12_E3T"                                unit="umol/m2"   grid_ref="vert_sum" />
+       <field id="CFC12_INV"   field_ref="CFC12_E3T"   long_name="Age Inventory"    unit="umol/m2"   grid_ref="vert_sum" />
        <!-- SF6 : variables available with key_cfc -->
        <field id="SF6"         long_name="SF6 Concentration"                        unit="umol/m3" />
        <field id="SF6_E3T"     long_name="SF6 * E3T"                                unit="umol/m2"  > SF6 * e3t </field >
-       <field id="SF6_INV"     field_ref="SF6_E3T"                                  unit="umol/m2"   grid_ref="vert_sum" />
+       <field id="SF6_INV"     field_ref="SF6_E3T"   long_name="Age Inventory"      unit="umol/m2"   grid_ref="vert_sum" />
        <!-- Bomb C14 : variables available with key_c14b -->
        <field id="C14B"        long_name="Bomb C14 Concentration"                   unit="1"         />
        <field id="C14B_E3T"    long_name="C14B * E3T"                               unit="m"  > C14B * e3t </field >
-       <field id="C14B_INV"    field_ref="C14B_E3T"                                 unit="m"   grid_ref="vert_sum" />
+       <field id="C14B_INV"    field_ref="C14B_E3T"    long_name="Age Inventory"    unit="m"   grid_ref="vert_sum" />
        <!-- AGE : variables available with key_age -->
-       <field id="Age"        long_name="Sea Water Age Since Surface contact" standard_name="sea_water_age_since_surface_contact"  unit="yr"         />
+       <field id="Age"        long_name="Sea Water Age Since Surface contact"       unit="yr"         />
        <field id="Age_E3T"    long_name="Age * E3T"                                 unit="yr * m"  > Age * e3t </field >
-       <field id="Age_INV"    field_ref="Age_E3T"                                   unit="yr * m"   grid_ref="vert_sum" />
+       <field id="Age_INV"    field_ref="Age_E3T"   long_name="Age Inventory"       unit="yr * m"   grid_ref="vert_sum" />
      </field_group>
 
@@ -290,28 +303,28 @@
 
        <!-- MEDUSA additional diagnostics on T grid  -->
-       <field id= "INVTN"      long_name="Column N inventory"                        unit="mmolN/m2"    />
-       <field id= "INVTSI"     long_name="Column Si inventory"                       unit="mmolSi/m2"   />
-       <field id= "INVTFE"     long_name="Column Fe inventory"                       unit="mmolFe/m2"   />
-       <field id= "PRN"        long_name="Non-diatom primary production"             unit="mmolN/m2/d"  />
-       <field id= "MPN"        long_name="Non-diatom non-grazing losses"             unit="mmolN/m2/d"  />
-       <field id= "PRD"        long_name="Diatom primary production"                 unit="mmolN/m2/d"  />
-       <field id= "MPD"        long_name="Diatom non-grazing losses"                 unit="mmolN/m2/d"  />
-       <field id= "DSED"       long_name="Gravitational sinking of Detritus"         unit="mmolN/m2/d"  />
-       <field id= "OPAL"       long_name="Diatom biogenic opal production"           unit="mmolSi/m2/d" />
-       <field id= "OPALDISS"   long_name="Diatom biogenic opal dissolution"          unit="mmolSi/m2/d" />
-       <field id= "GMIPn"      long_name="Microzoo grazing on non-diatoms"           unit="mmolN/m2/d"  />
-       <field id= "GMID"       long_name="Microzoo grazing on detritus"              unit="mmolN/m2/d"  />
-       <field id= "MZMI"       long_name="Microzoo non-grazing losses"               unit="mmolN/m2/d"  />
-       <field id= "GMEPN"      long_name="Mesozoo grazing on non-diatoms"            unit="mmolN/m2/d"  />
-       <field id= "GMEPD"      long_name="Mesozoo grazing on non-diatoms"            unit="mmolN/m2/d"  />
-       <field id= "GMEZMI"     long_name="Mesozoo grazing on microzoo"               unit="mmolN/m2/d"  />
-       <field id= "GMED"       long_name="Mesozoo grazing on detritus"               unit="mmolN/m2/d"  />
-       <field id= "MZME"       long_name="Mesozoo non-grazing losses"                unit="mmolN/m2/d"  />
-       <field id= "DEXP"       long_name="Detritus export"                           unit="mmolN/m2/d"  />
-       <field id= "DETN"       long_name="Slow detritus creation"                    unit="mmolN/m2/d"  />
+       <field id= "INVTN"      long_name="Column N inventory"                        unit="mmol-N/m2"    />
+       <field id= "INVTSI"     long_name="Column Si inventory"                       unit="mmol-Si/m2"   />
+       <field id= "INVTFE"     long_name="Column Fe inventory"                       unit="mmol-Fe/m2"   />
+       <field id= "PRN"        long_name="Non-diatom primary production"             unit="mmol-N/m2/d"  />
+       <field id= "MPN"        long_name="Non-diatom non-grazing losses"             unit="mmol-N/m2/d"  />
+       <field id= "PRD"        long_name="Diatom primary production"                 unit="mmol-N/m2/d"  />
+       <field id= "MPD"        long_name="Diatom non-grazing losses"                 unit="mmol-N/m2/d"  />
+       <field id= "DSED"       long_name="Gravitational sinking of Detritus"         unit="mmol-N/m2/d"  />
+       <field id= "OPAL"       long_name="Diatom biogenic opal production"           unit="mmol-Si/m2/d" />
+       <field id= "OPALDISS"   long_name="Diatom biogenic opal dissolution"          unit="mmol-Si/m2/d" />
+       <field id= "GMIPn"      long_name="Microzoo grazing on non-diatoms"           unit="mmol-N/m2/d"  />
+       <field id= "GMID"       long_name="Microzoo grazing on detritus"              unit="mmol-N/m2/d"  />
+       <field id= "MZMI"       long_name="Microzoo non-grazing losses"               unit="mmol-N/m2/d"  />
+       <field id= "GMEPN"      long_name="Mesozoo grazing on non-diatoms"            unit="mmol-N/m2/d"  />
+       <field id= "GMEPD"      long_name="Mesozoo grazing on non-diatoms"            unit="mmol-N/m2/d"  />
+       <field id= "GMEZMI"     long_name="Mesozoo grazing on microzoo"               unit="mmol-N/m2/d"  />
+       <field id= "GMED"       long_name="Mesozoo grazing on detritus"               unit="mmol-N/m2/d"  />
+       <field id= "MZME"       long_name="Mesozoo non-grazing losses"                unit="mmol-N/m2/d"  />
+       <field id= "DEXP"       long_name="Detritus export"                           unit="mmol-N/m2/d"  />
+       <field id= "DETN"       long_name="Slow detritus creation"                    unit="mmol-N/m2/d"  />
        <field id= "MDET"       long_name="Detritus non-grazing losses"               unit="MmolN/m2/d"  />
-       <field id= "AEOLIAN"    long_name="Aeolian deposition of iron"                unit="mmolFe/m2/d" />
-       <field id= "BENTHIC"    long_name="Benthic supply of iron"                    unit="mmolFe/m2/d" />
-       <field id= "SCAVENGE"   long_name="Scavenged iron"                            unit="mmolFe/m2/d" />
+       <field id= "AEOLIAN"    long_name="Aeolian deposition of iron"                unit="mmol-Fe/m2/d" />
+       <field id= "BENTHIC"    long_name="Benthic supply of iron"                    unit="mmol-Fe/m2/d" />
+       <field id= "SCAVENGE"   long_name="Scavenged iron"                            unit="mmol-Fe/m2/d" />
        <field id= "PN_JLIM"    long_name="Non-diatom light limitation"               unit="-"           />
        <field id= "PN_NLIM"    long_name="Non-diatom N limitation"                   unit="-"           />
@@ -322,54 +335,54 @@
        <field id= "PD_SILIM"   long_name="Diatom Si limitation"                      unit="-"           />
        <field id= "PDSILIM2"   long_name="Diatom Si uptake limitation"               unit="-"           />
-       <field id= "SDT__100"   long_name="Slow detrital flux at  100 m"              unit="mmolN/m2/d"  />
-       <field id= "SDT__200"   long_name="Slow detrital flux at  200 m"              unit="mmolN/m2/d"  />
-       <field id= "SDT__500"   long_name="Slow detrital flux at  500 m"              unit="mmolN/m2/d"  />
-       <field id= "SDT_1000"   long_name="Slow detrital flux at 1000 m"              unit="mmolN/m2/d"  />
-       <field id= "TOTREG_N"   long_name="Full column regenerated N"                 unit="mmolN/m2/d"  />
-       <field id= "TOTRG_SI"   long_name="Full column regenerated Si"                unit="mmolSi/m2/d" />
-       <field id= "REG__100"   long_name="Regenerated N to  100 m"                   unit="mmolN/m2/d"  />
-       <field id= "REG__200"   long_name="Regenerated N to  200 m"                   unit="mmolN/m2/d"  />
-       <field id= "REG__500"   long_name="Regenerated N to  500 m"                   unit="mmolN/m2/d"  />
-       <field id= "REG_1000"   long_name="Regenerated N to 1000 m"                   unit="mmolN/m2/d"  />
-       <field id= "FASTN"      long_name="Fast-sinking flux N"                       unit="mmolN/m2/d"  />
-       <field id= "FASTSI"     long_name="Fast-sinking flux Si"                      unit="mmolSi/m2/d" />
-       <field id= "FASTFE"     long_name="Fast-sinking flux Fe"                      unit="mmolFe/m2/d" />
-       <field id= "FASTC"      long_name="Fast-sinking flux C"                       unit="mmolC/m2/d"  />
-       <field id= "FASTCA"     long_name="Fast-sinking flux CaCO3"                   unit="mmolC/m2/d"  />
-       <field id= "FDT__100"   long_name="Fast detrital N flux at  100 m"            unit="mmolN/m2/d"  />
-       <field id= "FDT__200"   long_name="Fast detrital N flux at  200 m"            unit="mmolN/m2/d"  />
-       <field id= "FDT__500"   long_name="Fast detrital N flux at  500 m"            unit="mmolN/m2/d"  />
-       <field id= "FDT_1000"   long_name="Fast detrital N flux at 1000 m"            unit="mmolN/m2/d"  />
-       <field id= "RG__100F"   long_name="Regenerated fast N to  100 m"              unit="mmolN/m2/d"  />
-       <field id= "RG__200F"   long_name="Regenerated fast N to  200 m"              unit="mmolN/m2/d"  />
-       <field id= "RG__500F"   long_name="Regenerated fast N to  500 m"              unit="mmolN/m2/d"  />
-       <field id= "RG_1000F"   long_name="Regenerated fast N to 1000 m"              unit="mmolN/m2/d"  />
-       <field id= "FDS__100"   long_name="Fast detrital Si flux at  100 m"           unit="mmolSi/m2/d" />
-       <field id= "FDS__200"   long_name="Fast detrital Si flux at  200 m"           unit="mmolSi/m2/d" />
-       <field id= "FDS__500"   long_name="Fast detrital Si flux at  500 m"           unit="mmolSi/m2/d" />
-       <field id= "FDS_1000"   long_name="Fast detrital Si flux at 1000 m"           unit="mmolSi/m2/d" />
-       <field id= "RGS_100F"   long_name="Regenerated fast Si to  100 m"             unit="mmolSi/m2/d" />
-       <field id= "RGS_200F"   long_name="Regenerated fast Si to  200 m"             unit="mmolSi/m2/d" />
-       <field id= "RGS_500F"   long_name="Regenerated fast Si to  500 m"             unit="mmolSi/m2/d" />
-       <field id= "RGS1000F"   long_name="Regenerated fast Si to 1000 m"             unit="mmolSi/m2/d" />
-       <field id= "REMINN"     long_name="Fast-sinking remin flux N"                 unit="mmolN/m2/d"  />
-       <field id= "REMINSI"    long_name="Fast-sinking remin flux Si"                unit="mmolSi/m2/d" />
-       <field id= "REMINFE"    long_name="Fast-sinking remin flux Fe"                unit="mmolFe/m2/d" />
-       <field id= "REMINC"     long_name="Fast-sinking remin flux C"                 unit="mmolC/m2/d"  />
-       <field id= "REMINCA"    long_name="Fast-sinking remin flux CaCO3"             unit="mmolC/m2/d"  />
-       <field id= "SEAFLRN"    long_name="Seafloor flux of N"                        unit="mmolN/m2/d"  />
-       <field id= "SEAFLRSI"   long_name="Seafloor flux of Si"                       unit="mmolSi/m2/d" />
-       <field id= "SEAFLRFE"   long_name="Seafloor flux of Fe"                       unit="mmolFe/m2/d" />
-       <field id= "SEAFLRC"    long_name="Seafloor flux of C"                        unit="mmolC/m2/d"  />
-       <field id= "SEAFLRCA"   long_name="Seafloor flux of CaCO3"                    unit="mmolC/m2/d"  />
+       <field id= "SDT__100"   long_name="Slow detrital flux at  100 m"              unit="mmol-N/m2/d"  />
+       <field id= "SDT__200"   long_name="Slow detrital flux at  200 m"              unit="mmol-N/m2/d"  />
+       <field id= "SDT__500"   long_name="Slow detrital flux at  500 m"              unit="mmol-N/m2/d"  />
+       <field id= "SDT_1000"   long_name="Slow detrital flux at 1000 m"              unit="mmol-N/m2/d"  />
+       <field id= "TOTREG_N"   long_name="Full column regenerated N"                 unit="mmol-N/m2/d"  />
+       <field id= "TOTRG_SI"   long_name="Full column regenerated Si"                unit="mmol-Si/m2/d" />
+       <field id= "REG__100"   long_name="Regenerated N to  100 m"                   unit="mmol-N/m2/d"  />
+       <field id= "REG__200"   long_name="Regenerated N to  200 m"                   unit="mmol-N/m2/d"  />
+       <field id= "REG__500"   long_name="Regenerated N to  500 m"                   unit="mmol-N/m2/d"  />
+       <field id= "REG_1000"   long_name="Regenerated N to 1000 m"                   unit="mmol-N/m2/d"  />
+       <field id= "FASTN"      long_name="Fast-sinking flux N"                       unit="mmol-N/m2/d"  />
+       <field id= "FASTSI"     long_name="Fast-sinking flux Si"                      unit="mmol-Si/m2/d" />
+       <field id= "FASTFE"     long_name="Fast-sinking flux Fe"                      unit="mmol-Fe/m2/d" />
+       <field id= "FASTC"      long_name="Fast-sinking flux C"                       unit="mmol-C/m2/d"  />
+       <field id= "FASTCA"     long_name="Fast-sinking flux CaCO3"                   unit="mmol-C/m2/d"  />
+       <field id= "FDT__100"   long_name="Fast detrital N flux at  100 m"            unit="mmol-N/m2/d"  />
+       <field id= "FDT__200"   long_name="Fast detrital N flux at  200 m"            unit="mmol-N/m2/d"  />
+       <field id= "FDT__500"   long_name="Fast detrital N flux at  500 m"            unit="mmol-N/m2/d"  />
+       <field id= "FDT_1000"   long_name="Fast detrital N flux at 1000 m"            unit="mmol-N/m2/d"  />
+       <field id= "RG__100F"   long_name="Regenerated fast N to  100 m"              unit="mmol-N/m2/d"  />
+       <field id= "RG__200F"   long_name="Regenerated fast N to  200 m"              unit="mmol-N/m2/d"  />
+       <field id= "RG__500F"   long_name="Regenerated fast N to  500 m"              unit="mmol-N/m2/d"  />
+       <field id= "RG_1000F"   long_name="Regenerated fast N to 1000 m"              unit="mmol-N/m2/d"  />
+       <field id= "FDS__100"   long_name="Fast detrital Si flux at  100 m"           unit="mmol-Si/m2/d" />
+       <field id= "FDS__200"   long_name="Fast detrital Si flux at  200 m"           unit="mmol-Si/m2/d" />
+       <field id= "FDS__500"   long_name="Fast detrital Si flux at  500 m"           unit="mmol-Si/m2/d" />
+       <field id= "FDS_1000"   long_name="Fast detrital Si flux at 1000 m"           unit="mmol-Si/m2/d" />
+       <field id= "RGS_100F"   long_name="Regenerated fast Si to  100 m"             unit="mmol-Si/m2/d" />
+       <field id= "RGS_200F"   long_name="Regenerated fast Si to  200 m"             unit="mmol-Si/m2/d" />
+       <field id= "RGS_500F"   long_name="Regenerated fast Si to  500 m"             unit="mmol-Si/m2/d" />
+       <field id= "RGS1000F"   long_name="Regenerated fast Si to 1000 m"             unit="mmol-Si/m2/d" />
+       <field id= "REMINN"     long_name="Fast-sinking remin flux N"                 unit="mmol-N/m2/d"  />
+       <field id= "REMINSI"    long_name="Fast-sinking remin flux Si"                unit="mmol-Si/m2/d" />
+       <field id= "REMINFE"    long_name="Fast-sinking remin flux Fe"                unit="mmol-Fe/m2/d" />
+       <field id= "REMINC"     long_name="Fast-sinking remin flux C"                 unit="mmol-C/m2/d"  />
+       <field id= "REMINCA"    long_name="Fast-sinking remin flux CaCO3"             unit="mmol-C/m2/d"  />
+       <field id= "SEAFLRN"    long_name="Seafloor flux of N"                        unit="mmol-N/m2/d"  />
+       <field id= "SEAFLRSI"   long_name="Seafloor flux of Si"                       unit="mmol-Si/m2/d" />
+       <field id= "SEAFLRFE"   long_name="Seafloor flux of Fe"                       unit="mmol-Fe/m2/d" />
+       <field id= "SEAFLRC"    long_name="Seafloor flux of C"                        unit="mmol-C/m2/d"  />
+       <field id= "SEAFLRCA"   long_name="Seafloor flux of CaCO3"                    unit="mmol-C/m2/d"  />
        <field id= "MED_QSR"    long_name="Sea surface radiation"                     unit="W/m2"        />
        <field id= "MED_XPAR"   long_name="Top level radiation"                       unit="W/m2"        />
-       <field id= "INTFLX_N"   long_name="Integrated N  cycle fluxes"                unit="mmolN/m2/d"  />
-       <field id= "INTFLX_SI"  long_name="Integrated Si cycle fluxes"                unit="mmolSi/m2/d" />
-       <field id= "INTFLX_FE"  long_name="Integrated Fe cycle fluxes"                unit="mmolFe/m2/d" />
-       <field id= "INT_PN"     long_name="Vertically integrated Pn"                  unit="mmolN/m2"    />
-       <field id= "INT_PD"     long_name="Vertically integrated Pd"                  unit="mmolN/m2"    />
-       <field id= "ML_PRN"     long_name="Non-diatom mixed layer PP"                 unit="mmolN/m2/d"  />
-       <field id= "ML_PRD"     long_name="Diatom mixed layer PP"                     unit="mmolN/m2/d"  />
+       <field id= "INTFLX_N"   long_name="Integrated N  cycle fluxes"                unit="mmol-N/m2/d"  />
+       <field id= "INTFLX_SI"  long_name="Integrated Si cycle fluxes"                unit="mmol-Si/m2/d" />
+       <field id= "INTFLX_FE"  long_name="Integrated Fe cycle fluxes"                unit="mmol-Fe/m2/d" />
+       <field id= "INT_PN"     long_name="Vertically integrated Pn"                  unit="mmol-N/m2"    />
+       <field id= "INT_PD"     long_name="Vertically integrated Pd"                  unit="mmol-N/m2"    />
+       <field id= "ML_PRN"     long_name="Non-diatom mixed layer PP"                 unit="mmol-N/m2/d"  />
+       <field id= "ML_PRD"     long_name="Diatom mixed layer PP"                     unit="mmol-N/m2/d"  />
        <field id= "OCAL_CCD"   long_name="Calcite CCD depth"                         unit="m"           />
        <field id= "OCAL_LVL"   long_name="Calcite CCD level"                         unit="-"           />
@@ -384,8 +397,8 @@
        <field id= "OCN_PH"     long_name="Surface ocean pH"                          unit="-"           />
        <field id= "OCN_PCO2"   long_name="Surface ocean pCO2"                        unit="uatm"        />
-       <field id= "OCNH2CO3"   long_name="Surface ocean H2CO3 conc"                  unit="mmolC/m3"    />
-       <field id= "OCN_HCO3"   long_name="Surface ocean HCO3 conc"                   unit="mmolC/m3"    />
-       <field id= "OCN_CO3"    long_name="Surface ocean CO3 conc"                    unit="mmolC/m3"    />
-       <field id= "CO2FLUX"    long_name="Air-sea CO2 flux"                          unit="mmolC/m2/d"  />
+       <field id= "OCNH2CO3"   long_name="Surface ocean H2CO3 conc"                  unit="mmol-C/m3"    />
+       <field id= "OCN_HCO3"   long_name="Surface ocean HCO3 conc"                   unit="mmol-C/m3"    />
+       <field id= "OCN_CO3"    long_name="Surface ocean CO3 conc"                    unit="mmol-C/m3"    />
+       <field id= "CO2FLUX"    long_name="Air-sea CO2 flux"                          unit="mmol-C/m2/d"  />
        <field id= "FGCO2"      long_name="Surface Downward CO2 Flux"                 unit="kg-CO2/m2/s" />
        <field id= "OM_CAL"     long_name="Omega calcite"                             unit="-"           />
@@ -395,75 +408,75 @@
        <field id= "KW660"      long_name="Piston velocity"                           unit="m/s"         />
        <field id= "ATM_PP0"    long_name="Atmospheric pressure"                      unit="atm"         />
-       <field id= "O2FLUX"     long_name="Air-sea O2 flux"                           unit="mmolO2/m2/d" />
-       <field id= "O2SAT"      long_name="Surface ocean O2 saturation"               unit="mmolO2/m3"   />
+       <field id= "O2FLUX"     long_name="Air-sea O2 flux"                           unit="mmol-O2/m2/d" />
+       <field id= "O2SAT"      long_name="Surface ocean O2 saturation"               unit="mmol-O2/m3"   />
        <field id= "CAL_CCD"    long_name="Calcite CCD depth"                         unit="m"           />
        <field id= "ARG_CCD"    long_name="Aragonite CCD depth"                       unit="m"           />
        <field id= "SFR_OCAL"   long_name="Seafloor omega calcite"                    unit="-"           />
        <field id= "SFR_OARG"   long_name="Seafloor omega aragonite"                  unit="-"           />
-       <field id= "N_PROD"     long_name="Nitrogen production"                       unit="mmolN/m2/d"  />
-       <field id= "N_CONS"     long_name="Nitrogen consumption"                      unit="mmolN/m2/d"  />
-       <field id= "C_PROD"     long_name="Carbon production"                         unit="mmolC/m2/d"  />
-       <field id= "C_CONS"     long_name="Carbon consumption"                        unit="mmolC/m2/d"  />
-       <field id= "O2_PROD"    long_name="Oxygen production"                         unit="mmolO2/m2/d" />
-       <field id= "O2_CONS"    long_name="Oxygen consumption"                        unit="mmolO2/m2/d" />
-       <field id= "O2_ANOX"    long_name="Unrealised oxygen consumption"             unit="mmolO2/m2/d" />
+       <field id= "N_PROD"     long_name="Nitrogen production"                       unit="mmol-N/m2/d"  />
+       <field id= "N_CONS"     long_name="Nitrogen consumption"                      unit="mmol-N/m2/d"  />
+       <field id= "C_PROD"     long_name="Carbon production"                         unit="mmol-C/m2/d"  />
+       <field id= "C_CONS"     long_name="Carbon consumption"                        unit="mmol-C/m2/d"  />
+       <field id= "O2_PROD"    long_name="Oxygen production"                         unit="mmol-O2/m2/d" />
+       <field id= "O2_CONS"    long_name="Oxygen consumption"                        unit="mmol-O2/m2/d" />
+       <field id= "O2_ANOX"    long_name="Unrealised oxygen consumption"             unit="mmol-O2/m2/d" />
        <field id= "RR_0100"    long_name="Rain ratio at  100m"                       unit="molC/molC"   />
        <field id= "RR_0500"    long_name="Rain ratio at  500m"                       unit="molC/molC"   />
        <field id= "RR_1000"    long_name="Rain ratio at 1000m"                       unit="molC/molC"   />
-       <field id= "IBEN_N"     long_name="Benthic input nitrogen"                    unit="mmolN/m2/d"  />
-       <field id= "IBEN_FE"    long_name="Benthic input iron"                        unit="mmolFe/m2/d" />
-       <field id= "IBEN_C"     long_name="Benthic input carbon"                      unit="mmolC/m2/d"  />
-       <field id= "IBEN_SI"    long_name="Benthic input silicon"                     unit="mmolSi/m2/d" />
-       <field id= "IBEN_CA"    long_name="Benthic input CaCO3"                       unit="mmolC/m2/d"  />
-       <field id= "OBEN_N"     long_name="Benthic output nitrogen"                   unit="mmolN/m2/d"  />
-       <field id= "OBEN_FE"    long_name="Benthic output iron"                       unit="mmolFe/m2/d" />
-       <field id= "OBEN_C"     long_name="Benthic output carbon"                     unit="mmolC/m2/d"  />
-       <field id= "OBEN_SI"    long_name="Benthic output silicon"                    unit="mmolSi/m2/d" />
-       <field id= "OBEN_CA"    long_name="Benthic output CaCO3"                      unit="mmolC/m2/d"  />
-       <field id= "BEN_N"      long_name="Benthic nitrogen"                          unit="mmolN/m2"    />
-       <field id= "BEN_FE"     long_name="Benthic iron"                              unit="mmolFe/m2"   />
-       <field id= "BEN_C"      long_name="Benthic carbon"                            unit="mmolC/m2"    />
-       <field id= "BEN_SI"     long_name="Benthic silicon"                           unit="mmolSi/m2"   />
-       <field id= "BEN_CA"     long_name="Benthic CaCO3"                             unit="mmolC/m2"    />
+       <field id= "IBEN_N"     long_name="Benthic input nitrogen"                    unit="mmol-N/m2/d"  />
+       <field id= "IBEN_FE"    long_name="Benthic input iron"                        unit="mmol-Fe/m2/d" />
+       <field id= "IBEN_C"     long_name="Benthic input carbon"                      unit="mmol-C/m2/d"  />
+       <field id= "IBEN_SI"    long_name="Benthic input silicon"                     unit="mmol-Si/m2/d" />
+       <field id= "IBEN_CA"    long_name="Benthic input CaCO3"                       unit="mmol-C/m2/d"  />
+       <field id= "OBEN_N"     long_name="Benthic output nitrogen"                   unit="mmol-N/m2/d"  />
+       <field id= "OBEN_FE"    long_name="Benthic output iron"                       unit="mmol-Fe/m2/d" />
+       <field id= "OBEN_C"     long_name="Benthic output carbon"                     unit="mmol-C/m2/d"  />
+       <field id= "OBEN_SI"    long_name="Benthic output silicon"                    unit="mmol-Si/m2/d" />
+       <field id= "OBEN_CA"    long_name="Benthic output CaCO3"                      unit="mmol-C/m2/d"  />
+       <field id= "BEN_N"      long_name="Benthic nitrogen"                          unit="mmol-N/m2"    />
+       <field id= "BEN_FE"     long_name="Benthic iron"                              unit="mmol-Fe/m2"   />
+       <field id= "BEN_C"      long_name="Benthic carbon"                            unit="mmol-C/m2"    />
+       <field id= "BEN_SI"     long_name="Benthic silicon"                           unit="mmol-Si/m2"   />
+       <field id= "BEN_CA"     long_name="Benthic CaCO3"                             unit="mmol-C/m2"    />
        <field id= "RUNOFF"     long_name="River runoff"                              unit="m/d"         />
-       <field id= "RIV_N"      long_name="Riverine input nitrogen"                   unit="mmolN/m2/d"  />
-       <field id= "RIV_SI"     long_name="Riverine input silicon"                    unit="mmolSi/m2/d" />
-       <field id= "RIV_C"      long_name="Riverine input carbon"                     unit="mmolSi/m2/d" />
+       <field id= "RIV_N"      long_name="Riverine input nitrogen"                   unit="mmol-N/m2/d"  />
+       <field id= "RIV_SI"     long_name="Riverine input silicon"                    unit="mmol-Si/m2/d" />
+       <field id= "RIV_C"      long_name="Riverine input carbon"                     unit="mmol-Si/m2/d" />
        <field id= "RIV_ALK"    long_name="Riverine input alkalinity"                 unit="meq/m2/d"    />
-       <field id= "DETC"       long_name="Slow detritus C creation"                  unit="mmolC/m2/d"  />
-       <field id= "SDC__100"   long_name="Slow detrital C flux at  100 m"            unit="mmolC/m2/d"  />
-       <field id= "SDC__200"   long_name="Slow detrital C flux at  200 m"            unit="mmolC/m2/d"  />
-       <field id= "SDC__500"   long_name="Slow detrital C flux at  500 m"            unit="mmolC/m2/d"  />
-       <field id= "SDC_1000"   long_name="Slow detrital C flux at 1000 m"            unit="mmolC/m2/d"  />
-       <field id= "INVTC"      long_name="Column C inventory"                        unit="mmolC/m2"    />
+       <field id= "DETC"       long_name="Slow detritus C creation"                  unit="mmol-C/m2/d"  />
+       <field id= "SDC__100"   long_name="Slow detrital C flux at  100 m"            unit="mmol-C/m2/d"  />
+       <field id= "SDC__200"   long_name="Slow detrital C flux at  200 m"            unit="mmol-C/m2/d"  />
+       <field id= "SDC__500"   long_name="Slow detrital C flux at  500 m"            unit="mmol-C/m2/d"  />
+       <field id= "SDC_1000"   long_name="Slow detrital C flux at 1000 m"            unit="mmol-C/m2/d"  />
+       <field id= "INVTC"      long_name="Column C inventory"                        unit="mmol-C/m2"    />
        <field id= "INVTALK"    long_name="Column alkalinity inventory"               unit="meq/m2"      />
-       <field id= "INVTO2"     long_name="Column O2 inventory"                       unit="mmolO2/m2"   />
-       <field id= "LYSO_CA"    long_name="Incorrect benthic output CaCO3"            unit="mmolC/m2/d"  />
-       <field id= "COM_RESP"   long_name="Community respiration"                     unit="mmolC/m2/d"  />
-       <field id= "PN_LLOSS"   long_name="Non-diatom linear losses"                  unit="mmolN/m2/d"  />
-       <field id= "PD_LLOSS"   long_name="Diatom linear losses"                      unit="mmolN/m2/d"  />
-       <field id= "ZI_LLOSS"   long_name="Microzooplankton linear losses"            unit="mmolN/m2/d"  />
-       <field id= "ZE_LLOSS"   long_name="Mesozooplankton linear losses"             unit="mmolN/m2/d"  />
-       <field id= "ZI_MES_N"   long_name="Microzoo messy feeding loss to N"          unit="mmolN/m2/d"  />
-       <field id= "ZI_MES_D"   long_name="Microzoo messy feeding loss to D"          unit="mmolN/m2/d"  />
-       <field id= "ZI_MES_C"   long_name="Microzoo messy feeding loss to C"          unit="mmolC/m2/d"  />
-       <field id= "ZI_MESDC"   long_name="Microzoo messy feeding loss to Dc"         unit="mmolC/m2/d"  />
-       <field id= "ZI_EXCR"    long_name="Microzoo excretion"                        unit="mmolN/m2/d"  />
-       <field id= "ZI_RESP"    long_name="Microzoo respiration"                      unit="mmolC/m2/d"  />
-       <field id= "ZI_GROW"    long_name="Microzoo growth"                           unit="mmolN/m2/d"  />
-       <field id= "ZE_MES_N"   long_name="Mesozoo messy feeding loss to N"           unit="mmolN/m2/d"  />
-       <field id= "ZE_MES_D"   long_name="Mesozoo messy feeding loss to D"           unit="mmolN/m2/d"  />
-       <field id= "ZE_MES_C"   long_name="Mesozoo messy feeding loss to C"           unit="mmolC/m2/d"  />
-       <field id= "ZE_MESDC"   long_name="Mesozoo messy feeding loss to Dc"          unit="mmolC/m2/d"  />
-       <field id= "ZE_EXCR"    long_name="Mesozoo excretion"                         unit="mmolN/m2/d"  />
-       <field id= "ZE_RESP"    long_name="Mesozoo respiration"                       unit="mmolC/m2/d"  />
-       <field id= "ZE_GROW"    long_name="Mesozoo growth"                            unit="mmolN/m2/d"  />
-       <field id= "MDETC"      long_name="Detritus non-grazing losses, carbon"       unit="mmolC/m2/d"  />
-       <field id= "GMIDC"      long_name="Microzoo grazing on detritus, carbon"      unit="mmolC/m2/d"  />
-       <field id= "GMEDC"      long_name="Mesozoo  grazing on detritus, carbon"      unit="mmolC/m2/d"  />
-       <field id= "INT_ZMI"    long_name="Vertically integrated Zmi"                 unit="mmolN/m2"    />
-       <field id= "INT_ZME"    long_name="Vertically integrated Zme"                 unit="mmolN/m2"    />
-       <field id= "INT_DET"    long_name="Vertically integrated Det"                 unit="mmolN/m2"    />
-       <field id= "INT_DTC"    long_name="Vertically integrated Dtc"                 unit="mmolC/m2"    />
+       <field id= "INVTO2"     long_name="Column O2 inventory"                       unit="mmol-O2/m2"   />
+       <field id= "LYSO_CA"    long_name="Incorrect benthic output CaCO3"            unit="mmol-C/m2/d"  />
+       <field id= "COM_RESP"   long_name="Community respiration"                     unit="mmol-C/m2/d"  />
+       <field id= "PN_LLOSS"   long_name="Non-diatom linear losses"                  unit="mmol-N/m2/d"  />
+       <field id= "PD_LLOSS"   long_name="Diatom linear losses"                      unit="mmol-N/m2/d"  />
+       <field id= "ZI_LLOSS"   long_name="Microzooplankton linear losses"            unit="mmol-N/m2/d"  />
+       <field id= "ZE_LLOSS"   long_name="Mesozooplankton linear losses"             unit="mmol-N/m2/d"  />
+       <field id= "ZI_MES_N"   long_name="Microzoo messy feeding loss to N"          unit="mmol-N/m2/d"  />
+       <field id= "ZI_MES_D"   long_name="Microzoo messy feeding loss to D"          unit="mmol-N/m2/d"  />
+       <field id= "ZI_MES_C"   long_name="Microzoo messy feeding loss to C"          unit="mmol-C/m2/d"  />
+       <field id= "ZI_MESDC"   long_name="Microzoo messy feeding loss to Dc"         unit="mmol-C/m2/d"  />
+       <field id= "ZI_EXCR"    long_name="Microzoo excretion"                        unit="mmol-N/m2/d"  />
+       <field id= "ZI_RESP"    long_name="Microzoo respiration"                      unit="mmol-C/m2/d"  />
+       <field id= "ZI_GROW"    long_name="Microzoo growth"                           unit="mmol-N/m2/d"  />
+       <field id= "ZE_MES_N"   long_name="Mesozoo messy feeding loss to N"           unit="mmol-N/m2/d"  />
+       <field id= "ZE_MES_D"   long_name="Mesozoo messy feeding loss to D"           unit="mmol-N/m2/d"  />
+       <field id= "ZE_MES_C"   long_name="Mesozoo messy feeding loss to C"           unit="mmol-C/m2/d"  />
+       <field id= "ZE_MESDC"   long_name="Mesozoo messy feeding loss to Dc"          unit="mmol-C/m2/d"  />
+       <field id= "ZE_EXCR"    long_name="Mesozoo excretion"                         unit="mmol-N/m2/d"  />
+       <field id= "ZE_RESP"    long_name="Mesozoo respiration"                       unit="mmol-C/m2/d"  />
+       <field id= "ZE_GROW"    long_name="Mesozoo growth"                            unit="mmol-N/m2/d"  />
+       <field id= "MDETC"      long_name="Detritus non-grazing losses, carbon"       unit="mmol-C/m2/d"  />
+       <field id= "GMIDC"      long_name="Microzoo grazing on detritus, carbon"      unit="mmol-C/m2/d"  />
+       <field id= "GMEDC"      long_name="Mesozoo  grazing on detritus, carbon"      unit="mmol-C/m2/d"  />
+       <field id= "INT_ZMI"    long_name="Vertically integrated Zmi"                 unit="mmol-N/m2"    />
+       <field id= "INT_ZME"    long_name="Vertically integrated Zme"                 unit="mmol-N/m2"    />
+       <field id= "INT_DET"    long_name="Vertically integrated Det"                 unit="mmol-N/m2"    />
+       <field id= "INT_DTC"    long_name="Vertically integrated Dtc"                 unit="mmol-C/m2"    />
        <field id= "DMS_SURF"   long_name="DMS Surface Concentration"                 unit="nmol/L"      />
        <field id= "DMS_ANDR"   long_name="DMS Surface Concentration, Anderson"       unit="nmol/L"      />
@@ -472,5 +485,5 @@
        <field id= "DMS_HALL"   long_name="DMS Surface Concentration, Halloran"       unit="nmol/L"      />
        <field id= "DMS_ANDM"   long_name="DMS Surface Concentration, Anderson modif" unit="nmol/L"      />
-       <field id= "CHL_MLD"    long_name="MLD averaged Chlorophyll"                  unit="mg Chl/m3"   />
+       <field id= "CHL_MLD"    long_name="MLD averaged Chlorophyll"                  unit="mg-Chl/m3"   />
        <field id= "CHL_CPL"    long_name="Scaled Surf or MLD Chlorophyll to UM"      unit="kg Chl/m3"   />
        <field id= "ATM_XCO2"   long_name="Atmospheric xCO2"                          unit="ppm"         />
@@ -486,56 +499,56 @@
 
        <!-- AXY (08/11/16): add new 2D CMIP6 diagnostics -->
-       <field id= "epC100"     long_name="Downward Flux of Particle Organic Carbon"  unit="mmolC/m2/d"  />
-       <field id= "epCALC100"  long_name="Downward Flux of Calcite"                  unit="mmolC/m2/d"  />
-       <field id= "epN100"     long_name="Downward Flux of Particulate Nitrogen"     unit="mmolN/m2/d"  />
-       <field id= "epSI100"    long_name="Downward Flux of Particulate Silica"       unit="mmolSi/m2/d" />
-       <field id= "INTDISSIC"  long_name="Dissolved Inorganic Carbon Content"        unit="mmolC/m2"    />
-       <field id= "INTDISSIN"  long_name="Dissolved Inorganic Nitrogen Content"      unit="mmolN/m2"    />
-       <field id= "INTDISSISI" long_name="Dissolved Inorganic Silicon Content"       unit="mmolSi/m2"   />
+       <field id= "epC100"     long_name="Downward Flux of Particle Organic Carbon"  unit="mmol-C/m2/d"  />
+       <field id= "epCALC100"  long_name="Downward Flux of Calcite"                  unit="mmol-C/m2/d"  />
+       <field id= "epN100"     long_name="Downward Flux of Particulate Nitrogen"     unit="mmol-N/m2/d"  />
+       <field id= "epSI100"    long_name="Downward Flux of Particulate Silica"       unit="mmol-Si/m2/d" />
+       <field id= "INTDISSIC"  long_name="Dissolved Inorganic Carbon Content"        unit="mmol-C/m2"    />
+       <field id= "INTDISSIN"  long_name="Dissolved Inorganic Nitrogen Content"      unit="mmol-N/m2"    />
+       <field id= "INTDISSISI" long_name="Dissolved Inorganic Silicon Content"       unit="mmol-Si/m2"   />
        <field id= "INTTALK"    long_name="Dissolved Alkalinity Content"              unit="meq/m2"      />
-       <field id= "O2min"      long_name="Oxygen Minimum Concentration"              unit="mmolO2/m3"   />
+       <field id= "O2min"      long_name="Oxygen Minimum Concentration"              unit="mmol-O2/m3"   />
        <field id= "ZO2min"     long_name="Depth of Oxygen Minimum Concentration"     unit="m"           />
        <field id= "FBDDTALK"   long_name="Int. change of Alkalinity due to Biology"  unit="meq/m2/d"    />
-       <field id= "FBDDTDIC"   long_name="Int. change of DI Carbon due to Biology"   unit="mmolC/m2/d"  />
-       <field id= "FBDDTDIFE"  long_name="Int. change of DI Iron due to Biology"     unit="mmolFe/m2/d" />
-       <field id= "FBDDTDIN"   long_name="Int. change of DI Nitrogen due to Biology" unit="mmolN/m2/d"  />
-       <field id= "FBDDTDISI"  long_name="Int. change of DI Silicon due to Biology"  unit="mmolSi/m2/d" />
+       <field id= "FBDDTDIC"   long_name="Int. change of DI Carbon due to Biology"   unit="mmol-C/m2/d"  />
+       <field id= "FBDDTDIFE"  long_name="Int. change of DI Iron due to Biology"     unit="mmol-Fe/m2/d" />
+       <field id= "FBDDTDIN"   long_name="Int. change of DI Nitrogen due to Biology" unit="mmol-N/m2/d"  />
+       <field id= "FBDDTDISI"  long_name="Int. change of DI Silicon due to Biology"  unit="mmol-Si/m2/d" />
        
 
        <!-- MEDUSA 3D diagnostics -->
-       <field id= "TPP3"       long_name="Total primary production 3D"               unit="mmolN/m3/d"    grid_ref="grid_T_3D"  />
-       <field id= "DETFLUX3"   long_name="Total detrital flux 3D"                    unit="mmolN/m3/d"    grid_ref="grid_T_3D"  />
-       <field id= "REMIN3N"    long_name="Total remin flux N 3D"                     unit="mmolN/m3/d"    grid_ref="grid_T_3D"  />
+       <field id= "TPP3"       long_name="Total primary production 3D"               unit="mmol-N/m3/d"    grid_ref="grid_T_3D"  />
+       <field id= "DETFLUX3"   long_name="Total detrital flux 3D"                    unit="mmol-N/m3/d"    grid_ref="grid_T_3D"  />
+       <field id= "REMIN3N"    long_name="Total remin flux N 3D"                     unit="mmol-N/m3/d"    grid_ref="grid_T_3D"  />
        <field id= "PH3"        long_name="Ocean pH 3D"                               unit="-"             grid_ref="grid_T_3D"  />
        <field id= "OM_CAL3"    long_name="Omega calcite 3D"                          unit="-"             grid_ref="grid_T_3D"  />
 
        <!-- AXY (08/11/16): add new 3D CMIP6 diagnostics -->
-       <field id= "TPPD3"      long_name="Diatom primary production 3D"              unit="mmolN/m3/d"    grid_ref="grid_T_3D"  />
+       <field id= "TPPD3"      long_name="Diatom primary production 3D"              unit="mmol-N/m3/d"    grid_ref="grid_T_3D"  />
        <field id= "BDDTALK3"   long_name="Change of Alkalinity due to Biology"       unit="meq/m3/d"      grid_ref="grid_T_3D"  />
-       <field id= "BDDTDIC3"   long_name="Change of DI Carbon due to Biology"        unit="mmolC/m3/d"    grid_ref="grid_T_3D"  />
-       <field id= "BDDTDIFE3"  long_name="Change of DI Iron due to Biology"          unit="mmolFe/m3/d"   grid_ref="grid_T_3D"  />
-       <field id= "BDDTDIN3"   long_name="Change of DI Nitrogen due to Biology"      unit="mmolN/m3/d"    grid_ref="grid_T_3D"  />
-       <field id= "BDDTDISI3"  long_name="Change of DI Silicon due to Biology"       unit="mmolSi/m3/d"   grid_ref="grid_T_3D"  />
-       <field id= "FD_NIT3"    long_name="Fast sinking detrital nitrogen"            unit="mmolN/m2/d"    grid_ref="grid_T_3D"  />
-       <field id= "FD_SIL3"    long_name="Fast sinking detrital silicon"             unit="mmolSi/m2/d"   grid_ref="grid_T_3D"  />
-       <field id= "FD_CAR3"    long_name="Fast sinking detrital carbon"              unit="mmolC/m2/d"    grid_ref="grid_T_3D"  />
-       <field id= "FD_CAL3"    long_name="Fast sinking detrital calcium carbonate"   unit="mmolC/m2/d"    grid_ref="grid_T_3D"  />
-       <field id= "CO33"       long_name="Carbonate ion concentration"               unit="mmolC/m3"      grid_ref="grid_T_3D"  />
-       <field id= "CO3SATARAG3" long_name="Carbonate aragonite saturation conc"      unit="mmolC/m3"      grid_ref="grid_T_3D"  />
-       <field id= "CO3SATCALC3" long_name="Carbonate calcite saturation conc"        unit="mmolC/m3"      grid_ref="grid_T_3D"  />
-       <field id= "DCALC3"     long_name="Calcite dissolution"                       unit="mmolC/m3/d"    grid_ref="grid_T_3D"  />
-       <field id= "EXPC3"      long_name="Downward Flux of Particulate Org Carbon"   unit="mmolC/m3/d"    grid_ref="grid_T_3D"  />
-       <field id= "EXPN3"      long_name="Downward Flux of Particulate Org Nitrogen" unit="mmolN/m3/d"    grid_ref="grid_T_3D"  />
-       <field id= "FEDISS3"    long_name="Particle Source of Dissolved Iron"         unit="mmolFe/m3/d"   grid_ref="grid_T_3D"  />
-       <field id= "FESCAV3"    long_name="Nonbiogenic Iron Scavenging"               unit="mmolFe/m3/d"   grid_ref="grid_T_3D"  />
-       <field id= "MIGRAZP3"   long_name="Microzooplankton grazing on phytoplankton" unit="mmolC/m3/d"    grid_ref="grid_T_3D"  />
-       <field id= "MIGRAZD3"   long_name="Microzooplankton grazing on detritus"      unit="mmolC/m3/d"    grid_ref="grid_T_3D"  />
-       <field id= "MEGRAZP3"   long_name="Mesozooplankton grazing on phytoplankton"  unit="mmolC/m3/d"    grid_ref="grid_T_3D"  />
-       <field id= "MEGRAZD3"   long_name="Mesozooplankton grazing on detritus"       unit="mmolC/m3/d"    grid_ref="grid_T_3D"  />
-       <field id= "MEGRAZZ3"   long_name="Mesozooplankton grazing on microzoop"      unit="mmolC/m3/d"    grid_ref="grid_T_3D"  />
-       <field id= "O2SAT3"     long_name="Dissolved Oxygen Saturation Concentration" unit="mmolO2/m3"     grid_ref="grid_T_3D"  />
-       <field id= "PBSI3"      long_name="Biogenic Silica Production"                unit="mmolSi/m3/d"   grid_ref="grid_T_3D"  />
-       <field id= "PCAL3"      long_name="Biogenic Calcite Production"               unit="mmolC/m3/d"    grid_ref="grid_T_3D"  />
-       <field id= "REMOC3"     long_name="Remineralization of Organic Carbon"        unit="mmolC/m3/d"    grid_ref="grid_T_3D"  />
+       <field id= "BDDTDIC3"   long_name="Change of DI Carbon due to Biology"        unit="mmol-C/m3/d"    grid_ref="grid_T_3D"  />
+       <field id= "BDDTDIFE3"  long_name="Change of DI Iron due to Biology"          unit="mmol-Fe/m3/d"   grid_ref="grid_T_3D"  />
+       <field id= "BDDTDIN3"   long_name="Change of DI Nitrogen due to Biology"      unit="mmol-N/m3/d"    grid_ref="grid_T_3D"  />
+       <field id= "BDDTDISI3"  long_name="Change of DI Silicon due to Biology"       unit="mmol-Si/m3/d"   grid_ref="grid_T_3D"  />
+       <field id= "FD_NIT3"    long_name="Fast sinking detrital nitrogen"            unit="mmol-N/m2/d"    grid_ref="grid_T_3D"  />
+       <field id= "FD_SIL3"    long_name="Fast sinking detrital silicon"             unit="mmol-Si/m2/d"   grid_ref="grid_T_3D"  />
+       <field id= "FD_CAR3"    long_name="Fast sinking detrital carbon"              unit="mmol-C/m2/d"    grid_ref="grid_T_3D"  />
+       <field id= "FD_CAL3"    long_name="Fast sinking detrital calcium carbonate"   unit="mmol-C/m2/d"    grid_ref="grid_T_3D"  />
+       <field id= "CO33"       long_name="Carbonate ion concentration"               unit="mmol-C/m3"      grid_ref="grid_T_3D"  />
+       <field id= "CO3SATARAG3" long_name="Carbonate aragonite saturation conc"      unit="mmol-C/m3"      grid_ref="grid_T_3D"  />
+       <field id= "CO3SATCALC3" long_name="Carbonate calcite saturation conc"        unit="mmol-C/m3"      grid_ref="grid_T_3D"  />
+       <field id= "DCALC3"     long_name="Calcite dissolution"                       unit="mmol-C/m3/d"    grid_ref="grid_T_3D"  />
+       <field id= "EXPC3"      long_name="Downward Flux of Particulate Org Carbon"   unit="mmol-C/m3/d"    grid_ref="grid_T_3D"  />
+       <field id= "EXPN3"      long_name="Downward Flux of Particulate Org Nitrogen" unit="mmol-N/m3/d"    grid_ref="grid_T_3D"  />
+       <field id= "FEDISS3"    long_name="Particle Source of Dissolved Iron"         unit="mmol-Fe/m3/d"   grid_ref="grid_T_3D"  />
+       <field id= "FESCAV3"    long_name="Nonbiogenic Iron Scavenging"               unit="mmol-Fe/m3/d"   grid_ref="grid_T_3D"  />
+       <field id= "MIGRAZP3"   long_name="Microzooplankton grazing on phytoplankton" unit="mmol-C/m3/d"    grid_ref="grid_T_3D"  />
+       <field id= "MIGRAZD3"   long_name="Microzooplankton grazing on detritus"      unit="mmol-C/m3/d"    grid_ref="grid_T_3D"  />
+       <field id= "MEGRAZP3"   long_name="Mesozooplankton grazing on phytoplankton"  unit="mmol-C/m3/d"    grid_ref="grid_T_3D"  />
+       <field id= "MEGRAZD3"   long_name="Mesozooplankton grazing on detritus"       unit="mmol-C/m3/d"    grid_ref="grid_T_3D"  />
+       <field id= "MEGRAZZ3"   long_name="Mesozooplankton grazing on microzoop"      unit="mmol-C/m3/d"    grid_ref="grid_T_3D"  />
+       <field id= "O2SAT3"     long_name="Dissolved Oxygen Saturation Concentration" unit="mmol-O2/m3"     grid_ref="grid_T_3D"  />
+       <field id= "PBSI3"      long_name="Biogenic Silica Production"                unit="mmol-Si/m3/d"   grid_ref="grid_T_3D"  />
+       <field id= "PCAL3"      long_name="Biogenic Calcite Production"               unit="mmol-C/m3/d"    grid_ref="grid_T_3D"  />
+       <field id= "REMOC3"     long_name="Remineralization of Organic Carbon"        unit="mmol-C/m3/d"    grid_ref="grid_T_3D"  />
        <field id= "PNLIMJ3"    long_name="Irradiance limitation of non-diatoms"      unit="-"             grid_ref="grid_T_3D"  />
        <field id= "PNLIMN3"    long_name="Nitrogen limitation of non-diatoms"        unit="-"             grid_ref="grid_T_3D"  />
@@ -552,10 +565,10 @@
       <!-- MEDUSA : variables available with key_medusa -->
        <!-- trd case: jptra_atf -->
-       <field id="ATF_CHN"      long_name="Non-diatom Chl-a Asselin Filter Trend"             unit="mg Chl/m3/s" />
-       <field id="ATF_CHN_E3T"  long_name="ATF_CHN * E3T"                                     unit="mg Chl/m2/s" > ATF_CHN * e3t </field>
-       <field id="ATF_CHN_INV"  field_ref="ATF_CHN_E3T" long_name="ATF_CHN Inventory"         unit="mg Chl/m2/s" grid_ref="vert_sum" />
-       <field id="ATF_CHD"      long_name="Diatom Chl-a Asselin Filter Trend"                 unit="mg Chl/m3/s" />
-       <field id="ATF_CHD_E3T"  long_name="ATF_CHD * E3T"                                     unit="mg Chl/m2/s" > ATF_CHD * e3t </field>
-       <field id="ATF_CHD_INV"  field_ref="ATF_CHD_E3T" long_name="ATF_CHD Inventory"         unit="mg Chl/m2/s" grid_ref="vert_sum" />
+       <field id="ATF_CHN"      long_name="Non-diatom Chl-a Asselin Filter Trend"             unit="mg-Chl/m3/s" />
+       <field id="ATF_CHN_E3T"  long_name="ATF_CHN * E3T"                                     unit="mg-Chl/m2/s" > ATF_CHN * e3t </field>
+       <field id="ATF_CHN_INV"  field_ref="ATF_CHN_E3T" long_name="ATF_CHN Inventory"         unit="mg-Chl/m2/s" grid_ref="vert_sum" />
+       <field id="ATF_CHD"      long_name="Diatom Chl-a Asselin Filter Trend"                 unit="mg-Chl/m3/s" />
+       <field id="ATF_CHD_E3T"  long_name="ATF_CHD * E3T"                                     unit="mg-Chl/m2/s" > ATF_CHD * e3t </field>
+       <field id="ATF_CHD_INV"  field_ref="ATF_CHD_E3T" long_name="ATF_CHD Inventory"         unit="mg-Chl/m2/s" grid_ref="vert_sum" />
        <field id="ATF_PHN"      long_name="non-diatom phytoplankton Asselin Filter Trend"     unit="mmol-N/m3/s" />
        <field id="ATF_PHN_E3T"  long_name="ATF_PHN * E3T"                                     unit="mmol-N/m2/s" > ATF_PHN * e3t </field>
@@ -573,16 +586,16 @@
        <field id="ATF_DIN_E3T"  long_name="ATF_DIN * E3T"                                     unit="mmol-N/m2/s" > ATF_DIN * e3t </field>
        <field id="ATF_DIN_INV"  field_ref="ATF_DIN_E3T" long_name="ATF_DIN Inventory"         unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="ATF_SIL"      long_name="dissolved silicic acid Asselin Filter Trend"       unit="mmolSi/m3/s" />
-       <field id="ATF_SIL_E3T"  long_name="ATF_SIL * E3T"                                     unit="mmolSi/m2/s" > ATF_SIL * e3t </field>
-       <field id="ATF_SIL_INV"  field_ref="ATF_SIL_E3T" long_name="ATF_SIL Inventory"         unit="mmolSi/m2/s" grid_ref="vert_sum" />
-       <field id="ATF_FER"      long_name="dissolved iron Asselin Filter Trend"               unit="mmolFe/m3/s" />
-       <field id="ATF_FER_E3T"  long_name="ATF_FER * E3T"                                     unit="mmolFe/m2/s" > ATF_FER * e3t </field>
-       <field id="ATF_FER_INV"  field_ref="ATF_FER_E3T" long_name="ATF_FER Inventory"         unit="mmolFe/m2/s" grid_ref="vert_sum" />
+       <field id="ATF_SIL"      long_name="dissolved silicic acid Asselin Filter Trend"       unit="mmol-Si/m3/s" />
+       <field id="ATF_SIL_E3T"  long_name="ATF_SIL * E3T"                                     unit="mmol-Si/m2/s" > ATF_SIL * e3t </field>
+       <field id="ATF_SIL_INV"  field_ref="ATF_SIL_E3T" long_name="ATF_SIL Inventory"         unit="mmol-Si/m2/s" grid_ref="vert_sum" />
+       <field id="ATF_FER"      long_name="dissolved iron Asselin Filter Trend"               unit="mmol-Fe/m3/s" />
+       <field id="ATF_FER_E3T"  long_name="ATF_FER * E3T"                                     unit="mmol-Fe/m2/s" > ATF_FER * e3t </field>
+       <field id="ATF_FER_INV"  field_ref="ATF_FER_E3T" long_name="ATF_FER Inventory"         unit="mmol-Fe/m2/s" grid_ref="vert_sum" />
        <field id="ATF_DET"      long_name="detrital nitrogen Asselin Filter Trend"            unit="mmol-N/m3/s" />
        <field id="ATF_DET_E3T"  long_name="ATF_DET * E3T"                                     unit="mmol-N/m2/s" > ATF_DET * e3t </field>
        <field id="ATF_DET_INV"  field_ref="ATF_DET_E3T" long_name="ATF_DET Inventory"         unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="ATF_PDS"      long_name="Diatoms biogenic silicon Asselin Filter Trend"     unit="mmolSi/m3/s" />
-       <field id="ATF_PDS_E3T"  long_name="ATF_PDS * E3T"                                     unit="mmolSi/m2/s" > ATF_PDS * e3t </field>
-       <field id="ATF_PDS_INV"  field_ref="ATF_PDS_E3T" long_name="ATF_PDS Inventory"         unit="mmolSi/m2/s" grid_ref="vert_sum" />
+       <field id="ATF_PDS"      long_name="Diatoms biogenic silicon Asselin Filter Trend"     unit="mmol-Si/m3/s" />
+       <field id="ATF_PDS_E3T"  long_name="ATF_PDS * E3T"                                     unit="mmol-Si/m2/s" > ATF_PDS * e3t </field>
+       <field id="ATF_PDS_INV"  field_ref="ATF_PDS_E3T" long_name="ATF_PDS Inventory"         unit="mmol-Si/m2/s" grid_ref="vert_sum" />
        <field id="ATF_DTC"      long_name="detrital carbon Asselin Filter Trend"              unit="mmol-C/m3/s" />
        <field id="ATF_DTC_E3T"  long_name="ATF_DTC * E3T"                                     unit="mmol-C/m2/s" > ATF_DTC * e3t </field>
@@ -594,17 +607,17 @@
        <field id="ATF_ALK_E3T"  long_name="ATF_ALK * E3T"                                     unit="meq/m2/s"    > ATF_ALK * e3t </field>
        <field id="ATF_ALK_INV"  field_ref="ATF_ALK_E3T" long_name="ATF_ALK Inventory"         unit="meq/m2/s" grid_ref="vert_sum" />
-       <field id="ATF_OXY"      long_name="dissolved oxygen Asselin Filter Trend"             unit="mmolO2/m3/s" />
-       <field id="ATF_OXY_E3T"  long_name="ATF_OXY * E3T"                                     unit="mmolO2/m2/s" > ATF_OXY * e3t </field>
-       <field id="ATF_OXY_INV"  field_ref="ATF_OXY_E3T" long_name="ATF_OXY Inventory"         unit="mmolO2/m2/s" grid_ref="vert_sum" />
+       <field id="ATF_OXY"      long_name="dissolved oxygen Asselin Filter Trend"             unit="mmol-O2/m3/s" />
+       <field id="ATF_OXY_E3T"  long_name="ATF_OXY * E3T"                                     unit="mmol-O2/m2/s" > ATF_OXY * e3t </field>
+       <field id="ATF_OXY_INV"  field_ref="ATF_OXY_E3T" long_name="ATF_OXY Inventory"         unit="mmol-O2/m2/s" grid_ref="vert_sum" />
 
       <!-- Ideal traceurs : variables available with key_idtra -->
        <field id="ATF_IDTRA"      long_name="Ideal traceur Asselin Filter Trend"            unit="mmol/m3/s"    />
        <field id="ATF_IDTRA_E3T"   long_name="ATF_IDTRA * E3T"                              unit="mmol/m2/s" > ATF_IDTRA * e3t </field>
-       <field id="ATF_IDTRA_INV"  field_ref="ATF_IDTRA_E3T" long_name="ATF_IDTRA Inventory" unit="mmolO2/m2/s" grid_ref="vert_sum" />
+       <field id="ATF_IDTRA_INV"  field_ref="ATF_IDTRA_E3T" long_name="ATF_IDTRA Inventory" unit="mmol-O2/m2/s" grid_ref="vert_sum" />
 
        <!-- CFC11 : variables available with key_cfc -->
        <field id="ATF_CFC11"       long_name="CFC11 Asselin Filter Trend"                   unit="umol/m3/s" />
        <field id="ATF_CFC11_E3T"   long_name="ATF_CFC11 * E3T"                              unit="umol/m2/s" > ATF_CFC11 * e3t </field>
-       <field id="ATF_CFC11_INV"  field_ref="ATF_CFC11_E3T" long_name="ATF_CFC11 Inventory" unit="mmolO2/m2/s" grid_ref="vert_sum" />
+       <field id="ATF_CFC11_INV"  field_ref="ATF_CFC11_E3T" long_name="ATF_CFC11 Inventory" unit="mmol-O2/m2/s" grid_ref="vert_sum" />
 
        <!-- CFC12 : variables available with key_cfc -->
@@ -624,7 +637,7 @@
 
        <!-- AGE : variables available with key_age -->
-       <field id="ATF_Age"        long_name="Sea Water Age Asselin Filter Trend" standard_name="sea_water_age_since_surface_contact"  unit="yr/s"         />
-       <field id="ATF_Age_E3T"    long_name="ATF_Age * E3T"                             unit="yr m/s" > ATF_Age * e3t </field>
-       <field id="ATF_Age_INV"    field_ref="ATF_Age_E3T" long_name="ATF_Age Inventory" unit="yr m/s" grid_ref="vert_sum" />
+       <field id="ATF_Age"        long_name="Sea Water Age Asselin Filter Trend"           unit="yr/s"         />
+       <field id="ATF_Age_E3T"    long_name="ATF_Age * E3T"                                unit="yr m/s" > ATF_Age * e3t </field>
+       <field id="ATF_Age_INV"    field_ref="ATF_Age_E3T" long_name="ATF_Age Inventory"    unit="yr m/s" grid_ref="vert_sum" />
      </field_group>
     
@@ -633,10 +646,10 @@
       <!-- MEDUSA : variables available with key_medusa -->
        <!-- trd case: jptra_xad -->
-       <field id="XAD_CHN"      long_name="Non-diatom Chl-a X-Advection Trend"                unit="mg Chl/m3/s" />
-       <field id="XAD_CHN_E3T"  long_name="XAD_CHN * E3T"                                     unit="mg Chl/m2/s" > XAD_CHN * e3t </field>
-       <field id="XAD_CHN_INV"  field_ref="XAD_CHN_E3T" long_name="XAD_CHN Inventory"         unit="mg Chl/m2/s" grid_ref="vert_sum" />
-       <field id="XAD_CHD"      long_name="Diatom Chl-a X-Advection Trend"                    unit="mg Chl/m3/s" />
-       <field id="XAD_CHD_E3T"  long_name="XAD_CHD * E3T"                                     unit="mg Chl/m2/s" > XAD_CHD * e3t </field>
-       <field id="XAD_CHD_INV"  field_ref="XAD_CHD_E3T" long_name="XAD_CHD Inventory"         unit="mg Chl/m2/s" grid_ref="vert_sum" />
+       <field id="XAD_CHN"      long_name="Non-diatom Chl-a X-Advection Trend"                unit="mg-Chl/m3/s" />
+       <field id="XAD_CHN_E3T"  long_name="XAD_CHN * E3T"                                     unit="mg-Chl/m2/s" > XAD_CHN * e3t </field>
+       <field id="XAD_CHN_INV"  field_ref="XAD_CHN_E3T" long_name="XAD_CHN Inventory"         unit="mg-Chl/m2/s" grid_ref="vert_sum" />
+       <field id="XAD_CHD"      long_name="Diatom Chl-a X-Advection Trend"                    unit="mg-Chl/m3/s" />
+       <field id="XAD_CHD_E3T"  long_name="XAD_CHD * E3T"                                     unit="mg-Chl/m2/s" > XAD_CHD * e3t </field>
+       <field id="XAD_CHD_INV"  field_ref="XAD_CHD_E3T" long_name="XAD_CHD Inventory"         unit="mg-Chl/m2/s" grid_ref="vert_sum" />
        <field id="XAD_PHN"      long_name="non-diatom phytoplankton X-Advection Trend"        unit="mmol-N/m3/s" />
        <field id="XAD_PHN_E3T"  long_name="XAD_PHN * E3T"                                     unit="mmol-N/m2/s" > XAD_PHN * e3t </field>
@@ -654,16 +667,16 @@
        <field id="XAD_DIN_E3T"  long_name="XAD_DIN * E3T"                                     unit="mmol-N/m2/s" > XAD_DIN * e3t </field>
        <field id="XAD_DIN_INV"  field_ref="XAD_DIN_E3T" long_name="XAD_DIN Inventory"         unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="XAD_SIL"      long_name="dissolved silicic acid X-Advection Trend"          unit="mmolSi/m3/s" />
-       <field id="XAD_SIL_E3T"  long_name="XAD_SIL * E3T"                                     unit="mmolSi/m2/s" > XAD_SIL * e3t </field>
-       <field id="XAD_SIL_INV"  field_ref="XAD_SIL_E3T" long_name="XAD_SIL Inventory"         unit="mmolSi/m2/s" grid_ref="vert_sum" />
-       <field id="XAD_FER"      long_name="dissolved iron X-Advection Trend"                  unit="mmolFe/m3/s" />
-       <field id="XAD_FER_E3T"  long_name="XAD_FER * E3T"                                     unit="mmolFe/m2/s" > XAD_FER * e3t </field>
-       <field id="XAD_FER_INV"  field_ref="XAD_FER_E3T" long_name="XAD_FER Inventory"         unit="mmolFe/m2/s" grid_ref="vert_sum" />
+       <field id="XAD_SIL"      long_name="dissolved silicic acid X-Advection Trend"          unit="mmol-Si/m3/s" />
+       <field id="XAD_SIL_E3T"  long_name="XAD_SIL * E3T"                                     unit="mmol-Si/m2/s" > XAD_SIL * e3t </field>
+       <field id="XAD_SIL_INV"  field_ref="XAD_SIL_E3T" long_name="XAD_SIL Inventory"         unit="mmol-Si/m2/s" grid_ref="vert_sum" />
+       <field id="XAD_FER"      long_name="dissolved iron X-Advection Trend"                  unit="mmol-Fe/m3/s" />
+       <field id="XAD_FER_E3T"  long_name="XAD_FER * E3T"                                     unit="mmol-Fe/m2/s" > XAD_FER * e3t </field>
+       <field id="XAD_FER_INV"  field_ref="XAD_FER_E3T" long_name="XAD_FER Inventory"         unit="mmol-Fe/m2/s" grid_ref="vert_sum" />
        <field id="XAD_DET"      long_name="detrital nitrogen X-Advection Trend"               unit="mmol-N/m3/s" />
        <field id="XAD_DET_E3T"  long_name="XAD_DET * E3T"                                     unit="mmol-N/m2/s" > XAD_DET * e3t </field>
        <field id="XAD_DET_INV"  field_ref="XAD_DET_E3T" long_name="XAD_DET Inventory"         unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="XAD_PDS"      long_name="Diatoms biogenic silicon X-Advection Trend"        unit="mmolSi/m3/s" />
-       <field id="XAD_PDS_E3T"  long_name="XAD_PDS * E3T"                                     unit="mmolSi/m2/s" > XAD_PDS * e3t </field>
-       <field id="XAD_PDS_INV"  field_ref="XAD_PDS_E3T" long_name="XAD_PDS Inventory"         unit="mmolSi/m2/s" grid_ref="vert_sum" />
+       <field id="XAD_PDS"      long_name="Diatoms biogenic silicon X-Advection Trend"        unit="mmol-Si/m3/s" />
+       <field id="XAD_PDS_E3T"  long_name="XAD_PDS * E3T"                                     unit="mmol-Si/m2/s" > XAD_PDS * e3t </field>
+       <field id="XAD_PDS_INV"  field_ref="XAD_PDS_E3T" long_name="XAD_PDS Inventory"         unit="mmol-Si/m2/s" grid_ref="vert_sum" />
        <field id="XAD_DTC"      long_name="detrital carbon X-Advection Trend"                 unit="mmol-C/m3/s" />
        <field id="XAD_DTC_E3T"  long_name="XAD_DTC * E3T"                                     unit="mmol-C/m2/s" > XAD_DTC * e3t </field>
@@ -675,14 +688,14 @@
        <field id="XAD_ALK_E3T"  long_name="XAD_ALK * E3T"                                     unit="meq/m2/s"    > XAD_ALK * e3t </field>
        <field id="XAD_ALK_INV"  field_ref="XAD_ALK_E3T" long_name="XAD_ALK Inventory"         unit="meq/m2/s" grid_ref="vert_sum" />
-       <field id="XAD_OXY"      long_name="dissolved oxygen X-Advection Trend"                unit="mmolO2/m3/s" />
-       <field id="XAD_OXY_E3T"  long_name="XAD_OXY * E3T"                                     unit="mmolO2/m2/s" > XAD_OXY * e3t </field>
-       <field id="XAD_OXY_INV"  field_ref="XAD_OXY_E3T" long_name="XAD_OXY Inventory"         unit="mmolO2/m2/s" grid_ref="vert_sum" />
+       <field id="XAD_OXY"      long_name="dissolved oxygen X-Advection Trend"                unit="mmol-O2/m3/s" />
+       <field id="XAD_OXY_E3T"  long_name="XAD_OXY * E3T"                                     unit="mmol-O2/m2/s" > XAD_OXY * e3t </field>
+       <field id="XAD_OXY_INV"  field_ref="XAD_OXY_E3T" long_name="XAD_OXY Inventory"         unit="mmol-O2/m2/s" grid_ref="vert_sum" />
        <!-- trd case: jptra_yad -->
-       <field id="YAD_CHN"      long_name="Non-diatom Chl-a Y-Advection Trend"                unit="mg Chl/m3/s" />
-       <field id="YAD_CHN_E3T"  long_name="YAD_CHN * E3T"                                     unit="mg Chl/m2/s" > YAD_CHN * e3t </field>
-       <field id="YAD_CHN_INV"  field_ref="YAD_CHN_E3T" long_name="YAD_CHN Inventory"         unit="mg Chl/m2/s" grid_ref="vert_sum" />
-       <field id="YAD_CHD"      long_name="Diatom Chl-a Y-Advection Trend"                    unit="mg Chl/m3/s" />
-       <field id="YAD_CHD_E3T"  long_name="YAD_CHD * E3T"                                     unit="mg Chl/m2/s" > YAD_CHD * e3t </field>
-       <field id="YAD_CHD_INV"  field_ref="YAD_CHD_E3T" long_name="YAD_CHD Inventory"         unit="mg Chl/m2/s" grid_ref="vert_sum" />
+       <field id="YAD_CHN"      long_name="Non-diatom Chl-a Y-Advection Trend"                unit="mg-Chl/m3/s" />
+       <field id="YAD_CHN_E3T"  long_name="YAD_CHN * E3T"                                     unit="mg-Chl/m2/s" > YAD_CHN * e3t </field>
+       <field id="YAD_CHN_INV"  field_ref="YAD_CHN_E3T" long_name="YAD_CHN Inventory"         unit="mg-Chl/m2/s" grid_ref="vert_sum" />
+       <field id="YAD_CHD"      long_name="Diatom Chl-a Y-Advection Trend"                    unit="mg-Chl/m3/s" />
+       <field id="YAD_CHD_E3T"  long_name="YAD_CHD * E3T"                                     unit="mg-Chl/m2/s" > YAD_CHD * e3t </field>
+       <field id="YAD_CHD_INV"  field_ref="YAD_CHD_E3T" long_name="YAD_CHD Inventory"         unit="mg-Chl/m2/s" grid_ref="vert_sum" />
        <field id="YAD_PHN"      long_name="non-diatom phytoplankton Y-Advection Trend"        unit="mmol-N/m3/s" />
        <field id="YAD_PHN_E3T"  long_name="YAD_PHN * E3T"                                     unit="mmol-N/m2/s" > YAD_PHN * e3t </field>
@@ -700,16 +713,16 @@
        <field id="YAD_DIN_E3T"  long_name="YAD_DIN * E3T"                                     unit="mmol-N/m2/s" > YAD_DIN * e3t </field>
        <field id="YAD_DIN_INV"  field_ref="YAD_DIN_E3T" long_name="YAD_DIN Inventory"         unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="YAD_SIL"      long_name="dissolved silicic acid Y-Advection Trend"          unit="mmolSi/m3/s" />
-       <field id="YAD_SIL_E3T"  long_name="YAD_SIL * E3T"                                     unit="mmolSi/m2/s" > YAD_SIL * e3t </field>
-       <field id="YAD_SIL_INV"  field_ref="YAD_SIL_E3T" long_name="YAD_SIL Inventory"         unit="mmolSi/m2/s" grid_ref="vert_sum" />
-       <field id="YAD_FER"      long_name="dissolved iron Y-Advection Trend"                  unit="mmolFe/m3/s" />
-       <field id="YAD_FER_E3T"  long_name="YAD_FER * E3T"                                     unit="mmolFe/m2/s" > YAD_FER * e3t </field>
-       <field id="YAD_FER_INV"  field_ref="YAD_FER_E3T" long_name="YAD_FER Inventory"         unit="mmolFe/m2/s" grid_ref="vert_sum" />
+       <field id="YAD_SIL"      long_name="dissolved silicic acid Y-Advection Trend"          unit="mmol-Si/m3/s" />
+       <field id="YAD_SIL_E3T"  long_name="YAD_SIL * E3T"                                     unit="mmol-Si/m2/s" > YAD_SIL * e3t </field>
+       <field id="YAD_SIL_INV"  field_ref="YAD_SIL_E3T" long_name="YAD_SIL Inventory"         unit="mmol-Si/m2/s" grid_ref="vert_sum" />
+       <field id="YAD_FER"      long_name="dissolved iron Y-Advection Trend"                  unit="mmol-Fe/m3/s" />
+       <field id="YAD_FER_E3T"  long_name="YAD_FER * E3T"                                     unit="mmol-Fe/m2/s" > YAD_FER * e3t </field>
+       <field id="YAD_FER_INV"  field_ref="YAD_FER_E3T" long_name="YAD_FER Inventory"         unit="mmol-Fe/m2/s" grid_ref="vert_sum" />
        <field id="YAD_DET"      long_name="detrital nitrogen Y-Advection Trend"               unit="mmol-N/m3/s" />
        <field id="YAD_DET_E3T"  long_name="YAD_DET * E3T"                                     unit="mmol-N/m2/s" > YAD_DET * e3t </field>
        <field id="YAD_DET_INV"  field_ref="YAD_DET_E3T" long_name="YAD_DET Inventory"         unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="YAD_PDS"      long_name="Diatoms biogenic silicon Y-Advection Trend"        unit="mmolSi/m3/s" />
-       <field id="YAD_PDS_E3T"  long_name="YAD_PDS * E3T"                                     unit="mmolSi/m2/s" > YAD_PDS * e3t </field>
-       <field id="YAD_PDS_INV"  field_ref="YAD_PDS_E3T" long_name="YAD_PDS Inventory"         unit="mmolSi/m2/s" grid_ref="vert_sum" />
+       <field id="YAD_PDS"      long_name="Diatoms biogenic silicon Y-Advection Trend"        unit="mmol-Si/m3/s" />
+       <field id="YAD_PDS_E3T"  long_name="YAD_PDS * E3T"                                     unit="mmol-Si/m2/s" > YAD_PDS * e3t </field>
+       <field id="YAD_PDS_INV"  field_ref="YAD_PDS_E3T" long_name="YAD_PDS Inventory"         unit="mmol-Si/m2/s" grid_ref="vert_sum" />
        <field id="YAD_DTC"      long_name="detrital carbon Y-Advection Trend"                 unit="mmol-C/m3/s" />
        <field id="YAD_DTC_E3T"  long_name="YAD_DTC * E3T"                                     unit="mmol-C/m2/s" > YAD_DTC * e3t </field>
@@ -721,14 +734,14 @@
        <field id="YAD_ALK_E3T"  long_name="YAD_ALK * E3T"                                     unit="meq/m2/s"    > YAD_ALK * e3t </field>
        <field id="YAD_ALK_INV"  field_ref="YAD_ALK_E3T" long_name="YAD_ALK Inventory"         unit="meq/m2/s" grid_ref="vert_sum" />
-       <field id="YAD_OXY"      long_name="dissolved oxygen Y-Advection Trend"                unit="mmolO2/m3/s" />
-       <field id="YAD_OXY_E3T"  long_name="YAD_OXY * E3T"                                     unit="mmolO2/m2/s" > YAD_OXY * e3t </field>
-       <field id="YAD_OXY_INV"  field_ref="YAD_OXY_E3T" long_name="YAD_OXY Inventory"         unit="mmolO2/m2/s" grid_ref="vert_sum" />
+       <field id="YAD_OXY"      long_name="dissolved oxygen Y-Advection Trend"                unit="mmol-O2/m3/s" />
+       <field id="YAD_OXY_E3T"  long_name="YAD_OXY * E3T"                                     unit="mmol-O2/m2/s" > YAD_OXY * e3t </field>
+       <field id="YAD_OXY_INV"  field_ref="YAD_OXY_E3T" long_name="YAD_OXY Inventory"         unit="mmol-O2/m2/s" grid_ref="vert_sum" />
        <!-- trd case: jptra_zad -->
-       <field id="ZAD_CHN"      long_name="Non-diatom Chl-a Z-Advection Trend"                unit="mg Chl/m3/s" />
-       <field id="ZAD_CHN_E3T"  long_name="ZAD_CHN * E3T"                                     unit="mg Chl/m2/s" > ZAD_CHN * e3t </field>
-       <field id="ZAD_CHN_INV"  field_ref="ZAD_CHN_E3T" long_name="ZAD_CHN Inventory"         unit="mg Chl/m2/s" grid_ref="vert_sum" />
-       <field id="ZAD_CHD"      long_name="Diatom Chl-a Z-Advection Trend"                    unit="mg Chl/m3/s" />
-       <field id="ZAD_CHD_E3T"  long_name="ZAD_CHD * E3T"                                     unit="mg Chl/m2/s" > ZAD_CHD * e3t </field>
-       <field id="ZAD_CHD_INV"  field_ref="ZAD_CHD_E3T" long_name="ZAD_CHD Inventory"         unit="mg Chl/m2/s" grid_ref="vert_sum" />
+       <field id="ZAD_CHN"      long_name="Non-diatom Chl-a Z-Advection Trend"                unit="mg-Chl/m3/s" />
+       <field id="ZAD_CHN_E3T"  long_name="ZAD_CHN * E3T"                                     unit="mg-Chl/m2/s" > ZAD_CHN * e3t </field>
+       <field id="ZAD_CHN_INV"  field_ref="ZAD_CHN_E3T" long_name="ZAD_CHN Inventory"         unit="mg-Chl/m2/s" grid_ref="vert_sum" />
+       <field id="ZAD_CHD"      long_name="Diatom Chl-a Z-Advection Trend"                    unit="mg-Chl/m3/s" />
+       <field id="ZAD_CHD_E3T"  long_name="ZAD_CHD * E3T"                                     unit="mg-Chl/m2/s" > ZAD_CHD * e3t </field>
+       <field id="ZAD_CHD_INV"  field_ref="ZAD_CHD_E3T" long_name="ZAD_CHD Inventory"         unit="mg-Chl/m2/s" grid_ref="vert_sum" />
        <field id="ZAD_PHN"      long_name="non-diatom phytoplankton Z-Advection Trend"        unit="mmol-N/m3/s" />
        <field id="ZAD_PHN_E3T"  long_name="ZAD_PHN * E3T"                                     unit="mmol-N/m2/s" > ZAD_PHN * e3t </field>
@@ -746,16 +759,16 @@
        <field id="ZAD_DIN_E3T"  long_name="ZAD_DIN * E3T"                                     unit="mmol-N/m2/s" > ZAD_DIN * e3t </field>
        <field id="ZAD_DIN_INV"  field_ref="ZAD_DIN_E3T" long_name="ZAD_DIN Inventory"         unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="ZAD_SIL"      long_name="dissolved silicic acid Z-Advection Trend"          unit="mmolSi/m3/s" />
-       <field id="ZAD_SIL_E3T"  long_name="ZAD_SIL * E3T"                                     unit="mmolSi/m2/s" > ZAD_SIL * e3t </field>
-       <field id="ZAD_SIL_INV"  field_ref="ZAD_SIL_E3T" long_name="ZAD_SIL Inventory"         unit="mmolSi/m2/s" grid_ref="vert_sum" />
-       <field id="ZAD_FER"      long_name="dissolved iron Z-Advection Trend"                  unit="mmolFe/m3/s" />
-       <field id="ZAD_FER_E3T"  long_name="ZAD_FER * E3T"                                     unit="mmolFe/m2/s" > ZAD_FER * e3t </field>
-       <field id="ZAD_FER_INV"  field_ref="ZAD_FER_E3T" long_name="ZAD_FER Inventory"         unit="mmolFe/m2/s" grid_ref="vert_sum" />
+       <field id="ZAD_SIL"      long_name="dissolved silicic acid Z-Advection Trend"          unit="mmol-Si/m3/s" />
+       <field id="ZAD_SIL_E3T"  long_name="ZAD_SIL * E3T"                                     unit="mmol-Si/m2/s" > ZAD_SIL * e3t </field>
+       <field id="ZAD_SIL_INV"  field_ref="ZAD_SIL_E3T" long_name="ZAD_SIL Inventory"         unit="mmol-Si/m2/s" grid_ref="vert_sum" />
+       <field id="ZAD_FER"      long_name="dissolved iron Z-Advection Trend"                  unit="mmol-Fe/m3/s" />
+       <field id="ZAD_FER_E3T"  long_name="ZAD_FER * E3T"                                     unit="mmol-Fe/m2/s" > ZAD_FER * e3t </field>
+       <field id="ZAD_FER_INV"  field_ref="ZAD_FER_E3T" long_name="ZAD_FER Inventory"         unit="mmol-Fe/m2/s" grid_ref="vert_sum" />
        <field id="ZAD_DET"      long_name="detrital nitrogen Z-Advection Trend"               unit="mmol-N/m3/s" />
        <field id="ZAD_DET_E3T"  long_name="ZAD_DET * E3T"                                     unit="mmol-N/m2/s" > ZAD_DET * e3t </field>
        <field id="ZAD_DET_INV"  field_ref="ZAD_DET_E3T" long_name="ZAD_DET Inventory"         unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="ZAD_PDS"      long_name="Diatoms biogenic silicon Z-Advection Trend"        unit="mmolSi/m3/s" />
-       <field id="ZAD_PDS_E3T"  long_name="ZAD_PDS * E3T"                                     unit="mmolSi/m2/s" > ZAD_PDS * e3t </field>
-       <field id="ZAD_PDS_INV"  field_ref="ZAD_PDS_E3T" long_name="ZAD_PDS Inventory"         unit="mmolSi/m2/s" grid_ref="vert_sum" />
+       <field id="ZAD_PDS"      long_name="Diatoms biogenic silicon Z-Advection Trend"        unit="mmol-Si/m3/s" />
+       <field id="ZAD_PDS_E3T"  long_name="ZAD_PDS * E3T"                                     unit="mmol-Si/m2/s" > ZAD_PDS * e3t </field>
+       <field id="ZAD_PDS_INV"  field_ref="ZAD_PDS_E3T" long_name="ZAD_PDS Inventory"         unit="mmol-Si/m2/s" grid_ref="vert_sum" />
        <field id="ZAD_DTC"      long_name="detrital carbon Z-Advection Trend"                 unit="mmol-C/m3/s" />
        <field id="ZAD_DTC_E3T"  long_name="ZAD_DTC * E3T"                                     unit="mmol-C/m2/s" > ZAD_DTC * e3t </field>
@@ -767,14 +780,14 @@
        <field id="ZAD_ALK_E3T"  long_name="ZAD_ALK * E3T"                                     unit="meq/m2/s"    > ZAD_ALK * e3t </field>
        <field id="ZAD_ALK_INV"  field_ref="ZAD_ALK_E3T" long_name="ZAD_ALK Inventory"         unit="meq/m2/s" grid_ref="vert_sum" />
-       <field id="ZAD_OXY"      long_name="dissolved oxygen Z-Advection Trend"                unit="mmolO2/m3/s" />
-       <field id="ZAD_OXY_E3T"  long_name="ZAD_OXY * E3T"                                     unit="mmolO2/m2/s" > ZAD_OXY * e3t </field>
-       <field id="ZAD_OXY_INV"  field_ref="ZAD_OXY_E3T" long_name="ZAD_OXY Inventory"         unit="mmolO2/m2/s" grid_ref="vert_sum" />
+       <field id="ZAD_OXY"      long_name="dissolved oxygen Z-Advection Trend"                unit="mmol-O2/m3/s" />
+       <field id="ZAD_OXY_E3T"  long_name="ZAD_OXY * E3T"                                     unit="mmol-O2/m2/s" > ZAD_OXY * e3t </field>
+       <field id="ZAD_OXY_INV"  field_ref="ZAD_OXY_E3T" long_name="ZAD_OXY Inventory"         unit="mmol-O2/m2/s" grid_ref="vert_sum" />
        <!-- trd case: jptra_totad -->
-       <field id="TAD_CHN"      long_name="Non-diatom Chl-a Total Advection Trend"             unit="mg Chl/m3/s" />
-       <field id="TAD_CHN_E3T"  long_name="TAD_CHN * E3T"                                      unit="mg Chl/m2/s" > TAD_CHN * e3t </field>
-       <field id="TAD_CHN_INV"  field_ref="TAD_CHN_E3T" long_name="TAD_CHN Inventory"          unit="mg Chl/m2/s" grid_ref="vert_sum" />
-       <field id="TAD_CHD"      long_name="Diatom Chl-a Total Advection Trend"                 unit="mg Chl/m3/s" />
-       <field id="TAD_CHD_E3T"  long_name="TAD_CHD * E3T"                                      unit="mg Chl/m2/s" > TAD_CHD * e3t </field>
-       <field id="TAD_CHD_INV"  field_ref="TAD_CHD_E3T" long_name="TAD_CHD Inventory"          unit="mg Chl/m2/s" grid_ref="vert_sum" />
+       <field id="TAD_CHN"      long_name="Non-diatom Chl-a Total Advection Trend"             unit="mg-Chl/m3/s" />
+       <field id="TAD_CHN_E3T"  long_name="TAD_CHN * E3T"                                      unit="mg-Chl/m2/s" > TAD_CHN * e3t </field>
+       <field id="TAD_CHN_INV"  field_ref="TAD_CHN_E3T" long_name="TAD_CHN Inventory"          unit="mg-Chl/m2/s" grid_ref="vert_sum" />
+       <field id="TAD_CHD"      long_name="Diatom Chl-a Total Advection Trend"                 unit="mg-Chl/m3/s" />
+       <field id="TAD_CHD_E3T"  long_name="TAD_CHD * E3T"                                      unit="mg-Chl/m2/s" > TAD_CHD * e3t </field>
+       <field id="TAD_CHD_INV"  field_ref="TAD_CHD_E3T" long_name="TAD_CHD Inventory"          unit="mg-Chl/m2/s" grid_ref="vert_sum" />
        <field id="TAD_PHN"      long_name="non-diatom phytoplankton Total Advection Trend"     unit="mmol-N/m3/s" />
        <field id="TAD_PHN_E3T"  long_name="TAD_PHN * E3T"                                      unit="mmol-N/m2/s" > TAD_PHN * e3t </field>
@@ -792,16 +805,16 @@
        <field id="TAD_DIN_E3T"  long_name="TAD_DIN * E3T"                                      unit="mmol-N/m2/s" > TAD_DIN * e3t </field>
        <field id="TAD_DIN_INV"  field_ref="TAD_DIN_E3T" long_name="TAD_DIN Inventory"          unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="TAD_SIL"      long_name="dissolved silicic acid Total Advection Trend"       unit="mmolSi/m3/s" />
-       <field id="TAD_SIL_E3T"  long_name="TAD_SIL * E3T"                                      unit="mmolSi/m2/s" > TAD_SIL * e3t </field>
-       <field id="TAD_SIL_INV"  field_ref="TAD_SIL_E3T" long_name="TAD_SIL Inventory"          unit="mmolSi/m2/s" grid_ref="vert_sum" />
-       <field id="TAD_FER"      long_name="dissolved iron Total Advection Trend"               unit="mmolFe/m3/s" />
-       <field id="TAD_FER_E3T"  long_name="TAD_FER * E3T"                                      unit="mmolFe/m2/s" > TAD_FER * e3t </field>
-       <field id="TAD_FER_INV"  field_ref="TAD_FER_E3T" long_name="TAD_FER Inventory"          unit="mmolFe/m2/s" grid_ref="vert_sum" />
+       <field id="TAD_SIL"      long_name="dissolved silicic acid Total Advection Trend"       unit="mmol-Si/m3/s" />
+       <field id="TAD_SIL_E3T"  long_name="TAD_SIL * E3T"                                      unit="mmol-Si/m2/s" > TAD_SIL * e3t </field>
+       <field id="TAD_SIL_INV"  field_ref="TAD_SIL_E3T" long_name="TAD_SIL Inventory"          unit="mmol-Si/m2/s" grid_ref="vert_sum" />
+       <field id="TAD_FER"      long_name="dissolved iron Total Advection Trend"               unit="mmol-Fe/m3/s" />
+       <field id="TAD_FER_E3T"  long_name="TAD_FER * E3T"                                      unit="mmol-Fe/m2/s" > TAD_FER * e3t </field>
+       <field id="TAD_FER_INV"  field_ref="TAD_FER_E3T" long_name="TAD_FER Inventory"          unit="mmol-Fe/m2/s" grid_ref="vert_sum" />
        <field id="TAD_DET"      long_name="detrital nitrogen Total Advection Trend"            unit="mmol-N/m3/s" />
        <field id="TAD_DET_E3T"  long_name="TAD_DET * E3T"                                      unit="mmol-N/m2/s" > TAD_DET * e3t </field>
        <field id="TAD_DET_INV"  field_ref="TAD_DET_E3T" long_name="TAD_DET Inventory"          unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="TAD_PDS"      long_name="Diatoms biogenic silicon Total Advection Trend"     unit="mmolSi/m3/s" />
-       <field id="TAD_PDS_E3T"  long_name="TAD_PDS * E3T"                                      unit="mmolSi/m2/s" > TAD_PDS * e3t </field>
-       <field id="TAD_PDS_INV"  field_ref="TAD_PDS_E3T" long_name="TAD_PDS Inventory"          unit="mmolSi/m2/s" grid_ref="vert_sum" />
+       <field id="TAD_PDS"      long_name="Diatoms biogenic silicon Total Advection Trend"     unit="mmol-Si/m3/s" />
+       <field id="TAD_PDS_E3T"  long_name="TAD_PDS * E3T"                                      unit="mmol-Si/m2/s" > TAD_PDS * e3t </field>
+       <field id="TAD_PDS_INV"  field_ref="TAD_PDS_E3T" long_name="TAD_PDS Inventory"          unit="mmol-Si/m2/s" grid_ref="vert_sum" />
        <field id="TAD_DTC"      long_name="detrital carbon Total Advection Trend"              unit="mmol-C/m3/s" />
        <field id="TAD_DTC_E3T"  long_name="TAD_DTC * E3T"                                      unit="mmol-C/m2/s" > TAD_DTC * e3t </field>
@@ -813,14 +826,14 @@
        <field id="TAD_ALK_E3T"  long_name="TAD_ALK * E3T"                                      unit="meq/m2/s"    > TAD_ALK * e3t </field>
        <field id="TAD_ALK_INV"  field_ref="TAD_ALK_E3T" long_name="TAD_ALK Inventory"          unit="meq/m2/s" grid_ref="vert_sum" />
-       <field id="TAD_OXY"      long_name="dissolved oxygen Total Advection Trend"             unit="mmolO2/m3/s" />
-       <field id="TAD_OXY_E3T"  long_name="TAD_OXY * E3T"                                      unit="mmolO2/m2/s" > TAD_OXY * e3t </field>
-       <field id="TAD_OXY_INV"  field_ref="TAD_OXY_E3T" long_name="TAD_OXY Inventory"          unit="mmolO2/m2/s" grid_ref="vert_sum" />
+       <field id="TAD_OXY"      long_name="dissolved oxygen Total Advection Trend"             unit="mmol-O2/m3/s" />
+       <field id="TAD_OXY_E3T"  long_name="TAD_OXY * E3T"                                      unit="mmol-O2/m2/s" > TAD_OXY * e3t </field>
+       <field id="TAD_OXY_INV"  field_ref="TAD_OXY_E3T" long_name="TAD_OXY Inventory"          unit="mmol-O2/m2/s" grid_ref="vert_sum" />
        <!-- trd case: jptra_ldf -->
-       <field id="LDF_CHN"      long_name="Non-diatom Chl-a Lateral Mixing Trend"             unit="mg Chl/m3/s" />
-       <field id="LDF_CHN_E3T"  long_name="LDF_CHN * E3T"                                     unit="mg Chl/m2/s" > LDF_CHN * e3t </field>
-       <field id="LDF_CHN_INV"  field_ref="LDF_CHN_E3T" long_name="LDF_CHN Inventory"         unit="mg Chl/m2/s" grid_ref="vert_sum" />
-       <field id="LDF_CHD"      long_name="Diatom Chl-a Lateral Mixing Trend"                 unit="mg Chl/m3/s" />
-       <field id="LDF_CHD_E3T"  long_name="LDF_CHD * E3T"                                     unit="mg Chl/m2/s" > LDF_CHD * e3t </field>
-       <field id="LDF_CHD_INV"  field_ref="LDF_CHD_E3T" long_name="LDF_CHD Inventory"         unit="mg Chl/m2/s" grid_ref="vert_sum" />
+       <field id="LDF_CHN"      long_name="Non-diatom Chl-a Lateral Mixing Trend"             unit="mg-Chl/m3/s" />
+       <field id="LDF_CHN_E3T"  long_name="LDF_CHN * E3T"                                     unit="mg-Chl/m2/s" > LDF_CHN * e3t </field>
+       <field id="LDF_CHN_INV"  field_ref="LDF_CHN_E3T" long_name="LDF_CHN Inventory"         unit="mg-Chl/m2/s" grid_ref="vert_sum" />
+       <field id="LDF_CHD"      long_name="Diatom Chl-a Lateral Mixing Trend"                 unit="mg-Chl/m3/s" />
+       <field id="LDF_CHD_E3T"  long_name="LDF_CHD * E3T"                                     unit="mg-Chl/m2/s" > LDF_CHD * e3t </field>
+       <field id="LDF_CHD_INV"  field_ref="LDF_CHD_E3T" long_name="LDF_CHD Inventory"         unit="mg-Chl/m2/s" grid_ref="vert_sum" />
        <field id="LDF_PHN"      long_name="non-diatom phytoplankton Lateral Mixing Trend"     unit="mmol-N/m3/s" />
        <field id="LDF_PHN_E3T"  long_name="LDF_PHN * E3T"                                     unit="mmol-N/m2/s" > LDF_PHN * e3t </field>
@@ -838,16 +851,16 @@
        <field id="LDF_DIN_E3T"  long_name="LDF_DIN * E3T"                                     unit="mmol-N/m2/s" > LDF_DIN * e3t </field>
        <field id="LDF_DIN_INV"  field_ref="LDF_DIN_E3T" long_name="LDF_DIN Inventory"         unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="LDF_SIL"      long_name="dissolved silicic acid Lateral Mixing Trend"       unit="mmolSi/m3/s" />
-       <field id="LDF_SIL_E3T"  long_name="LDF_SIL * E3T"                                     unit="mmolSi/m2/s" > LDF_SIL * e3t </field>
-       <field id="LDF_SIL_INV"  field_ref="LDF_SIL_E3T" long_name="LDF_SIL Inventory"         unit="mmolSi/m2/s" grid_ref="vert_sum" />
-       <field id="LDF_FER"      long_name="dissolved iron Lateral Mixing Trend"               unit="mmolFe/m3/s" />
-       <field id="LDF_FER_E3T"  long_name="LDF_FER * E3T"                                     unit="mmolFe/m2/s" > LDF_FER * e3t </field>
-       <field id="LDF_FER_INV"  field_ref="LDF_FER_E3T" long_name="LDF_FER Inventory"         unit="mmolFe/m2/s" grid_ref="vert_sum" />
+       <field id="LDF_SIL"      long_name="dissolved silicic acid Lateral Mixing Trend"       unit="mmol-Si/m3/s" />
+       <field id="LDF_SIL_E3T"  long_name="LDF_SIL * E3T"                                     unit="mmol-Si/m2/s" > LDF_SIL * e3t </field>
+       <field id="LDF_SIL_INV"  field_ref="LDF_SIL_E3T" long_name="LDF_SIL Inventory"         unit="mmol-Si/m2/s" grid_ref="vert_sum" />
+       <field id="LDF_FER"      long_name="dissolved iron Lateral Mixing Trend"               unit="mmol-Fe/m3/s" />
+       <field id="LDF_FER_E3T"  long_name="LDF_FER * E3T"                                     unit="mmol-Fe/m2/s" > LDF_FER * e3t </field>
+       <field id="LDF_FER_INV"  field_ref="LDF_FER_E3T" long_name="LDF_FER Inventory"         unit="mmol-Fe/m2/s" grid_ref="vert_sum" />
        <field id="LDF_DET"      long_name="detrital nitrogen Lateral Mixing Trend"            unit="mmol-N/m3/s" />
        <field id="LDF_DET_E3T"  long_name="LDF_DET * E3T"                                     unit="mmol-N/m2/s" > LDF_DET * e3t </field>
        <field id="LDF_DET_INV"  field_ref="LDF_DET_E3T" long_name="LDF_DET Inventory"         unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="LDF_PDS"      long_name="Diatoms biogenic silicon Lateral Mixing Trend"     unit="mmolSi/m3/s" />
-       <field id="LDF_PDS_E3T"  long_name="LDF_PDS * E3T"                                     unit="mmolSi/m2/s" > LDF_PDS * e3t </field>
-       <field id="LDF_PDS_INV"  field_ref="LDF_PDS_E3T" long_name="LDF_PDS Inventory"         unit="mmolSi/m2/s" grid_ref="vert_sum" />
+       <field id="LDF_PDS"      long_name="Diatoms biogenic silicon Lateral Mixing Trend"     unit="mmol-Si/m3/s" />
+       <field id="LDF_PDS_E3T"  long_name="LDF_PDS * E3T"                                     unit="mmol-Si/m2/s" > LDF_PDS * e3t </field>
+       <field id="LDF_PDS_INV"  field_ref="LDF_PDS_E3T" long_name="LDF_PDS Inventory"         unit="mmol-Si/m2/s" grid_ref="vert_sum" />
        <field id="LDF_DTC"      long_name="detrital carbon Lateral Mixing Trend"              unit="mmol-C/m3/s" />
        <field id="LDF_DTC_E3T"  long_name="LDF_DTC * E3T"                                     unit="mmol-C/m2/s" > LDF_DTC * e3t </field>
@@ -859,14 +872,14 @@
        <field id="LDF_ALK_E3T"  long_name="LDF_ALK * E3T"                                     unit="meq/m2/s"    > LDF_ALK * e3t </field>
        <field id="LDF_ALK_INV"  field_ref="LDF_ALK_E3T" long_name="LDF_ALK Inventory"         unit="meq/m2/s" grid_ref="vert_sum" />
-       <field id="LDF_OXY"      long_name="dissolved oxygen Lateral Mixing Trend"             unit="mmolO2/m3/s" />
-       <field id="LDF_OXY_E3T"  long_name="LDF_OXY * E3T"                                     unit="mmolO2/m2/s" > LDF_OXY * e3t </field>
-       <field id="LDF_OXY_INV"  field_ref="LDF_OXY_E3T" long_name="LDF_OXY Inventory"         unit="mmolO2/m2/s" grid_ref="vert_sum" />
+       <field id="LDF_OXY"      long_name="dissolved oxygen Lateral Mixing Trend"             unit="mmol-O2/m3/s" />
+       <field id="LDF_OXY_E3T"  long_name="LDF_OXY * E3T"                                     unit="mmol-O2/m2/s" > LDF_OXY * e3t </field>
+       <field id="LDF_OXY_INV"  field_ref="LDF_OXY_E3T" long_name="LDF_OXY Inventory"         unit="mmol-O2/m2/s" grid_ref="vert_sum" />
        <!-- trd case: jptra_bbl -->
-       <field id="BBL_CHN"      long_name="Non-diatom Chl-a Bottom Boundary Trend"             unit="mg Chl/m3/s" />
-       <field id="BBL_CHN_E3T"  long_name="BBL_CHN * E3T"                                      unit="mg Chl/m2/s" > BBL_CHN * e3t </field>
-       <field id="BBL_CHN_INV"  field_ref="BBL_CHN_E3T" long_name="BBL_CHN Inventory"          unit="mg Chl/m2/s" grid_ref="vert_sum" />
-       <field id="BBL_CHD"      long_name="Diatom Chl-a Bottom Boundary Trend"                 unit="mg Chl/m3/s" />
-       <field id="BBL_CHD_E3T"  long_name="BBL_CHD * E3T"                                      unit="mg Chl/m2/s" > BBL_CHD * e3t </field>
-       <field id="BBL_CHD_INV"  field_ref="BBL_CHD_E3T" long_name="BBL_CHD Inventory"          unit="mg Chl/m2/s" grid_ref="vert_sum" />
+       <field id="BBL_CHN"      long_name="Non-diatom Chl-a Bottom Boundary Trend"             unit="mg-Chl/m3/s" />
+       <field id="BBL_CHN_E3T"  long_name="BBL_CHN * E3T"                                      unit="mg-Chl/m2/s" > BBL_CHN * e3t </field>
+       <field id="BBL_CHN_INV"  field_ref="BBL_CHN_E3T" long_name="BBL_CHN Inventory"          unit="mg-Chl/m2/s" grid_ref="vert_sum" />
+       <field id="BBL_CHD"      long_name="Diatom Chl-a Bottom Boundary Trend"                 unit="mg-Chl/m3/s" />
+       <field id="BBL_CHD_E3T"  long_name="BBL_CHD * E3T"                                      unit="mg-Chl/m2/s" > BBL_CHD * e3t </field>
+       <field id="BBL_CHD_INV"  field_ref="BBL_CHD_E3T" long_name="BBL_CHD Inventory"          unit="mg-Chl/m2/s" grid_ref="vert_sum" />
        <field id="BBL_PHN"      long_name="non-diatom phytoplankton Bottom Boundary Trend"     unit="mmol-N/m3/s" />
        <field id="BBL_PHN_E3T"  long_name="BBL_PHN * E3T"                                      unit="mmol-N/m2/s" > BBL_PHN * e3t </field>
@@ -884,16 +897,16 @@
        <field id="BBL_DIN_E3T"  long_name="BBL_DIN * E3T"                                      unit="mmol-N/m2/s" > BBL_DIN * e3t </field>
        <field id="BBL_DIN_INV"  field_ref="BBL_DIN_E3T" long_name="BBL_DIN Inventory"          unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="BBL_SIL"      long_name="dissolved silicic acid Bottom Boundary Trend"       unit="mmolSi/m3/s" />
-       <field id="BBL_SIL_E3T"  long_name="BBL_SIL * E3T"                                      unit="mmolSi/m2/s" > BBL_SIL * e3t </field>
-       <field id="BBL_SIL_INV"  field_ref="BBL_SIL_E3T" long_name="BBL_SIL Inventory"          unit="mmolSi/m2/s" grid_ref="vert_sum" />
-       <field id="BBL_FER"      long_name="dissolved iron Bottom Boundary Trend"               unit="mmolFe/m3/s" />
-       <field id="BBL_FER_E3T"  long_name="BBL_FER * E3T"                                      unit="mmolFe/m2/s" > BBL_FER * e3t </field>
-       <field id="BBL_FER_INV"  field_ref="BBL_FER_E3T" long_name="BBL_FER Inventory"          unit="mmolFe/m2/s" grid_ref="vert_sum" />
+       <field id="BBL_SIL"      long_name="dissolved silicic acid Bottom Boundary Trend"       unit="mmol-Si/m3/s" />
+       <field id="BBL_SIL_E3T"  long_name="BBL_SIL * E3T"                                      unit="mmol-Si/m2/s" > BBL_SIL * e3t </field>
+       <field id="BBL_SIL_INV"  field_ref="BBL_SIL_E3T" long_name="BBL_SIL Inventory"          unit="mmol-Si/m2/s" grid_ref="vert_sum" />
+       <field id="BBL_FER"      long_name="dissolved iron Bottom Boundary Trend"               unit="mmol-Fe/m3/s" />
+       <field id="BBL_FER_E3T"  long_name="BBL_FER * E3T"                                      unit="mmol-Fe/m2/s" > BBL_FER * e3t </field>
+       <field id="BBL_FER_INV"  field_ref="BBL_FER_E3T" long_name="BBL_FER Inventory"          unit="mmol-Fe/m2/s" grid_ref="vert_sum" />
        <field id="BBL_DET"      long_name="detrital nitrogen Bottom Boundary Trend"            unit="mmol-N/m3/s" />
        <field id="BBL_DET_E3T"  long_name="BBL_DET * E3T"                                      unit="mmol-N/m2/s" > BBL_DET * e3t </field>
        <field id="BBL_DET_INV"  field_ref="BBL_DET_E3T" long_name="BBL_DET Inventory"          unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="BBL_PDS"      long_name="Diatoms biogenic silicon Bottom Boundary Trend"     unit="mmolSi/m3/s" />
-       <field id="BBL_PDS_E3T"  long_name="BBL_PDS * E3T"                                      unit="mmolSi/m2/s" > BBL_PDS * e3t </field>
-       <field id="BBL_PDS_INV"  field_ref="BBL_PDS_E3T" long_name="BBL_PDS Inventory"          unit="mmolSi/m2/s" grid_ref="vert_sum" />
+       <field id="BBL_PDS"      long_name="Diatoms biogenic silicon Bottom Boundary Trend"     unit="mmol-Si/m3/s" />
+       <field id="BBL_PDS_E3T"  long_name="BBL_PDS * E3T"                                      unit="mmol-Si/m2/s" > BBL_PDS * e3t </field>
+       <field id="BBL_PDS_INV"  field_ref="BBL_PDS_E3T" long_name="BBL_PDS Inventory"          unit="mmol-Si/m2/s" grid_ref="vert_sum" />
        <field id="BBL_DTC"      long_name="detrital carbon Bottom Boundary Trend"              unit="mmol-C/m3/s" />
        <field id="BBL_DTC_E3T"  long_name="BBL_DTC * E3T"                                      unit="mmol-C/m2/s" > BBL_DTC * e3t </field>
@@ -905,14 +918,14 @@
        <field id="BBL_ALK_E3T"  long_name="BBL_ALK * E3T"                                      unit="meq/m2/s"    > BBL_ALK * e3t </field>
        <field id="BBL_ALK_INV"  field_ref="BBL_ALK_E3T" long_name="BBL_ALK Inventory"          unit="meq/m2/s" grid_ref="vert_sum" />
-       <field id="BBL_OXY"      long_name="dissolved oxygen Bottom Boundary Trend"             unit="mmolO2/m3/s" />
-       <field id="BBL_OXY_E3T"  long_name="BBL_OXY * E3T"                                      unit="mmolO2/m2/s" > BBL_OXY * e3t </field>
-       <field id="BBL_OXY_INV"  field_ref="BBL_OXY_E3T" long_name="BBL_OXY Inventory"          unit="mmolO2/m2/s" grid_ref="vert_sum" />
+       <field id="BBL_OXY"      long_name="dissolved oxygen Bottom Boundary Trend"             unit="mmol-O2/m3/s" />
+       <field id="BBL_OXY_E3T"  long_name="BBL_OXY * E3T"                                      unit="mmol-O2/m2/s" > BBL_OXY * e3t </field>
+       <field id="BBL_OXY_INV"  field_ref="BBL_OXY_E3T" long_name="BBL_OXY Inventory"          unit="mmol-O2/m2/s" grid_ref="vert_sum" />
        <!-- trd case: jptra_nsr -->
-       <field id="FOR_CHN"      long_name="Non-diatom Chl-a Surface Boundary Trend"             unit="mg Chl/m3/s" />
-       <field id="FOR_CHN_E3T"  long_name="FOR_CHN * E3T"                                       unit="mg Chl/m2/s" > FOR_CHN * e3t </field>
-       <field id="FOR_CHN_INV"  field_ref="FOR_CHN_E3T" long_name="FOR_CHN Inventory"           unit="mg Chl/m2/s" grid_ref="vert_sum" />
-       <field id="FOR_CHD"      long_name="Diatom Chl-a Surface Boundary Trend"                 unit="mg Chl/m3/s" />
-       <field id="FOR_CHD_E3T"  long_name="FOR_CHD * E3T"                                       unit="mg Chl/m2/s" > FOR_CHD * e3t </field>
-       <field id="FOR_CHD_INV"  field_ref="FOR_CHD_E3T" long_name="FOR_CHD Inventory"           unit="mg Chl/m2/s" grid_ref="vert_sum" />
+       <field id="FOR_CHN"      long_name="Non-diatom Chl-a Surface Boundary Trend"             unit="mg-Chl/m3/s" />
+       <field id="FOR_CHN_E3T"  long_name="FOR_CHN * E3T"                                       unit="mg-Chl/m2/s" > FOR_CHN * e3t </field>
+       <field id="FOR_CHN_INV"  field_ref="FOR_CHN_E3T" long_name="FOR_CHN Inventory"           unit="mg-Chl/m2/s" grid_ref="vert_sum" />
+       <field id="FOR_CHD"      long_name="Diatom Chl-a Surface Boundary Trend"                 unit="mg-Chl/m3/s" />
+       <field id="FOR_CHD_E3T"  long_name="FOR_CHD * E3T"                                       unit="mg-Chl/m2/s" > FOR_CHD * e3t </field>
+       <field id="FOR_CHD_INV"  field_ref="FOR_CHD_E3T" long_name="FOR_CHD Inventory"           unit="mg-Chl/m2/s" grid_ref="vert_sum" />
        <field id="FOR_PHN"      long_name="non-diatom phytoplankton Surface Boundary Trend"     unit="mmol-N/m3/s" />
        <field id="FOR_PHN_E3T"  long_name="FOR_PHN * E3T"                                       unit="mmol-N/m2/s" > FOR_PHN * e3t </field>
@@ -930,16 +943,16 @@
        <field id="FOR_DIN_E3T"  long_name="FOR_DIN * E3T"                                       unit="mmol-N/m2/s" > FOR_DIN * e3t </field>
        <field id="FOR_DIN_INV"  field_ref="FOR_DIN_E3T" long_name="FOR_DIN Inventory"           unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="FOR_SIL"      long_name="dissolved silicic acid Surface Boundary Trend"       unit="mmolSi/m3/s" />
-       <field id="FOR_SIL_E3T"  long_name="FOR_SIL * E3T"                                       unit="mmolSi/m2/s" > FOR_SIL * e3t </field>
-       <field id="FOR_SIL_INV"  field_ref="FOR_SIL_E3T" long_name="FOR_SIL Inventory"           unit="mmolSi/m2/s" grid_ref="vert_sum" />
-       <field id="FOR_FER"      long_name="dissolved iron Surface Boundary Trend"               unit="mmolFe/m3/s" />
-       <field id="FOR_FER_E3T"  long_name="FOR_FER * E3T"                                       unit="mmolFe/m2/s" > FOR_FER * e3t </field>
-       <field id="FOR_FER_INV"  field_ref="FOR_FER_E3T" long_name="FOR_FER Inventory"           unit="mmolFe/m2/s" grid_ref="vert_sum" />
+       <field id="FOR_SIL"      long_name="dissolved silicic acid Surface Boundary Trend"       unit="mmol-Si/m3/s" />
+       <field id="FOR_SIL_E3T"  long_name="FOR_SIL * E3T"                                       unit="mmol-Si/m2/s" > FOR_SIL * e3t </field>
+       <field id="FOR_SIL_INV"  field_ref="FOR_SIL_E3T" long_name="FOR_SIL Inventory"           unit="mmol-Si/m2/s" grid_ref="vert_sum" />
+       <field id="FOR_FER"      long_name="dissolved iron Surface Boundary Trend"               unit="mmol-Fe/m3/s" />
+       <field id="FOR_FER_E3T"  long_name="FOR_FER * E3T"                                       unit="mmol-Fe/m2/s" > FOR_FER * e3t </field>
+       <field id="FOR_FER_INV"  field_ref="FOR_FER_E3T" long_name="FOR_FER Inventory"           unit="mmol-Fe/m2/s" grid_ref="vert_sum" />
        <field id="FOR_DET"      long_name="detrital nitrogen Surface Boundary Trend"            unit="mmol-N/m3/s" />
        <field id="FOR_DET_E3T"  long_name="FOR_DET * E3T"                                       unit="mmol-N/m2/s" > FOR_DET * e3t </field>
        <field id="FOR_DET_INV"  field_ref="FOR_DET_E3T" long_name="FOR_DET Inventory"           unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="FOR_PDS"      long_name="Diatoms biogenic silicon Surface Boundary Trend"     unit="mmolSi/m3/s" />
-       <field id="FOR_PDS_E3T"  long_name="FOR_PDS * E3T"                                       unit="mmolSi/m2/s" > FOR_PDS * e3t </field>
-       <field id="FOR_PDS_INV"  field_ref="FOR_PDS_E3T" long_name="FOR_PDS Inventory"           unit="mmolSi/m2/s" grid_ref="vert_sum" />
+       <field id="FOR_PDS"      long_name="Diatoms biogenic silicon Surface Boundary Trend"     unit="mmol-Si/m3/s" />
+       <field id="FOR_PDS_E3T"  long_name="FOR_PDS * E3T"                                       unit="mmol-Si/m2/s" > FOR_PDS * e3t </field>
+       <field id="FOR_PDS_INV"  field_ref="FOR_PDS_E3T" long_name="FOR_PDS Inventory"           unit="mmol-Si/m2/s" grid_ref="vert_sum" />
        <field id="FOR_DTC"      long_name="detrital carbon Surface Boundary Trend"              unit="mmol-C/m3/s" />
        <field id="FOR_DTC_E3T"  long_name="FOR_DTC * E3T"                                       unit="mmol-C/m2/s" > FOR_DTC * e3t </field>
@@ -951,14 +964,14 @@
        <field id="FOR_ALK_E3T"  long_name="FOR_ALK * E3T"                                       unit="meq/m2/s"    > FOR_ALK * e3t </field>
        <field id="FOR_ALK_INV"  field_ref="FOR_ALK_E3T" long_name="FOR_ALK Inventory"           unit="meq/m2/s" grid_ref="vert_sum" />
-       <field id="FOR_OXY"      long_name="dissolved oxygen Surface Boundary Trend"             unit="mmolO2/m3/s" />
-       <field id="FOR_OXY_E3T"  long_name="FOR_OXY * E3T"                                       unit="mmolO2/m2/s" > FOR_OXY * e3t </field>
-       <field id="FOR_OXY_INV"  field_ref="FOR_OXY_E3T" long_name="FOR_OXY Inventory"           unit="mmolO2/m2/s" grid_ref="vert_sum" />
+       <field id="FOR_OXY"      long_name="dissolved oxygen Surface Boundary Trend"             unit="mmol-O2/m3/s" />
+       <field id="FOR_OXY_E3T"  long_name="FOR_OXY * E3T"                                       unit="mmol-O2/m2/s" > FOR_OXY * e3t </field>
+       <field id="FOR_OXY_INV"  field_ref="FOR_OXY_E3T" long_name="FOR_OXY Inventory"           unit="mmol-O2/m2/s" grid_ref="vert_sum" />
        <!-- trd case: jptra_zdf -->
-       <field id="ZDF_CHN"      long_name="Non-diatom Chl-a Vertical Mixing Trend"             unit="mg Chl/m3/s" />
-       <field id="ZDF_CHN_E3T"  long_name="ZDF_CHN * E3T"                                      unit="mg Chl/m2/s" > ZDF_CHN * e3t </field>
-       <field id="ZDF_CHN_INV"  field_ref="ZDF_CHN_E3T" long_name="ZDF_CHN Inventory"          unit="mg Chl/m2/s" grid_ref="vert_sum" />
-       <field id="ZDF_CHD"      long_name="Diatom Chl-a Vertical Mixing Trend"                 unit="mg Chl/m3/s" />
-       <field id="ZDF_CHD_E3T"  long_name="ZDF_CHD * E3T"                                      unit="mg Chl/m2/s" > ZDF_CHD * e3t </field>
-       <field id="ZDF_CHD_INV"  field_ref="ZDF_CHD_E3T" long_name="ZDF_CHD Inventory"          unit="mg Chl/m2/s" grid_ref="vert_sum" />
+       <field id="ZDF_CHN"      long_name="Non-diatom Chl-a Vertical Mixing Trend"             unit="mg-Chl/m3/s" />
+       <field id="ZDF_CHN_E3T"  long_name="ZDF_CHN * E3T"                                      unit="mg-Chl/m2/s" > ZDF_CHN * e3t </field>
+       <field id="ZDF_CHN_INV"  field_ref="ZDF_CHN_E3T" long_name="ZDF_CHN Inventory"          unit="mg-Chl/m2/s" grid_ref="vert_sum" />
+       <field id="ZDF_CHD"      long_name="Diatom Chl-a Vertical Mixing Trend"                 unit="mg-Chl/m3/s" />
+       <field id="ZDF_CHD_E3T"  long_name="ZDF_CHD * E3T"                                      unit="mg-Chl/m2/s" > ZDF_CHD * e3t </field>
+       <field id="ZDF_CHD_INV"  field_ref="ZDF_CHD_E3T" long_name="ZDF_CHD Inventory"          unit="mg-Chl/m2/s" grid_ref="vert_sum" />
        <field id="ZDF_PHN"      long_name="non-diatom phytoplankton Vertical Mixing Trend"     unit="mmol-N/m3/s" />
        <field id="ZDF_PHN_E3T"  long_name="ZDF_PHN * E3T"                                      unit="mmol-N/m2/s" > ZDF_PHN * e3t </field>
@@ -976,16 +989,16 @@
        <field id="ZDF_DIN_E3T"  long_name="ZDF_DIN * E3T"                                      unit="mmol-N/m2/s" > ZDF_DIN * e3t </field>
        <field id="ZDF_DIN_INV"  field_ref="ZDF_DIN_E3T" long_name="ZDF_DIN Inventory"          unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="ZDF_SIL"      long_name="dissolved silicic acid Vertical Mixing Trend"       unit="mmolSi/m3/s" />
-       <field id="ZDF_SIL_E3T"  long_name="ZDF_SIL * E3T"                                      unit="mmolSi/m2/s" > ZDF_SIL * e3t </field>
-       <field id="ZDF_SIL_INV"  field_ref="ZDF_SIL_E3T" long_name="ZDF_SIL Inventory"          unit="mmolSi/m2/s" grid_ref="vert_sum" />
-       <field id="ZDF_FER"      long_name="dissolved iron Vertical Mixing Trend"               unit="mmolFe/m3/s" />
-       <field id="ZDF_FER_E3T"  long_name="ZDF_FER * E3T"                                      unit="mmolFe/m2/s" > ZDF_FER * e3t </field>
-       <field id="ZDF_FER_INV"  field_ref="ZDF_FER_E3T" long_name="ZDF_FER Inventory"          unit="mmolFe/m2/s" grid_ref="vert_sum" />
+       <field id="ZDF_SIL"      long_name="dissolved silicic acid Vertical Mixing Trend"       unit="mmol-Si/m3/s" />
+       <field id="ZDF_SIL_E3T"  long_name="ZDF_SIL * E3T"                                      unit="mmol-Si/m2/s" > ZDF_SIL * e3t </field>
+       <field id="ZDF_SIL_INV"  field_ref="ZDF_SIL_E3T" long_name="ZDF_SIL Inventory"          unit="mmol-Si/m2/s" grid_ref="vert_sum" />
+       <field id="ZDF_FER"      long_name="dissolved iron Vertical Mixing Trend"               unit="mmol-Fe/m3/s" />
+       <field id="ZDF_FER_E3T"  long_name="ZDF_FER * E3T"                                      unit="mmol-Fe/m2/s" > ZDF_FER * e3t </field>
+       <field id="ZDF_FER_INV"  field_ref="ZDF_FER_E3T" long_name="ZDF_FER Inventory"          unit="mmol-Fe/m2/s" grid_ref="vert_sum" />
        <field id="ZDF_DET"      long_name="detrital nitrogen Vertical Mixing Trend"            unit="mmol-N/m3/s" />
        <field id="ZDF_DET_E3T"  long_name="ZDF_DET * E3T"                                      unit="mmol-N/m2/s" > ZDF_DET * e3t </field>
        <field id="ZDF_DET_INV"  field_ref="ZDF_DET_E3T" long_name="ZDF_DET Inventory"          unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="ZDF_PDS"      long_name="Diatoms biogenic silicon Vertical Mixing Trend"     unit="mmolSi/m3/s" />
-       <field id="ZDF_PDS_E3T"  long_name="ZDF_PDS * E3T"                                      unit="mmolSi/m2/s" > ZDF_PDS * e3t </field>
-       <field id="ZDF_PDS_INV"  field_ref="ZDF_PDS_E3T" long_name="ZDF_PDS Inventory"          unit="mmolSi/m2/s" grid_ref="vert_sum" />
+       <field id="ZDF_PDS"      long_name="Diatoms biogenic silicon Vertical Mixing Trend"     unit="mmol-Si/m3/s" />
+       <field id="ZDF_PDS_E3T"  long_name="ZDF_PDS * E3T"                                      unit="mmol-Si/m2/s" > ZDF_PDS * e3t </field>
+       <field id="ZDF_PDS_INV"  field_ref="ZDF_PDS_E3T" long_name="ZDF_PDS Inventory"          unit="mmol-Si/m2/s" grid_ref="vert_sum" />
        <field id="ZDF_DTC"      long_name="detrital carbon Vertical Mixing Trend"              unit="mmol-C/m3/s" />
        <field id="ZDF_DTC_E3T"  long_name="ZDF_DTC * E3T"                                      unit="mmol-C/m2/s" > ZDF_DTC * e3t </field>
@@ -997,14 +1010,14 @@
        <field id="ZDF_ALK_E3T"  long_name="ZDF_ALK * E3T"                                      unit="meq/m2/s"    > ZDF_ALK * e3t </field>
        <field id="ZDF_ALK_INV"  field_ref="ZDF_ALK_E3T" long_name="ZDF_ALK Inventory"          unit="meq/m2/s" grid_ref="vert_sum" />
-       <field id="ZDF_OXY"      long_name="dissolved oxygen Vertical Mixing Trend"             unit="mmolO2/m3/s" />
-       <field id="ZDF_OXY_E3T"  long_name="ZDF_OXY * E3T"                                      unit="mmolO2/m2/s" > ZDF_OXY * e3t </field>
-       <field id="ZDF_OXY_INV"  field_ref="ZDF_OXY_E3T" long_name="ZDF_OXY Inventory"          unit="mmolO2/m2/s" grid_ref="vert_sum" />
+       <field id="ZDF_OXY"      long_name="dissolved oxygen Vertical Mixing Trend"             unit="mmol-O2/m3/s" />
+       <field id="ZDF_OXY_E3T"  long_name="ZDF_OXY * E3T"                                      unit="mmol-O2/m2/s" > ZDF_OXY * e3t </field>
+       <field id="ZDF_OXY_INV"  field_ref="ZDF_OXY_E3T" long_name="ZDF_OXY Inventory"          unit="mmol-O2/m2/s" grid_ref="vert_sum" />
        <!-- trd case: jptra_zdfp -->
-       <field id="ZDP_CHN"      long_name="Non-diatom Chl-a Kz Diffusive Trend"               unit="mg Chl/m3/s" />
-       <field id="ZDP_CHN_E3T"  long_name="ZDP_CHN * E3T"                                     unit="mg Chl/m2/s" > ZDP_CHN * e3t </field>
-       <field id="ZDP_CHN_INV"  field_ref="ZDP_CHN_E3T" long_name="ZDP_CHN Inventory"         unit="mg Chl/m2/s" grid_ref="vert_sum" />
-       <field id="ZDP_CHD"      long_name="Diatom Chl-a Kz Diffusive Trend"                   unit="mg Chl/m3/s" />
-       <field id="ZDP_CHD_E3T"  long_name="ZDP_CHD * E3T"                                     unit="mg Chl/m2/s" > ZDP_CHD * e3t </field>
-       <field id="ZDP_CHD_INV"  field_ref="ZDP_CHD_E3T" long_name="ZDP_CHD Inventory"         unit="mg Chl/m2/s" grid_ref="vert_sum" />
+       <field id="ZDP_CHN"      long_name="Non-diatom Chl-a Kz Diffusive Trend"               unit="mg-Chl/m3/s" />
+       <field id="ZDP_CHN_E3T"  long_name="ZDP_CHN * E3T"                                     unit="mg-Chl/m2/s" > ZDP_CHN * e3t </field>
+       <field id="ZDP_CHN_INV"  field_ref="ZDP_CHN_E3T" long_name="ZDP_CHN Inventory"         unit="mg-Chl/m2/s" grid_ref="vert_sum" />
+       <field id="ZDP_CHD"      long_name="Diatom Chl-a Kz Diffusive Trend"                   unit="mg-Chl/m3/s" />
+       <field id="ZDP_CHD_E3T"  long_name="ZDP_CHD * E3T"                                     unit="mg-Chl/m2/s" > ZDP_CHD * e3t </field>
+       <field id="ZDP_CHD_INV"  field_ref="ZDP_CHD_E3T" long_name="ZDP_CHD Inventory"         unit="mg-Chl/m2/s" grid_ref="vert_sum" />
        <field id="ZDP_PHN"      long_name="non-diatom phytoplankton Kz Diffusive Trend"       unit="mmol-N/m3/s" />
        <field id="ZDP_PHN_E3T"  long_name="ZDP_PHN * E3T"                                     unit="mmol-N/m2/s" > ZDP_PHN * e3t </field>
@@ -1022,16 +1035,16 @@
        <field id="ZDP_DIN_E3T"  long_name="ZDP_DIN * E3T"                                     unit="mmol-N/m2/s" > ZDP_DIN * e3t </field>
        <field id="ZDP_DIN_INV"  field_ref="ZDP_DIN_E3T" long_name="ZDP_DIN Inventory"         unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="ZDP_SIL"      long_name="dissolved silicic acid Kz Diffusive Trend"         unit="mmolSi/m3/s" />
-       <field id="ZDP_SIL_E3T"  long_name="ZDP_SIL * E3T"                                     unit="mmolSi/m2/s" > ZDP_SIL * e3t </field>
-       <field id="ZDP_SIL_INV"  field_ref="ZDP_SIL_E3T" long_name="ZDP_SIL Inventory"         unit="mmolSi/m2/s" grid_ref="vert_sum" />
-       <field id="ZDP_FER"      long_name="dissolved iron Kz Diffusive Trend"                 unit="mmolFe/m3/s" />
-       <field id="ZDP_FER_E3T"  long_name="ZDP_FER * E3T"                                     unit="mmolFe/m2/s" > ZDP_FER * e3t </field>
-       <field id="ZDP_FER_INV"  field_ref="ZDP_FER_E3T" long_name="ZDP_FER Inventory"         unit="mmolFe/m2/s" grid_ref="vert_sum" />
+       <field id="ZDP_SIL"      long_name="dissolved silicic acid Kz Diffusive Trend"         unit="mmol-Si/m3/s" />
+       <field id="ZDP_SIL_E3T"  long_name="ZDP_SIL * E3T"                                     unit="mmol-Si/m2/s" > ZDP_SIL * e3t </field>
+       <field id="ZDP_SIL_INV"  field_ref="ZDP_SIL_E3T" long_name="ZDP_SIL Inventory"         unit="mmol-Si/m2/s" grid_ref="vert_sum" />
+       <field id="ZDP_FER"      long_name="dissolved iron Kz Diffusive Trend"                 unit="mmol-Fe/m3/s" />
+       <field id="ZDP_FER_E3T"  long_name="ZDP_FER * E3T"                                     unit="mmol-Fe/m2/s" > ZDP_FER * e3t </field>
+       <field id="ZDP_FER_INV"  field_ref="ZDP_FER_E3T" long_name="ZDP_FER Inventory"         unit="mmol-Fe/m2/s" grid_ref="vert_sum" />
        <field id="ZDP_DET"      long_name="detrital nitrogen Kz Diffusive Trend"              unit="mmol-N/m3/s" />
        <field id="ZDP_DET_E3T"  long_name="ZDP_DET * E3T"                                     unit="mmol-N/m2/s" > ZDP_DET * e3t </field>
        <field id="ZDP_DET_INV"  field_ref="ZDP_DET_E3T" long_name="ZDP_DET Inventory"         unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="ZDP_PDS"      long_name="Diatoms biogenic silicon Kz Diffusive Trend"       unit="mmolSi/m3/s" />
-       <field id="ZDP_PDS_E3T"  long_name="ZDP_PDS * E3T"                                     unit="mmolSi/m2/s" > ZDP_PDS * e3t </field>
-       <field id="ZDP_PDS_INV"  field_ref="ZDP_PDS_E3T" long_name="ZDP_PDS Inventory"         unit="mmolSi/m2/s" grid_ref="vert_sum" />
+       <field id="ZDP_PDS"      long_name="Diatoms biogenic silicon Kz Diffusive Trend"       unit="mmol-Si/m3/s" />
+       <field id="ZDP_PDS_E3T"  long_name="ZDP_PDS * E3T"                                     unit="mmol-Si/m2/s" > ZDP_PDS * e3t </field>
+       <field id="ZDP_PDS_INV"  field_ref="ZDP_PDS_E3T" long_name="ZDP_PDS Inventory"         unit="mmol-Si/m2/s" grid_ref="vert_sum" />
        <field id="ZDP_DTC"      long_name="detrital carbon Kz Diffusive Trend"                unit="mmol-C/m3/s" />
        <field id="ZDP_DTC_E3T"  long_name="ZDP_DTC * E3T"                                     unit="mmol-C/m2/s" > ZDP_DTC * e3t </field>
@@ -1043,14 +1056,14 @@
        <field id="ZDP_ALK_E3T"  long_name="ZDP_ALK * E3T"                                     unit="meq/m2/s"    > ZDP_ALK * e3t </field>
        <field id="ZDP_ALK_INV"  field_ref="ZDP_ALK_E3T" long_name="ZDP_ALK Inventory"         unit="meq/m2/s" grid_ref="vert_sum" />
-       <field id="ZDP_OXY"      long_name="dissolved oxygen Kz Diffusive Trend"               unit="mmolO2/m3/s" />
-       <field id="ZDP_OXY_E3T"  long_name="ZDP_OXY * E3T"                                     unit="mmolO2/m2/s" > ZDP_OXY * e3t </field>
-       <field id="ZDP_OXY_INV"  field_ref="ZDP_OXY_E3T" long_name="ZDP_OXY Inventory"         unit="mmolO2/m2/s" grid_ref="vert_sum" />
+       <field id="ZDP_OXY"      long_name="dissolved oxygen Kz Diffusive Trend"               unit="mmol-O2/m3/s" />
+       <field id="ZDP_OXY_E3T"  long_name="ZDP_OXY * E3T"                                     unit="mmol-O2/m2/s" > ZDP_OXY * e3t </field>
+       <field id="ZDP_OXY_INV"  field_ref="ZDP_OXY_E3T" long_name="ZDP_OXY Inventory"         unit="mmol-O2/m2/s" grid_ref="vert_sum" />
        <!-- trd case: jptra_dmp -->
-       <field id="DMP_CHN"      long_name="Non-diatom Chl-a Damping Trend"                    unit="mg Chl/m3/s" />
-       <field id="DMP_CHN_E3T"  long_name="DMP_CHN * E3T"                                     unit="mg Chl/m2/s" > DMP_CHN * e3t </field>
-       <field id="DMP_CHN_INV"  field_ref="DMP_CHN_E3T" long_name="DMP_CHN Inventory"         unit="mg Chl/m2/s" grid_ref="vert_sum" />
-       <field id="DMP_CHD"      long_name="Diatom Chl-a Damping Trend"                        unit="mg Chl/m3/s" />
-       <field id="DMP_CHD_E3T"  long_name="DMP_CHD * E3T"                                     unit="mg Chl/m2/s" > DMP_CHD * e3t </field>
-       <field id="DMP_CHD_INV"  field_ref="DMP_CHD_E3T" long_name="DMP_CHD Inventory"         unit="mg Chl/m2/s" grid_ref="vert_sum" />
+       <field id="DMP_CHN"      long_name="Non-diatom Chl-a Damping Trend"                    unit="mg-Chl/m3/s" />
+       <field id="DMP_CHN_E3T"  long_name="DMP_CHN * E3T"                                     unit="mg-Chl/m2/s" > DMP_CHN * e3t </field>
+       <field id="DMP_CHN_INV"  field_ref="DMP_CHN_E3T" long_name="DMP_CHN Inventory"         unit="mg-Chl/m2/s" grid_ref="vert_sum" />
+       <field id="DMP_CHD"      long_name="Diatom Chl-a Damping Trend"                        unit="mg-Chl/m3/s" />
+       <field id="DMP_CHD_E3T"  long_name="DMP_CHD * E3T"                                     unit="mg-Chl/m2/s" > DMP_CHD * e3t </field>
+       <field id="DMP_CHD_INV"  field_ref="DMP_CHD_E3T" long_name="DMP_CHD Inventory"         unit="mg-Chl/m2/s" grid_ref="vert_sum" />
        <field id="DMP_PHN"      long_name="non-diatom phytoplankton Damping Trend"            unit="mmol-N/m3/s" />
        <field id="DMP_PHN_E3T"  long_name="DMP_PHN * E3T"                                     unit="mmol-N/m2/s" > DMP_PHN * e3t </field>
@@ -1068,16 +1081,16 @@
        <field id="DMP_DIN_E3T"  long_name="DMP_DIN * E3T"                                     unit="mmol-N/m2/s" > DMP_DIN * e3t </field>
        <field id="DMP_DIN_INV"  field_ref="DMP_DIN_E3T" long_name="DMP_DIN Inventory"         unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="DMP_SIL"      long_name="dissolved silicic acid Damping Trend"              unit="mmolSi/m3/s" />
-       <field id="DMP_SIL_E3T"  long_name="DMP_SIL * E3T"                                     unit="mmolSi/m2/s" > DMP_SIL * e3t </field>
-       <field id="DMP_SIL_INV"  field_ref="DMP_SIL_E3T" long_name="DMP_SIL Inventory"         unit="mmolSi/m2/s" grid_ref="vert_sum" />
-       <field id="DMP_FER"      long_name="dissolved iron Damping Trend"                      unit="mmolFe/m3/s" />
-       <field id="DMP_FER_E3T"  long_name="DMP_FER * E3T"                                     unit="mmolFe/m2/s" > DMP_FER * e3t </field>
-       <field id="DMP_FER_INV"  field_ref="DMP_FER_E3T" long_name="DMP_FER Inventory"         unit="mmolFe/m2/s" grid_ref="vert_sum" />
+       <field id="DMP_SIL"      long_name="dissolved silicic acid Damping Trend"              unit="mmol-Si/m3/s" />
+       <field id="DMP_SIL_E3T"  long_name="DMP_SIL * E3T"                                     unit="mmol-Si/m2/s" > DMP_SIL * e3t </field>
+       <field id="DMP_SIL_INV"  field_ref="DMP_SIL_E3T" long_name="DMP_SIL Inventory"         unit="mmol-Si/m2/s" grid_ref="vert_sum" />
+       <field id="DMP_FER"      long_name="dissolved iron Damping Trend"                      unit="mmol-Fe/m3/s" />
+       <field id="DMP_FER_E3T"  long_name="DMP_FER * E3T"                                     unit="mmol-Fe/m2/s" > DMP_FER * e3t </field>
+       <field id="DMP_FER_INV"  field_ref="DMP_FER_E3T" long_name="DMP_FER Inventory"         unit="mmol-Fe/m2/s" grid_ref="vert_sum" />
        <field id="DMP_DET"      long_name="detrital nitrogen Damping Trend"                   unit="mmol-N/m3/s" />
        <field id="DMP_DET_E3T"  long_name="DMP_DET * E3T"                                     unit="mmol-N/m2/s" > DMP_DET * e3t </field>
        <field id="DMP_DET_INV"  field_ref="DMP_DET_E3T" long_name="DMP_DET Inventory"         unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="DMP_PDS"      long_name="Diatoms biogenic silicon Damping Trend"            unit="mmolSi/m3/s" />
-       <field id="DMP_PDS_E3T"  long_name="DMP_PDS * E3T"                                     unit="mmolSi/m2/s" > DMP_PDS * e3t </field>
-       <field id="DMP_PDS_INV"  field_ref="DMP_PDS_E3T" long_name="DMP_PDS Inventory"         unit="mmolSi/m2/s" grid_ref="vert_sum" />
+       <field id="DMP_PDS"      long_name="Diatoms biogenic silicon Damping Trend"            unit="mmol-Si/m3/s" />
+       <field id="DMP_PDS_E3T"  long_name="DMP_PDS * E3T"                                     unit="mmol-Si/m2/s" > DMP_PDS * e3t </field>
+       <field id="DMP_PDS_INV"  field_ref="DMP_PDS_E3T" long_name="DMP_PDS Inventory"         unit="mmol-Si/m2/s" grid_ref="vert_sum" />
        <field id="DMP_DTC"      long_name="detrital carbon Damping Trend"                     unit="mmol-C/m3/s" />
        <field id="DMP_DTC_E3T"  long_name="DMP_DTC * E3T"                                     unit="mmol-C/m2/s" > DMP_DTC * e3t </field>
@@ -1089,14 +1102,14 @@
        <field id="DMP_ALK_E3T"  long_name="DMP_ALK * E3T"                                     unit="meq/m2/s"    > DMP_ALK * e3t </field>
        <field id="DMP_ALK_INV"  field_ref="DMP_ALK_E3T" long_name="DMP_ALK Inventory"         unit="meq/m2/s" grid_ref="vert_sum" />
-       <field id="DMP_OXY"      long_name="dissolved oxygen Damping Trend"                    unit="mmolO2/m3/s" />
-       <field id="DMP_OXY_E3T"  long_name="DMP_OXY * E3T"                                     unit="mmolO2/m2/s" > DMP_OXY * e3t </field>
-       <field id="DMP_OXY_INV"  field_ref="DMP_OXY_E3T" long_name="DMP_OXY Inventory"         unit="mmolO2/m2/s" grid_ref="vert_sum" />
+       <field id="DMP_OXY"      long_name="dissolved oxygen Damping Trend"                    unit="mmol-O2/m3/s" />
+       <field id="DMP_OXY_E3T"  long_name="DMP_OXY * E3T"                                     unit="mmol-O2/m2/s" > DMP_OXY * e3t </field>
+       <field id="DMP_OXY_INV"  field_ref="DMP_OXY_E3T" long_name="DMP_OXY Inventory"         unit="mmol-O2/m2/s" grid_ref="vert_sum" />
        <!-- trd case: jptra_sms -->
-       <field id="SMS_CHN"      long_name="Non-diatom Chl-a Sources Minus Sinks Trend"             unit="mg Chl/m3/s" />
-       <field id="SMS_CHN_E3T"  long_name="SMS_CHN * E3T"                                          unit="mg Chl/m2/s" > SMS_CHN * e3t </field>
-       <field id="SMS_CHN_INV"  field_ref="SMS_CHN_E3T" long_name="SMS_CHN Inventory"              unit="mg Chl/m2/s" grid_ref="vert_sum" />
-       <field id="SMS_CHD"      long_name="Diatom Chl-a Sources Minus Sinks Trend"                 unit="mg Chl/m3/s" />
-       <field id="SMS_CHD_E3T"  long_name="SMS_CHD * E3T"                                          unit="mg Chl/m2/s" > SMS_CHD * e3t </field>
-       <field id="SMS_CHD_INV"  field_ref="SMS_CHD_E3T" long_name="SMS_CHD Inventory"              unit="mg Chl/m2/s" grid_ref="vert_sum" />
+       <field id="SMS_CHN"      long_name="Non-diatom Chl-a Sources Minus Sinks Trend"             unit="mg-Chl/m3/s" />
+       <field id="SMS_CHN_E3T"  long_name="SMS_CHN * E3T"                                          unit="mg-Chl/m2/s" > SMS_CHN * e3t </field>
+       <field id="SMS_CHN_INV"  field_ref="SMS_CHN_E3T" long_name="SMS_CHN Inventory"              unit="mg-Chl/m2/s" grid_ref="vert_sum" />
+       <field id="SMS_CHD"      long_name="Diatom Chl-a Sources Minus Sinks Trend"                 unit="mg-Chl/m3/s" />
+       <field id="SMS_CHD_E3T"  long_name="SMS_CHD * E3T"                                          unit="mg-Chl/m2/s" > SMS_CHD * e3t </field>
+       <field id="SMS_CHD_INV"  field_ref="SMS_CHD_E3T" long_name="SMS_CHD Inventory"              unit="mg-Chl/m2/s" grid_ref="vert_sum" />
        <field id="SMS_PHN"      long_name="non-diatom phytoplankton Sources Minus Sinks Trend"     unit="mmol-N/m3/s" />
        <field id="SMS_PHN_E3T"  long_name="SMS_PHN * E3T"                                          unit="mmol-N/m2/s" > SMS_PHN * e3t </field>
@@ -1114,16 +1127,16 @@
        <field id="SMS_DIN_E3T"  long_name="SMS_DIN * E3T"                                          unit="mmol-N/m2/s" > SMS_DIN * e3t </field>
        <field id="SMS_DIN_INV"  field_ref="SMS_DIN_E3T" long_name="SMS_DIN Inventory"              unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="SMS_SIL"      long_name="dissolved silicic acid Sources Minus Sinks Trend"       unit="mmolSi/m3/s" />
-       <field id="SMS_SIL_E3T"  long_name="SMS_SIL * E3T"                                          unit="mmolSi/m2/s" > SMS_SIL * e3t </field>
-       <field id="SMS_SIL_INV"  field_ref="SMS_SIL_E3T" long_name="SMS_SIL Inventory"              unit="mmolSi/m2/s" grid_ref="vert_sum" />
-       <field id="SMS_FER"      long_name="dissolved iron Sources Minus Sinks Trend"               unit="mmolFe/m3/s" />
-       <field id="SMS_FER_E3T"  long_name="SMS_FER * E3T"                                          unit="mmolFe/m2/s" > SMS_FER * e3t </field>
-       <field id="SMS_FER_INV"  field_ref="SMS_FER_E3T" long_name="SMS_FER Inventory"              unit="mmolFe/m2/s" grid_ref="vert_sum" />
+       <field id="SMS_SIL"      long_name="dissolved silicic acid Sources Minus Sinks Trend"       unit="mmol-Si/m3/s" />
+       <field id="SMS_SIL_E3T"  long_name="SMS_SIL * E3T"                                          unit="mmol-Si/m2/s" > SMS_SIL * e3t </field>
+       <field id="SMS_SIL_INV"  field_ref="SMS_SIL_E3T" long_name="SMS_SIL Inventory"              unit="mmol-Si/m2/s" grid_ref="vert_sum" />
+       <field id="SMS_FER"      long_name="dissolved iron Sources Minus Sinks Trend"               unit="mmol-Fe/m3/s" />
+       <field id="SMS_FER_E3T"  long_name="SMS_FER * E3T"                                          unit="mmol-Fe/m2/s" > SMS_FER * e3t </field>
+       <field id="SMS_FER_INV"  field_ref="SMS_FER_E3T" long_name="SMS_FER Inventory"              unit="mmol-Fe/m2/s" grid_ref="vert_sum" />
        <field id="SMS_DET"      long_name="detrital nitrogen Sources Minus Sinks Trend"            unit="mmol-N/m3/s" />
        <field id="SMS_DET_E3T"  long_name="SMS_DET * E3T"                                          unit="mmol-N/m2/s" > SMS_DET * e3t </field>
        <field id="SMS_DET_INV"  field_ref="SMS_DET_E3T" long_name="SMS_DET Inventory"              unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="SMS_PDS"      long_name="Diatoms biogenic silicon Sources Minus Sinks Trend"     unit="mmolSi/m3/s" />
-       <field id="SMS_PDS_E3T"  long_name="SMS_PDS * E3T"                                          unit="mmolSi/m2/s" > SMS_PDS * e3t </field>
-       <field id="SMS_PDS_INV"  field_ref="SMS_PDS_E3T" long_name="SMS_PDS Inventory"              unit="mmolSi/m2/s" grid_ref="vert_sum" />
+       <field id="SMS_PDS"      long_name="Diatoms biogenic silicon Sources Minus Sinks Trend"     unit="mmol-Si/m3/s" />
+       <field id="SMS_PDS_E3T"  long_name="SMS_PDS * E3T"                                          unit="mmol-Si/m2/s" > SMS_PDS * e3t </field>
+       <field id="SMS_PDS_INV"  field_ref="SMS_PDS_E3T" long_name="SMS_PDS Inventory"              unit="mmol-Si/m2/s" grid_ref="vert_sum" />
        <field id="SMS_DTC"      long_name="detrital carbon Sources Minus Sinks Trend"              unit="mmol-C/m3/s" />
        <field id="SMS_DTC_E3T"  long_name="SMS_DTC * E3T"                                          unit="mmol-C/m2/s" > SMS_DTC * e3t </field>
@@ -1135,14 +1148,14 @@
        <field id="SMS_ALK_E3T"  long_name="SMS_ALK * E3T"                                          unit="meq/m2/s"    > SMS_ALK * e3t </field>
        <field id="SMS_ALK_INV"  field_ref="SMS_ALK_E3T" long_name="SMS_ALK Inventory"              unit="meq/m2/s" grid_ref="vert_sum" />
-       <field id="SMS_OXY"      long_name="dissolved oxygen Sources Minus Sinks Trend"             unit="mmolO2/m3/s" />
-       <field id="SMS_OXY_E3T"  long_name="SMS_OXY * E3T"                                          unit="mmolO2/m2/s" > SMS_OXY * e3t </field>
-       <field id="SMS_OXY_INV"  field_ref="SMS_OXY_E3T" long_name="SMS_OXY Inventory"              unit="mmolO2/m2/s" grid_ref="vert_sum" />
+       <field id="SMS_OXY"      long_name="dissolved oxygen Sources Minus Sinks Trend"             unit="mmol-O2/m3/s" />
+       <field id="SMS_OXY_E3T"  long_name="SMS_OXY * E3T"                                          unit="mmol-O2/m2/s" > SMS_OXY * e3t </field>
+       <field id="SMS_OXY_INV"  field_ref="SMS_OXY_E3T" long_name="SMS_OXY Inventory"              unit="mmol-O2/m2/s" grid_ref="vert_sum" />
        <!-- trd case: jptra_radb -->
-       <field id="RDB_CHN"      long_name="Non-diatom Chl-a-b negative values correction trend"             unit="mg Chl/m3/s" />
-       <field id="RDB_CHN_E3T"  long_name="RDB_CHN * E3T"                                                   unit="mg Chl/m2/s" > RDB_CHN * e3t </field>
-       <field id="RDB_CHN_INV"  field_ref="RDB_CHN_E3T" long_name="RDB_CHN Inventory"                       unit="mg Chl/m2/s" grid_ref="vert_sum" />
-       <field id="RDB_CHD"      long_name="Diatom Chl-a-b negative values correction trend"                 unit="mg Chl/m3/s" />
-       <field id="RDB_CHD_E3T"  long_name="RDB_CHD * E3T"                                                   unit="mg Chl/m2/s" > RDB_CHD * e3t </field>
-       <field id="RDB_CHD_INV"  field_ref="RDB_CHD_E3T" long_name="RDB_CHD Inventory"                       unit="mg Chl/m2/s" grid_ref="vert_sum" />
+       <field id="RDB_CHN"      long_name="Non-diatom Chl-a-b negative values correction trend"             unit="mg-Chl/m3/s" />
+       <field id="RDB_CHN_E3T"  long_name="RDB_CHN * E3T"                                                   unit="mg-Chl/m2/s" > RDB_CHN * e3t </field>
+       <field id="RDB_CHN_INV"  field_ref="RDB_CHN_E3T" long_name="RDB_CHN Inventory"                       unit="mg-Chl/m2/s" grid_ref="vert_sum" />
+       <field id="RDB_CHD"      long_name="Diatom Chl-a-b negative values correction trend"                 unit="mg-Chl/m3/s" />
+       <field id="RDB_CHD_E3T"  long_name="RDB_CHD * E3T"                                                   unit="mg-Chl/m2/s" > RDB_CHD * e3t </field>
+       <field id="RDB_CHD_INV"  field_ref="RDB_CHD_E3T" long_name="RDB_CHD Inventory"                       unit="mg-Chl/m2/s" grid_ref="vert_sum" />
        <field id="RDB_PHN"      long_name="non-diatom phytoplankton-b negative values correction trend"     unit="mmol-N/m3/s" />
        <field id="RDB_PHN_E3T"  long_name="RDB_PHN * E3T"                                                   unit="mmol-N/m2/s" > RDB_PHN * e3t </field>
@@ -1160,16 +1173,16 @@
        <field id="RDB_DIN_E3T"  long_name="RDB_DIN * E3T"                                                   unit="mmol-N/m2/s" > RDB_DIN * e3t </field>
        <field id="RDB_DIN_INV"  field_ref="RDB_DIN_E3T" long_name="RDB_DIN Inventory"                       unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="RDB_SIL"      long_name="dissolved silicic acid-b negative values correction trend"       unit="mmolSi/m3/s" />
-       <field id="RDB_SIL_E3T"  long_name="RDB_SIL * E3T"                                                   unit="mmolSi/m2/s" > RDB_SIL * e3t </field>
-       <field id="RDB_SIL_INV"  field_ref="RDB_SIL_E3T" long_name="RDB_SIL Inventory"                       unit="mmolSi/m2/s" grid_ref="vert_sum" />
-       <field id="RDB_FER"      long_name="dissolved iron-b negative values correction trend"               unit="mmolFe/m3/s" />
-       <field id="RDB_FER_E3T"  long_name="RDB_FER * E3T"                                                   unit="mmolFe/m2/s" > RDB_FER * e3t </field>
-       <field id="RDB_FER_INV"  field_ref="RDB_FER_E3T" long_name="RDB_FER Inventory"                       unit="mmolFe/m2/s" grid_ref="vert_sum" />
+       <field id="RDB_SIL"      long_name="dissolved silicic acid-b negative values correction trend"       unit="mmol-Si/m3/s" />
+       <field id="RDB_SIL_E3T"  long_name="RDB_SIL * E3T"                                                   unit="mmol-Si/m2/s" > RDB_SIL * e3t </field>
+       <field id="RDB_SIL_INV"  field_ref="RDB_SIL_E3T" long_name="RDB_SIL Inventory"                       unit="mmol-Si/m2/s" grid_ref="vert_sum" />
+       <field id="RDB_FER"      long_name="dissolved iron-b negative values correction trend"               unit="mmol-Fe/m3/s" />
+       <field id="RDB_FER_E3T"  long_name="RDB_FER * E3T"                                                   unit="mmol-Fe/m2/s" > RDB_FER * e3t </field>
+       <field id="RDB_FER_INV"  field_ref="RDB_FER_E3T" long_name="RDB_FER Inventory"                       unit="mmol-Fe/m2/s" grid_ref="vert_sum" />
        <field id="RDB_DET"      long_name="detrital nitrogen-b negative values correction trend"            unit="mmol-N/m3/s" />
        <field id="RDB_DET_E3T"  long_name="RDB_DET * E3T"                                                   unit="mmol-N/m2/s" > RDB_DET * e3t </field>
        <field id="RDB_DET_INV"  field_ref="RDB_DET_E3T" long_name="RDB_DET Inventory"                       unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="RDB_PDS"      long_name="Diatoms biogenic silicon-b negative values correction trend"     unit="mmolSi/m3/s" />
-       <field id="RDB_PDS_E3T"  long_name="RDB_PDS * E3T"                                                   unit="mmolSi/m2/s" > RDB_PDS * e3t </field>
-       <field id="RDB_PDS_INV"  field_ref="RDB_PDS_E3T" long_name="RDB_PDS Inventory"                       unit="mmolSi/m2/s" grid_ref="vert_sum" />
+       <field id="RDB_PDS"      long_name="Diatoms biogenic silicon-b negative values correction trend"     unit="mmol-Si/m3/s" />
+       <field id="RDB_PDS_E3T"  long_name="RDB_PDS * E3T"                                                   unit="mmol-Si/m2/s" > RDB_PDS * e3t </field>
+       <field id="RDB_PDS_INV"  field_ref="RDB_PDS_E3T" long_name="RDB_PDS Inventory"                       unit="mmol-Si/m2/s" grid_ref="vert_sum" />
        <field id="RDB_DTC"      long_name="detrital carbon-b negative values correction trend"              unit="mmol-C/m3/s" />
        <field id="RDB_DTC_E3T"  long_name="RDB_DTC * E3T"                                                   unit="mmol-C/m2/s" > RDB_DTC * e3t </field>
@@ -1181,14 +1194,14 @@
        <field id="RDB_ALK_E3T"  long_name="RDB_ALK * E3T"                                                   unit="meq/m2/s"    > RDB_ALK * e3t </field>
        <field id="RDB_ALK_INV"  field_ref="RDB_ALK_E3T" long_name="RDB_ALK Inventory"                       unit="meq/m2/s" grid_ref="vert_sum" />
-       <field id="RDB_OXY"      long_name="dissolved oxygen-b negative values correction trend"             unit="mmolO2/m3/s" />
-       <field id="RDB_OXY_E3T"  long_name="RDB_OXY * E3T"                                                   unit="mmolO2/m2/s" > RDB_OXY * e3t </field>
-       <field id="RDB_OXY_INV"  field_ref="RDB_OXY_E3T" long_name="RDB_OXY Inventory"                       unit="mmolO2/m2/s" grid_ref="vert_sum" />
+       <field id="RDB_OXY"      long_name="dissolved oxygen-b negative values correction trend"             unit="mmol-O2/m3/s" />
+       <field id="RDB_OXY_E3T"  long_name="RDB_OXY * E3T"                                                   unit="mmol-O2/m2/s" > RDB_OXY * e3t </field>
+       <field id="RDB_OXY_INV"  field_ref="RDB_OXY_E3T" long_name="RDB_OXY Inventory"                       unit="mmol-O2/m2/s" grid_ref="vert_sum" />
        <!-- trd case: jptra_radn -->
-       <field id="RDN_CHN"      long_name="Non-diatom Chl-a-n negative values correction trend"             unit="mg Chl/m3/s" />
-       <field id="RDN_CHN_E3T"  long_name="RDN_CHN * E3T"                                                   unit="mg Chl/m2/s" > RDN_CHN * e3t </field>
-       <field id="RDN_CHN_INV"  field_ref="RDN_CHN_E3T" long_name="RDN_CHN Inventory"                       unit="mg Chl/m2/s" grid_ref="vert_sum" />
-       <field id="RDN_CHD"      long_name="Diatom Chl-a-n negative values correction trend"                 unit="mg Chl/m3/s" />
-       <field id="RDN_CHD_E3T"  long_name="RDN_CHD * E3T"                                                   unit="mg Chl/m2/s" > RDN_CHD * e3t </field>
-       <field id="RDN_CHD_INV"  field_ref="RDN_CHD_E3T" long_name="RDN_CHD Inventory"                       unit="mg Chl/m2/s" grid_ref="vert_sum" />
+       <field id="RDN_CHN"      long_name="Non-diatom Chl-a-n negative values correction trend"             unit="mg-Chl/m3/s" />
+       <field id="RDN_CHN_E3T"  long_name="RDN_CHN * E3T"                                                   unit="mg-Chl/m2/s" > RDN_CHN * e3t </field>
+       <field id="RDN_CHN_INV"  field_ref="RDN_CHN_E3T" long_name="RDN_CHN Inventory"                       unit="mg-Chl/m2/s" grid_ref="vert_sum" />
+       <field id="RDN_CHD"      long_name="Diatom Chl-a-n negative values correction trend"                 unit="mg-Chl/m3/s" />
+       <field id="RDN_CHD_E3T"  long_name="RDN_CHD * E3T"                                                   unit="mg-Chl/m2/s" > RDN_CHD * e3t </field>
+       <field id="RDN_CHD_INV"  field_ref="RDN_CHD_E3T" long_name="RDN_CHD Inventory"                       unit="mg-Chl/m2/s" grid_ref="vert_sum" />
        <field id="RDN_PHN"      long_name="non-diatom phytoplankton-n negative values correction trend"     unit="mmol-N/m3/s" />
        <field id="RDN_PHN_E3T"  long_name="RDN_PHN * E3T"                                                   unit="mmol-N/m2/s" > RDN_PHN * e3t </field>
@@ -1206,16 +1219,16 @@
        <field id="RDN_DIN_E3T"  long_name="RDN_DIN * E3T"                                                   unit="mmol-N/m2/s" > RDN_DIN * e3t </field>
        <field id="RDN_DIN_INV"  field_ref="RDN_DIN_E3T" long_name="RDN_DIN Inventory"                       unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="RDN_SIL"      long_name="dissolved silicic acid-n negative values correction trend"       unit="mmolSi/m3/s" />
-       <field id="RDN_SIL_E3T"  long_name="RDN_SIL * E3T"                                                   unit="mmolSi/m2/s" > RDN_SIL * e3t </field>
-       <field id="RDN_SIL_INV"  field_ref="RDN_SIL_E3T" long_name="RDN_SIL Inventory"                       unit="mmolSi/m2/s" grid_ref="vert_sum" />
-       <field id="RDN_FER"      long_name="dissolved iron-n negative values correction trend"               unit="mmolFe/m3/s" />
-       <field id="RDN_FER_E3T"  long_name="RDN_FER * E3T"                                                   unit="mmolFe/m2/s" > RDN_FER * e3t </field>
-       <field id="RDN_FER_INV"  field_ref="RDN_FER_E3T" long_name="RDN_FER Inventory"                       unit="mmolFe/m2/s" grid_ref="vert_sum" />
+       <field id="RDN_SIL"      long_name="dissolved silicic acid-n negative values correction trend"       unit="mmol-Si/m3/s" />
+       <field id="RDN_SIL_E3T"  long_name="RDN_SIL * E3T"                                                   unit="mmol-Si/m2/s" > RDN_SIL * e3t </field>
+       <field id="RDN_SIL_INV"  field_ref="RDN_SIL_E3T" long_name="RDN_SIL Inventory"                       unit="mmol-Si/m2/s" grid_ref="vert_sum" />
+       <field id="RDN_FER"      long_name="dissolved iron-n negative values correction trend"               unit="mmol-Fe/m3/s" />
+       <field id="RDN_FER_E3T"  long_name="RDN_FER * E3T"                                                   unit="mmol-Fe/m2/s" > RDN_FER * e3t </field>
+       <field id="RDN_FER_INV"  field_ref="RDN_FER_E3T" long_name="RDN_FER Inventory"                       unit="mmol-Fe/m2/s" grid_ref="vert_sum" />
        <field id="RDN_DET"      long_name="detrital nitrogen-n negative values correction trend"            unit="mmol-N/m3/s" />
        <field id="RDN_DET_E3T"  long_name="RDN_DET * E3T"                                                   unit="mmol-N/m2/s" > RDN_DET * e3t </field>
        <field id="RDN_DET_INV"  field_ref="RDN_DET_E3T" long_name="RDN_DET Inventory"                       unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="RDN_PDS"      long_name="Diatoms biogenic silicon-n negative values correction trend"     unit="mmolSi/m3/s" />
-       <field id="RDN_PDS_E3T"  long_name="RDN_PDS * E3T"                                                   unit="mmolSi/m2/s" > RDN_PDS * e3t </field>
-       <field id="RDN_PDS_INV"  field_ref="RDN_PDS_E3T" long_name="RDN_PDS Inventory"                       unit="mmolSi/m2/s" grid_ref="vert_sum" />
+       <field id="RDN_PDS"      long_name="Diatoms biogenic silicon-n negative values correction trend"     unit="mmol-Si/m3/s" />
+       <field id="RDN_PDS_E3T"  long_name="RDN_PDS * E3T"                                                   unit="mmol-Si/m2/s" > RDN_PDS * e3t </field>
+       <field id="RDN_PDS_INV"  field_ref="RDN_PDS_E3T" long_name="RDN_PDS Inventory"                       unit="mmol-Si/m2/s" grid_ref="vert_sum" />
        <field id="RDN_DTC"      long_name="detrital carbon-n negative values correction trend"              unit="mmol-C/m3/s" />
        <field id="RDN_DTC_E3T"  long_name="RDN_DTC * E3T"                                                   unit="mmol-C/m2/s" > RDN_DTC * e3t </field>
@@ -1227,14 +1240,14 @@
        <field id="RDN_ALK_E3T"  long_name="RDN_ALK * E3T"                                                   unit="meq/m2/s"    > RDN_ALK * e3t </field>
        <field id="RDN_ALK_INV"  field_ref="RDN_ALK_E3T" long_name="RDN_ALK Inventory"                       unit="meq/m2/s" grid_ref="vert_sum" />
-       <field id="RDN_OXY"      long_name="dissolved oxygen-n negative values correction trend"             unit="mmolO2/m3/s" />
-       <field id="RDN_OXY_E3T"  long_name="RDN_OXY * E3T"                                                   unit="mmolO2/m2/s" > RDN_OXY * e3t </field>
-       <field id="RDN_OXY_INV"  field_ref="RDN_OXY_E3T" long_name="RDN_OXY Inventory"                       unit="mmolO2/m2/s" grid_ref="vert_sum" />
+       <field id="RDN_OXY"      long_name="dissolved oxygen-n negative values correction trend"             unit="mmol-O2/m3/s" />
+       <field id="RDN_OXY_E3T"  long_name="RDN_OXY * E3T"                                                   unit="mmol-O2/m2/s" > RDN_OXY * e3t </field>
+       <field id="RDN_OXY_INV"  field_ref="RDN_OXY_E3T" long_name="RDN_OXY Inventory"                       unit="mmol-O2/m2/s" grid_ref="vert_sum" />
        <!-- trd case: jptra_iso -->
-       <field id="ISO_CHN"      long_name="Non-diatom Chl-a Isopycnal Mixing Trend"             unit="mg Chl/m3/s" > LDF_CHN + ZDF_CHN - ZDP_CHN  </field>
-       <field id="ISO_CHN_E3T"  long_name="ISO_CHN * E3T"                                       unit="mg Chl/m2/s" > ISO_CHN * e3t </field>
-       <field id="ISO_CHN_INV"  field_ref="ISO_CHN_E3T" long_name="ISO_CHN Inventory"           unit="mg Chl/m2/s" grid_ref="vert_sum" />
-       <field id="ISO_CHD"      long_name="Diatom Chl-a Isopycnal Mixing Trend"                 unit="mg Chl/m3/s" > LDF_CHD + ZDF_CHD - ZDP_CHD  </field>
-       <field id="ISO_CHD_E3T"  long_name="ISO_CHD * E3T"                                       unit="mg Chl/m2/s" > ISO_CHD * e3t </field>
-       <field id="ISO_CHD_INV"  field_ref="ISO_CHD_E3T" long_name="ISO_CHD Inventory"           unit="mg Chl/m2/s" grid_ref="vert_sum" />
+       <field id="ISO_CHN"      long_name="Non-diatom Chl-a Isopycnal Mixing Trend"             unit="mg-Chl/m3/s" > LDF_CHN + ZDF_CHN - ZDP_CHN  </field>
+       <field id="ISO_CHN_E3T"  long_name="ISO_CHN * E3T"                                       unit="mg-Chl/m2/s" > ISO_CHN * e3t </field>
+       <field id="ISO_CHN_INV"  field_ref="ISO_CHN_E3T" long_name="ISO_CHN Inventory"           unit="mg-Chl/m2/s" grid_ref="vert_sum" />
+       <field id="ISO_CHD"      long_name="Diatom Chl-a Isopycnal Mixing Trend"                 unit="mg-Chl/m3/s" > LDF_CHD + ZDF_CHD - ZDP_CHD  </field>
+       <field id="ISO_CHD_E3T"  long_name="ISO_CHD * E3T"                                       unit="mg-Chl/m2/s" > ISO_CHD * e3t </field>
+       <field id="ISO_CHD_INV"  field_ref="ISO_CHD_E3T" long_name="ISO_CHD Inventory"           unit="mg-Chl/m2/s" grid_ref="vert_sum" />
        <field id="ISO_PHN"      long_name="non-diatom phytoplankton Isopycnal Mixing Trend"     unit="mmol-N/m3/s" > LDF_PHN + ZDF_PHN - ZDP_PHN  </field>
        <field id="ISO_PHN_E3T"  long_name="ISO_PHN * E3T"                                       unit="mmol-N/m2/s" > ISO_PHN * e3t </field>
@@ -1252,16 +1265,16 @@
        <field id="ISO_DIN_E3T"  long_name="ISO_DIN * E3T"                                       unit="mmol-N/m2/s" > ISO_DIN * e3t </field>
        <field id="ISO_DIN_INV"  field_ref="ISO_DIN_E3T" long_name="ISO_DIN Inventory"           unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="ISO_SIL"      long_name="dissolved silicic acid Isopycnal Mixing Trend"       unit="mmolSi/m3/s" > LDF_SIL + ZDF_SIL - ZDP_SIL  </field>
-       <field id="ISO_SIL_E3T"  long_name="ISO_SIL * E3T"                                       unit="mmolSi/m2/s" > ISO_SIL * e3t </field>
-       <field id="ISO_SIL_INV"  field_ref="ISO_SIL_E3T" long_name="ISO_SIL Inventory"           unit="mmolSi/m2/s" grid_ref="vert_sum" />
-       <field id="ISO_FER"      long_name="dissolved iron Isopycnal Mixing Trend"               unit="mmolFe/m3/s" > LDF_FER + ZDF_FER - ZDP_FER  </field>
-       <field id="ISO_FER_E3T"  long_name="ISO_FER * E3T"                                       unit="mmolFe/m2/s" > ISO_FER * e3t </field>
-       <field id="ISO_FER_INV"  field_ref="ISO_FER_E3T" long_name="ISO_FER Inventory"           unit="mmolFe/m2/s" grid_ref="vert_sum" />
+       <field id="ISO_SIL"      long_name="dissolved silicic acid Isopycnal Mixing Trend"       unit="mmol-Si/m3/s" > LDF_SIL + ZDF_SIL - ZDP_SIL  </field>
+       <field id="ISO_SIL_E3T"  long_name="ISO_SIL * E3T"                                       unit="mmol-Si/m2/s" > ISO_SIL * e3t </field>
+       <field id="ISO_SIL_INV"  field_ref="ISO_SIL_E3T" long_name="ISO_SIL Inventory"           unit="mmol-Si/m2/s" grid_ref="vert_sum" />
+       <field id="ISO_FER"      long_name="dissolved iron Isopycnal Mixing Trend"               unit="mmol-Fe/m3/s" > LDF_FER + ZDF_FER - ZDP_FER  </field>
+       <field id="ISO_FER_E3T"  long_name="ISO_FER * E3T"                                       unit="mmol-Fe/m2/s" > ISO_FER * e3t </field>
+       <field id="ISO_FER_INV"  field_ref="ISO_FER_E3T" long_name="ISO_FER Inventory"           unit="mmol-Fe/m2/s" grid_ref="vert_sum" />
        <field id="ISO_DET"      long_name="detrital nitrogen Isopycnal Mixing Trend"            unit="mmol-N/m3/s" > LDF_DET + ZDF_DET - ZDP_DET  </field>
        <field id="ISO_DET_E3T"  long_name="ISO_DET * E3T"                                       unit="mmol-N/m2/s" > ISO_DET * e3t </field>
        <field id="ISO_DET_INV"  field_ref="ISO_DET_E3T" long_name="ISO_DET Inventory"           unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="ISO_PDS"      long_name="Diatoms biogenic silicon Isopycnal Mixing Trend"     unit="mmolSi/m3/s" > LDF_PDS + ZDF_PDS - ZDP_PDS  </field>
-       <field id="ISO_PDS_E3T"  long_name="ISO_PDS * E3T"                                       unit="mmolSi/m2/s" > ISO_PDS * e3t </field>
-       <field id="ISO_PDS_INV"  field_ref="ISO_PDS_E3T" long_name="ISO_PDS Inventory"           unit="mmolSi/m2/s" grid_ref="vert_sum" />
+       <field id="ISO_PDS"      long_name="Diatoms biogenic silicon Isopycnal Mixing Trend"     unit="mmol-Si/m3/s" > LDF_PDS + ZDF_PDS - ZDP_PDS  </field>
+       <field id="ISO_PDS_E3T"  long_name="ISO_PDS * E3T"                                       unit="mmol-Si/m2/s" > ISO_PDS * e3t </field>
+       <field id="ISO_PDS_INV"  field_ref="ISO_PDS_E3T" long_name="ISO_PDS Inventory"           unit="mmol-Si/m2/s" grid_ref="vert_sum" />
        <field id="ISO_DTC"      long_name="detrital carbon Isopycnal Mixing Trend"              unit="mmol-C/m3/s" > LDF_DTC + ZDF_DTC - ZDP_DTC  </field>
        <field id="ISO_DTC_E3T"  long_name="ISO_DTC * E3T"                                       unit="mmol-C/m2/s" > ISO_DTC * e3t </field>
@@ -1273,7 +1286,7 @@
        <field id="ISO_ALK_E3T"  long_name="ISO_ALK * E3T"                                       unit="meq/m2/s"    > ISO_ALK * e3t </field>
        <field id="ISO_ALK_INV"  field_ref="ISO_ALK_E3T" long_name="ISO_ALK Inventory"           unit="meq/m2/s" grid_ref="vert_sum" />
-       <field id="ISO_OXY"      long_name="dissolved oxygen Isopycnal Mixing Trend"             unit="mmolO2/m3/s" > LDF_OXY + ZDF_OXY - ZDP_OXY  </field>
-       <field id="ISO_OXY_E3T"  long_name="ISO_OXY * E3T"                                       unit="mmolO2/m2/s" > ISO_OXY * e3t </field>
-       <field id="ISO_OXY_INV"  field_ref="ISO_OXY_E3T" long_name="ISO_OXY Inventory"           unit="mmolO2/m2/s" grid_ref="vert_sum" />
+       <field id="ISO_OXY"      long_name="dissolved oxygen Isopycnal Mixing Trend"             unit="mmol-O2/m3/s" > LDF_OXY + ZDF_OXY - ZDP_OXY  </field>
+       <field id="ISO_OXY_E3T"  long_name="ISO_OXY * E3T"                                       unit="mmol-O2/m2/s" > ISO_OXY * e3t </field>
+       <field id="ISO_OXY_INV"  field_ref="ISO_OXY_E3T" long_name="ISO_OXY Inventory"           unit="mmol-O2/m2/s" grid_ref="vert_sum" />
 
       <!-- Ideal traceurs : variables available with key_idtra -->
@@ -1326,5 +1339,5 @@
        <field id="XAD_CFC11_INV"  field_ref="XAD_CFC11_E3T" long_name="XAD_CFC11 Inventory" unit="umol/m2/s" grid_ref="vert_sum" />
        <field id="YAD_CFC11"      long_name="CFC11 Y-Advection Trend"                       unit="umol/m3/s" />
-       <field id="YAD_CFC11_E3T"  long_name="YAD_CFC11 * E3T"                           unit="umol/m2/s" > YAD_CFC11 * e3t </field>
+       <field id="YAD_CFC11_E3T"  long_name="YAD_CFC11 * E3T"                               unit="umol/m2/s" > YAD_CFC11 * e3t </field>
        <field id="YAD_CFC11_INV"  field_ref="YAD_CFC11_E3T" long_name="YAD_CFC11 Inventory" unit="umol/m2/s" grid_ref="vert_sum" />
        <field id="ZAD_CFC11"      long_name="CFC11 Z-Advection Trend"                       unit="umol/m3/s" />
@@ -1545,10 +1558,10 @@
      <field_group id="ptrd_T" grid_ref="grid_T_3D">  <!-- key_trdtrc || key_trdmlx_trc -->
        <!-- trd case: jptra_tot -->
-       <field id="TOT_CHN"      long_name="Non-diatom Chl-a Total Trend"                      unit="mg Chl/m3/s" />
-       <field id="TOT_CHN_E3T"  long_name="TOT_CHN * E3T"                                     unit="mg Chl/m2/s" > TOT_CHN * e3t </field>
-       <field id="TOT_CHN_INV"  field_ref="TOT_CHN_E3T" long_name="TOT_CHN Inventory"         unit="mg Chl/m2/s" grid_ref="vert_sum" />
-       <field id="TOT_CHD"      long_name="Diatom Chl-a Total Trend"                          unit="mg Chl/m3/s" />
-       <field id="TOT_CHD_E3T"  long_name="TOT_CHD * E3T"                                     unit="mg Chl/m2/s" > TOT_CHD * e3t </field>
-       <field id="TOT_CHD_INV"  field_ref="TOT_CHD_E3T" long_name="TOT_CHD Inventory"         unit="mg Chl/m2/s" grid_ref="vert_sum" />
+       <field id="TOT_CHN"      long_name="Non-diatom Chl-a Total Trend"                      unit="mg-Chl/m3/s" />
+       <field id="TOT_CHN_E3T"  long_name="TOT_CHN * E3T"                                     unit="mg-Chl/m2/s" > TOT_CHN * e3t </field>
+       <field id="TOT_CHN_INV"  field_ref="TOT_CHN_E3T" long_name="TOT_CHN Inventory"         unit="mg-Chl/m2/s" grid_ref="vert_sum" />
+       <field id="TOT_CHD"      long_name="Diatom Chl-a Total Trend"                          unit="mg-Chl/m3/s" />
+       <field id="TOT_CHD_E3T"  long_name="TOT_CHD * E3T"                                     unit="mg-Chl/m2/s" > TOT_CHD * e3t </field>
+       <field id="TOT_CHD_INV"  field_ref="TOT_CHD_E3T" long_name="TOT_CHD Inventory"         unit="mg-Chl/m2/s" grid_ref="vert_sum" />
        <field id="TOT_PHN"      long_name="non-diatom phytoplankton Total Trend"              unit="mmol-N/m3/s" />
        <field id="TOT_PHN_E3T"  long_name="TOT_PHN * E3T"                                     unit="mmol-N/m2/s" > TOT_PHN * e3t </field>
@@ -1566,16 +1579,16 @@
        <field id="TOT_DIN_E3T"  long_name="TOT_DIN * E3T"                                     unit="mmol-N/m2/s" > TOT_DIN * e3t </field>
        <field id="TOT_DIN_INV"  field_ref="TOT_DIN_E3T" long_name="TOT_DIN Inventory"         unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="TOT_SIL"      long_name="dissolved silicic acid Total Trend"                unit="mmolSi/m3/s" />
-       <field id="TOT_SIL_E3T"  long_name="TOT_SIL * E3T"                                     unit="mmolSi/m2/s" > TOT_SIL * e3t </field>
-       <field id="TOT_SIL_INV"  field_ref="TOT_SIL_E3T" long_name="TOT_SIL Inventory"         unit="mmolSi/m2/s" grid_ref="vert_sum" />
-       <field id="TOT_FER"      long_name="dissolved iron Total Trend"                        unit="mmolFe/m3/s" />
-       <field id="TOT_FER_E3T"  long_name="TOT_FER * E3T"                                     unit="mmolFe/m2/s" > TOT_FER * e3t </field>
-       <field id="TOT_FER_INV"  field_ref="TOT_FER_E3T" long_name="TOT_FER Inventory"         unit="mmolFe/m2/s" grid_ref="vert_sum" />
+       <field id="TOT_SIL"      long_name="dissolved silicic acid Total Trend"                unit="mmol-Si/m3/s" />
+       <field id="TOT_SIL_E3T"  long_name="TOT_SIL * E3T"                                     unit="mmol-Si/m2/s" > TOT_SIL * e3t </field>
+       <field id="TOT_SIL_INV"  field_ref="TOT_SIL_E3T" long_name="TOT_SIL Inventory"         unit="mmol-Si/m2/s" grid_ref="vert_sum" />
+       <field id="TOT_FER"      long_name="dissolved iron Total Trend"                        unit="mmol-Fe/m3/s" />
+       <field id="TOT_FER_E3T"  long_name="TOT_FER * E3T"                                     unit="mmol-Fe/m2/s" > TOT_FER * e3t </field>
+       <field id="TOT_FER_INV"  field_ref="TOT_FER_E3T" long_name="TOT_FER Inventory"         unit="mmol-Fe/m2/s" grid_ref="vert_sum" />
        <field id="TOT_DET"      long_name="detrital nitrogen Total Trend"                     unit="mmol-N/m3/s" />
        <field id="TOT_DET_E3T"  long_name="TOT_DET * E3T"                                     unit="mmol-N/m2/s" > TOT_DET * e3t </field>
        <field id="TOT_DET_INV"  field_ref="TOT_DET_E3T" long_name="TOT_DET Inventory"         unit="mmol-N/m2/s" grid_ref="vert_sum" />
-       <field id="TOT_PDS"      long_name="Diatoms biogenic silicon Total Trend"              unit="mmolSi/m3/s" />
-       <field id="TOT_PDS_E3T"  long_name="TOT_PDS * E3T"                                     unit="mmolSi/m2/s" > TOT_PDS * e3t </field>
-       <field id="TOT_PDS_INV"  field_ref="TOT_PDS_E3T" long_name="TOT_PDS Inventory"         unit="mmolSi/m2/s" grid_ref="vert_sum" />
+       <field id="TOT_PDS"      long_name="Diatoms biogenic silicon Total Trend"              unit="mmol-Si/m3/s" />
+       <field id="TOT_PDS_E3T"  long_name="TOT_PDS * E3T"                                     unit="mmol-Si/m2/s" > TOT_PDS * e3t </field>
+       <field id="TOT_PDS_INV"  field_ref="TOT_PDS_E3T" long_name="TOT_PDS Inventory"         unit="mmol-Si/m2/s" grid_ref="vert_sum" />
        <field id="TOT_DTC"      long_name="detrital carbon Total Trend"                       unit="mmol-C/m3/s" />
        <field id="TOT_DTC_E3T"  long_name="TOT_DTC * E3T"                                     unit="mmol-C/m2/s" > TOT_DTC * e3t </field>
@@ -1587,7 +1600,7 @@
        <field id="TOT_ALK_E3T"  long_name="TOT_ALK * E3T"                                     unit="meq/m2/s"    > TOT_ALK * e3t </field>
        <field id="TOT_ALK_INV"  field_ref="TOT_ALK_E3T" long_name="TOT_ALK Inventory"         unit="meq/m2/s" grid_ref="vert_sum" />
-       <field id="TOT_OXY"      long_name="dissolved oxygen Total Trend"                      unit="mmolO2/m3/s" />
-       <field id="TOT_OXY_E3T"  long_name="TOT_OXY * E3T"                                     unit="mmolO2/m2/s" > TOT_OXY * e3t </field>
-       <field id="TOT_OXY_INV"  field_ref="TOT_OXY_E3T" long_name="TOT_OXY Inventory"         unit="mmolO2/m2/s" grid_ref="vert_sum" />
+       <field id="TOT_OXY"      long_name="dissolved oxygen Total Trend"                      unit="mmol-O2/m3/s" />
+       <field id="TOT_OXY_E3T"  long_name="TOT_OXY * E3T"                                     unit="mmol-O2/m2/s" > TOT_OXY * e3t </field>
+       <field id="TOT_OXY_INV"  field_ref="TOT_OXY_E3T" long_name="TOT_OXY Inventory"         unit="mmol-O2/m2/s" grid_ref="vert_sum" />
        <!-- trd : VERIF TRENDS  -->
        <!--  <field id="TOT_DIN_CHECK" long_name="DIN - indirect calculation TOTAL trend"           unit="mmol-N/m3/s" > TAD_DIN_E3T + BBL_DIN_E3T + ISO_DIN_E3T + ZDP_DIN_E3T + ATF_DIN_E3T + SMS_DIN_E3T </field>  -->
@@ -1596,5 +1609,5 @@
        <field id="TOT_IDTRA"      long_name="Ideal traceur Total Trend "                     unit="mmol/m3/s"    />
        <field id="TOT_IDTRA_E3T"  long_name="TOT_IDTRA * E3T"                                unit="mmol/m2/s" > TOT_IDTRA * e3t </field>
-       <field id="TOT_IDTRA_INV"  field_ref="TOT_IDTRA_E3T" long_name="TOT_IDTRA Inventory" unit="mmol/m2/s" grid_ref="vert_sum" />
+       <field id="TOT_IDTRA_INV"  field_ref="TOT_IDTRA_E3T" long_name="TOT_IDTRA Inventory"  unit="mmol/m2/s" grid_ref="vert_sum" />
 
        <!-- CFC11 : variables available with key_cfc -->
@@ -1617,5 +1630,5 @@
 
        <!-- AGE : variables available with key_age -->
-       <field id="TOT_Age"        long_name="Sea Water Age Total Trend" standard_name="sea_water_age_since_surface_contact"  unit="yr/s"         />
+       <field id="TOT_Age"        long_name="Sea Water Age Total Trend"                  unit="yr/s"         />
        <field id="TOT_Age_E3T"    long_name="TOT_Age * E3T"                              unit="yr m/s" > TOT_Age * e3t </field>
        <field id="TOT_Age_INV"    field_ref="TOT_Age_E3T"  long_name="TOT_Age Inventory" unit="yr m/s" grid_ref="vert_sum" />
@@ -1646,8 +1659,6 @@
       <field field_ref="CHN"      name="CHN"      />
       <field field_ref="CHN_E3T"  name="CHN_E3T"      />
-      <field field_ref="SURF_CHN" name="SURF_CHN"  />
       <field field_ref="CHD"      name="CHD"      />
       <field field_ref="CHD_E3T"  name="CHD_E3T"      />
-      <field field_ref="SURF_CHD" name="SURF_CHD"  />
       <field field_ref="PHN"      name="PHN"      />
       <field field_ref="PHN_E3T"  name="PHN_E3T"      />
@@ -1676,6 +1687,23 @@
       <field field_ref="OXY"      name="OXY"      />
       <field field_ref="OXY_E3T"  name="OXY_E3T"      />
-      </field_group>
-
+   </field_group>
+
+    <field_group id="groupMEDUSA_surf" >
+      <field field_ref="SURF_CHN" name="SURF_CHN"  />
+      <field field_ref="SURF_CHD" name="SURF_CHD"  />
+      <field field_ref="SURF_PHN" name="SURF_PHN"  />
+      <field field_ref="SURF_PHD" name="SURF_PHD"  />
+      <field field_ref="SURF_ZMI" name="SURF_ZMI"  />
+      <field field_ref="SURF_ZME" name="SURF_ZME"  />
+      <field field_ref="SURF_DIN" name="SURF_DIN"  />
+      <field field_ref="SURF_SIL" name="SURF_SIL"  />
+      <field field_ref="SURF_FER" name="SURF_FER"  />
+      <field field_ref="SURF_DET" name="SURF_DET"  />
+      <field field_ref="SURF_PDS" name="SURF_PDS"  />
+      <field field_ref="SURF_DTC" name="SURF_DTC"  />
+      <field field_ref="SURF_DiC" name="SURF_DiC"  />
+      <field field_ref="SURF_ALK" name="SURF_ALK"  />
+      <field field_ref="SURF_OXY" name="SURF_OXY"  />
+    </field_group>
 
     <field_group id="groupMEDUSA_INV" >
@@ -1730,5 +1758,5 @@
 
 
-    <field_group id="trendMEDUSA" >
+    <field_group id="trendMEDUSA_long" >
        <!-- trd case: jptra_xad -->
        <field field_ref="XAD_CHN"     name="XAD_CHN"   />
@@ -1781,33 +1809,18 @@
        <!-- trd case: jptra_totad -->
        <field field_ref="TAD_CHN"      name="TAD_CHN"   />
-       <field field_ref="TAD_CHN_INV"  name="TAD_CHN_INV"   />
        <field field_ref="TAD_CHD"      name="TAD_CHD"   />
-       <field field_ref="TAD_CHD_INV"  name="TAD_CHD_INV"   />
        <field field_ref="TAD_PHN"      name="TAD_PHN"   />
-       <field field_ref="TAD_PHN_INV"  name="TAD_PHN_INV"   />
        <field field_ref="TAD_PHD"      name="TAD_PHD"   />
-       <field field_ref="TAD_PHD_INV"  name="TAD_PHD_INV"   />
        <field field_ref="TAD_ZMI"      name="TAD_ZMI"   />
-       <field field_ref="TAD_ZMI_INV"  name="TAD_ZMI_INV"   />
        <field field_ref="TAD_ZME"      name="TAD_ZME"   />
-       <field field_ref="TAD_ZME_INV"  name="TAD_ZME_INV"   />
        <field field_ref="TAD_DIN"      name="TAD_DIN"   />
-       <field field_ref="TAD_DIN_INV"  name="TAD_DIN_INV"   />
        <field field_ref="TAD_SIL"      name="TAD_SIL"   />
-       <field field_ref="TAD_SIL_INV"  name="TAD_SIL_INV"   />
        <field field_ref="TAD_FER"      name="TAD_FER"   />
-       <field field_ref="TAD_FER_INV"  name="TAD_FER_INV"   />
        <field field_ref="TAD_DET"      name="TAD_DET"   />
-       <field field_ref="TAD_DET_INV"  name="TAD_DET_INV"   />
        <field field_ref="TAD_PDS"      name="TAD_PDS"   />
-       <field field_ref="TAD_PDS_INV"  name="TAD_PDS_INV"   />
        <field field_ref="TAD_DTC"      name="TAD_DTC"   />
-       <field field_ref="TAD_DTC_INV"  name="TAD_DTC_INV"   />
        <field field_ref="TAD_DiC"      name="TAD_DiC"   />
-       <field field_ref="TAD_DiC_INV"  name="TAD_DiC_INV"   />
        <field field_ref="TAD_ALK"      name="TAD_ALK"   />
-       <field field_ref="TAD_ALK_INV"  name="TAD_ALK_INV"   />
        <field field_ref="TAD_OXY"      name="TAD_OXY"   />
-       <field field_ref="TAD_OXY_INV"  name="TAD_OXY_INV"   />
        <!-- trd case: jptra_ldf -->
        <field field_ref="LDF_CHN"      name="LDF_CHN"   />
@@ -1909,33 +1922,18 @@
        <!-- trd case: jptra_sms -->
        <field field_ref="SMS_CHN"      name="SMS_CHN"   />
-       <field field_ref="SMS_CHN_INV"  name="SMS_CHN_INV"   />
        <field field_ref="SMS_CHD"      name="SMS_CHD"   />
-       <field field_ref="SMS_CHD_INV"  name="SMS_CHD_INV"   />
        <field field_ref="SMS_PHN"      name="SMS_PHN"   />
-       <field field_ref="SMS_PHN_INV"  name="SMS_PHN_INV"   />
        <field field_ref="SMS_PHD"      name="SMS_PHD"   />
-       <field field_ref="SMS_PHD_INV"  name="SMS_PHD_INV"   />
        <field field_ref="SMS_ZMI"      name="SMS_ZMI"   />
-       <field field_ref="SMS_ZMI_INV"  name="SMS_ZMI_INV"   />
        <field field_ref="SMS_ZME"      name="SMS_ZME"   />
-       <field field_ref="SMS_ZME_INV"  name="SMS_ZME_INV"   />
        <field field_ref="SMS_DIN"      name="SMS_DIN"   />
-       <field field_ref="SMS_DIN_INV"  name="SMS_DIN_INV"   />
        <field field_ref="SMS_SIL"      name="SMS_SIL"   />
-       <field field_ref="SMS_SIL_INV"  name="SMS_SIL_INV"   />
        <field field_ref="SMS_FER"      name="SMS_FER"   />
-       <field field_ref="SMS_FER_INV"  name="SMS_FER_INV"   />
        <field field_ref="SMS_DET"      name="SMS_DET"   />
-       <field field_ref="SMS_DET_INV"  name="SMS_DET_INV"   />
        <field field_ref="SMS_PDS"      name="SMS_PDS"   />
-       <field field_ref="SMS_PDS_INV"  name="SMS_PDS_INV"   />
        <field field_ref="SMS_DTC"      name="SMS_DTC"   />
-       <field field_ref="SMS_DTC_INV"  name="SMS_DTC_INV"   />
        <field field_ref="SMS_DiC"      name="SMS_DiC"   /> 
-       <field field_ref="SMS_DiC_INV"  name="SMS_DiC_INV"   />
        <field field_ref="SMS_ALK"      name="SMS_ALK"   />
-       <field field_ref="SMS_ALK_INV"  name="SMS_ALK_INV"   />
        <field field_ref="SMS_OXY"      name="SMS_OXY"   />
-       <field field_ref="SMS_OXY_INV"  name="SMS_OXY_INV"   />
        <!-- trd case: jptra_atf -->
        <field field_ref="ATF_CHN"      name="ATF_CHN"   />
@@ -1956,33 +1954,18 @@
        <!-- trd case: jptra_tot -->   
        <field field_ref="TOT_CHN"      name="TOT_CHN"   />
-       <field field_ref="TOT_CHN_INV"  name="TOT_CHN_INV"   />
        <field field_ref="TOT_CHD"      name="TOT_CHD"   />
-       <field field_ref="TOT_CHD_INV"  name="TOT_CHD_INV"   />
        <field field_ref="TOT_PHN"      name="TOT_PHN"   />
-       <field field_ref="TOT_PHN_INV"  name="TOT_PHN_INV"   />
        <field field_ref="TOT_PHD"      name="TOT_PHD"   />
-       <field field_ref="TOT_PHD_INV"  name="TOT_PHD_INV"   />
        <field field_ref="TOT_ZMI"      name="TOT_ZMI"   />
-       <field field_ref="TOT_ZMI_INV"  name="TOT_ZMI_INV"   />
        <field field_ref="TOT_ZME"      name="TOT_ZME"   />
-       <field field_ref="TOT_ZME_INV"  name="TOT_ZME_INV"   />
        <field field_ref="TOT_DIN"      name="TOT_DIN"   />
-       <field field_ref="TOT_DIN_INV"  name="TOT_DIN_INV"   />
        <field field_ref="TOT_SIL"      name="TOT_SIL"   />
-       <field field_ref="TOT_SIL_INV"  name="TOT_SIL_INV"   />
        <field field_ref="TOT_FER"      name="TOT_FER"   />
-       <field field_ref="TOT_FER_INV"  name="TOT_FER_INV"   />
        <field field_ref="TOT_DET"      name="TOT_DET"   />
-       <field field_ref="TOT_DET_INV"  name="TOT_DET_INV"   />
        <field field_ref="TOT_PDS"      name="TOT_PDS"   />
-       <field field_ref="TOT_PDS_INV"  name="TOT_PDS_INV"   />
        <field field_ref="TOT_DTC"      name="TOT_DTC"   />
-       <field field_ref="TOT_DTC_INV"  name="TOT_DTC_INV"   />
        <field field_ref="TOT_DiC"      name="TOT_DiC"   />
-       <field field_ref="TOT_DiC_INV"  name="TOT_DiC_INV"   />
        <field field_ref="TOT_ALK"      name="TOT_ALK"   />   
-       <field field_ref="TOT_ALK_INV"  name="TOT_ALK_INV"   />
        <field field_ref="TOT_OXY"      name="TOT_OXY"   />
-       <field field_ref="TOT_OXY_INV"  name="TOT_OXY_INV"   />  
        <!-- trd case: jptra_iso -->
        <field field_ref="ISO_CHN"      name="ISO_CHN"   />   
@@ -2003,128 +1986,110 @@
     </field_group>
 
-    <field_group id="trendCFC11" >
+    <field_group id="trendCFC11_long" >
           <!-- cfc11 -->
-          <field field_ref="TOT_CFC11"     name="TOT_CFC11"     standard_name="CFC-11_Concentration"                  />
-          <field field_ref="TOT_CFC11_INV" name="TOT_CFC11_INV" standard_name="CFC-11_Concentration"                  />
-          <field field_ref="XAD_CFC11"     name="XAD_CFC11"     standard_name="CFC-11_Concentration"                  />
-          <field field_ref="YAD_CFC11"     name="YAD_CFC11"     standard_name="CFC-11_Concentration"                  />
-          <field field_ref="ZAD_CFC11"     name="ZAD_CFC11"     standard_name="CFC-11_Concentration"                  />
-          <field field_ref="TAD_CFC11"     name="TAD_CFC11"     standard_name="CFC-11_Concentration"                  />
-          <field field_ref="TAD_CFC11_INV" name="TAD_CFC11_INV" standard_name="CFC-11_Concentration"                  />
-          <field field_ref="LDF_CFC11"     name="LDF_CFC11"     standard_name="CFC-11_Concentration"                  />
-          <field field_ref="BBL_CFC11"     name="BBL_CFC11"     standard_name="CFC-11_Concentration"                  />
-          <field field_ref="FOR_CFC11"     name="FOR_CFC11"     standard_name="CFC-11_Concentration"                  />
-          <field field_ref="ZDF_CFC11"     name="ZDF_CFC11"     standard_name="CFC-11_Concentration"                  />
-          <field field_ref="ZDP_CFC11"     name="ZDP_CFC11"     standard_name="CFC-11_Concentration"                  />
-          <!-- <field field_ref="DMP_CFC11"     name="DMP_CFC11"     standard_name="CFC-11_Concentration"             /> -->
-          <field field_ref="SMS_CFC11"     name="SMS_CFC11"     standard_name="CFC-11_Concentration"                  />
-          <field field_ref="SMS_CFC11_INV" name="SMS_CFC11_INV" standard_name="CFC-11_Concentration"                  />
-          <field field_ref="ATF_CFC11"     name="ATF_CFC11"     standard_name="CFC-11_Concentration"                  /> 
-          <field field_ref="ISO_CFC11"     name="ISO_CFC11"     standard_name="CFC-11_Concentration"                  />
+          <field field_ref="TOT_CFC11"     name="TOT_CFC11"     />
+          <field field_ref="XAD_CFC11"     name="XAD_CFC11"     /> 
+          <field field_ref="YAD_CFC11"     name="YAD_CFC11"     />
+          <field field_ref="ZAD_CFC11"     name="ZAD_CFC11"     />
+          <field field_ref="TAD_CFC11"     name="TAD_CFC11"     />
+          <field field_ref="LDF_CFC11"     name="LDF_CFC11"     />
+          <field field_ref="BBL_CFC11"     name="BBL_CFC11"     />
+          <field field_ref="FOR_CFC11"     name="FOR_CFC11"     />
+          <field field_ref="ZDF_CFC11"     name="ZDF_CFC11"     />
+          <field field_ref="ZDP_CFC11"     name="ZDP_CFC11"     />
+          <!-- <field field_ref="DMP_CFC11"     name="DMP_CFC11" /> -->
+          <field field_ref="SMS_CFC11"     name="SMS_CFC11"     />
+          <field field_ref="ATF_CFC11"     name="ATF_CFC11"     />
+          <field field_ref="ISO_CFC11"     name="ISO_CFC11"     />
    </field_group>
 
-    <field_group id="trendCFC12" >
+    <field_group id="trendCFC12_long" >
           <!-- cfc12 -->
-          <field field_ref="TOT_CFC12"     name="TOT_CFC12"     standard_name="CFC-12_Concentration"                  />
-          <field field_ref="TOT_CFC12_INV" name="TOT_CFC12_INV" standard_name="CFC-12_Concentration"                  />
-          <field field_ref="XAD_CFC12"     name="XAD_CFC12"     standard_name="CFC-12_Concentration"                  />
-          <field field_ref="YAD_CFC12"     name="YAD_CFC12"     standard_name="CFC-12_Concentration"                  />
-          <field field_ref="ZAD_CFC12"     name="ZAD_CFC12"     standard_name="CFC-12_Concentration"                  />
-          <field field_ref="TAD_CFC12"     name="TAD_CFC12"     standard_name="CFC-12_Concentration"                  />
-          <field field_ref="TAD_CFC12_INV" name="TAD_CFC12_INV" standard_name="CFC-12_Concentration"                  />
-          <field field_ref="LDF_CFC12"     name="LDF_CFC12"     standard_name="CFC-12_Concentration"                  />
-          <field field_ref="BBL_CFC12"     name="BBL_CFC12"     standard_name="CFC-12_Concentration"                  />
-          <field field_ref="FOR_CFC12"     name="FOR_CFC12"     standard_name="CFC-12_Concentration"                  />
-          <field field_ref="ZDF_CFC12"     name="ZDF_CFC12"     standard_name="CFC-12_Concentration"                  />
-          <field field_ref="ZDP_CFC12"     name="ZDP_CFC12"     standard_name="CFC-12_Concentration"                  />
-          <!-- <field field_ref="DMP_CFC12"     name="DMP_CFC12"     standard_name="CFC-12_Concentration"             /> -->
-          <field field_ref="SMS_CFC12"     name="SMS_CFC12"     standard_name="CFC-12_Concentration"                  />
-          <field field_ref="SMS_CFC12_INV" name="SMS_CFC12_INV" standard_name="CFC-12_Concentration"                  />
-          <field field_ref="ATF_CFC12"     name="ATF_CFC12"     standard_name="CFC-12_Concentration"                  /> 
-          <field field_ref="ISO_CFC12"     name="ISO_CFC12"     standard_name="CFC-12_Concentration"                  />
+          <field field_ref="TOT_CFC12"     name="TOT_CFC12"     />
+          <field field_ref="XAD_CFC12"     name="XAD_CFC12"     />
+          <field field_ref="YAD_CFC12"     name="YAD_CFC12"     />
+          <field field_ref="ZAD_CFC12"     name="ZAD_CFC12"     />
+          <field field_ref="TAD_CFC12"     name="TAD_CFC12"     />
+          <field field_ref="LDF_CFC12"     name="LDF_CFC12"     />
+          <field field_ref="BBL_CFC12"     name="BBL_CFC12"     />
+          <field field_ref="FOR_CFC12"     name="FOR_CFC12"     />
+          <field field_ref="ZDF_CFC12"     name="ZDF_CFC12"     />
+          <field field_ref="ZDP_CFC12"     name="ZDP_CFC12"     />
+          <!-- <field field_ref="DMP_CFC12"     name="DMP_CFC12" /> -->
+          <field field_ref="SMS_CFC12"     name="SMS_CFC12"     /> 
+          <field field_ref="ATF_CFC12"     name="ATF_CFC12"     />
+          <field field_ref="ISO_CFC12"     name="ISO_CFC12"     />
    </field_group>
 
-    <field_group id="trendSF6" >
+    <field_group id="trendSF6_long" >
           <!-- sf6 -->
-          <field field_ref="TOT_SF6"      name="TOT_SF6"      standard_name="SF6_Concentration"                     />
-          <field field_ref="TOT_SF6_INV"  name="TOT_SF6_INV"  standard_name="SF6_Concentration"                     />
-          <field field_ref="XAD_SF6"      name="XAD_SF6"      standard_name="SF6_Concentration"                     />
-          <field field_ref="YAD_SF6"      name="YAD_SF6"      standard_name="SF6_Concentration"                     />
-          <field field_ref="ZAD_SF6"      name="ZAD_SF6"      standard_name="SF6_Concentration"                     />
-          <field field_ref="TAD_SF6"      name="TAD_SF6"      standard_name="SF6_Concentration"                     />
-          <field field_ref="TAD_SF6_INV"  name="TAD_SF6_INV"  standard_name="SF6_Concentration"                     />
-          <field field_ref="LDF_SF6"      name="LDF_SF6"      standard_name="SF6_Concentration"                     />
-          <field field_ref="BBL_SF6"      name="BBL_SF6"      standard_name="SF6_Concentration"                     />
-          <field field_ref="FOR_SF6"      name="FOR_SF6"      standard_name="SF6_Concentration"                     />
-          <field field_ref="ZDF_SF6"      name="ZDF_SF6"      standard_name="SF6_Concentration"                     />
-          <field field_ref="ZDP_SF6"      name="ZDP_SF6"      standard_name="SF6_Concentration"                     />
-          <!-- <field field_ref="DMP_SF6"      name="DMP_SF6"      standard_name="SF6_Concentration"                /> -->
-          <field field_ref="SMS_SF6"      name="SMS_SF6"      standard_name="SF6_Concentration"                     />
-          <field field_ref="SMS_SF6_INV"  name="SMS_SF6_INV"  standard_name="SF6_Concentration"                     />
-          <field field_ref="ATF_SF6"      name="ATF_SF6"      standard_name="SF6_Concentration"                     /> 
-          <field field_ref="ISO_SF6"      name="ISO_SF6"      standard_name="SF6_Concentration"                     />
+          <field field_ref="TOT_SF6"      name="TOT_SF6"      />
+          <field field_ref="XAD_SF6"      name="XAD_SF6"      />
+          <field field_ref="YAD_SF6"      name="YAD_SF6"      />
+          <field field_ref="ZAD_SF6"      name="ZAD_SF6"      />
+          <field field_ref="TAD_SF6"      name="TAD_SF6"      />
+          <field field_ref="LDF_SF6"      name="LDF_SF6"      />
+          <field field_ref="BBL_SF6"      name="BBL_SF6"      />
+          <field field_ref="FOR_SF6"      name="FOR_SF6"      />
+          <field field_ref="ZDF_SF6"      name="ZDF_SF6"      />
+          <field field_ref="ZDP_SF6"      name="ZDP_SF6"      />
+          <!-- <field field_ref="DMP_SF6"      name="DMP_SF6" /> -->
+          <field field_ref="SMS_SF6"      name="SMS_SF6"      />
+          <field field_ref="ATF_SF6"      name="ATF_SF6"      />
+          <field field_ref="ISO_SF6"      name="ISO_SF6"      />
    </field_group>
 
-    <field_group id="trendAGE" >
+    <field_group id="trendAGE_long" >
           <!-- age -->
-          <field field_ref="TOT_Age"      name="TOT_Age"      standard_name="sea_water_age_since_surface_contact"   />
-          <field field_ref="TOT_Age_INV"  name="TOT_Age_INV"  standard_name="sea_water_age_since_surface_contact"   />
-          <field field_ref="XAD_Age"      name="XAD_Age"      standard_name="sea_water_age_since_surface_contact"   />
-          <field field_ref="YAD_Age"      name="YAD_Age"      standard_name="sea_water_age_since_surface_contact"   />
-          <field field_ref="ZAD_Age"      name="ZAD_Age"      standard_name="sea_water_age_since_surface_contact"   />
-          <field field_ref="TAD_Age"      name="TAD_Age"      standard_name="sea_water_age_since_surface_contact"   />
-          <field field_ref="TAD_Age_INV"  name="TAD_Age_INV"  standard_name="sea_water_age_since_surface_contact"   />
-          <field field_ref="LDF_Age"      name="LDF_Age"      standard_name="sea_water_age_since_surface_contact"   />
-          <field field_ref="BBL_Age"      name="BBL_Age"      standard_name="sea_water_age_since_surface_contact"   />
-          <field field_ref="FOR_Age"      name="FOR_Age"      standard_name="sea_water_age_since_surface_contact"   />
-          <field field_ref="ZDF_Age"      name="ZDF_Age"      standard_name="sea_water_age_since_surface_contact"   />
-          <field field_ref="ZDP_Age"      name="ZDP_Age"      standard_name="sea_water_age_since_surface_contact"   />
-          <!-- <field field_ref="DMP_Age"      name="DMP_Age"      standard_name="sea_water_age_since_surface_contact" /> -->
-          <field field_ref="SMS_Age"      name="SMS_Age"      standard_name="sea_water_age_since_surface_contact"   />
-          <field field_ref="SMS_Age_INV"  name="SMS_Age_INV"  standard_name="sea_water_age_since_surface_contact"   />
-          <field field_ref="ATF_Age"      name="ATF_Age"      standard_name="sea_water_age_since_surface_contact"   /> 
-          <field field_ref="ISO_Age"      name="ISO_Age"      standard_name="sea_water_age_since_surface_contact"   />
+          <field field_ref="TOT_Age"      name="TOT_Age"      />
+          <field field_ref="XAD_Age"      name="XAD_Age"      />
+          <field field_ref="YAD_Age"      name="YAD_Age"      />
+          <field field_ref="ZAD_Age"      name="ZAD_Age"      />
+          <field field_ref="TAD_Age"      name="TAD_Age"      />
+          <field field_ref="LDF_Age"      name="LDF_Age"      />
+          <field field_ref="BBL_Age"      name="BBL_Age"      />
+          <field field_ref="FOR_Age"      name="FOR_Age"      />
+          <field field_ref="ZDF_Age"      name="ZDF_Age"      />
+          <field field_ref="ZDP_Age"      name="ZDP_Age"      />
+          <!-- <field field_ref="DMP_Age"      name="DMP_Age" /> -->
+          <field field_ref="SMS_Age"      name="SMS_Age"      />
+          <field field_ref="ATF_Age"      name="ATF_Age"      />
+          <field field_ref="ISO_Age"      name="ISO_Age"      />
    </field_group>
 
-    <field_group id="trendIDTRA" >
+    <field_group id="trendIDTRA_long" >
           <!-- Ideal tracer -->
-          <field field_ref="TOT_IDTRA"      name="TOT_IDTRA"      standard_name="IDTRA_Concentration"               />
-          <field field_ref="TOT_IDTRA_INV"  name="TOT_IDTRA_INV"  standard_name="IDTRA_Concentration"               />
-          <field field_ref="XAD_IDTRA"      name="XAD_IDTRA"      standard_name="IDTRA_Concentration"               />
-          <field field_ref="YAD_IDTRA"      name="YAD_IDTRA"      standard_name="IDTRA_Concentration"               />
-          <field field_ref="ZAD_IDTRA"      name="ZAD_IDTRA"      standard_name="IDTRA_Concentration"               />
-          <field field_ref="TAD_IDTRA"      name="TAD_IDTRA"      standard_name="IDTRA_Concentration"               />
-          <field field_ref="TAD_IDTRA_INV"  name="TAD_IDTRA_INV"  standard_name="IDTRA_Concentration"               />
-          <field field_ref="LDF_IDTRA"      name="LDF_IDTRA"      standard_name="IDTRA_Concentration"               />
-          <field field_ref="BBL_IDTRA"      name="BBL_IDTRA"      standard_name="IDTRA_Concentration"               />
-          <field field_ref="FOR_IDTRA"      name="FOR_IDTRA"      standard_name="IDTRA_Concentration"               />
-          <field field_ref="ZDF_IDTRA"      name="ZDF_IDTRA"      standard_name="IDTRA_Concentration"               />
-          <field field_ref="ZDP_IDTRA"      name="ZDP_IDTRA"      standard_name="IDTRA_Concentration"               />
-          <!-- <field field_ref="DMP_IDTRA"      name="DMP_IDTRA"      standard_name="IDTRA_Concentration"          /> -->
-          <field field_ref="SMS_IDTRA"      name="SMS_IDTRA"      standard_name="IDTRA_Concentration"               />
-          <field field_ref="SMS_IDTRA_INV"  name="SMS_IDTRA_INV"  standard_name="IDTRA_Concentration"               />
-          <field field_ref="ATF_IDTRA"      name="ATF_IDTRA"      standard_name="IDTRA_Concentration"               /> 
-          <field field_ref="ISO_IDTRA"      name="ISO_IDTRA"      standard_name="IDTRA_Concentration"               />
+          <field field_ref="TOT_IDTRA"      name="TOT_IDTRA"      />
+          <field field_ref="XAD_IDTRA"      name="XAD_IDTRA"      />
+          <field field_ref="YAD_IDTRA"      name="YAD_IDTRA"      />
+          <field field_ref="ZAD_IDTRA"      name="ZAD_IDTRA"      />
+          <field field_ref="TAD_IDTRA"      name="TAD_IDTRA"      />
+          <field field_ref="LDF_IDTRA"      name="LDF_IDTRA"      />
+          <field field_ref="BBL_IDTRA"      name="BBL_IDTRA"      />
+          <field field_ref="FOR_IDTRA"      name="FOR_IDTRA"      />
+          <field field_ref="ZDF_IDTRA"      name="ZDF_IDTRA"      />
+          <field field_ref="ZDP_IDTRA"      name="ZDP_IDTRA"      />
+          <!-- <field field_ref="DMP_IDTRA"      name="DMP_IDTRA" /> -->
+          <field field_ref="SMS_IDTRA"      name="SMS_IDTRA"      />
+          <field field_ref="ATF_IDTRA"      name="ATF_IDTRA"      />
+          <field field_ref="ISO_IDTRA"      name="ISO_IDTRA"      />
    </field_group>
 
-    <field_group id="trendC14B" >
+    <field_group id="trendC14B_long" >
           <!-- c14 bomb -->
-          <field field_ref="TOT_C14B"      name="TOT_C14B"      standard_name="C14b_Concentration"               />
-          <field field_ref="TOT_C14B_INV"  name="TOT_C14B_INV"  standard_name="C14b_Concentration"               />
-          <field field_ref="XAD_C14B"      name="XAD_C14B"      standard_name="C14b_Concentration"               />
-          <field field_ref="YAD_C14B"      name="YAD_C14B"      standard_name="C14b_Concentration"               />
-          <field field_ref="ZAD_C14B"      name="ZAD_C14B"      standard_name="C14b_Concentration"               />
-          <field field_ref="TAD_C14B"      name="TAD_C14B"      standard_name="C14b_Concentration"               />
-          <field field_ref="TAD_C14B_INV"  name="TAD_C14B_INV"  standard_name="C14b_Concentration"               />
-          <field field_ref="LDF_C14B"      name="LDF_C14B"      standard_name="C14b_Concentration"               />
-          <field field_ref="BBL_C14B"      name="BBL_C14B"      standard_name="C14b_Concentration"               />
-          <field field_ref="FOR_C14B"      name="FOR_C14B"      standard_name="C14b_Concentration"               />
-          <field field_ref="ZDF_C14B"      name="ZDF_C14B"      standard_name="C14b_Concentration"               />
-          <field field_ref="ZDP_C14B"      name="ZDP_C14B"      standard_name="C14b_Concentration"               />
-          <!-- <field field_ref="DMP_C14B"      name="DMP_C14B"      standard_name="C14b_Concentration"          /> -->
-          <field field_ref="SMS_C14B"      name="SMS_C14B"      standard_name="C14b_Concentration"               />
-          <field field_ref="SMS_C14B_INV"  name="SMS_C14B_INV"  standard_name="C14b_Concentration"               />
-          <field field_ref="ATF_C14B"      name="ATF_C14B"      standard_name="C14b_Concentration"               /> 
-          <field field_ref="ISO_C14B"      name="ISO_C14B"      standard_name="C14b_Concentration"               />
+          <field field_ref="TOT_C14B"      name="TOT_C14B"      />
+          <field field_ref="XAD_C14B"      name="XAD_C14B"      />
+          <field field_ref="YAD_C14B"      name="YAD_C14B"      />
+          <field field_ref="ZAD_C14B"      name="ZAD_C14B"      />
+          <field field_ref="TAD_C14B"      name="TAD_C14B"      />
+          <field field_ref="LDF_C14B"      name="LDF_C14B"      />
+          <field field_ref="BBL_C14B"      name="BBL_C14B"      />
+          <field field_ref="FOR_C14B"      name="FOR_C14B"      />
+          <field field_ref="ZDF_C14B"      name="ZDF_C14B"      />
+          <field field_ref="ZDP_C14B"      name="ZDP_C14B"      />
+          <!-- <field field_ref="DMP_C14B"      name="DMP_C14B" /> -->
+          <field field_ref="SMS_C14B"      name="SMS_C14B"      />
+          <field field_ref="ATF_C14B"      name="ATF_C14B"      />
+          <field field_ref="ISO_C14B"      name="ISO_C14B"      />
    </field_group>
 
@@ -2161,50 +2126,74 @@
 
 
-    <field_group id="trendCFC11_short" >
+    <field_group id="trendCFC11_cmip6" >
           <!-- cfc11 -->
-          <field field_ref="TOT_CFC11_E3T" name="TOT_CFC11_E3T" standard_name="CFC-11_Concentration"                  />
-          <field field_ref="TOT_CFC11_INV" name="TOT_CFC11_INV" standard_name="CFC-11_Concentration"                  />
-          <field field_ref="SMS_CFC11_E3T" name="SMS_CFC11_E3T" standard_name="CFC-11_Concentration"                  />
-          <field field_ref="SMS_CFC11_INV" name="SMS_CFC11_INV" standard_name="CFC-11_Concentration"                  />
+          <field field_ref="TOT_CFC11_E3T" name="TOT_CFC11_E3T" />
+          <field field_ref="SMS_CFC11_E3T" name="SMS_CFC11_E3T" />
    </field_group>
 
-    <field_group id="trendCFC12_short" >
+    <field_group id="trendCFC12_cmip6" >
           <!-- cfc12 -->
-          <field field_ref="TOT_CFC12_E3T" name="TOT_CFC12_E3T" standard_name="CFC-12_Concentration"                  />
-          <field field_ref="TOT_CFC12_INV" name="TOT_CFC12_INV" standard_name="CFC-12_Concentration"                  />
-          <field field_ref="SMS_CFC12_E3T" name="SMS_CFC12_E3T" standard_name="CFC-12_Concentration"                  />
-          <field field_ref="SMS_CFC12_INV" name="SMS_CFC12_INV" standard_name="CFC-12_Concentration"                  />
+          <field field_ref="TOT_CFC12_E3T" name="TOT_CFC12_E3T" />
+          <field field_ref="SMS_CFC12_E3T" name="SMS_CFC12_E3T" />
    </field_group>
 
-    <field_group id="trendSF6_short" >
+    <field_group id="trendSF6_cmip6" >
           <!-- sf6 -->
-          <field field_ref="TOT_SF6_E3T"  name="TOT_SF6_E3T"  standard_name="SF6_Concentration"                     />
-          <field field_ref="TOT_SF6_INV"  name="TOT_SF6_INV"  standard_name="SF6_Concentration"                     />
-          <field field_ref="SMS_SF6_E3T"  name="SMS_SF6_E3T"  standard_name="SF6_Concentration"                     />
-          <field field_ref="SMS_SF6_INV"  name="SMS_SF6_INV"  standard_name="SF6_Concentration"                     />
+          <field field_ref="TOT_SF6_E3T"  name="TOT_SF6_E3T"  />
+          <field field_ref="SMS_SF6_E3T"  name="SMS_SF6_E3T"  />
    </field_group>
 
-    <field_group id="trendAGE_short" >
+    <field_group id="trendAGE_cmip6" >
           <!-- age -->
-          <field field_ref="TOT_Age_E3T"  name="TOT_Age_E3T"  standard_name="sea_water_age_since_surface_contact"   />
-          <field field_ref="TOT_Age_INV"  name="TOT_Age_INV"  standard_name="sea_water_age_since_surface_contact"   />
-          <field field_ref="SMS_Age_E3T"  name="SMS_Age_E3T"  standard_name="sea_water_age_since_surface_contact"   />
-          <field field_ref="SMS_Age_INV"  name="SMS_Age_INV"  standard_name="sea_water_age_since_surface_contact"   />
+          <field field_ref="TOT_Age_E3T"  name="TOT_Age_E3T"  />
+          <field field_ref="SMS_Age_E3T"  name="SMS_Age_E3T"  />
    </field_group>
 
-    <field_group id="trendIDTRA_short" >
+    <field_group id="trendIDTRA_cmip6" >
           <!-- Ideal tracer -->
-          <field field_ref="TOT_IDTRA_E3T"  name="TOT_IDTRA_E3T"  standard_name="IDTRA_Concentration"               />
-          <field field_ref="TOT_IDTRA_INV"  name="TOT_IDTRA_INV"  standard_name="IDTRA_Concentration"               />
-          <field field_ref="SMS_IDTRA_E3T"  name="SMS_IDTRA_E3T"  standard_name="IDTRA_Concentration"               />
-          <field field_ref="SMS_IDTRA_INV"  name="SMS_IDTRA_INV"  standard_name="IDTRA_Concentration"               />
+          <field field_ref="TOT_IDTRA_E3T"  name="TOT_IDTRA_E3T"  />
+          <field field_ref="SMS_IDTRA_E3T"  name="SMS_IDTRA_E3T"  />
    </field_group>
 
-    <field_group id="trendC14B_short" >
+    <field_group id="trendC14B_cmip6" >
           <!-- c14 bomb -->
-          <field field_ref="TOT_C14B_E3T"  name="TOT_C14B_E3T"  standard_name="C14b_Concentration"               />
-          <field field_ref="TOT_C14B_INV"  name="TOT_C14B_INV"  standard_name="C14b_Concentration"               />
-          <field field_ref="SMS_C14B_E3T"  name="SMS_C14B_E3T"  standard_name="C14b_Concentration"               />
-          <field field_ref="SMS_C14B_INV"  name="SMS_C14B_INV"  standard_name="C14b_Concentration"               />
+          <field field_ref="TOT_C14B_E3T"  name="TOT_C14B_E3T"  />
+          <field field_ref="SMS_C14B_E3T"  name="SMS_C14B_E3T"  />
+   </field_group>
+
+    <field_group id="trendCFC11_cmip6_inv" >
+          <!-- cfc11 -->
+          <field field_ref="TOT_CFC11_INV" name="TOT_CFC11_INV" />
+          <field field_ref="SMS_CFC11_INV" name="SMS_CFC11_INV" />
+   </field_group>
+
+    <field_group id="trendCFC12_cmip6_inv" >
+          <!-- cfc12 -->
+          <field field_ref="TOT_CFC12_INV" name="TOT_CFC12_INV" />
+          <field field_ref="SMS_CFC12_INV" name="SMS_CFC12_INV" />
+   </field_group>
+
+    <field_group id="trendSF6_cmip6_inv" >
+          <!-- sf6 -->
+          <field field_ref="TOT_SF6_INV"  name="TOT_SF6_INV"  />
+          <field field_ref="SMS_SF6_INV"  name="SMS_SF6_INV"  />
+   </field_group>
+
+    <field_group id="trendAGE_cmip6_inv" >
+          <!-- age -->
+          <field field_ref="TOT_Age_INV"  name="TOT_Age_INV"  />
+          <field field_ref="SMS_Age_INV"  name="SMS_Age_INV"  />
+   </field_group>
+
+    <field_group id="trendIDTRA_cmip6_inv" >
+          <!-- Ideal tracer -->
+          <field field_ref="TOT_IDTRA_INV"  name="TOT_IDTRA_INV" /> 
+          <field field_ref="SMS_IDTRA_INV"  name="SMS_IDTRA_INV" />  
+   </field_group>
+
+    <field_group id="trendC14B_cmip6_inv" >
+          <!-- c14 bomb -->
+          <field field_ref="TOT_C14B_INV"  name="TOT_C14B_INV"  />
+          <field field_ref="SMS_C14B_INV"  name="SMS_C14B_INV"  /> 
    </field_group>
 
@@ -2421,4 +2410,17 @@
     </field_group>
 
+    <field_group id="groupMEDUSA_cmip6_duplicates" >
+      <field field_ref= "FBDDTALK"   name="FBDDTALK"   />
+      <field field_ref= "FBDDTDIC"   name="FBDDTDIC"   />
+      <field field_ref= "FBDDTDIFE"  name="FBDDTDIFE"  />
+      <field field_ref= "FBDDTDIN"   name="FBDDTDIN"   />
+      <field field_ref= "FBDDTDISI"  name="FBDDTDISI"  />
+      <field field_ref= "BDDTALK3"   name="BDDTALK3"   />
+      <field field_ref= "BDDTDIC3"   name="BDDTDIC3"   />
+      <field field_ref= "BDDTDIFE3"  name="BDDTDIFE3"  />
+      <field field_ref= "BDDTDIN3"   name="BDDTDIN3"   />
+      <field field_ref= "BDDTDISI3"  name="BDDTDISI3"  />
+    </field_group>
+
     <field_group id="groupMEDUSA_cmip6" >
       <field field_ref= "epC100"     name="epC100"     />
@@ -2432,15 +2434,5 @@
       <field field_ref= "O2min"      name="O2min"      />
       <field field_ref= "ZO2min"     name="ZO2min"     />
-      <field field_ref= "FBDDTALK"   name="FBDDTALK"   />
-      <field field_ref= "FBDDTDIC"   name="FBDDTDIC"   />
-      <field field_ref= "FBDDTDIFE"  name="FBDDTDIFE"  />
-      <field field_ref= "FBDDTDIN"   name="FBDDTDIN"   />
-      <field field_ref= "FBDDTDISI"  name="FBDDTDISI"  />
       <field field_ref= "TPPD3"      name="TPPD3"      />
-      <field field_ref= "BDDTALK3"   name="BDDTALK3"   />
-      <field field_ref= "BDDTDIC3"   name="BDDTDIC3"   />
-      <field field_ref= "BDDTDIFE3"  name="BDDTDIFE3"  />
-      <field field_ref= "BDDTDIN3"   name="BDDTDIN3"   />
-      <field field_ref= "BDDTDISI3"  name="BDDTDISI3"  />
       <field field_ref= "FD_NIT3"    name="FD_NIT3"    />
       <field field_ref= "FD_SIL3"    name="FD_SIL3"    />
Index: /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/CONFIG/SHARED/xco2.atm
===================================================================
--- /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/CONFIG/SHARED/xco2.atm	(revision 9385)
+++ /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/CONFIG/SHARED/xco2.atm	(revision 9385)
@@ -0,0 +1,166 @@
+% Data source is Meinshausen et al., GMD, doi:10.5194/gmd-10-2057-2017, 2017
+%      
+% Year  xCO2
+%       (ppm)
+1849.5  284.3170000
+1850.5  284.3169999
+1851.5  284.4509998
+1852.5  284.5979998
+1853.5  284.7309998
+1854.5  284.8459998
+1855.5  284.9409998
+1856.5  285.0489998
+1857.5  285.2039998
+1858.5  285.3689998
+1859.5  285.5449998
+1860.5  285.7389997
+1861.5  285.9329997
+1862.5  286.0999997
+1863.5  286.2709997
+1864.5  286.4419997
+1865.5  286.6139996
+1866.5  286.7809996
+1867.5  286.9549996
+1868.5  287.1049996
+1869.5  287.2249996
+1870.5  287.3549996
+1871.5  287.4939995
+1872.5  287.6639995
+1873.5  287.8599995
+1874.5  288.0609995
+1875.5  288.2909994
+1876.5  288.5199994
+1877.5  288.7519994
+1878.5  288.9929994
+1879.5  289.2209994
+1880.5  289.4699993
+1881.5  289.7369993
+1882.5  290.0189993
+1883.5  290.2629992
+1884.5  290.5119992
+1885.5  290.7969992
+1886.5  291.0999992
+1887.5  291.4139991
+1888.5  291.7629991
+1889.5  292.1129991
+1890.5  292.4579990
+1891.5  292.8159990
+1892.5  293.1669989
+1893.5  293.4769989
+1894.5  293.7909989
+1895.5  294.0789989
+1896.5  294.3649988
+1897.5  294.6459988
+1898.5  294.9539987
+1899.5  295.2999986
+1900.5  295.6749984
+1901.5  296.0069980
+1902.5  296.3249974
+1903.5  296.6539968
+1904.5  296.9539963
+1905.5  297.2889957
+1906.5  297.6619951
+1907.5  298.0979945
+1908.5  298.5179940
+1909.5  298.9359935
+1910.5  299.3769929
+1911.5  299.8289923
+1912.5  300.3529917
+1913.5  300.9099911
+1914.5  301.4189908
+1915.5  301.9369903
+1916.5  302.4849897
+1917.5  303.0109891
+1918.5  303.4489886
+1919.5  303.8139883
+1920.5  304.2459877
+1921.5  304.5999873
+1922.5  304.9449868
+1923.5  305.2709861
+1924.5  305.6299855
+1925.5  305.8129850
+1926.5  305.9539845
+1927.5  306.1769839
+1928.5  306.3289833
+1929.5  306.4949827
+1930.5  306.6199824
+1931.5  306.8219821
+1932.5  307.0929818
+1933.5  307.4019813
+1934.5  307.7849806
+1935.5  308.2269800
+1936.5  309.0119793
+1937.5  309.7639786
+1938.5  310.2939782
+1939.5  310.8509776
+1940.5  311.3569769
+1941.5  311.8109763
+1942.5  312.1719757
+1943.5  312.3899752
+1944.5  312.4129748
+1945.5  312.3849746
+1946.5  312.3899740
+1947.5  312.4859732
+1948.5  312.5209725
+1949.5  312.6319721
+1950.5  312.8209713
+1951.5  313.0139706
+1952.5  313.3419700
+1953.5  313.7299694
+1954.5  314.0949688
+1955.5  314.4149680
+1956.5  314.6979672
+1957.5  314.9919665
+1958.5  315.3449659
+1959.5  315.8069651
+1960.5  316.6249644
+1961.5  317.2989638
+1962.5  318.0439631
+1963.5  318.6499622
+1964.5  319.3329614
+1965.5  319.8159605
+1966.5  320.8799597
+1967.5  321.4799589
+1968.5  322.3889580
+1969.5  323.2509570
+1970.5  324.7829559
+1971.5  325.3999550
+1972.5  327.3489541
+1973.5  329.9089531
+1974.5  330.7559525
+1975.5  330.8269520
+1976.5  331.5449510
+1977.5  333.3529501
+1978.5  335.0099494
+1979.5  336.6049484
+1980.5  338.7049479
+1981.5  340.0589478
+1982.5  340.6439474
+1983.5  342.2659473
+1984.5  344.0079495
+1985.5  345.4589538
+1986.5  346.9029481
+1987.5  348.7749474
+1988.5  351.2759329
+1989.5  352.8939214
+1990.5  354.0729301
+1991.5  355.3529349
+1992.5  356.2289489
+1993.5  356.9249589
+1994.5  358.2539622
+1995.5  360.2389564
+1996.5  362.0049615
+1997.5  363.2519618
+1998.5  365.9329580
+1999.5  367.8449748
+2000.5  369.1249800
+2001.5  370.6729901
+2002.5  372.8349943
+2003.5  375.4109950
+2004.5  376.9870025
+2005.5  378.9070050
+2006.5  381.0100070
+2007.5  382.6030247
+2008.5  384.7390186
+2009.5  386.2800190
+2010.5  388.7170293
Index: /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/CFC/trcini_cfc.F90
===================================================================
--- /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/CFC/trcini_cfc.F90	(revision 9384)
+++ /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/CFC/trcini_cfc.F90	(revision 9385)
@@ -44,5 +44,5 @@
       !! ** Method  : - Read the namcfc namelist and check the parameter values
       !!----------------------------------------------------------------------
-      INTEGER  ::  ji, jj, jn, jl, jm, js, io, ierr
+      INTEGER  ::  ji, jj, jn, jl, jm, js, io, iostatus, ierr
       INTEGER  ::  iskip = 7   ! number of 1st descriptor lines
       REAL(wp) ::  zyy, zyd
@@ -57,13 +57,19 @@
       
       CALL ctl_opn( inum, clname, 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE. )
-      REWIND(inum)
       
       ! compute the number of year in the file
       ! file starts in 1931 do jn represent the year in the century
+      iostatus = 0
       jn = 31 
-      DO 
-        READ(inum,'(1x)',END=100) 
+      DO WHILE ( iostatus == 0 )
+        READ(inum,'(1x)', IOSTAT=iostatus, END=100)
         jn = jn + 1
-      END DO
+      ENDDO
+      IF( iostatus .NE. 0 ) THEN
+        !! Error while reading CFC input file 
+        CALL ctl_stop('trc_ini_cfc:  &
+                      & Error on the 1st reading of cfc1112sf6.atm')
+        RETURN
+      ENDIF
  100  jpyear = jn - 1 - iskip
       IF ( lwp) WRITE(numout,*) '    ', jpyear ,' years read'
@@ -72,5 +78,6 @@
       ALLOCATE( p_cfc(jpyear,jphem,3), STAT=ierr )
       IF( ierr > 0 ) THEN
-         CALL ctl_stop( 'trc_ini_cfc: unable to allocate p_cfc array' )   ;   RETURN
+         CALL ctl_stop( 'trc_ini_cfc: unable to allocate p_cfc array' )   
+         RETURN
       ENDIF
       IF( trc_sms_cfc_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'trc_ini_cfc: unable to allocate CFC arrays' )
@@ -101,11 +108,15 @@
       ! file starts in 1931 do jn represent the year in the century.jhh
       ! Read file till the end
-      jn = 31
-      DO 
+      DO jn = 31, jpyear 
+        !!READ(inum, '(F6.1,6F7.2)', IOSTAT=io) zyy, p_cfc(jn,1,1), p_cfc(jn,1,2), &
         READ(inum,*, IOSTAT=io) zyy, p_cfc(jn,1,1), p_cfc(jn,1,2), &
              & p_cfc(jn,1,3), p_cfc(jn,2,1),  &
              & p_cfc(jn,2,2), p_cfc(jn,2,3)
-        IF( io < 0 ) exit
-        jn = jn + 1
+        IF( io .NE.0 )  THEN
+          !! Error while reading CFC input file 
+          CALL ctl_stop('trc_ini_cfc:   &
+                        & Error on the 2nd reading of cfc1112sf6.atm')
+          RETURN
+        ENDIF
       END DO
 
Index: /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/air_sea.F90
===================================================================
--- /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/air_sea.F90	(revision 9384)
+++ /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/air_sea.F90	(revision 9385)
@@ -67,8 +67,7 @@
 # endif
       USE in_out_manager,    ONLY: lwp, numout
-      USE oce,               ONLY: PCO2a_in_cpl
       USE par_kind,          ONLY: wp
       USE par_oce,           ONLY: jpi, jpim1, jpj, jpjm1
-      USE sbc_oce,           ONLY: fr_i, lk_oasis, qsr, wndm
+      USE sbc_oce,           ONLY: fr_i, qsr, wndm
       USE sms_medusa,        ONLY: jdms, jdms_input, jdms_model,          &
                                    jriver_alk, jriver_c,                  &
@@ -152,17 +151,4 @@
             !! OPEN wet point IF..THEN loop
             IF (tmask(ji,jj,1) == 1) then
-               IF (lk_oasis) THEN
-                  !! use 2D atm xCO2 from atm coupling
-                  f_xco2a(ji,jj) = PCO2a_in_cpl(ji,jj)
-                  !!! 
-                  !!! Jpalm test on atm xCO2
-                  IF ( (f_xco2a(ji,jj) > 1500.0 ).OR.(f_xco2a(ji,jj) < 100.0 ) ) THEN
-                    IF(lwp) THEN 
-                       WRITE(numout,*) ' atm xCO2 = ',f_xco2a(ji,jj),          &
-                                       ' -- ji =', mig(ji),' jj = ', mjg(jj)
-                    ENDIF
-                    CALL ctl_stop( 'MEDUSA - Air-Sea :', 'unrealistic atm xCO2 ' )
-                 ENDIF 
-               ENDIF
                !!
                !! AXY (23/06/15): as part of an effort to update the 
@@ -261,28 +247,38 @@
                !!          must be associated to air-sea flux or air xCO2...
                !!          Check MOCSY outputs
-              IF ( (f_pco2w(ji,jj) > 1.E4 ).OR.(f_pco2w(ji,jj) < 0.0 ) .OR.     &
-                   (f_fco2w(ji,jj) > 1.E4 ).OR.(f_fco2w(ji,jj) < 0.0 ) .OR.     &   
-                   (f_fco2atm(ji,jj) > 1.E4 ).OR.(f_fco2atm(ji,jj) < 0.0 ) .OR.     &
-                   (f_co2flux(ji,jj) > 1.E-2 ).OR.(f_co2flux(ji,jj) < -1.E-2 ) .OR.     &
-                   (f_dpco2(ji,jj) > 1.E4 ).OR.(f_dpco2(ji,jj) < -1.E4 ) ) THEN
-                 IF(lwp) THEN 
-                     WRITE(numout,*) ' surface T = ',ztmp(ji,jj)
-                     WRITE(numout,*) ' surface S = ',zsal(ji,jj)
-                     WRITE(numout,*) ' surface ALK = ',zalk(ji,jj)
-                     WRITE(numout,*) ' surface DIC = ',zdic(ji,jj)
-                     WRITE(numout,*) ' KW660 = ',f_kw660(ji,jj)
-                     WRITE(numout,*) ' atm xCO2 = ',f_xco2a(ji,jj)   
-                     WRITE(numout,*) ' surface pco2w  = ',f_pco2w(ji,jj)
-                     WRITE(numout,*) ' surface fco2w  = ',f_fco2w(ji,jj)
-                     WRITE(numout,*) ' surface fco2a  = ',f_fco2atm(ji,jj)
-                     WRITE(numout,*) ' surface co2flx = ',f_co2flux(ji,jj)
-                     WRITE(numout,*) ' surface dpco2  = ',f_dpco2(ji,jj)
-                     WRITE(numout,*) ' MOCSY output: ji =', mig(ji),' jj = ', mjg(jj),  &
-                                       ' kt = ', kt     
-                     WRITE(numout,*) 'MEDUSA - Air-Sea OUTPUT: unrealistic surface Carb. Chemistry'
-                 ENDIF     
-                 CALL ctl_stop( 'MEDUSA - Air-Sea OUTPUT: ',            &
-                                'unrealistic surface Carb. Chemistry -- OUTPUTS' )
-              ENDIF     
+               !!===================
+               !! Jpalm -- 19-02-2018 -- remove the cap - only check MOCSY inputs
+               !!       because of specific area in arabic sea where strangely
+               !!       with core 2 forcing, ALK is lower than DIC and result in 
+               !!       Enormous dpco2 - even if all carb chem caract are OK.
+               !!       and this check stops the model.
+               !!       --Input checks are already more than enough to stop the
+               !!       model if carb chem goes crazy. 
+               !!       we remove the mocsy output checks
+               !!===================
+               !!IF ( (f_pco2w(ji,jj) > 1.E4 ).OR.(f_pco2w(ji,jj) < 0.0 ) .OR.     &
+               !!    (f_fco2w(ji,jj) > 1.E4 ).OR.(f_fco2w(ji,jj) < 0.0 ) .OR.     &   
+               !!    (f_fco2atm(ji,jj) > 1.E4 ).OR.(f_fco2atm(ji,jj) < 0.0 ) .OR.     &
+               !!    (f_co2flux(ji,jj) > 1.E-1 ).OR.(f_co2flux(ji,jj) < -1.E-1 ) .OR.     &
+               !!    (f_dpco2(ji,jj) > 1.E4 ).OR.(f_dpco2(ji,jj) < -1.E4 ) ) THEN
+               !!  IF(lwp) THEN 
+               !!      WRITE(numout,*) ' surface T = ',ztmp(ji,jj)
+               !!      WRITE(numout,*) ' surface S = ',zsal(ji,jj)
+               !!      WRITE(numout,*) ' surface ALK = ',zalk(ji,jj)
+               !!      WRITE(numout,*) ' surface DIC = ',zdic(ji,jj)
+               !!      WRITE(numout,*) ' KW660 = ',f_kw660(ji,jj)
+               !!      WRITE(numout,*) ' atm xCO2 = ',f_xco2a(ji,jj)   
+               !!      WRITE(numout,*) ' surface pco2w  = ',f_pco2w(ji,jj)
+               !!      WRITE(numout,*) ' surface fco2w  = ',f_fco2w(ji,jj)
+               !!      WRITE(numout,*) ' surface fco2a  = ',f_fco2atm(ji,jj)
+               !!      WRITE(numout,*) ' surface co2flx = ',f_co2flux(ji,jj)
+               !!      WRITE(numout,*) ' surface dpco2  = ',f_dpco2(ji,jj)
+               !!      WRITE(numout,*) ' MOCSY output: ji =', mig(ji),' jj = ', mjg(jj),  &
+               !!                        ' kt = ', kt     
+               !!      WRITE(numout,*) 'MEDUSA - Air-Sea OUTPUT: unrealistic surface Carb. Chemistry'
+               !!  ENDIF     
+               !!  CALL ctl_stop( 'MEDUSA - Air-Sea OUTPUT: ',            &
+               !!                 'unrealistic surface Carb. Chemistry -- OUTPUTS' )
+               !!ENDIF     
             ENDIF
          ENDDO
Index: /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/carb_chem.F90
===================================================================
--- /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/carb_chem.F90	(revision 9384)
+++ /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/carb_chem.F90	(revision 9385)
@@ -103,8 +103,4 @@
                !! OPEN wet point IF..THEN loop
                IF (tmask(ji,jj,jk).eq.1) THEN
-                  IF (lk_oasis) THEN
-                     !! use 2D atm xCO2 from atm coupling
-                     f_xco2a(ji,jj) = PCO2a_in_cpl(ji,jj)
-                  ENDIF
                   !! Do carbonate chemistry
                   !!
Index: /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/sms_medusa.F90
===================================================================
--- /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/sms_medusa.F90	(revision 9384)
+++ /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/sms_medusa.F90	(revision 9385)
@@ -283,112 +283,20 @@
 #if defined key_roam
 !!----------------------------------------------------------------------
-!! Atmospheric pCO2 data (1859 to 2100 inclusive)
-!!----------------------------------------------------------------------
-!!
-   REAL(wp), DIMENSION(242)         ::   hist_pco2 !: pCO2
-
-# if defined key_rcp26
-      !! UKMO, run AJKKH + KAAEC, RCP 2.6, pCO2 time evolution
-      DATA hist_pco2 / 286.0230, 286.1730, 286.3230, 286.4480, 286.5730, &
-      & 286.7230, 286.8480, 286.9480, 287.0480, 287.1730, &
-      & 287.3230, 287.4730, 287.6480, 287.8480, 288.0730, &
-      & 288.3480, 288.6480, 288.9730, 289.3470, 289.7470, &
-      & 290.1730, 290.6470, 291.1470, 291.6220, 292.0720, &
-      & 292.5220, 292.9220, 293.2470, 293.5220, 293.7470, &
-      & 293.9470, 294.1220, 294.2720, 294.4220, 294.5470, &
-      & 294.6470, 294.7470, 294.8470, 294.9710, 295.1710, &
-      & 295.4460, 295.7470, 296.0720, 296.4210, 296.7710, &
-      & 297.1460, 297.5710, 298.0210, 298.4460, 298.8460, &
-      & 299.2460, 299.6450, 300.0210, 300.3710, 300.7200, &
-      & 301.0450, 301.3460, 301.6710, 302.0200, 302.3450, &
-      & 302.6450, 302.9700, 303.3450, 303.7200, 304.0700, &
-      & 304.4700, 304.9200, 305.3440, 305.7700, 306.2450, &
-      & 306.7190, 307.1700, 307.6440, 308.1190, 308.5440, &
-      & 308.9440, 309.3440, 309.6940, 309.9440, 310.1190, &
-      & 310.2440, 310.3190, 310.3190, 310.2440, 310.1440, &
-      & 310.0690, 310.0440, 310.0690, 310.1440, 310.2690, &
-      & 310.4440, 310.6940, 311.0430, 311.4440, 311.8690, &
-      & 312.3680, 312.9430, 313.5430, 314.1680, 314.7900, &
-      & 315.4430, 316.2150, 317.0170, 317.7370, 318.3400, &
-      & 318.8680, 319.5900, 320.5890, 321.5470, 322.5770, &
-      & 323.8440, 324.9260, 325.7960, 327.0810, 328.6180, &
-      & 329.6830, 330.5250, 331.6880, 333.2120, 334.7870, &
-      & 336.4640, 338.2990, 339.6660, 340.7310, 342.1360, &
-      & 343.7200, 345.2200, 346.7350, 348.5820, 350.6740, &
-      & 352.4230, 353.7910, 354.9530, 355.8210, 356.7130, &
-      & 358.0630, 359.7720, 361.3970, 363.0900, 365.2560, &
-      & 367.2810, 368.7980, 370.4000, 372.4550, 374.6920, &
-      & 376.7440, 378.7440, 380.7580, 382.7080, 384.7300, &
-      & 386.9310, 389.2150, 391.4910, 393.7710, 396.0460, &
-      & 398.3240, 400.6080, 402.8950, 405.1780, 407.4550, &
-      & 409.7260, 411.9930, 414.2500, 416.4410, 418.5280, &
-      & 420.5250, 422.4390, 424.2720, 426.0200, 427.6750, &
-      & 429.2360, 430.7050, 432.0850, 433.3580, 434.5140, &
-      & 435.5740, 436.5490, 437.4420, 438.2550, 438.9810, &
-      & 439.6110, 440.1430, 440.5770, 440.9450, 441.2660, &
-      & 441.5410, 441.7840, 442.0050, 442.2040, 442.3780, &
-      & 442.5210, 442.6200, 442.6720, 442.6810, 442.6540, &
-      & 442.5830, 442.4670, 442.3270, 442.1680, 441.9960, &
-      & 441.8060, 441.5930, 441.3440, 441.0540, 440.7230, &
-      & 440.3510, 439.9300, 439.4650, 438.9730, 438.4630, &
-      & 437.9400, 437.4020, 436.8400, 436.2640, 435.6850, &
-      & 435.1030, 434.5160, 433.9170, 433.3060, 432.7010, &
-      & 432.1110, 431.5380, 430.9810, 430.4320, 429.8860, &
-      & 429.3370, 428.7810, 428.2220, 427.6490, 427.0660, &
-      & 426.4890, 425.9270, 425.3840, 424.8610, 424.3540, &
-      & 423.8540, 423.3540, 422.8530, 422.3510, 421.8410, &
-      & 421.3250, 420.8190 /
-# else
-      !! UKMO, run AJKKH + KAAEF, RCP 8.5, pCO2 time evolution
-      DATA hist_pco2 / 286.0230, 286.1730, 286.3230, 286.4480, 286.5730, &
-      & 286.7230, 286.8480, 286.9480, 287.0480, 287.1730, &
-      & 287.3230, 287.4730, 287.6480, 287.8480, 288.0730, &
-      & 288.3480, 288.6480, 288.9730, 289.3470, 289.7470, &
-      & 290.1730, 290.6470, 291.1470, 291.6220, 292.0720, &
-      & 292.5220, 292.9220, 293.2470, 293.5220, 293.7470, &
-      & 293.9470, 294.1220, 294.2720, 294.4220, 294.5470, &
-      & 294.6470, 294.7470, 294.8470, 294.9710, 295.1710, &
-      & 295.4460, 295.7470, 296.0720, 296.4210, 296.7710, &
-      & 297.1460, 297.5710, 298.0210, 298.4460, 298.8460, &
-      & 299.2460, 299.6450, 300.0210, 300.3710, 300.7200, &
-      & 301.0450, 301.3460, 301.6710, 302.0200, 302.3450, &
-      & 302.6450, 302.9700, 303.3450, 303.7200, 304.0700, &
-      & 304.4700, 304.9200, 305.3440, 305.7700, 306.2450, &
-      & 306.7190, 307.1700, 307.6440, 308.1190, 308.5440, &
-      & 308.9440, 309.3440, 309.6940, 309.9440, 310.1190, &
-      & 310.2440, 310.3190, 310.3190, 310.2440, 310.1440, &
-      & 310.0690, 310.0440, 310.0690, 310.1440, 310.2690, &
-      & 310.4440, 310.6940, 311.0430, 311.4440, 311.8690, &
-      & 312.3680, 312.9430, 313.5430, 314.1680, 314.7900, &
-      & 315.4430, 316.2150, 317.0170, 317.7370, 318.3400, &
-      & 318.8680, 319.5900, 320.5890, 321.5470, 322.5770, &
-      & 323.8440, 324.9260, 325.7960, 327.0810, 328.6180, &
-      & 329.6830, 330.5250, 331.6880, 333.2120, 334.7870, &
-      & 336.4640, 338.2990, 339.6660, 340.7310, 342.1360, &
-      & 343.7200, 345.2200, 346.7350, 348.5820, 350.6740, &
-      & 352.4230, 353.7910, 354.9530, 355.8210, 356.7130, &
-      & 358.0630, 359.7720, 361.3970, 363.0900, 365.2560, &
-      & 367.2810, 368.7980, 370.4000, 372.4550, 374.6920, &
-      & 376.7440, 378.7440, 380.7580, 382.7080, 384.7300, &
-      & 386.9420, 389.2540, 391.5670, 393.9370, 396.3920, &
-      & 398.9320, 401.5550, 404.2550, 407.0220, 409.8530, &
-      & 412.7470, 415.7050, 418.7210, 421.7880, 424.9180, &
-      & 428.1200, 431.3970, 434.7470, 438.1650, 441.6410, &
-      & 445.1700, 448.7530, 452.3920, 456.0950, 459.8810, &
-      & 463.7680, 467.7660, 471.8750, 476.0960, 480.4210, &
-      & 484.8390, 489.3470, 493.9430, 498.6400, 503.4380, &
-      & 508.3410, 513.3630, 518.5160, 523.8050, 529.2290, &
-      & 534.7780, 540.4450, 546.2230, 552.1120, 558.1110, &
-      & 564.2110, 570.4130, 576.7390, 583.1990, 589.7980, &
-      & 596.5390, 603.4110, 610.4060, 617.4940, 624.6500, &
-      & 631.8800, 639.1750, 646.5360, 653.9800, 661.5230, &
-      & 669.1840, 676.9570, 684.8290, 692.7790, 700.7690, &
-      & 708.8050, 716.8870, 725.0020, 733.1770, 741.3900, &
-      & 749.6700, 758.0480, 766.5050, 775.0350, 783.6110, &
-      & 792.2200, 800.8740, 809.5680, 818.2760, 827.0090, &
-      & 835.8020, 844.6550, 853.5730, 862.5690, 871.6190, &
-      & 880.7020, 889.8240, 898.9590, 908.1270, 917.3080, &
-      & 926.4960, 935.7040 /
-# endif
+!! JPALM -- change hist_pco2 init
+!!----------------------------------------------------------------------
+!!
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:)   ::   hist_pco2 !: pCO2
+   INTEGER  :: co2_rec
+   REAL(wp) :: co2_yinit, co2_yend    !: First and Last year read in the xCO2.atm file
+#endif
+
+!!----------------------------------------------------------------------
+!! JPALM -- PI CO2 key
+!!----------------------------------------------------------------------
+!!
+#if defined key_axy_pi_co2
+   LOGICAL , PUBLIC ::   lk_pi_co2 = .TRUE.  !: PI xCO2 used
+#else
+   LOGICAL , PUBLIC ::   lk_pi_co2 = .FALSE. !: PI xCO2 unused
 #endif
 
Index: /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90
===================================================================
--- /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90	(revision 9384)
+++ /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90	(revision 9385)
@@ -81,5 +81,7 @@
                                             gdept_0, gdept_n,               &
                                             gdepw_0, gdepw_n,               &
-                                            nday_year, nsec_day, nyear,     &
+                                            nday_year, nsec_day,            &
+                                            nyear, nyear_len, ndastp,       &
+                                            nsec_month,                     &
                                             rdt, tmask, mig, mjg, nimpp,    &
                                             njmpp 
@@ -92,5 +94,5 @@
                                             mpp_min, mpp_minloc,            &
                                             ctl_stop, ctl_warn, lk_mpp  
-      USE oce,                        ONLY: tsb, tsn
+      USE oce,                        ONLY: tsb, tsn, PCO2a_in_cpl
       USE par_kind,                   ONLY: wp
       USE par_medusa,                 ONLY: jpalk, jpchd, jpchn, jpdet,     &
@@ -102,5 +104,6 @@
       !! JPALM (27-06-2016): add lk_oasis for CO2 and DMS coupling with atm
       USE sbc_oce,                    ONLY: lk_oasis
-      USE sms_medusa,                 ONLY: hist_pco2
+      USE sms_medusa,                 ONLY: hist_pco2, co2_yinit, co2_yend, &
+                                            lk_pi_co2
       USE trc,                        ONLY: ln_rsttr, nittrc000, trn
       USE bio_medusa_init_mod,        ONLY: bio_medusa_init
@@ -114,4 +117,5 @@
       USE bio_medusa_diag_slice_mod,  ONLY: bio_medusa_diag_slice
       USE bio_medusa_fin_mod,         ONLY: bio_medusa_fin
+      USE trcstat,                    ONLY: trc_rst_dia_stat
 
       IMPLICIT NONE
@@ -181,5 +185,6 @@
       !! 
       !! temporary variables
-      REAL(wp) ::    fq0,fq1,fq2,fq3,fq4
+      REAL(wp) ::    fq3,fq4
+      REAL(wp) ::    this_y, this_d, this_s, fyear
       !!
       !! T and S check temporary variable
@@ -293,44 +298,85 @@
       !!------------------------------------------------------------------
       !!
-      !! what's atmospheric pCO2 doing? (data start in 1859)
-      iyr1  = nyear - 1859 + 1
-      iyr2  = iyr1 + 1
-      if (iyr1 .le. 1) then
-         !! before 1860
-         f_xco2a(:,:) = hist_pco2(1)
-      elseif (iyr2 .ge. 242) then
-         !! after 2099
-         f_xco2a(:,:) = hist_pco2(242)
-      else
-         !! just right
-         fq0 = hist_pco2(iyr1)
-         fq1 = hist_pco2(iyr2)
-         fq2 = real(nsec_day) / (60.0 * 60.0 * 24.0)
-         !! AXY (14/06/12): tweaked to make more sense (and be correct)
-#  if defined key_bs_axy_yrlen
-         !! bugfix: for 360d year with HadGEM2-ES forcing
-         fq3 = (real(nday_year) - 1.0 + fq2) / 360.0  
-#  else
-         !! original use of 365 days (not accounting for leap year or 
-         !! 360d year)
-         fq3 = (real(nday_year) - 1.0 + fq2) / 365.0
-#  endif
-         fq4 = (fq0 * (1.0 - fq3)) + (fq1 * fq3)
-         f_xco2a(:,:) = fq4
-      endif
-#  if defined key_axy_pi_co2
-      !! OCMIP pre-industrial pCO2
-      !! f_xco2a(:,:) = 284.725  !! CMIP5 pre-industrial pCO2
-      f_xco2a = 284.317          !! CMIP6 pre-industrial pCO2 
-#  endif
-      !! IF(lwp) WRITE(numout,*) ' MEDUSA nyear     =', nyear
-      !! IF(lwp) WRITE(numout,*) ' MEDUSA nsec_day  =', real(nsec_day)
-      !! IF(lwp) WRITE(numout,*) ' MEDUSA nday_year =', real(nday_year)
-      !! AXY (29/01/14): remove surplus diagnostics
-      !! IF(lwp) WRITE(numout,*) ' MEDUSA fq0       =', fq0
-      !! IF(lwp) WRITE(numout,*) ' MEDUSA fq1       =', fq1
-      !! IF(lwp) WRITE(numout,*) ' MEDUSA fq2       =', fq2
-      !! IF(lwp) WRITE(numout,*) ' MEDUSA fq3       =', fq3
-      IF(lwp) WRITE(numout,*) ' MEDUSA atm pCO2  =', f_xco2a(1,1)
+      IF (lk_oasis) THEN 
+         !! xCO2 from coupled
+         IF ( ( kt == nittrc000 ) .AND. lwp )     &
+             WRITE(numout,*) '** MEDUSA Atm xCO2 given by the UM **'
+         f_xco2a(:,:) = PCO2a_in_cpl(:,:)
+         !! Check the xCO2 from the UM is OK
+         !! piece of code moved from air-sea.F90
+         !!---
+         DO jj = 2,jpjm1
+            DO ji = 2,jpim1
+               !! OPEN wet point IF..THEN loop
+               IF (tmask(ji,jj,1) == 1) then
+                  !!! Jpalm test on atm xCO2
+                  IF ( (f_xco2a(ji,jj) .GT. 10000.0 ).OR.     &
+                       (f_xco2a(ji,jj) .LE. 0.0 ) ) THEN
+                     IF(lwp) THEN
+                        WRITE(numout,*) ' atm xCO2 = ',f_xco2a(ji,jj),       &
+                                        ' -- ji =', mig(ji),' jj = ', mjg(jj)
+                     ENDIF
+                     CALL ctl_stop( 'MEDUSA - trc_bio :',     &
+                                    'unrealistic coupled atm xCO2 ' )
+                  ENDIF
+               ENDIF
+            ENDDO
+         ENDDO
+         !!--- 
+      ELSEIF (lk_pi_co2) THEN
+         !! OCMIP pre-industrial xCO2
+         IF ( ( kt == nittrc000 ) .AND. lwp )     &
+             WRITE(numout,*) '** MEDUSA Atm xCO2 fixed to pre-industrial value **'
+         !! f_xco2a(:,:) = 284.725       !! CMIP5 pre-industrial pCO2
+         f_xco2a(:,:) = 284.317          !! CMIP6 pre-industrial pCO2 
+      ELSE      
+         !! xCO2 from file
+         !! AXY - JPALM new interpolation scheme usinf nyear_len
+         this_y = real(nyear)
+         this_d = real(nday_year)
+         this_s = real(nsec_day)
+         !!
+         fyear = this_y + ((this_d - 1) + (this_s / (60. * 60. * 24.))) / real(nyear_len(1))
+         !!
+         IF ( ( kt == nittrc000 ) .AND. lwp ) THEN 
+            WRITE(numout,*) '** MEDUSA Atm xCO2 from file **'
+            WRITE(numout,*) ' MEDUSA year      =', this_y
+            WRITE(numout,*) ' Year length      =', real(nyear_len(1))
+            WRITE(numout,*) ' MEDUSA nday_year =', this_d
+            WRITE(numout,*) ' MEDUSA nsec_day  =', this_s
+         ENDIF
+         !! 
+         !! different case test 
+         IF (fyear .LE. co2_yinit) THEN
+            !! before first record -- pre-industrial value
+            f_xco2a(:,:) = hist_pco2(1)  
+         ELSEIF (fyear .GE. co2_yend) THEN
+            !! after last record - continue to use the last value
+            f_xco2a(:,:) = hist_pco2(int(co2_yend - co2_yinit + 1.) )
+         ELSE
+            !! just right
+            iyr1 = int(fyear - co2_yinit) + 1
+            iyr2 = iyr1 + 1 
+            fq3 = fyear - real(iyr1) - co2_yinit + 1.
+            fq4 = ((1 - fq3) * hist_pco2(iyr1)) + (fq3 * hist_pco2(iyr2))
+            f_xco2a(:,:) = fq4
+            !!
+            IF ( ( kt == nittrc000 ) .AND. lwp ) THEN 
+               WRITE(numout,*) ' MEDUSA year1     =', iyr1
+               WRITE(numout,*) ' MEDUSA year2     =', iyr2
+               WRITE(numout,*) ' xCO2 year1       =', hist_pco2(iyr1)
+               WRITE(numout,*) ' xCO2 year2       =', hist_pco2(iyr2)
+               WRITE(numout,*) ' Year2 weight     =', fq3
+            ENDIF
+         ENDIF
+      ENDIF
+ 
+      !! Writing xCO2 in output on start and on the 1st tsp of each  month
+      IF ( (kt == nittrc000 .AND. .NOT.ln_rsttr) .OR.                        &
+           ( nsec_month .LE. INT(rdt) ) )  THEN
+           IF ( lwp )  WRITE(numout,*) ' *** Atm xCO2 *** -- kt:', kt,       &
+                                       ';  current date:', ndastp
+          call trc_rst_dia_stat(f_xco2a(:,:), 'atm xCO2')
+      ENDIF
 # endif
 
@@ -358,6 +404,23 @@
       !!          x * 30d + 1*rdt(i.e: mod = rdt)   
       !!          ++ need to pass carb-chem output var through restarts
-      If ( (kt == nittrc000 .AND. .NOT.ln_rsttr) .OR.                        &
-           ((86400*mod(nn_date0,100) + mod(kt*rdt,2592000.)) == rdt) ) THEN
+      !!If ( (kt == nitt8rc000 .AND. .NOT.ln_rsttr) .OR.          &
+      !!     ( (mod(kt*rdt,2592000.)) == rdt) THEN
+      !!=============================
+      !! (Jpalm -- updated for restartability issues)
+      !! We want this to be start of month or if starting afresh from  
+      !! climatology - marc 20/6/17 
+      !!If ( (kt == nittrc000 .AND. .NOT.ln_rsttr) .OR.                         & 
+      !!     ((86400*mod(nn_date0,100) + mod(kt*rdt,2592000.)) == rdt) ) THEN 
+      !!=============================
+      !! Jpalm -- 15-02-2018 -- need to change 3D carb-chem call freq again.
+      !! previous call did not work, probably the (86400*mod(nn_date0,100) part
+      !! should not be in...
+      !! now use the NEMO calendar tool : nsec_month to be sure to call 
+      !! at the beginning of a new month .
+      IF ( (kt == nittrc000 .AND. .NOT.ln_rsttr) .OR.                        &
+           ( nsec_month .LE. INT(rdt) ) )  THEN
+           IF ( lwp )  WRITE(numout,*)                                       &         
+                              ' *** 3D carb chem call *** -- kt:', kt,       &
+                              ';  current date:', ndastp 
          !!---------------------------------------------------------------
          !! Calculate the carbonate chemistry for the whole ocean on the first
@@ -502,5 +565,5 @@
          !!              Exceptionnal value did exist
          !!
-         Call trc_bio_check(kt)
+         Call trc_bio_check(kt, jk)
 
          !!================================================================
@@ -810,5 +873,5 @@
    END SUBROUTINE trc_bio_exceptionnal_fix 
 
-   SUBROUTINE trc_bio_check(kt)
+   SUBROUTINE trc_bio_check(kt, jk)
       !!-----------------------------------
       !! JPALM -- 14-12-2017 -- Still dealing with this micro-boil/carb failure
@@ -824,5 +887,5 @@
       INTEGER               :: ii,ij         ! temporary scalars 
       INTEGER, DIMENSION(2) :: ilocs         ! 
-      INTEGER, INTENT( in ) :: kt
+      INTEGER, INTENT( in ) :: kt, jk
       !!
       !!==========================
@@ -852,6 +915,6 @@
          IF(lwp) THEN
             WRITE(numout,*) 'trc_bio:tracer anomaly: *****    WARNING     *****'
-            WRITE(numout,*) 'trc_bio:tracer anomaly: sea surface DIC > 4000 '
-            WRITE(numout,9600) kt, zmax, ii, ij
+            WRITE(numout,*) 'trc_bio:tracer anomaly: DIC concentration > 4000 '
+            WRITE(numout,9600) kt, zmax, ii, ij, jk
             WRITE(numout,*) 'trc_bio:tracer anomaly: ***** END OF WARNING *****'
          ENDIF
@@ -869,6 +932,6 @@
          IF(lwp) THEN
             WRITE(numout,*) 'trc_bio:tracer anomaly: *****    WARNING     *****'
-            WRITE(numout,*) 'trc_bio:tracer anomaly: sea surface DIC <= 0 '
-            WRITE(numout,9700) kt, zmin, ii, ij
+            WRITE(numout,*) 'trc_bio:tracer anomaly: DIC concentration <= 0 '
+            WRITE(numout,9700) kt, zmin, ii, ij, jk
             WRITE(numout,*) 'trc_bio:tracer anomaly: ***** END OF WARNING *****'
          ENDIF
@@ -901,6 +964,6 @@
          IF(lwp) THEN
             WRITE(numout,*) 'trc_bio:tracer anomaly: *****     WARNING    *****'
-            WRITE(numout,*) 'trc_bio:tracer anomaly: sea surface Alkalinity > 4000 '
-            WRITE(numout,9800) kt, zmax, ii, ij
+            WRITE(numout,*) 'trc_bio:tracer anomaly: ALK concentration > 4000 '
+            WRITE(numout,9800) kt, zmax, ii, ij, jk
             WRITE(numout,*) 'trc_bio:tracer anomaly: ***** END OF WARNING *****'
          ENDIF
@@ -918,6 +981,6 @@
          IF(lwp) THEN
             WRITE(numout,*) 'trc_bio:tracer anomaly: *****    WARNING     *****'
-            WRITE(numout,*) 'trc_bio:tracer anomaly:  sea surface Alkalinity <= 0 '
-            WRITE(numout,9900) kt, zmin, ii, ij
+            WRITE(numout,*) 'trc_bio:tracer anomaly:  ALK concentration <= 0 '
+            WRITE(numout,9900) kt, zmin, ii, ij, jk
             WRITE(numout,*) 'trc_bio:tracer anomaly: ***** END OF WARNING *****'
          ENDIF
@@ -925,8 +988,8 @@
 
 
-9600  FORMAT ('trc_bio:tracer anomaly: kt=',i6,' max DIC: ',f16.10,', i j: ',2i5)
-9700  FORMAT ('trc_bio:tracer anomaly: kt=',i6,' min DIC: ',f16.10,', i j: ',2i5)
-9800  FORMAT ('trc_bio:tracer anomaly: kt=',i6,' max ALK: ',f16.10,', i j: ',2i5)
-9900  FORMAT ('trc_bio:tracer anomaly: kt=',i6,' min ALK: ',f16.10,', i j: ',2i5)
+9600  FORMAT ('trc_bio:tracer anomaly: kt=',i6,' max DIC: ',f16.10,', i j k: ',3i5)
+9700  FORMAT ('trc_bio:tracer anomaly: kt=',i6,' min DIC: ',f16.10,', i j k: ',3i5)
+9800  FORMAT ('trc_bio:tracer anomaly: kt=',i6,' max ALK: ',f16.10,', i j k: ',3i5)
+9900  FORMAT ('trc_bio:tracer anomaly: kt=',i6,' min ALK: ',f16.10,', i j k: ',3i5)
 
    END SUBROUTINE trc_bio_check
Index: /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcini_medusa.F90
===================================================================
--- /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcini_medusa.F90	(revision 9384)
+++ /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcini_medusa.F90	(revision 9385)
@@ -324,4 +324,14 @@
       IF(lwp) WRITE(numout,*) ' ~~~~~~~~~~~~~~'
       IF(lwp) CALL flush(numout)
+      !!
+      !!----------------------------------------------------------------------
+      !! JPALM (23-01-2017): new way to initialize CO2-atm for cmip6 
+      !!                     initially done in trcsms_medusa
+      !!----------------------------------------------------------------------
+      !! 
+      IF( ( .NOT.lk_oasis ) .AND. ( .NOT.lk_pi_co2 ) ) THEN
+         IF(lwp) WRITE(numout,*) ' trc_ini_medusa: initialisating atm CO2 record'
+         CALL trc_ini_medusa_co2atm
+      ENDIF
 
    END SUBROUTINE trc_ini_medusa
@@ -480,4 +490,88 @@
    END SUBROUTINE trc_ini_medusa_river
    
+   SUBROUTINE trc_ini_medusa_co2atm
+      !!----------------------------------------------------------------------
+      !!                     ***  trc_ini_medusa_co2atm  ***  
+      !!
+      !! ** Purpose :   initialization atmospheric co2 record
+      !!
+      !! ** Method  : - Read the xco2 file
+      !!----------------------------------------------------------------------
+      INTEGER                       ::  jn, jm, io, ierr, inum, iostatus
+      INTEGER, PARAMETER            ::  iskip = 4   ! number of 1st descriptor lines
+      REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:)   ::   zyy !: xCO2 record years
+      CHARACTER (len=10), PARAMETER ::  clname = 'xco2.atm'  !! atm CO2 record file
+      !!----------------------------------------------------------------------
+
+      IF(lwp) WRITE(numout,*)
+      IF(lwp) WRITE(numout,*) ' trc_ini_medusa_co2atm: initialisation of atm CO2 historical record'
+      IF(lwp) WRITE(numout,*) ' ~~~~~~~~~~~'
+
+
+      IF(lwp) WRITE(numout,*) 'read of formatted file xco2.atm'
+
+      CALL ctl_opn( inum, clname, 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE. )
+      !!!
+      ! -Compute the number of year in the file
+      ! -File starts in co2_yinit, jn represents the record number in the file.
+      ! -Remove the file head (iskip lines) to jn
+      ! -The year is jn + yinit - 1 
+      !! Determine the number of lines in xCO2 input file
+      iostatus = 0
+      jn = 1
+      DO WHILE ( iostatus == 0 )
+        READ(inum,'(1x)', IOSTAT=iostatus, END=100)
+        jn = jn + 1
+      ENDDO
+      IF( iostatus .NE. 0 ) THEN
+        !! Error while reading xCO2 input file 
+        CALL ctl_stop('trc_ini_medusa_co2atm: &
+                      & Error on the 1st reading of xco2.atm')
+        RETURN
+      ENDIF
+ 100  co2_rec = jn - 1 - iskip
+      IF ( lwp) WRITE(numout,*) '    ', co2_rec ,' years read in the file'
+      !                                ! Allocate CO2 hist arrays
+      ierr = 0 
+      ALLOCATE( hist_pco2(co2_rec),zyy(co2_rec), STAT=ierr )
+      IF( ierr > 0 ) THEN
+         CALL ctl_stop( 'trc_ini_medusa_co2atm: unable to allocate  array' )  
+         RETURN
+      ENDIF
+
+      REWIND(inum)
+
+      DO jm = 1, iskip        ! Skip over 1st six descriptor lines
+         READ(inum,'(1x)')
+      END DO
+      ! file starts in 1931 do jn represent the year in the century.jhh
+      ! Read file till the end
+      ! allocate start and end year of the file
+      DO jn = 1, co2_rec
+        READ(inum,'(F6.1,F12.7)', IOSTAT=io) zyy(jn), hist_pco2(jn)
+        IF( io .NE. 0 ) THEN
+          !! Error while reading xCO2 input file 
+          CALL ctl_stop('trc_ini_medusa_co2atm: &
+                        & Error on the 2nd reading of xco2.atm')
+          RETURN
+        ENDIF
+
+        IF(jn==1) co2_yinit = zyy(jn)
+      END DO
+      co2_yend = co2_yinit + real(co2_rec) - 1.
+
+      IF(lwp) THEN        ! Control print
+         WRITE(numout,*)
+         WRITE(numout,*) 'CO2 hist start year: ', co2_yinit
+         WRITE(numout,*) 'CO2 hist end   year: ', co2_yend
+         WRITE(numout,*) ' Year   xCO2 atm '
+         DO jn = 1, co2_rec
+            WRITE(numout, '(F6.1,F12.7)') zyy(jn), hist_pco2(jn)
+         END DO
+      ENDIF
+
+   END SUBROUTINE trc_ini_medusa_co2atm
+
+
 #else
    !!----------------------------------------------------------------------
Index: /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/trcrst.F90
===================================================================
--- /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/trcrst.F90	(revision 9384)
+++ /branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/trcrst.F90	(revision 9385)
@@ -378,5 +378,5 @@
             !!
             IF(lwp) WRITE(numout,*) ' CFC averaged properties absent - setting to zero ...'
-            qint_cfc(:,:,jn)  = 0.0   !! CHN
+            qint_cfc(:,:,jl)  = 0.0   !! CHN
          ENDIF
          !!
