Commit 68e66abe authored by jouke's avatar jouke
Browse files

Some minor changes to get rid of warning messages.

parent 21274f33
Loading
Loading
Loading
Loading
+36 −0
Original line number Diff line number Diff line
@@ -212,6 +212,42 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic
				1 1  0.2 0.5 0 1
			</SimulaTable>
		</SimulaBase>
		<SimulaBase name="impactOn:nodalRootBranchingDelay">
			<SimulaTable
				name_column2="impactBy:phosphorus"
				name_column1="phosphorus stress factor"> 1 1 0 5
			</SimulaTable>
			<SimulaTable
				name_column2="impactBy:potassium"
				name_column1="potassium stress factor"> 1 1 0 5
			</SimulaTable>
			<SimulaTable
				name_column2="impactBy:nitrate"
				name_column1="nitrate stress factor"> 1 1 0 5
			</SimulaTable>
			<SimulaTable
				name_column2="impactBy:water"
				name_column1="water stress factor">	1 1 0 5
			</SimulaTable>
		</SimulaBase>
		<SimulaBase name="impactOn:nodalRootinterBranchingDistance">
			<SimulaTable
				name_column2="impactBy:phosphorus"
				name_column1="phosphorus stress factor"> 1 1 0 1
			</SimulaTable>
			<SimulaTable
				name_column2="impactBy:potassium"
				name_column1="potassium stress factor"> 1 1 0 1
			</SimulaTable>
			<SimulaTable
				name_column2="impactBy:nitrate"
				name_column1="nitrate stress factor"> 1 1 0 1
			</SimulaTable>
			<SimulaTable
				name_column2="impactBy:water"
				name_column1="water stress factor">	1 1 0 1
			</SimulaTable>
		</SimulaBase>
		<SimulaBase name="impactOn:gravitropismMultiplier">
			<SimulaTable
				name_column2="impactBy:phosphorus"
+36 −15
Original line number Diff line number Diff line
@@ -171,21 +171,6 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic
			</SimulaTable>	
		</SimulaBase>

		<SimulaBase name="impactOn:nodalRootBranchingDelay">
			<SimulaTable name_column2="impactBy:phosphorus" name_column1="phosphorus stress factor">1. 1.
																									0.5 1.
																									0. 4.</SimulaTable>
			<SimulaTable name_column2="impactBy:potassium" name_column1="potassium stress factor">1 1 0 1</SimulaTable>
			<SimulaTable name_column2="impactBy:nitrate" name_column1="nitrate stress factor">1 1 0 1</SimulaTable>
			<SimulaTable
				name_column2="impactBy:water"
				name_column1="water stress factor">
				<!--JP complete guess  -->
				1 1  0 1
			</SimulaTable>
		</SimulaBase>


<!-- these moderate the local nutrient response -->
		<SimulaBase name="impactOn:rootPotentialLongitudinalGrowthMultiplier">
			<SimulaTable
@@ -227,6 +212,42 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic
				1 1  0.2 0.5 0 1
			</SimulaTable>
		</SimulaBase>
		<SimulaBase name="impactOn:nodalRootBranchingDelay">
			<SimulaTable
				name_column2="impactBy:phosphorus"
				name_column1="phosphorus stress factor"> 1 1 0 5
			</SimulaTable>
			<SimulaTable
				name_column2="impactBy:potassium"
				name_column1="potassium stress factor"> 1 1 0 5
			</SimulaTable>
			<SimulaTable
				name_column2="impactBy:nitrate"
				name_column1="nitrate stress factor"> 1 1 0 5
			</SimulaTable>
			<SimulaTable
				name_column2="impactBy:water"
				name_column1="water stress factor">	1 1 0 5
			</SimulaTable>
		</SimulaBase>
		<SimulaBase name="impactOn:nodalRootinterBranchingDistance">
			<SimulaTable
				name_column2="impactBy:phosphorus"
				name_column1="phosphorus stress factor"> 1 1 0 1
			</SimulaTable>
			<SimulaTable
				name_column2="impactBy:potassium"
				name_column1="potassium stress factor"> 1 1 0 1
			</SimulaTable>
			<SimulaTable
				name_column2="impactBy:nitrate"
				name_column1="nitrate stress factor"> 1 1 0 1
			</SimulaTable>
			<SimulaTable
				name_column2="impactBy:water"
				name_column1="water stress factor">	1 1 0 1
			</SimulaTable>
		</SimulaBase>
		<SimulaBase name="impactOn:gravitropismMultiplier">
			<SimulaTable
				name_column2="impactBy:phosphorus"
+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@
<SimulationModel
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	xsi:noNamespaceSchemaLocation="https://rootmodels.gitlab.io/opensimroot/XML/SimulaXMLSchema.xsd"
	nuexplicitCoupling="true" 
	defaultStartingTimeStep="0.2"
	synchronizationTimeStep="0.2" 
	defaultMaximumTimeStep="0.2"
+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@

<!--SIMULATION MODEL-->
<SimulationModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  xsi:noNamespaceSchemaLocation="https://rootmodels.gitlab.io/opensimroot/XML/SimulaXMLSchema.xsd"
	explicitCoupling="true"
    defaultStartingTimeStep="0.2"
	synchronizationTimeStep="0.2" 
	defaultMaximumTimeStep="0.2"
+6 −1
Original line number Diff line number Diff line
@@ -32,6 +32,11 @@
	<!-- SimulaIncludeFile fileName="environments/Rocksprings/Rocksprings-maize.xml"/-->
	<SimulaIncludeFile fileName="environments/WageningseBovenBuurt/WageningseBovenBuurt-maize.xml"/>

	<!--  for faster testing purposes -->
    <SimulaDirective path="/environment/dimensions">
      <SimulaConstant name="resolution" type="coordinate" replacesPreviousDeclaration="true"> 3 3 3 </SimulaConstant>
    </SimulaDirective>

	<SimulaIncludeFile fileName="templates/plantTemplate.IncludeGeometry.xml" />
	<SimulaIncludeFile fileName="templates/plantTemplate.IncludeGrowthImpedance.xml" />
	<SimulaIncludeFile fileName="templates/plantTemplate.IncludeDryweight.xml" />
@@ -40,7 +45,7 @@
	<!--SimulaIncludeFile fileName="templates/plantTemplate.IncludePhosphorus3D.xml" /-->
	<!--SimulaIncludeFile fileName="templates/plantTemplate.IncludeNitrateBasic.xml"/-->
	<SimulaIncludeFile fileName="templates/plantTemplate.IncludeWaterModule.xml"/>
	<!-- <SimulaIncludeFile fileName="templates/plantTemplate.IncludeNitrate3D.xml"/> -->
	<SimulaIncludeFile fileName="templates/plantTemplate.IncludeNitrate3D.xml"/> 
	<!--SimulaIncludeFile fileName="templates/plantTemplate.IncludePotassium3D.xml" /-->

	<SimulaIncludeFile fileName="templates/configurationCarbon.xml"/>
Loading