Commit 202aca84 authored by jouke's avatar jouke
Browse files

Merge branch 'master' of git@gitlab.com:rootmodels/OpenSimRoot.git into fixesForManual

parents 1f52e511 76dbb2dd

OpenSimRoot/InputFiles/runBarley.xml

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,11 @@ 
      <SimulaConstant name="resolution" type="coordinate" replacesPreviousDeclaration="true"> 2 2 2 </SimulaConstant>

    </SimulaDirective>



	<!--  for faster testing purposes -->

    <SimulaDirective path="/environment/dimensions">

      <SimulaConstant name="resolution" type="coordinate" replacesPreviousDeclaration="true"> 2 2 2 </SimulaConstant>

    </SimulaDirective>



	<SimulaIncludeFile

		fileName="templates/environmentTemplate.IncludeEvapotranspiration.xml" />

	<SimulaIncludeFile

OpenSimRoot/InputFiles/runRice.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<SimulationModel

	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

	xsi:noNamespaceSchemaLocation="https://rootmodels.gitlab.io/opensimroot/XML/SimulaXMLSchema.xsd"

	explicitCoupling="true" 

	nuexplicitCoupling="true" 

	defaultStartingTimeStep="0.2"

	synchronizationTimeStep="0.2" 

	defaultMaximumTimeStep="0.2"