Commit 6d181436 authored by Jouke's avatar Jouke
Browse files

Merge branch 'FixesForFarquhar' into 'master' 

This is an attempt to get a maize-farquhar running.

See merge request rootmodels/OpenSimRoot!81
parents c2d4f39d c7cd5441

OpenSimRoot/InputFiles/environments/A-climateChambersFZJ/atmosphere.xml

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
			    2548.8 uMol/cm2/day (based on 12 hour day)

			    about 25% less because of mornings and evenings ?

			    		   

              2.8330E-3 MJ/cm2/d sunny summers day in the Netherlands: day 190 year 1999 data KNMI ; NOTE: use PAR/RDD ratio of 0.5--> 

              2.8330E-3 MJ/cm2/d sunny summers day in the Netherlands: day 190 year 1999 data KNMI ;--> 

			</SimulaConstant>

			<SimulaConstant name="PAR/RDD"  unit="100%" >

			<!--note="optional conversion factor from RDD to PAR - normally 0.5; only used if irradiation isn't converted yet otherwise set to 1"-->

OpenSimRoot/InputFiles/environments/Rocksprings/atmosphere.xml

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic 
			    2548.8 uMol/cm2/day (based on 12 hour day)

			    about 25% less because of mornings and evenings ?

			    		   

              2.8330E-3 Mj/cm2/d sunny summers day in the Netherlands: day 190 year 1999 data KNMI ; NOTE: use PAR/RDD ratio of 0.5-->

              2.8330E-3 Mj/cm2/d sunny summers day in the Netherlands: day 190 year 1999 data KNMI ; -->

			</SimulaConstant>

			<SimulaTable

				name_column2="precipitation"
@@ -77,7 +77,7 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic 
				name_column1="time"

				unit_column1="day"

				unit_column2="degreesC"

				interpolationMethod="linear"> 0 16.9 100 16.9

				interpolationMethod="linear"> 0 25 100 25

			</SimulaTable>



<!-- these are necessary to compute incoming radiation by the radiation module -->
@@ -95,7 +95,7 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic 
				unit_column2="hour"

				interpolationMethod="step">

				<!-- time of the day that there are no clouds -->

				0 0 60 0

				0 6 60 6

			</SimulaTable>

		</SimulaBase>

			<SimulaConstant

OpenSimRoot/InputFiles/environments/WageningseBovenBuurt/atmosphere.xml

+1 −7
Original line number Diff line number Diff line
@@ -34,13 +34,7 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic 
			    2548.8 uMol/cm2/day (based on 12 hour day)

			    about 25% less because of mornings and evenings ?

			    		   

              2.8330E-3 Mj/cm2/d sunny summers day in the Netherlands: day 190 year 1999 data KNMI ; NOTE: use PAR/RDD ratio of 0.5-->

			</SimulaConstant>

			<SimulaConstant

				name="PAR/RDD"

				unit="100%">

			<!--note="optional conversion factor from RDD to PAR - normally 0.5; only used if irradiation isn't converted yet otherwise set to 1"-->

				1.

              2.8330E-3 Mj/cm2/d sunny summers day in the Netherlands: day 190 year 1999 data KNMI ;-->

			</SimulaConstant>

			<SimulaTable

				name_column2="precipitation"

OpenSimRoot/InputFiles/environments/atmosphereC3C4.xml

deleted100644 → 0
+0 −75
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!--?xml-stylesheet type="text/xsl" href="tree-view2.xsl"? -->

<!--

Copyright © 2022, Ernst Schäfer, Ishan Ajmera

All rights reserved.



Copyright © 2016, The Pennsylvania State University

All rights reserved.



Copyright © 2016 Forschungszentrum Jülich GmbH

All rights reserved.



Redistribution and use in source and binary forms, with or without modification, are permitted under the GNU General Public License v3 and provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.



Disclaimer

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.



You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in license.txt but can also be found at http://www.gnu.org/licenses/gpl-3.0.en.html



 -->



<SimulationModelIncludeFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../scripts/XML/SimulaXMLSchema.xsd">



	<SimulaDirective path="environment">

		<SimulaConstant name="startDay" type="integer" unit="noUnit">1</SimulaConstant>

		<SimulaConstant name="startMonth" type="integer" unit="noUnit">5</SimulaConstant>

		<SimulaConstant name="startYear" type="integer" unit="noUnit">2015</SimulaConstant>

		<SimulaConstant name="latitude" unit="noUnit">42.013720</SimulaConstant>

		<SimulaBase name="atmosphere">

			<SimulaDerivative name="solarElevationAngle" function="solarElevationAngle"/>

			<SimulaDerivative name="irradiation" function="diurnalRadiationSimulator" unit="W/m2"/>

			<SimulaDerivative name="beamIrradiation" function="beamRadiationSimulator" unit="W/m2"/>

			<SimulaDerivative name="diffuseIrradiation" function="diffuseRadiationSimulator" unit="W/m2"/>

			<SimulaDerivative name="dayLightHours" function="photoPeriod" unit="hour"/>

			<!--SimulaConstant name="solarRadiationAt1AU" unit="W/m2">800</SimulaConstant-->

			<SimulaConstant name="PAR/RDD" unit="100%">1.</SimulaConstant>

			<SimulaDerivative name="netRadiation" function="diurnalRadiationSimulator" unit="W/m2"/>

			<SimulaDerivative name="netRadiationSoil" function="diurnalRadiationSimulator" unit="W/m2">

				<SimulaDerivative name="multiplier" function="soilRadiationFactor"/>

			</SimulaDerivative>

			<SimulaConstant name="referenceVapourPressureDeficit" prettyName="reference Vapour Pressure Deficit" type="double" unit="hPa">16.4</SimulaConstant>

			<SimulaConstant name="CO2Concentration" prettyName="CO2 Concentration" type="double" unit="umol/mol">402.9</SimulaConstant>

			<SimulaConstant name="O2Concentration" prettyName="O2 Concentration" type="double" unit="mmol/mol">209.46</SimulaConstant>

			<SimulaConstant name="albedoSoil" unit="noUnit">0.17</SimulaConstant>

			<SimulaConstant name="albedoCrop" unit="noUnit">0.15</SimulaConstant>

			<SimulaConstant name="atmosphericTransmissionCoefficient">0.72</SimulaConstant>

			<SimulaTable name_column2="precipitation" name_column1="time" unit_column1="day" unit_column2="cm/day" interpolationMethod="step"> 

			  <!--

			  Rocksprings, PA, maize season 2009

			  1 0 2 1 3 0.29 4	0 5 0 6 0.61 7 0 8 0 9 0.25 10 0.03 11 0 12 0.64 13 0.33 14 0 15 0 16 0 17 0 18 1.8 19 0.2 20 0 21 2.84 22 0.38 23 0

				24 0 25 0 26 0 27 0.18 28 0 29 0.46 30 0 31 1.35 32 0.13 33 0.23 34 0.25 35 0 36 0 37 0 38 0 39 0 40 0 41 0 42 1.42 -->

				0 0 1 0 2 1 3 0.29 4 0 5 0 6 0.61 7 0 8 0 9 0.25 10 0.03 11 0 12

				0.64 13 0.33 14 0 15 0 16 0 17 0 18 1.8 19 0.2 20 0 21 2.84 22 0.38

				23 0 24 0 25 0 26 0 27 0.18 28 0 29 0.46 30 0 31 1.35 32 0.13 33

				0.23 34 0.25 35 0 36 0 37 0 38 0 39 0 40 0 41 0 42 1.42

			</SimulaTable>

			<SimulaTable name_column2="evaporation" name_column1="time" unit_column1="day" unit_column2="cm/day" interpolationMethod="step">

			<!--this is 'estimated' data for rocksprings: not so accurate -->

			<!--	0 0 1 0.05 2 0.1 3 0.1 4 0.05 5 0.05 6 0.1 7 0.05 8 0.05 9 0.1 10 0.1 11 0.05 12 0.1 13 0.1 14 0.05 15 0.04 16 0.03 17 0.02

				18 0.09 19 0.09 20 0.04 21 0.09 22 0.09 23 0.04 24 0.03 25 0.02 26 0.02 27 0.08 28 0.03 29 0.08 30 0.03 31 0.08 32 0.07

				33 0.07 34 0.07 35 0.03 36 0.02 37 0.01 38 0 39 0 40 0 41 0 42 0.06-->

				0 0.0 10 0 100 0

			</SimulaTable>

			<SimulaConstant name="windSpeed" unit="m/s">2.</SimulaConstant>

			<SimulaConstant name="relativeHumidity" unit="m/s">60</SimulaConstant>

			<SimulaTable name_column2="averageDailyTemperature" name_column1="time" unit_column1="day" unit_column2="degreesC" 	interpolationMethod="linear">

				0 16.9 100 16.9

			</SimulaTable>

			<SimulaConstant name="altitude" unit="m">91</SimulaConstant>

		</SimulaBase>

	</SimulaDirective>

</SimulationModelIncludeFile>
 
 No newline at end of file

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">