Commit c2d4f39d authored by Jouke's avatar Jouke
Browse files

Merge branch 'fixesForManual' into 'master' 

Many minor fixes that were implemented for the manual, and now tested with all the default run files

See merge request rootmodels/OpenSimRoot!80
parents 76dbb2dd 8c1ad88b

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ build_linux: 
  stage: build

  needs: []

  script:

    - apt-get install -y -qq gcc g++ make python3.12-dev

    - apt-get install -y -qq gcc g++ make python3-dev

    - ./build.sh

  artifacts:

    paths:
@@ -34,7 +34,7 @@ testEngine: 
  stage: test

  needs: ["build_linux"]

  script:

    - apt install -y -qq  libpython3.12-dev

    - apt install -y -qq  libpython3-dev

    - ./runTestsEngine.sh



testModules:
@@ -45,7 +45,7 @@ testModules: 
  script:

    - mkdir -p /root/.aws/

    - echo region = us-west-2 >> /root/.aws/credentials

    - apt install -y -qq  bc r-cran-xml libpython3.12-dev

    - apt install -y -qq  bc r-cran-xml libpython3-dev

    - ./runTestsModules.sh



pages:

Makefile

+9 −4
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ GW_BIN := $(GW_BUILD_DIR)OpenSimRoot_graphWriting 
DEBUG_BIN := $(DEBUG_BUILD_DIR)OpenSimRoot_debug

WIN_BIN := $(WIN_BUILD_DIR)OpenSimRoot.exe



# python version

python_version_full := $(wordlist 2,4,$(subst ., ,$(shell python3 --version 2>&1)))

python_version_major := $(word 1,${python_version_full})

python_version_minor := $(word 2,${python_version_full})

python_version_patch := $(word 3,${python_version_full})



## Set compiler options
@@ -39,8 +44,8 @@ CXXWIN := x86_64-w64-mingw32-g++ 
# -c: compile only; we'll link in a separate step

# -W: enable compiler warnings

# -fmessage-length=0: Don't insert linebreaks into error messages

CXXFLAGS =  -I/usr/include/python3.12 -std=c++23 -DGITHASH='$(GIT_HASH)' -O3 -Wall -c -fmessage-length=0 

CXXFLAGSWIN =  -I/usr/include/python3.12 -std=c++23 -DGITHASH='$(GIT_HASH)' -O3 -Wall -c -fmessage-length=0 

CXXFLAGS =  -I/usr/include/python3.$(python_version_minor) -std=c++23 -DGITHASH='$(GIT_HASH)' -O3 -Wall -c -fmessage-length=0 

CXXFLAGSWIN =  -I/usr/include/python3.$(python_version_minor) -std=c++23 -DGITHASH='$(GIT_HASH)' -O3 -Wall -c -fmessage-length=0 

# -g: include debug symbols

# -Og: include some speed optimizations but none that make debugger output confusing

CXXFLAGS_DEBUG = $(subst -O3, -Og -g, $(CXXFLAGS))
@@ -150,7 +155,7 @@ $(DEBUG_BUILD_DIR)%.o: $(SOURCE_DIR)%.cpp | $(BUILD_TREE_DEBUG) 
# `$+` is a space-separated list of all the prerequisites, including any duplicates

#	(we probably don't have duplicates, but that's sometimes useful when linking libraries)

$(RELEASE_BIN): $(OBJECTS_RELEASE) | $(RELEASE_BUILD_DIR)

	$(CXX) -o $@ $+ -lpython3.12 

	$(CXX) -o $@ $+ -lpython3.$(python_version_minor)

$(NOPYTHON_BIN): $(OBJECTS_NOPYTHON) | $(NOPYTHON_BUILD_DIR)

	$(CXX) -o $@ $+ 

$(GW_BIN): $(OBJECTS_GW) | $(GW_BUILD_DIR)
@@ -158,7 +163,7 @@ $(GW_BIN): $(OBJECTS_GW) | $(GW_BUILD_DIR) 
$(WIN_BIN): $(OBJECTS_WIN) | $(WIN_BUILD_DIR)

	$(CXXWIN) -o $@ $+ -lpsapi -lcomdlg32 -static-libstdc++ -static-libgcc 

$(DEBUG_BIN): $(OBJECTS_DEBUG) | $(DEBUG_BUILD_DIR)

	$(CXX) -g -o $@ $+ -lpython3.12 

	$(CXX) -g -o $@ $+ -lpython3.$(python_version_minor) 



# Each dependency file contains Make directives that specify which headers are included in which objects.

# We include them here as if we'd typed them out for ourselves.

OpenSimRoot/InputFiles/environments/CKA/CKA-barley.xml

+36 −17
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!--

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



 -->

<?xml-stylesheet type="text/xsl" href="XML/treeview.xsl"?>

<SimulationModelIncludeFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  xsi:noNamespaceSchemaLocation="https://rootmodels.gitlab.io/opensimroot/XML/SimulaXMLSchema.xsd">

	<SimulaBase name="environment">

			<SimulaConstant

				name="altitude"

				unit="m"> 64

			</SimulaConstant>

			<SimulaConstant

				name="startDay"

				unit="noUnit"

				type="integer"> 25

			</SimulaConstant>

			<SimulaConstant

				name="startMonth"

				unit="noUnit"

				type="integer"> 3

			</SimulaConstant>

			<SimulaConstant

				name="latitude"

				unit="noUnit"> 50.624071

			</SimulaConstant>	

			<SimulaConstant

				name="longitude"

				unit="noUnit"> 6.985767

			</SimulaConstant>	

	



		<SimulaBase name="dimensions">

			<!-- dimensions set by planting module

			<SimulaConstant name="minCorner" type="coordinate">
@@ -76,8 +85,18 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic 
				unit_column1="cm"

				name_column2="bulkDensity"

				unit_column2="g/cm3">

				<!--data maria rocksprings: 0 1.24 -5 1.24 -16 1.29 -30 1.42 -47 1.40 -65 1.51 -200 1.51 -->

				100 1.24 0 1.24 -5 1.24 -16 1.29 -30 1.42 -47 1.40 -65 1.51 -200 1.51

<!-- landl paper, see water.xml for details -->				

0	1.29

15	1.29

30	1.29

35	1.32

45	1.42

70	1.42

80	1.52

110	1.52

120	1.46

300	1.46



			</SimulaTable>

		</SimulaBase>

	</SimulaBase>

OpenSimRoot/InputFiles/environments/CKA/atmosphere.xml

+715 −126
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!--

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



 -->

<?xml-stylesheet type="text/xsl" href="XML/treeview.xsl"?>
@@ -22,114 +10,534 @@ You should have received the GNU GENERAL PUBLIC LICENSE v3 with this file in lic 
				name_column1="time"

				name_column2="shortwaveRadiation"

				unit_column1="day"

				unit_column2="uMol/cm2/day">

				0 3200 100 3500

				<!-- Hendrik Poorter 32-35 mol/m2/day  -->

				<!-- 2013 verahecht data klein altendorf increasing over 100 days from 

					500 to 700 wh/m2/day 500 *4.57 *3600 /10000 = 823 umol/cm2/day 700 *4.57 

					*3600 /10000 = 1152 umol/cm2/day -->

				<!-- average estimate for green houses tyson 800 uMol/m2/s = 3456.0 uMol/cm2/day 

					(12 hour light) 5184 for 1200uMol/m2/s average Raul experiment 2006 green 

					houses tyson 590 uMol/m2/s measurements taken from 10am-1pm 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 -->

				unit_column2="MJ/m2/day">

0	13.59

1	8.77

2	18.42

3	18.22

4	17.9

5	8.96

6	10.22

7	15.49

8	17.51

9	19.56

10	20.11

11	19.21

12	21.2

13	21.03

14	20.95

15	20.59

16	12

17	21.6

18	21.76

19	14.8

20	17.54

21	14.76

22	5.01

23	4.76

24	8.5

25	18.75

26	18.55

27	18.71

28	13.62

29	13.95

30	5.98

31	14.87

32	23.59

33	24.17

34	24.9

35	25.26

36	24.72

37	25.21

38	22.69

39	14.14

40	15.72

41	16.01

42	18.47

43	13.09

44	22.3

45	24.25

46	26.79

47	26.82

48	26.49

49	27.35

50	26.24

51	21.98

52	25.42

53	16.95

54	13.68

55	25.8

56	21.98

57	20.7

58	21.94

59	20.37

60	8.99

61	14.12

62	20.53

63	13.95

64	18.5

65	10.22

66	25.53

67	18.64

68	18.63

69	22.75

70	20.83

71	19.65

72	16.11

73	20.3

74	19.9

75	24.45

76	19.34

77	16.39

78	27.6

79	29.4

80	27.8

81	22.43

82	16.06

83	21.44

84	28.45

85	27.6

86	29.06

87	29.74

88	29.42

89	26.1

90	19.68

91	24.78

92	23.93

93	20.02

94	14.4

95	25.06

96	26.28

97	28.65

98	26.94

			</SimulaTable>

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

			</SimulaConstant>

			<!--avg precip over 2013-2015 from CKA -->

			<SimulaTable

				name_column2="precipitation"

				name_column1="time"

				unit_column1="day"

				unit_column2="cm/day"

				interpolationMethod="step"> 0 0 1 0 2 0 3 0.056666667 4 0.26 5 0.053333333

				6 0.203333333 7 0.046666667 8 0.19 9 0 10 0.19 11 0 12 0.013333333

				13 0 14 0.016666667 15 0.193333333 16 0.053333333 17 0.08 18 0.39 19

				0.01 20 0 21 0.076666667 22 0.163333333 23 0.006666667 24

				0.053333333 25 0.006666667 26 0 27 0.073333333 28 0.046666667 29

				0.006666667 30 0.046666667 31 0.45 32 0.446666667 33 0.673333333 34

				0.056666667 35 0 36 0.166666667 37 0.093333333 38 0.056666667 39

				0.17 40 0.456666667 41 0.116666667 42 0.306666667 43 0.31 44

				0.006666667 45 0.206666667 46 0.003333333 47 0.15 48 0.17 49

				0.163333333 50 0.093333333 51 0.25 52 0.436666667 53 0.216666667 54

				0.026666667 55 0.303333333 56 0.336666667 57 0.206666667 58 0.47 59

				0.496666667 60 0.003333333 61 0.126666667 62 0.323333333 63 0 64

				0.023333333 65 0.456666667 66 0.353333333 67 0.333333333 68

				0.233333333 69 0.113333333 70 0.21 71 0.133333333 72 0.38 73

				0.413333333 74 0.34 75 0.01 76 0.086666667 77 0.413333333 78

				0.253333333 79 0.18 80 0.543333333 81 0.416666667 82 0.023333333 83

				0.16 84 0 85 0.39 86 0.63 87 0.676666667 88 0.216666667 89

				0.436666667 90 0.503333333 91 0.17 92 0.05 93 0.003333333 94

				0.593333333 95 0.206666667 96 0.6 97 0.02 98 0.42 99 0.023333333 100

				0.743333333 101 0 102 0.076666667 103 0 104 0.056666667 105

				0.443333333 106 0.133333333 107 0 108 0.13 109 0.116666667 110

				0.623333333 111 0.493333333 112 0.173333333 113 0.07 114 0.05 115 0

				116 0.663333333 117 0.076666667 118 0 119 0 120 0 121 0.35 122 0.48

				123 0.113333333 124 1.036666667 125 0.543333333 126 0.036666667 127

				0.113333333 128 0.046666667

				interpolationMethod="step">

0	0

1	0.31

2	0

3	0

4	0.07

5	0.02

6	0.08

7	0

8	0

9	0

10	0

11	0

12	0

13	0

14	0

15	0

16	0

17	0

18	0

19	0.52

20	0.01

21	0.06

22	0.41

23	0.86

24	0.67

25	0.5

26	0.58

27	0.04

28	0.74

29	1.05

30	0.82

31	0.25

32	0

33	0

34	0

35	0

36	0

37	0

38	0.08

39	0.99

40	0.09

41	0.03

42	0.03

43	0

44	0

45	0

46	0

47	0

48	0

49	0

50	0

51	0.01

52	0

53	0.05

54	0.1

55	0

56	0

57	0

58	0.19

59	0.09

60	0.72

61	0.42

62	0.02

63	0.13

64	0.62

65	0.6

66	0

67	0.48

68	0.22

69	0.07

70	0

71	0.1

72	0.28

73	0.53

74	0.17

75	0.85

76	0.52

77	0.02

78	0

79	0

80	0

81	0.54

82	0.77

83	0.5

84	0

85	0

86	0

87	0

88	0

89	0

90	0.03

91	0

92	0

93	0.94

94	0.05

95	0

96	0

97	0

98	0

				 

			</SimulaTable>

			<!-- avg evaporation for CLA from 2013-2015 March 25+129 days -->

			<SimulaTable

				name_column2="evaporation"

				name="windSpeed"

				unit="m/s"

				name_column1="time"

				unit_column1="day"

				unit_column2="cm/day"

				interpolationMethod="step"> 0 0.12 1 0.13 2 0.07 3 0.19 4 0.16 5 0.17 6

				0.16 7 0.21 8 0.26 9 0.21 10 0.18 11 0.16 12 0.14 13 0.17 14 0.1 15

				0.2 16 0.19 17 0.27 18 0.35 19 0.27 20 0.31 21 0.24 22 0.37 23 0.38

				24 0.3 25 0.29 26 0.3 27 0.25 28 0.34 29 0.37 30 0.25 31 0.3 32 0.36

				33 0.15 34 0.22 35 0.08 36 0.27 37 0.24 38 0.14 39 0.17 40 0.24 41

				0.14 42 0.36 43 0.42 44 0.38 45 0.35 46 0.29 47 0.33 48 0.39 49 0.43

				50 0.41 51 0.4 52 0.32 53 0.35 54 0.17 55 0.32 56 0.44 57 0.36 58

				0.31 59 0.37 60 0.4 61 0.32 62 0.32 63 0.2 64 0.24 65 0.3 66 0.32 67

				0.25 68 0.31 69 0.28 70 0.3 71 0.41 72 0.38 73 0.47 74 0.61 75 0.33

				76 0.45 77 0.46 78 0.41 79 0.4 80 0.49 81 0.48 82 0.37 83 0.49 84

				0.24 85 0.36 86 0.41 87 0.36 88 0.18 89 0.2 90 0.25 91 0.13 92 0.2

				93 0.29 94 0.44 95 0.38 96 0.4 97 0.4 98 0.49 99 0.48 100 0.66 101

				0.69 102 0.54 103 0.58 104 0.57 105 0.52 106 0.44 107 0.39 108 0.31

				109 0.43 110 0.56 111 0.31 112 0.15 113 0.31 114 0.3 115 0.46 116

				0.65 117 0.4 118 0.22 119 0.2 120 0.31 121 0.37 122 0.41 123 0.43

				124 0.27 125 0.34 126 0.3 127 0.34 128 0.33 129 0.23

			</SimulaTable>

				unit_column1="day"> 

0	15.8

1	15.5

2	4.7

3	15.3

4	17.9

5	29.3

6	19.5

7	23.4

8	25.4

9	17.8

10	7.5

11	16

12	19.1

13	9.5

14	9.2

15	13.6

16	13

17	9.6

18	16.6

19	21

20	10.9

21	15

22	14

23	22.2

24	16

25	11.9

26	16.4

27	15.5

28	11.4

29	15.2

30	11.3

31	13.7

32	12.8

33	7.8

34	8.7

35	6.8

36	5.4

37	11.3

38	14.7

39	18.4

40	15.1

41	15.2

42	16.3

43	12.6

44	15.1

45	16.2

46	11.1

47	14.3

48	13.9

49	11.9

50	14.9

51	18.6

52	18.9

53	15.2

54	16.5

55	8

56	11.5

57	15.4

58	22.5

59	19.8

60	20.7

61	21.8

62	18

63	25.8

64	25.6

65	16.9

66	14.8

67	15

68	16.5

69	16.3

70	18.2

71	19.8

72	24.2

73	27.3

74	21.7

75	29

76	12.7

77	25.2

78	10.9

79	19.1

80	14.8

81	20

82	17.7

83	12.5

84	6.5

85	14.8

86	13.9

87	10

88	12.1

89	16.1

90	29

91	24.6

92	12.8

93	22.7

94	20.8

95	17

96	15.2

97	10.8

98	8.7

				

			<!-- for pennman monteith -->

			<!-- daily temp, RH, wind speed avg from 2013-2015 at CKA still need to 

				do net radiation and soil radiation -->

			<SimulaConstant

				name="windSpeed"

				unit="m/s"> 1.2

			</SimulaConstant>

			<SimulaConstant

			</SimulaTable>

			<SimulaTable

				name="relativeHumidity"

				unit="m/s"> 65

			</SimulaConstant>

				unit="%"

				name_column1="time"

				unit_column1="day"

				> 

0	82

1	82

2	77

3	70

4	72

5	67

6	70

7	68

8	64

9	63

10	65

11	65

12	52

13	60

14	64

15	68

16	77

17	76

18	62

19	73

20	71

21	77

22	92

23	92

24	84

25	75

26	79

27	77

28	86

29	86

30	93

31	82

32	72

33	68

34	72

35	65

36	67

37	65

38	63

39	87

40	75

41	70

42	72

43	72

44	61

45	58

46	56

47	55

48	48

49	49

50	52

51	56

52	54

53	61

54	71

55	60

56	60

57	56

58	61

59	59

60	68

61	82

62	65

63	66

64	80

65	82

66	71

67	79

68	77

69	67

70	65

71	67

72	75

73	73

74	72

75	71

76	66

77	69

78	69

79	54

80	47

81	56

82	72

83	64

84	61

85	58

86	57

87	54

88	45

89	45

90	54

91	54

92	56

93	71

94	70

95	65

96	67

97	59

98	43

				

			</SimulaTable>

			<SimulaTable

				name_column2="averageDailyTemperature"

				name_column1="time"

				unit_column1="day"

				unit_column2="degreesC"

				interpolationMethod="linear"> 0 5.4 1 5.8 2 6.5 3 7.3 4 8.4 5 10.9 6 7.4 7 9

				8 5.8 9 5.4 10 5.9 11 5 12 4.7 13 4.5 14 5.7 15 6.5 16 11.4 17 14.7

				18 12.8 19 11.6 20 10.2 21 14.7 22 17.7 23 14 24 10 25 8.2 26 8.4 27

				11.2 28 12.9 29 8.6 30 10 31 14.6 32 13.7 33 14.4 34 8.7 35 8 36 9

				37 9 38 7.5 39 9.9 40 13.7 41 16.9 42 17.6 43 13.5 44 12.5 45 13.9

				46 15.5 47 15 48 18.4 49 18.8 50 14.7 51 13 52 13.2 53 11.2 54 12.9

				55 15.4 56 11.9 57 10.5 58 12.4 59 14.4 60 14.2 61 15.3 62 13 63

				11.4 64 12.5 65 15.1 66 13 67 11.3 68 15 69 13.8 70 17.1 71 16.4 72

				17.6 73 23.3 74 18 75 15.7 76 14.9 77 13.7 78 16.3 79 19.3 80 20.1

				81 19.5 82 18.7 83 15.5 84 13.3 85 15.8 86 16.5 87 12.1 88 12.5 89

				15.7 90 12.2 91 12.1 92 14.3 93 18.5 94 21.1 95 19.4 96 18.4 97 21.2

				98 21.1 99 24.8 100 28.3 101 26.3 102 28.9 103 24.2 104 20.8 105

				21.8 106 17 107 14.9 108 15.8 109 21.6 110 17.2 111 17.3 112 20.2

				113 20.7 114 23 115 28 116 22.2 117 18.4 118 20.1 119 23.2 120 21.5

				121 19.2 122 20.1 123 16.2 124 15.6 125 16.8 126 15.8 127 14.6 128

				13 129 14.5

				interpolationMethod="linear"> 

0	8.5

1	8.3

2	7.7

3	9.5

4	8.4

5	8.4

6	7.9

7	6.9

8	9.8

9	12.3

10	12.4

11	11.3

12	6.4

13	5.7

14	7.7

15	8.7

16	7.3

17	9.1

18	13

19	14.5

20	13

21	13.6

22	10.4

23	8

24	7.8

25	9.9

26	11.5

27	11

28	11.1

29	11.5

30	10.2

31	11

32	11.5

33	13

34	13.6

35	14.4

36	16.3

37	17.9

38	20

39	15.4

40	10

41	9.4

42	10.3

43	10.7

44	10.6

45	11

46	12.9

47	15.3

48	16.8

49	15.7

50	16

51	13.3

52	12.7

53	13.6

54	11.9

55	14.4

56	15.9

57	14.4

58	11.6

59	9.8

60	10.5

61	15.4

62	14.5

63	15.4

64	15.6

65	14.7

66	19.9

67	20.6

68	19.1

69	16.3

70	17.1

71	18.2

72	16.1

73	16.7

74	15.7

75	13.7

76	13.9

77	16.2

78	15.4

79	19.9

80	24.9

81	25.2

82	19.2

83	18.4

84	20.4

85	21.3

86	20.7

87	19.6

88	22.2

89	25.6

90	20.5

91	19.8

92	24.4

93	21.9

94	19.6

95	23.2

96	23.6

97	25.2

98	28.4

				

				

			</SimulaTable>



			<!-- these are necessary to compute incoming radiation by the radiation
@@ -150,36 +558,217 @@ 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 7.66 129 7.89

0	7.78043333333333

1	2.42387777777778

2	12.0575

3	12.1541944444444

4	10.9080861111111

5	5.62731944444444

6	6.46415277777778

7	12.7703

8	12.5184777777778

9	12.8552194444444

10	12.8918972222222

11	12.2940583333333

12	12.9651138888889

13	13

14	13

15	13

16	7.143825

17	13

18	13

19	10.6974027777778

20	11.3215888888889

21	8.34925

22	0

23	0

24	1.81589166666667

25	11.6806888888889

26	10.1578916666667

27	11.3243277777778

28	8.20366666666667

29	6.06355555555556

30	0

31	9.81924444444445

32	13.415175

33	13.6029861111111

34	14.0061861111111

35	13.9823361111111

36	14.2820527777778

37	14.571325

38	14.2381194444444

39	7.12981388888889

40	12.1244111111111

41	10.4050111111111

42	11.9504888888889

43	5.14893333333333

44	12.5982055555556

45	14.9864805555556

46	15

47	15

48	15

49	15

50	15

51	11

52	13.5908277777778

53	11.7929361111111

54	7.00061388888889

55	15

56	15

57	12.2591111111111

58	13.7334361111111

59	14

60	3.3232

61	6.85596111111111

62	14.6261944444444

63	5.13385

64	10.2347333333333

65	2.87796111111111

66	15

67	9.18990555555556

68	10.8661861111111

69	15

70	14.33815

71	11.7950388888889

72	9.51720555555556

73	11.4338083333333

74	11

75	14.8591888888889

76	10.8227527777778

77	6.45055555555556

78	15.0605888888889

79	15.1460083333333

80	15.0514194444444

81	13

82	7.05885833333333

83	13.1488694444444

84	15.1620972222222

85	15.1594333333333

86	15.1570361111111

87	15.2457111111111

88	14.3951916666667

89	13.1222777777778

90	10.9601

91	12.8373333333333

92	13.7843833333333

93	11.9497555555556

94	5.81592222222222

95	15.1494555555556

96	15.1502833333333

97	15.1514611111111

98	15.1570583333333



			</SimulaTable>

			<SimulaTable

				name_column2="ET0"

				unit_column2="mm/day"

				unit_column2="cm/day"

				name_column1="time"

				unit_column1="day"

				interpolationMethod="step">

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

				0 2 100 2



0	0.176

1	0.129

2	0.235

3	0.274

4	0.241

5	0.198

6	0.177

7	0.229

8	0.295

9	0.33

10	0.323

11	0.31

12	0.297

13	0.27

14	0.286

15	0.301

16	0.17

17	0.294

18	0.378

19	0.274

20	0.298

21	0.252

22	0.081

23	0.077

24	0.124

25	0.269

26	0.287

27	0.28

28	0.204

29	0.202

30	0.097

31	0.22

32	0.361

33	0.371

34	0.391

35	0.408

36	0.415

37	0.47

38	0.468

39	0.228

40	0.227

41	0.245

42	0.275

43	0.216

44	0.349

45	0.382

46	0.442

47	0.494

48	0.532

49	0.49

50	0.497

51	0.412

52	0.431

53	0.327

54	0.241

55	0.426

56	0.397

57	0.394

58	0.356

59	0.332

60	0.209

61	0.251

62	0.366

63	0.328

64	0.306

65	0.197

66	0.476

67	0.361

68	0.341

69	0.397

70	0.426

71	0.408

72	0.306

73	0.373

74	0.351

75	0.368

76	0.331

77	0.353

78	0.449

79	0.624

80	0.693

81	0.551

82	0.337

83	0.415

84	0.527

85	0.546

86	0.58

87	0.561

88	0.641

89	0.703

90	0.501

91	0.549

92	0.531

93	0.402

94	0.323

95	0.552

96	0.543

97	0.617

98	0.626

				

			</SimulaTable>

		</SimulaBase>

			<SimulaConstant

				name="altitude"

				unit="m"> 64

			</SimulaConstant>

			<SimulaConstant

				name="startDay"

				unit="noUnit"

				type="integer"> 25

			</SimulaConstant>

			<SimulaConstant

				name="startMonth"

				unit="noUnit"

				type="integer"> 3

			</SimulaConstant>

			<SimulaConstant

				name="latitude"

				unit="noUnit"> 50.8

			</SimulaConstant>



	</SimulaDirective>

</SimulationModelIncludeFile>

OpenSimRoot/InputFiles/environments/CKA/water.xml

+64 −24
Original line number Diff line number Diff line
@@ -57,6 +57,24 @@ Mediumfine 0.010 0.412 0.0082 1.2179 0.1789 0.5000 4.000 
Fine 0.010 	0.481 0.0198 1.0861 0.0793 3.7124 8.500

Very Fine 	0.010 0.538 0.0168 1.0730 0.0680 0.0001 8.235

Organica 		0.010 0.766 0.0130 1.2039 0.1694 0.4000 8.000





Landl 2019 table 2 data for Campus Klein Altendorf

https://acsess.onlinelibrary.wiley.com/doi/full/10.2136/vzj2018.11.0196





horizont	depth(cm)	sand	silt	clay(%)	BD(g/cm3)	thr	ths	alpha	n	ks

Ap			0–30		7	76	17				1.29		0.041	0.4857	0.0103	1.2767	5.08

E/B			31–40		5	75	20				1.32		0.041	0.4778	0.0056	1.299	1.56

Bt1			41–75		5	68	27				1.42		0.041	0.4502	0.0047	1.2691	1.31

Bt2			76–115		4	67	29				1.52		0.041	0.4223	0.0041	1.2468	1.2

Bw			116–160		6	74	20				1.46		0.041	0.4381	0.005	1.2732	1.62













-->

	<SimulaDirective path="environment/soil">

	<SimulaBase name="water">
@@ -72,53 +90,75 @@ Organica 0.010 0.766 0.0130 1.2039 0.1694 0.4000 8.000 
			name_column2="residualWaterContent"

			name_column1="depth"

			unit_column1="cm"

			unit_column2="100%"> 0 0.067 -300 0.067

			unit_column2="100%"> 0 0.041 -300 0.041

		</SimulaTable>

		<SimulaTable

			name_column2="saturatedWaterContent"

			name_column1="depth"

			unit_column1="cm"

			unit_column2="100%"

			TinterpolationMethod="step">

				<!--Luo L, Lin H, Halleck P. 2008. Quantifying Soil Structure and Preferential Flow in Intact Soil Using X-ray Computed Tomography. Soil Sci Soc Am J 72: 1058-1069.-->

			0 0.460 -15 0.450 -25 0.430 -35 0.390 -65 0.390 -300 0.390

			unit_column2="100%">

-0	0.4857

-15	0.4857

-30	0.4857

-35	0.4778

-45	0.4502

-70	0.4502

-80	0.4223

-110	0.4223

-120	0.4381

-300	0.4381

		</SimulaTable>

		<SimulaTable

			name_column2="vanGenuchten:alpha"

			name_column1="depth"

			unit_column1="cm"

			unit_column2="1/cm">

				<!--see hodnet and tomasella 2002 - rocksprings has a hagerstown silt loam-->

			0 0.02 -300 0.02

0	0.0103

-15	0.0103

-30	0.0103

-35	0.0056

-45	0.0047

-70	0.0047

-80	0.0041

-110	0.0041

-120	0.005

-300	0.005



		</SimulaTable>

		<SimulaTable

			name_column2="vanGenuchten:n"

			name_column1="depth"

			unit_column1="cm"

			unit_column2="noUnit"> 

				<!--see hodnet and tomasella 2002 - rocksprings has a hagerstown silt loam-->

			0 1.41 -300 1.41

0	1.2767

-15	1.2767

-30	1.2767

-35	1.299

-45	1.2691

-70	1.2691

-80	1.2468

-110	1.2468

-120	1.2732

-300	1.2732



		</SimulaTable>

		<SimulaTable

			name_column2="saturatedConductivity"

			name_column1="depth"

			unit_column1="cm"

			unit_column2="cm/day"

			TinterpolationMethod="step">

				<!--Luo L, Lin H, Halleck P. 2008. Quantifying Soil Structure and Preferential Flow in Intact Soil Using X-ray Computed Tomography. Soil Sci Soc Am J 72: 1058-1069.

					  0	74.000

					-15 74.000

					-25 64.800

					-35 50.400

					-65 50.400

					-300 50.400 -->

					<!--These numbers seem high, may rocksprings is more like a sandy clay loam?-->

					<!-- silt loam 0.45*24=10.8 -->

			0 10.8 -300 10.8

			unit_column2="cm/day">

-0	5.08

-15	5.08

-30	5.08

-35	1.56

-45	1.31

-70	1.31

-80	1.2

-110	1.2

-120	1.62

-300	1.62



		</SimulaTable>

		<SimulaConstant

			name="volumetricWaterContentInBarberCushman"

			unit="cm3/cm3">0.3</SimulaConstant>

	</SimulaBase>

	</SimulaDirective>

</SimulationModelIncludeFile>