Commit 20b1c052 authored by jouke's avatar jouke
Browse files

Replace all to use plantTotal instead of other deprecated naming

parent 8df96532

OpenSimRoot/InputFiles/templates/plantTemplate.IncludeCarbonSecondaryGrowth.xml

+6 −6
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic 
		<SimulaVariable

			name="rootSystemPotentialCarbonSinkForGrowth;majorAxis"

			unit="g"

			function="rootSystemTotalRates">

			function="rootSystemTotal">

			0

			<SimulaConstant

				name="includedRootClasses"
@@ -70,11 +70,11 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic 
		<SimulaVariable

			name="rootSecondaryPotentialCarbonSinkForGrowth"

			unit="g"

			function="rootTotalRates" />

			function="rootTotal" />

		<SimulaVariable

			name="rootSystemSecondaryPotentialCarbonSinkForGrowth"

			unit="g"

			function="rootSystemTotalRates" />

			function="rootSystemTotal" />

	</SimulaDirective>



<!--Sibling root template-->
@@ -87,7 +87,7 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic 
		<SimulaVariable

			name="rootSystemPotentialCarbonSinkForGrowth;majorAxis"

			unit="g"

			function="rootSystemTotalRates">

			function="rootSystemTotal">

			0

			<SimulaConstant

				name="includedRootClasses"
@@ -100,11 +100,11 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic 
		<SimulaVariable

			name="rootSecondaryPotentialCarbonSinkForGrowth"

			unit="g"

			function="rootTotalRates" />

			function="rootTotal" />

		<SimulaVariable

			name="rootSystemSecondaryPotentialCarbonSinkForGrowth"

			unit="g"

			function="rootSystemTotalRates" />

			function="rootSystemTotal" />

	</SimulaDirective>



<!--DataPointTemplate-->

OpenSimRoot/InputFiles/templates/plantTemplate.IncludeCarbonSinks.xml

+4 −4
Original line number Diff line number Diff line
@@ -61,11 +61,11 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic 
				unit="g"

				function="rootNodePotentialCarbonSinkForGrowth" />

		</SimulaDirective>

		<!--SimulaVariable name="rootPotentialCarbonSinkForGrowth"  unit="g" function="rootTotalRates" /-->

		<!--SimulaVariable name="rootPotentialCarbonSinkForGrowth"  unit="g" function="rootTotal" /-->

		<SimulaVariable

			name="rootSystemPotentialCarbonSinkForGrowth"

			unit="g"

			function="rootSystemTotalRates" />

			function="rootSystemTotal" />

	</SimulaDirective>



<!--Sibling root template-->
@@ -76,10 +76,10 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic 
				unit="g"

				function="rootNodePotentialCarbonSinkForGrowth" />

		</SimulaDirective>

		<!--SimulaVariable name="rootPotentialCarbonSinkForGrowth"  unit="g" function="rootTotalRates" /-->

		<!--SimulaVariable name="rootPotentialCarbonSinkForGrowth"  unit="g" function="rootTotal" /-->

		<SimulaVariable

			name="rootSystemPotentialCarbonSinkForGrowth"

			unit="g"

			function="rootSystemTotalRates" />

			function="rootSystemTotal" />

	</SimulaDirective>

</SimulationModelIncludeFile>
 
 No newline at end of file

OpenSimRoot/InputFiles/templates/plantTemplate.IncludeCorticalSenescence.xml

+15 −15
Original line number Diff line number Diff line
@@ -23,39 +23,39 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic 
		<SimulaVariable

			name="rootRespirationSteel"

			unit="g"

			function="plantTotalRatesRootFraction" />

			function="plantTotal" />

		<SimulaVariable

			name="rootRespirationCortex"

			unit="g"

			function="plantTotalRatesRootFraction" />

			function="plantTotal" />

		<SimulaVariable

			name="rootRespirationCortexNoRCS"

			unit="g"

			function="plantTotalRatesRootFraction" />

			function="plantTotal" />

		<SimulaDerivative

			name="rootVolumeSteel"

			unit="cm3"

			function="plantTotalRootFraction" />

			function="plantTotal" />

		<SimulaDerivative

			name="rootVolumeNoRCS"

			unit="cm3"

			function="plantTotalRootFraction" />

			function="plantTotal" />

		<SimulaDerivative

			name="rootDryWeightNoRCS"

			unit="g"

			function="plantTotalRootFraction" />

			function="plantTotal" />

		<SimulaDerivative

			name="rootDryWeightSteel"

			unit="g"

			function="plantTotalRootFraction" />

			function="plantTotal" />

		<SimulaDerivative

			name="rootDryWeightCortexNoRCS"

			unit="g"

			function="plantTotalRootFraction" />

			function="plantTotal" />

		<SimulaDerivative

			name="rootDryWeightCortex"

			unit="g"

			function="plantTotalRootFraction" />

			function="plantTotal" />

		<SimulaDirective

			path="nitrate"

			optional="whenExisting">
@@ -161,27 +161,27 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic 
		<SimulaVariable

			name="rootRespirationSteel"

			unit="g"

			function="rootTotalRates" />

			function="rootTotal.v2" />

		<SimulaVariable

			name="rootSystemRespirationSteel"

			unit="g"

			function="rootSystemTotalRates" />

			function="rootSystemTotal" />

		<SimulaVariable

			name="rootRespirationCortex"

			unit="g"

			function="rootTotalRates" />

			function="rootTotal.v2" />

		<SimulaVariable

			name="rootSystemRespirationCortex"

			unit="g"

			function="rootSystemTotalRates" />

			function="rootSystemTotal" />

		<SimulaVariable

			name="rootRespirationCortexNoRCS"

			unit="g"

			function="rootTotalRates" />

			function="rootTotal.v2" />

		<SimulaVariable

			name="rootSystemRespirationCortexNoRCS"

			unit="g"

			function="rootSystemTotalRates" />

			function="rootSystemTotal" />

		<SimulaDerivative

			name="rootVolumeSteel"

			unit="cm3"

OpenSimRoot/InputFiles/templates/plantTemplate.IncludeDryweight.xml

+7 −7
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 
<!--PlantTemplate-->

	<SimulaDirective path="/plantTemplate">

		<SimulaDerivative name="plantDryWeight" unit="g" function="plantTotal" />

		<SimulaDerivative name="shootDryWeight" unit="g" function="plantTotalShootFraction" />

		<SimulaDerivative name="rootDryWeight" unit="g" function="plantTotalRootFraction" />

		<SimulaDerivative name="shootDryWeight" unit="g" function="plantTotal" />

		<SimulaDerivative name="rootDryWeight" unit="g" function="plantTotal" />

		<SimulaDerivative name="carbonToDryWeightRatio" unit="100%" function="carbonToDryWeightRatio" />

	</SimulaDirective>
@@ -24,18 +24,18 @@ 
			<!--SimulaConstant name="rootSegmentSpecificWeight"  unit="g/cm3" > 0 </SimulaConstant-->

			<SimulaConstant name="rootSegmentDryWeight"  unit="g" > 0 </SimulaConstant>

		</SimulaDirective>

		<SimulaDerivative name="rootDryWeight" unit="g" function="rootTotal" /><!--in CO2-->

		<SimulaDerivative name="rootSystemDryWeight" unit="g" function="rootSystemTotal" /><!--in CO2-->

		<SimulaDerivative name="rootDryWeight" unit="g" function="rootTotal.v2" /><!--in CO2-->

		<SimulaDerivative name="rootSystemDryWeight" unit="g" function="rootSystemTotal" />

	</SimulaDirective>



<!--Sibling root template-->

	<SimulaDirective path="/siblingRootTemplate">

		<SimulaDirective path="growthpoint">

			<SimulaConstant name="rootSegmentSpecificWeight"  unit="g/cm3" > 0 </SimulaConstant>

			<!-- SimulaConstant name="rootSegmentSpecificWeight"  unit="g/cm3" > 0 </SimulaConstant-->

			<SimulaConstant name="rootSegmentDryWeight"  unit="g" > 0 </SimulaConstant>

		</SimulaDirective>

		<SimulaDerivative name="rootDryWeight" unit="g" function="rootTotal" /><!--in CO2-->

		<SimulaDerivative name="rootSystemDryWeight" unit="g" function="rootSystemTotal" /><!--in CO2-->

		<SimulaDerivative name="rootDryWeight" unit="g" function="rootTotal.v2" /><!--in CO2-->

		<SimulaDerivative name="rootSystemDryWeight" unit="g" function="rootSystemTotal" />

	</SimulaDirective>



<!--DataPointTemplate-->

OpenSimRoot/InputFiles/templates/plantTemplate.IncludeGeometry.xml

+4 −4
Original line number Diff line number Diff line
@@ -24,19 +24,19 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic 
		<SimulaDerivative

			name="rootLength"

			unit="cm"

			function="plantTotalRootFraction" />

			function="plantTotal" />

		<SimulaDerivative

			name="rootVolume"

			unit="cm3"

			function="plantTotalRootFraction" />

			function="plantTotal" />

		<SimulaDerivative

			name="rootSurfaceArea"

			unit="cm2"

			function="plantTotalRootFraction" />

			function="plantTotal" />

		<SimulaVariable

			name="rootLongitudinalGrowth"

			unit="cm"

			function="plantTotalRootFraction" />

			function="plantTotal" />

		<SimulaDerivative

			name="D90"

			unit="cm"