diff --git a/Model/Maize/Leaf.cpp b/Model/Maize/Leaf.cpp index a34e4df03f..a3d07c97a5 100644 --- a/Model/Maize/Leaf.cpp +++ b/Model/Maize/Leaf.cpp @@ -34,7 +34,7 @@ void Leaf::doRegistrations(void) scienceAPI.expose("DeltaSLAI", "m2/m2", "Leaf area senescence rate", false, dltSlai); scienceAPI.expose("TPLA", "m2", "Total plant leaf area", false, tpla); scienceAPI.expose("SPLA", "m2", "Senesced plant leaf area", false, spla); - scienceAPI.expose("GPLA", "m2", "Green plant leaf area", false, spla); + scienceAPI.expose("GPLA", "m2", "Green plant leaf area", false, gpla); scienceAPI.expose("LeafNo", "leaves","Number of fully expanded leaves", false, nLeaves); scienceAPI.expose("FinalLeafNo", "leaves", "Final Leaf Number", false, finalLeafNo); scienceAPI.expose("LeafGreenWt", "g/m^2", "Live leaf dry weight", false, dmGreen); @@ -73,6 +73,7 @@ void Leaf::initialize(void) dltSlai = 0.0; tpla = 0.0; spla= 0.0; + gpla= 0.0; tplaMax = 0.0; tplaPot = 0.0; dltSlaiN = 0.0; @@ -236,8 +237,9 @@ void Leaf::updateVars(void) sLai += dltSlai; lai -= dltSlai; - tpla = lai / density * 10000; - spla = sLai / density * 10000; + gpla = lai / density * smm2sm; + spla = sLai / density * smm2sm; + tpla = gpla + spla; dltSlaiN = 0.0; dltSlai = 0.0; diff --git a/Model/Maize/Leaf.h b/Model/Maize/Leaf.h index baa501b4d6..81eba14beb 100644 --- a/Model/Maize/Leaf.h +++ b/Model/Maize/Leaf.h @@ -105,6 +105,7 @@ namespace Maize { double tplaPot; double tpla; double spla; + double gpla; // senescence double sLai; diff --git a/Model/Sorghum/Leaf.cpp b/Model/Sorghum/Leaf.cpp index 9b64fa93d3..5d6ad0d5f1 100644 --- a/Model/Sorghum/Leaf.cpp +++ b/Model/Sorghum/Leaf.cpp @@ -38,7 +38,7 @@ void Leaf::doRegistrations(void) scienceAPI.expose("DeltaSlaiWater", "m2/m2", "Senesced leaf area from age", false, dltSlaiWater); scienceAPI.expose("TPLA", "m2", "Total plant leaf area", false, tpla); scienceAPI.expose("SPLA", "m2", "Senesced plant leaf area", false, spla); - scienceAPI.expose("GPLA", "m2", "Green plant leaf area", false, spla); + scienceAPI.expose("GPLA", "m2", "Green plant leaf area", false, gpla); scienceAPI.expose("LeafNo", "leaves","Number of fully expanded leaves", false, nLeaves); scienceAPI.expose("LeafGreenWt", "g/m^2", "Live leaf dry weight", false, dmGreen); scienceAPI.expose("LeafSenescedWt", "g/m^2", "Senesced leaf dry weight", false, dmSenesced); @@ -200,8 +200,8 @@ void Leaf::updateVars(void) sLai += dltSlai; lai -= dltSlai; - gpla = lai / density * 10000; - spla = sLai / density * 10000; + gpla = lai / density * smm2sm; + spla = sLai / density * smm2sm; tpla = gpla + spla; SLN = divide(nGreen,lai,0);