Commit c7cd5441 authored by jouke's avatar jouke
Browse files

Unified naming nodalRoot -> nodalroot 

Fixed nodalroot of tiller count

updated default output

This contains for the first time output for the FarquharModel based on
the updated code here. Note that this is still full of errors, only a
reference that it now at least runs and produces an output.

Merge branch 'master' of git@gitlab.com:rootmodels/OpenSimRoot.git into
cassava
parent 7da02bf3

OpenSimRoot/InputFiles/plantParameters/Barley/Barke/angles.xml

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic 
			name="cannotgrowup"

			type="bool">1</SimulaConstant> <!--this value is still from the old maize file-->

	</SimulaDirective>

	<SimulaDirective path="nodalRootsOfTillers">

	<SimulaDirective path="nodalrootsOfTillers">

		<SimulaConstant

			name="branchingAngle"

			unit="degrees">

OpenSimRoot/InputFiles/plantParameters/Barley/Barke/barley.xml

+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ Scarlett 13.2 14.4 7 
						name="allowBranchesToFormAboveGround"

						type="bool">false</SimulaConstant>

				</SimulaBase>

				<SimulaBase name="nodalRootsOfTillers">

				<SimulaBase name="nodalrootsOfTillers">

					<SimulaConstant

						type="string"

						name="objectGeneratorClassToUse"> rootBranchesOfTillers
@@ -355,7 +355,7 @@ Scarlett 13.2 14.4 7 
			</SimulaBase>

		</SimulaBase>

		<SimulaBase

			name="nodalRootsOfTillers"

			name="nodalrootsOfTillers"

			objectGenerator="copyDefaults">

			<SimulaConstant

				type="string"

OpenSimRoot/InputFiles/plantParameters/Barley/Barke/growthrates.xml

+1 −1
Original line number Diff line number Diff line
@@ -659,7 +659,7 @@ IL Low Rhizo (1xFert) 
			unit_column2="cm/day"> 0. 0.75 1. 1. 11. 3.5

		</SimulaTable>

	</SimulaDirective>

	<SimulaDirective path="nodalRootsOfTillers">

	<SimulaDirective path="nodalrootsOfTillers">

		<SimulaTable

			name_column1="time since creation"

			unit_column1="day"

OpenSimRoot/InputFiles/plantParameters/Barley/Barke/tillers.xml

+3 −3
Original line number Diff line number Diff line
@@ -124,9 +124,9 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic 


			<!--SimulaConstant name="firstTillerTime" unit="day"> 3 </SimulaConstant>

			<SimulaConstant name="timeDelayBetweenTillerOrders" unit="day">	10 </SimulaConstant>

			<SimulaConstant name="tillerRootType1" type="string"> nodalRootsOfTillers </SimulaConstant>

			<SimulaConstant name="tillerRootType2" type="string"> nodalRootsOfTillers </SimulaConstant>

			<SimulaConstant name="tillerRootType3" type="string"> nodalRootsOfTillers </SimulaConstant-->

			<SimulaConstant name="tillerRootType1" type="string"> nodalrootsOfTillers </SimulaConstant>

			<SimulaConstant name="tillerRootType2" type="string"> nodalrootsOfTillers </SimulaConstant>

			<SimulaConstant name="tillerRootType3" type="string"> nodalrootsOfTillers </SimulaConstant-->

		</SimulaBase>

	</SimulaDirective> 

</SimulationModelIncludeFile>

OpenSimRoot/InputFiles/plantParameters/Barley/Scarlett/angles.xml

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic 
			name="cannotgrowup"

			type="bool">1</SimulaConstant> <!--this value is still from the old maize file-->

	</SimulaDirective>

	<SimulaDirective path="nodalRootsOfTillers">

	<SimulaDirective path="nodalrootsOfTillers">

		<SimulaConstant

			name="branchingAngle"

			unit="degrees">