Index: branches/NERC/dev_r5518_GO6_CO2_cmip/NEMOGCM/CONFIG/SHARED/field_def_bgc.xml
===================================================================
--- branches/NERC/dev_r5518_GO6_CO2_cmip/NEMOGCM/CONFIG/SHARED/field_def_bgc.xml	(revision 9380)
+++ branches/NERC/dev_r5518_GO6_CO2_cmip/NEMOGCM/CONFIG/SHARED/field_def_bgc.xml	(revision 9384)
@@ -75,12 +75,12 @@
 
       <!-- 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"   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="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 >
@@ -103,20 +103,20 @@
        <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="mmolSi/m3" />
-       <field id="SIL_E3T"  long_name="SIL * E3T"                                         unit="mmolSi/m2"  > SIL * e3t </field >
-       <field id="SIL_INV"  field_ref="SIL_E3T"   long_name="SIL Inventory"               unit="mmolSi/m2"   grid_ref="vert_sum" />
-       <field id="SURF_SIL" field_ref="SIL"       long_name="SIL Surface concentration"   unit="mmolSi/m3"   grid_ref="grid_T_surface_extract" />
-       <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"   long_name="FER Inventory"               unit="mmolFe/m2"   grid_ref="vert_sum" />
-       <field id="SURF_FER" field_ref="FER"       long_name="FER Surface concentration"   unit="mmolFe/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"   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="mmolSi/m3" />
-       <field id="PDS_E3T"  long_name="PDS * E3T"                                         unit="mmolSi/m2"  > PDS * e3t </field >
-       <field id="PDS_INV"  field_ref="PDS_E3T"   long_name="PDS Inventory"               unit="mmolSi/m2"   grid_ref="vert_sum" />
-       <field id="SURF_PDS" field_ref="PDS"       long_name="PDS Surface concentration"   unit="mmolSi/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 >
@@ -131,8 +131,8 @@
        <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="mmolO2/m3" />
-       <field id="OXY_E3T"  long_name="OXY * E3T"                                         unit="mmolO2/m2"  > OXY * e3t </field >
-       <field id="OXY_INV"  field_ref="OXY_E3T"   long_name="OXY Inventory"               unit="mmolO2/m2"   grid_ref="vert_sum" />
-       <field id="SURF_OXY" field_ref="OXY"       long_name="OXY Surface concentration"   unit="mmolO2/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 -->
@@ -303,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="-"           />
@@ -335,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="-"           />
@@ -397,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="-"           />
@@ -408,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"      />
@@ -485,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"         />
@@ -499,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"  />
@@ -565,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>
@@ -586,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>
@@ -607,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 -->
@@ -646,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>
@@ -667,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>
@@ -688,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>
@@ -713,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>
@@ -734,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>
@@ -759,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>
@@ -780,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>
@@ -805,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>
@@ -826,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>
@@ -851,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>
@@ -872,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>
@@ -897,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>
@@ -918,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>
@@ -943,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>
@@ -964,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>
@@ -989,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>
@@ -1010,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>
@@ -1035,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>
@@ -1056,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>
@@ -1081,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>
@@ -1102,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>
@@ -1127,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>
@@ -1148,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>
@@ -1173,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>
@@ -1194,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>
@@ -1219,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>
@@ -1240,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>
@@ -1265,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>
@@ -1286,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 -->
@@ -1558,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>
@@ -1579,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>
@@ -1600,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>  -->
