Merge branch 'njeffery/seaice/update-bgc-history' into next (PR #6644)

Updates to sea ice bgc registry and history fields

Several changes including:
* Corrects units/descriptions of bgc fields in registry
* Defines column integrated and cell average bgc diagnostics
* Updates streams build to include new diagnostics for bgc runs

[BFB]

Author: jonbob

components/mpas-seaice/bld/namelist_files/namelist_definition_mpassi.xml

@@ -1077,7 +1077,7 @@ Default: Defined in namelist_defaults.xml
 
 <entry id="config_use_humics" type="logical"
 	category="biogeochemistry" group="biogeochemistry">
-Use the humic matter tracer
+Use the humic (refractory dissolved organic matter) tracer
 
 Valid values: true or false
 Default: Defined in namelist_defaults.xml
@@ -1949,7 +1949,7 @@ Default: Defined in namelist_defaults.xml
 
 <entry id="config_mobility_type_humics" type="real"
 	category="biogeochemistry" group="biogeochemistry">
-Transport type of humics
+Transport type of humics (refractory dissolved organic matter)
 
 Valid values: -1 = entirely in the mobile phase; 0 = retention dominated; 1 = release dominated; 0.5 = equal but rapid exchange; 2 = equal but slow exchange
 Default: Defined in namelist_defaults.xml

components/mpas-seaice/cime_config/buildnml

@@ -934,22 +934,41 @@ def buildnml(case, caseroot, compname):
                 lines.append('    <var name="bergLatentHeatFlux"/>')
 
             if ice_bgc == 'ice_bgc':
-                lines.append('    <var name="totalVerticalBiologyIce"/>')
                 lines.append('    <var name="totalChlorophyll"/>')
                 lines.append('    <var name="primaryProduction"/>')
                 lines.append('    <var name="bioShortwaveFlux"/>')
                 lines.append('    <var name="netBrineHeight"/>')
                 lines.append('    <var name="newlyFormedIce"/>')
                 lines.append('    <var name="snowThicknessChange"/>')
-                lines.append('    <var name="verticalAlgaeIceCell"/>')
+                lines.append('    <var name="totalVerticalDiatomIce"/>')
+                lines.append('    <var name="totalVerticalSmallPlanktonIce"/>')
+                lines.append('    <var name="totalVerticalAlgaeCarbonIce"/>')
+                lines.append('    <var name="totalVerticalNitrateIce"/>')
+                lines.append('    <var name="totalVerticalAmmoniumIce"/>')
+                lines.append('    <var name="totalVerticalSilicateIce"/>')
+                lines.append('    <var name="totalVerticalProteinsIce"/>')
+                lines.append('    <var name="totalVerticalDOCLabileIce"/>')
+                lines.append('    <var name="totalVerticalHumicsIce"/>')
+                lines.append('    <var name="totalVerticalDissolvedIronIce"/>')
+                lines.append('    <var name="totalVerticalParticulateIronIce"/>')
+                lines.append('    <var name="totalVerticalBCIce"/>')
+                lines.append('    <var name="totalVerticalBCSnow"/>')
+                lines.append('    <var name="totalVerticalDustIce"/>')
+                lines.append('    <var name="totalVerticalDustSnow"/>')
+                lines.append('    <var name="totalVerticalDissolvedIronSnow"/>')
+                lines.append('    <var name="verticalAlgaeTotalCarbonIceCell"/>')
+                lines.append('    <var name="verticalDOCLabileIceCell"/>')
+                lines.append('    <var name="verticalDONIceCell"/>')
+                lines.append('    <var name="verticalDICIceCell"/>')
                 lines.append('    <var name="verticalNitrateIceCell"/>')
                 lines.append('    <var name="verticalSilicateIceCell"/>')
                 lines.append('    <var name="verticalAmmoniumIceCell"/>')
-                lines.append('    <var name="verticalDMSIceCell"/>')
-                lines.append('    <var name="verticalDMSPdIceCell"/>')
-                lines.append('    <var name="verticalNonreactiveIceCell"/>')
                 lines.append('    <var name="verticalHumicsIceCell"/>')
                 lines.append('    <var name="verticalDissolvedIronIceCell"/>')
+                lines.append('    <var name="verticalBCTotalIceCell"/>')
+                lines.append('    <var name="verticalDustTotalIceCell"/>')
+                lines.append('    <var name="verticalBCTotalSnowCell"/>')
+                lines.append('    <var name="verticalDustTotalSnowCell"/>')
                 lines.append('    <var name="iceEnthalpyCell"/>')
                 lines.append('    <var name="iceSalinityCell"/>')
                 lines.append('    <var name="oceanBioFluxes"/>')
@@ -1009,15 +1028,35 @@ def buildnml(case, caseroot, compname):
                 lines.append('    <var name="snowAlbedoCell"/>')
                 lines.append('    <var name="bareIceAlbedoCell"/>')
                 lines.append('    <var name="pondAlbedoCell"/>')
-                lines.append('    <var name="verticalAlgaeIceCell"/>')
+                lines.append('    <var name="totalVerticalDiatomIce"/>')
+                lines.append('    <var name="totalVerticalSmallPlanktonIce"/>')
+                lines.append('    <var name="totalVerticalAlgaeCarbonIce"/>')
+                lines.append('    <var name="totalVerticalNitrateIce"/>')
+                lines.append('    <var name="totalVerticalAmmoniumIce"/>')
+                lines.append('    <var name="totalVerticalSilicateIce"/>')
+                lines.append('    <var name="totalVerticalProteinsIce"/>')
+                lines.append('    <var name="totalVerticalDOCLabileIce"/>')
+                lines.append('    <var name="totalVerticalHumicsIce"/>')
+                lines.append('    <var name="totalVerticalDissolvedIronIce"/>')
+                lines.append('    <var name="totalVerticalParticulateIronIce"/>')
+                lines.append('    <var name="totalVerticalBCIce"/>')
+                lines.append('    <var name="totalVerticalBCSnow"/>')
+                lines.append('    <var name="totalVerticalDustIce"/>')
+                lines.append('    <var name="totalVerticalDustSnow"/>')
+                lines.append('    <var name="totalVerticalDissolvedIronSnow"/>')
+                lines.append('    <var name="verticalAlgaeTotalCarbonIceCell"/>')
+                lines.append('    <var name="verticalDOCLabileIceCell"/>')
+                lines.append('    <var name="verticalDONIceCell"/>')
+                lines.append('    <var name="verticalDICIceCell"/>')
                 lines.append('    <var name="verticalNitrateIceCell"/>')
                 lines.append('    <var name="verticalSilicateIceCell"/>')
                 lines.append('    <var name="verticalAmmoniumIceCell"/>')
-                lines.append('    <var name="verticalDMSIceCell"/>')
-                lines.append('    <var name="verticalDMSPdIceCell"/>')
-                lines.append('    <var name="verticalNonreactiveIceCell"/>')
                 lines.append('    <var name="verticalHumicsIceCell"/>')
                 lines.append('    <var name="verticalDissolvedIronIceCell"/>')
+                lines.append('    <var name="verticalBCTotalIceCell"/>')
+                lines.append('    <var name="verticalDustTotalIceCell"/>')
+                lines.append('    <var name="verticalBCTotalSnowCell"/>')
+                lines.append('    <var name="verticalDustTotalSnowCell"/>')
                 lines.append('    <var name="iceEnthalpyCell"/>')
                 lines.append('    <var name="iceSalinityCell"/>')
                 lines.append('    <var name="oceanBioFluxes"/>')