Commit 176ca657 authored by Joe Melton's avatar Joe Melton
Browse files

replace output bleafmas with cbLeaf (following TRENDY), add cLitter outputs to xml

parent fe3ac586

configurationFiles/outputVariableDescriptors.xml

+75 −15
Original line number Diff line number Diff line
@@ -3003,18 +3003,6 @@ 
                <units>m</units>

            </variant>

        </variable>

        <variable id="99" includeBareGround="false" dormant="false">

            <standardName>Carbon mass in brown leaves</standardName>

            <longName>Carbon mass in brown leaves</longName>

            <shortName>bleafmas</shortName>

            <defaultUnits>kg m${-2}$</defaultUnits>

            <variant>

                <timeFrequency>daily</timeFrequency>

                <outputForm>grid</outputForm>

                <nameInCode>bleafmas_d_g</nameInCode>

                <units>kg m${-2}$</units>

            </variant>

        </variable>

        <variable id="100" includeBareGround="false" dormant="false">

            <standardName>Total Carbon Mass Flux from Leaf to Litter</standardName>

            <longName>Total Carbon Mass Flux from Leaf to Litter</longName>
@@ -3153,6 +3141,24 @@ 
            <shortName>cbLeaf</shortName>

            <defaultUnits>kg/m$^2$</defaultUnits>

                        <variant>

                <timeFrequency>annually</timeFrequency>

                <outputForm>grid</outputForm>

                <nameInCode>bleafmas_yr_g</nameInCode>

                <units>kg/m$^2$</units>

            </variant>

            <variant>

                <timeFrequency>annually</timeFrequency>

                <outputForm>pft</outputForm>

                <nameInCode>bleafmas_yr</nameInCode>

                <units>kg/m$^2$</units>

            </variant>

            <variant>

                <timeFrequency>annually</timeFrequency>

                <outputForm>tile</outputForm>

                <nameInCode>bleafmas_yr_t</nameInCode>

                <units>kg/m$^2$</units>

            </variant>

            <variant>

                <timeFrequency>monthly</timeFrequency>

                <outputForm>grid</outputForm>

                <nameInCode>bleafmas_mo_g</nameInCode>
@@ -3170,7 +3176,63 @@ 
                <nameInCode>bleafmas_mo_t</nameInCode>

                <units>kg/m$^2$</units>

            </variant>

            <variant>

                <timeFrequency>daily</timeFrequency>

                <outputForm>grid</outputForm>

                <nameInCode>bleafmas_d_g</nameInCode>

                <units>kg m${-2}$</units>

            </variant>

        </variable>

        <variable id="226" includeBareGround="true" dormant="false">

            <standardName>Carbon Mass in Model Litter Pool</standardName>

            <longName>Carbon mass for the 'litter' pool in the full depth of the soil.</longName>

            <shortName>cLitter</shortName>

            <defaultUnits>kg/m$^2$</defaultUnits>

            <variant>

                <timeFrequency>annually</timeFrequency>

                <outputForm>grid</outputForm>

                <nameInCode>litrmass_yr_g</nameInCode>

                <units>kg/m$^2$</units>

            </variant>

            <variant>

                <timeFrequency>annually</timeFrequency>

                <outputForm>pft</outputForm>

                <nameInCode>litrmass_yr</nameInCode>

                <units>kg/m$^2$</units>

            </variant>

            <variant>

                <timeFrequency>annually</timeFrequency>

                <outputForm>tile</outputForm>

                <nameInCode>litrmass_yr_t</nameInCode>

                <units>kg/m$^2$</units>

            </variant>

            <variant>

                <timeFrequency>monthly</timeFrequency>

                <outputForm>grid</outputForm>

                <nameInCode>litrmass_mo_g</nameInCode>

                <units>kg/m$^2$</units>

            </variant>

            <variant>

                <timeFrequency>monthly</timeFrequency>

                <outputForm>pft</outputForm>

                <nameInCode>litrmass_mo</nameInCode>

                <units>kg/m$^2$</units>

            </variant>

            <variant>

                <timeFrequency>monthly</timeFrequency>

                <outputForm>tile</outputForm>

                <nameInCode>litrmass_mo_t</nameInCode>

                <units>kg/m$^2$</units>

            </variant>

            <variant>

                <timeFrequency>daily</timeFrequency>

                <outputForm>grid</outputForm>

                <nameInCode>litrmass_g</nameInCode>

                <units>kg/m$^2$</units>

            </variant>

        </variable>

    </group>

    <group type="land_fire">

        <variable id="223" includeBareGround="false" dormant="false">

            <standardName>CO2 C veg fire emissions</standardName>

            <longName>Contribution of combustion of live biomass to carbon emissions from fire (via CO2)</longName>
@@ -3198,7 +3260,7 @@ 
        <variable id="224" includeBareGround="false" dormant="false">

            <standardName>CO2 aboveground litter fire emissions</standardName>

            <longName>Contribution of combustion of aboveground necromass (brown leaves and top litter layer) to carbon emissions from fire (via CO2)</longName>

            <shortName>fFireCVeg</shortName>

            <shortName>fFireLitter</shortName>

            <defaultUnits>kg/m$^2$/s$^1$</defaultUnits>

            <variant>

                <timeFrequency>monthly</timeFrequency>
@@ -3243,8 +3305,6 @@ 
                <units>kg/m$^2$/s$^1$</units>

            </variant>

        </variable>

    </group>

    <group type="land_fire">

        <variable id="94" includeBareGround="false" dormant="false">

            <standardName>Carbon Mass Flux into Atmosphere due to CO2 Emission from Fire</standardName>

            <longName>CO2 emissions (expressed as a C mass flux per unit area) from natural fires and human ignition fires as calculated by the fire module of the dynamic vegetation model (includes LUC fires)</longName>

src/driver/prepareOutputs.f90

+4 −1
Original line number Diff line number Diff line
@@ -2978,7 +2978,7 @@ contains 
    call writeOutput1D(lonLocalIndex,latLocalIndex,'gleafmas_d_g',timeStamp,'cLeaf',[gleafmas_g(i)])

    call writeOutput1D(lonLocalIndex,latLocalIndex,'gleafmas_NS_d_g',timeStamp,'cLeaf_ns',[gleafmas_ns_g(i)])

    call writeOutput1D(lonLocalIndex,latLocalIndex,'gleafmass_d_g',timeStamp,'cLeaf_s',[gleafmas_s_g(i)])

    call writeOutput1D(lonLocalIndex,latLocalIndex,'bleafmas_d_g' ,timeStamp,'bleafmas', [bleafmas_g(i)])

    call writeOutput1D(lonLocalIndex,latLocalIndex,'bleafmas_d_g' ,timeStamp,'cbLeaf', [bleafmas_g(i)])

    call writeOutput1D(lonLocalIndex,latLocalIndex,'stemmass_d_g',timeStamp,'cStem',[stemmass_g(i)])

    call writeOutput1D(lonLocalIndex,latLocalIndex,'stemmass_NS_d_g',timeStamp,'cStem_ns',[stemmass_ns_g(i)])

    call writeOutput1D(lonLocalIndex,latLocalIndex,'stemmasss_d_g',timeStamp,'cStem_s',[stemmass_s_g(i)])
@@ -6458,6 +6458,7 @@ contains 
      call writeOutput1D(lonLocalIndex,latLocalIndex,'laimaxg_yr_g' ,timeStamp,'lai', [laimaxg_yr_g(i)])

      call writeOutput1D(lonLocalIndex,latLocalIndex,'vgbiomas_yr_g',timeStamp,'cVeg',[vgbiomas_yr_g(i)])

      call writeOutput1D(lonLocalIndex,latLocalIndex,'gleafmas_yr_g',timeStamp,'cLeaf',[gleafmas_yr_g(i)])

      call writeOutput1D(lonLocalIndex,latLocalIndex,'bleafmas_yr_g',timeStamp,'cbLeaf',[bleafmas_yr_g(i)])

      call writeOutput1D(lonLocalIndex,latLocalIndex,'gleafmas_NS_yr_g',timeStamp,'cLeaf_ns',[gleafmas_NS_yr_g(i)])

      call writeOutput1D(lonLocalIndex,latLocalIndex,'gleafmass_yr_g',timeStamp,'cLeaf_s',[gleafmass_yr_g(i)])

      call writeOutput1D(lonLocalIndex,latLocalIndex,'stemmass_yr_g',timeStamp,'cStem',[stemmass_yr_g(i)])
@@ -6675,6 +6676,7 @@ contains 
          call writeOutput1D(lonLocalIndex,latLocalIndex,'laimaxg_yr' ,timeStamp,'lai', [laimaxg_yr(i,m,:)])

          call writeOutput1D(lonLocalIndex,latLocalIndex,'vgbiomas_yr',timeStamp,'cVeg',[vgbiomas_yr(i,m,:)])

          call writeOutput1D(lonLocalIndex,latLocalIndex,'gleafmas_yr',timeStamp,'cLeaf',[gleafmas_yr(i,m,:)])

          call writeOutput1D(lonLocalIndex,latLocalIndex,'bleafmas_yr',timeStamp,'cbLeaf',[bleafmas_yr(i,m,:)])

          call writeOutput1D(lonLocalIndex,latLocalIndex,'gleafmas_NS_yr',timeStamp,'cLeaf_ns',[gleafmas_NS_yr(i,m,:)])

          call writeOutput1D(lonLocalIndex,latLocalIndex,'gleafmass_yr',timeStamp,'cLeaf_s',[gleafmass_yr(i,m,:)])

          call writeOutput1D(lonLocalIndex,latLocalIndex,'stemmass_yr',timeStamp,'cStem',[stemmass_yr(i,m,:)])
@@ -6796,6 +6798,7 @@ contains 
          call writeOutput1D(lonLocalIndex,latLocalIndex,'laimaxg_yr_t' ,timeStamp,'lai', [laimaxg_yr_t(i,:)])

          call writeOutput1D(lonLocalIndex,latLocalIndex,'vgbiomas_yr_t',timeStamp,'cVeg',[vgbiomas_yr_t(i,:)])

          call writeOutput1D(lonLocalIndex,latLocalIndex,'gleafmas_yr_t',timeStamp,'cLeaf',[gleafmas_yr_t(i,:)])

          call writeOutput1D(lonLocalIndex,latLocalIndex,'bleafmas_yr_t',timeStamp,'cbLeaf',[bleafmas_yr_t(i,:)])

          call writeOutput1D(lonLocalIndex,latLocalIndex,'gleafmas_NS_yr_t',timeStamp,'cLeaf_ns',[gleafmas_NS_yr_t(i,:)])

          call writeOutput1D(lonLocalIndex,latLocalIndex,'gleafmass_yr_t',timeStamp,'cLeaf_s',[gleafmass_yr_t(i,:)])

          call writeOutput1D(lonLocalIndex,latLocalIndex,'stemmass_yr_t',timeStamp,'cStem',[stemmass_yr_t(i,:)])