Skip to content

Commit baef662

Browse files
mcwimmmcwimm
committed
[BM] update xml file structure #2 
1 parent db16246 commit baef662

16 files changed

Lines changed: 396 additions & 228 deletions

File tree

‎Benchmarks/ModuleBenchmarks/OutputModules/OneFile/OneFile.xml‎

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,46 @@
1414
<species> Benchmarks/ModuleBenchmarks/OutputModules/species1.py </species>
1515
<vegetation_model_type> Bettina </vegetation_model_type>
1616
<mortality> NoGrowth </mortality>
17-
<distribution>
17+
<domain>
18+
<x_1> 0 </x_1>
19+
<y_1> 0 </y_1>
20+
<x_2> 22 </x_2>
21+
<y_2> 22 </y_2>
22+
</domain>
23+
<initial_population>
1824
<type> FromFile </type>
19-
<domain>
20-
<x_1> 0 </x_1>
21-
<y_1> 0 </y_1>
22-
<x_2> 22 </x_2>
23-
<y_2> 22 </y_2>
24-
</domain>
25-
<n_recruitment_per_step> 0 </n_recruitment_per_step>
2625
<filename> Benchmarks/ModuleBenchmarks/OutputModules/initial_population_1.csv </filename>
27-
</distribution>
26+
</initial_population>
27+
<production>
28+
<type> FixedRate </type>
29+
<per_model_area> 0 </per_model_area>
30+
</production>
31+
<dispersal>
32+
<type> Uniform </type>
33+
</dispersal>
2834
</group>
2935
<group>
3036
<name> Species_2 </name>
3137
<species> Benchmarks/ModuleBenchmarks/OutputModules/species2.py </species>
3238
<vegetation_model_type> Bettina </vegetation_model_type>
3339
<mortality> NoGrowth </mortality>
34-
<distribution>
40+
<domain>
41+
<x_1> 0 </x_1>
42+
<y_1> 0 </y_1>
43+
<x_2> 22 </x_2>
44+
<y_2> 22 </y_2>
45+
</domain>
46+
<initial_population>
3547
<type> FromFile </type>
36-
<domain>
37-
<x_1> 0 </x_1>
38-
<y_1> 0 </y_1>
39-
<x_2> 22 </x_2>
40-
<y_2> 22 </y_2>
41-
</domain>
42-
<n_recruitment_per_step> 0 </n_recruitment_per_step>
4348
<filename> Benchmarks/ModuleBenchmarks/OutputModules/initial_population_2.csv </filename>
44-
</distribution>
49+
</initial_population>
50+
<production>
51+
<type> FixedRate </type>
52+
<per_model_area> 0 </per_model_area>
53+
</production>
54+
<dispersal>
55+
<type> Uniform </type>
56+
</dispersal>
4557
</group>
4658
</population>
4759
<time_loop>

‎Benchmarks/ModuleBenchmarks/OutputModules/OneFile/OneFile_CI.xml‎

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,46 @@
1414
<species> Benchmarks/ModuleBenchmarks/OutputModules/species1.py </species>
1515
<vegetation_model_type> Bettina </vegetation_model_type>
1616
<mortality> NoGrowth </mortality>
17-
<distribution>
17+
<domain>
18+
<x_1> 0 </x_1>
19+
<y_1> 0 </y_1>
20+
<x_2> 22 </x_2>
21+
<y_2> 22 </y_2>
22+
</domain>
23+
<initial_population>
1824
<type> FromFile </type>
19-
<domain>
20-
<x_1> 0 </x_1>
21-
<y_1> 0 </y_1>
22-
<x_2> 22 </x_2>
23-
<y_2> 22 </y_2>
24-
</domain>
25-
<n_recruitment_per_step> 0 </n_recruitment_per_step>
2625
<filename> Benchmarks/ModuleBenchmarks/OutputModules/initial_population_1.csv </filename>
27-
</distribution>
26+
</initial_population>
27+
<production>
28+
<type> FixedRate </type>
29+
<per_model_area> 0 </per_model_area>
30+
</production>
31+
<dispersal>
32+
<type> Uniform </type>
33+
</dispersal>
2834
</group>
2935
<group>
3036
<name> Species_2 </name>
3137
<species> Benchmarks/ModuleBenchmarks/OutputModules/species2.py </species>
3238
<vegetation_model_type> Bettina </vegetation_model_type>
3339
<mortality> NoGrowth </mortality>
34-
<distribution>
40+
<domain>
41+
<x_1> 0 </x_1>
42+
<y_1> 0 </y_1>
43+
<x_2> 22 </x_2>
44+
<y_2> 22 </y_2>
45+
</domain>
46+
<initial_population>
3547
<type> FromFile </type>
36-
<domain>
37-
<x_1> 0 </x_1>
38-
<y_1> 0 </y_1>
39-
<x_2> 22 </x_2>
40-
<y_2> 22 </y_2>
41-
</domain>
42-
<n_recruitment_per_step> 0 </n_recruitment_per_step>
4348
<filename> Benchmarks/ModuleBenchmarks/OutputModules/initial_population_2.csv </filename>
44-
</distribution>
49+
</initial_population>
50+
<production>
51+
<type> FixedRate </type>
52+
<per_model_area> 0 </per_model_area>
53+
</production>
54+
<dispersal>
55+
<type> Uniform </type>
56+
</dispersal>
4557
</group>
4658
</population>
4759
<time_loop>

‎Benchmarks/ModuleBenchmarks/OutputModules/OneFilePerGroup/OneFilePerGroup.xml‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,46 @@
1414
<species> Benchmarks/ModuleBenchmarks/OutputModules/species1.py </species>
1515
<vegetation_model_type> Bettina </vegetation_model_type>
1616
<mortality> NoGrowth </mortality>
17-
<distribution>
18-
<type> GroupFromFile </type>
19-
<n_recruitment_per_step> 0 </n_recruitment_per_step>
17+
<domain>
18+
<x_1> 0 </x_1>
19+
<y_1> 0 </y_1>
20+
<x_2> 22 </x_2>
21+
<y_2> 22 </y_2>
22+
</domain>
23+
<initial_population>
24+
<type> FromFile </type>
2025
<filename> Benchmarks/ModuleBenchmarks/OutputModules/initial_population_1.csv </filename>
21-
</distribution>
26+
</initial_population>
27+
<production>
28+
<type> FixedRate </type>
29+
<per_model_area> 0 </per_model_area>
30+
</production>
31+
<dispersal>
32+
<type> Uniform </type>
33+
</dispersal>
2234
</group>
2335
<group>
2436
<name> Species_2 </name>
2537
<species> Benchmarks/ModuleBenchmarks/OutputModules/species2.py </species>
2638
<vegetation_model_type> Bettina </vegetation_model_type>
2739
<mortality> NoGrowth </mortality>
28-
<distribution>
29-
<type> GroupFromFile </type>
30-
<n_recruitment_per_step> 0 </n_recruitment_per_step>
40+
<domain>
41+
<x_1> 0 </x_1>
42+
<y_1> 0 </y_1>
43+
<x_2> 22 </x_2>
44+
<y_2> 22 </y_2>
45+
</domain>
46+
<initial_population>
47+
<type> FromFile </type>
3148
<filename> Benchmarks/ModuleBenchmarks/OutputModules/initial_population_2.csv </filename>
32-
</distribution>
49+
</initial_population>
50+
<production>
51+
<type> FixedRate </type>
52+
<per_model_area> 0 </per_model_area>
53+
</production>
54+
<dispersal>
55+
<type> Uniform </type>
56+
</dispersal>
3357
</group>
3458
</population>
3559
<time_loop>

‎Benchmarks/ModuleBenchmarks/OutputModules/OneFilePerGroup/OneFilePerGroup_CI.xml‎

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,46 @@
1414
<species> Benchmarks/ModuleBenchmarks/OutputModules/species1.py </species>
1515
<vegetation_model_type> Bettina </vegetation_model_type>
1616
<mortality> NoGrowth </mortality>
17-
<distribution>
17+
<domain>
18+
<x_1> 0 </x_1>
19+
<y_1> 0 </y_1>
20+
<x_2> 22 </x_2>
21+
<y_2> 22 </y_2>
22+
</domain>
23+
<initial_population>
1824
<type> FromFile </type>
19-
<domain>
20-
<x_1> 0 </x_1>
21-
<y_1> 0 </y_1>
22-
<x_2> 22 </x_2>
23-
<y_2> 22 </y_2>
24-
</domain>
25-
<n_recruitment_per_step> 0 </n_recruitment_per_step>
2625
<filename> Benchmarks/ModuleBenchmarks/OutputModules/initial_population_1.csv </filename>
27-
</distribution>
26+
</initial_population>
27+
<production>
28+
<type> FixedRate </type>
29+
<per_model_area> 0 </per_model_area>
30+
</production>
31+
<dispersal>
32+
<type> Uniform </type>
33+
</dispersal>
2834
</group>
2935
<group>
3036
<name> Species_2 </name>
3137
<species> Benchmarks/ModuleBenchmarks/OutputModules/species2.py </species>
3238
<vegetation_model_type> Bettina </vegetation_model_type>
3339
<mortality> NoGrowth </mortality>
34-
<distribution>
40+
<domain>
41+
<x_1> 0 </x_1>
42+
<y_1> 0 </y_1>
43+
<x_2> 22 </x_2>
44+
<y_2> 22 </y_2>
45+
</domain>
46+
<initial_population>
3547
<type> FromFile </type>
36-
<domain>
37-
<x_1> 0 </x_1>
38-
<y_1> 0 </y_1>
39-
<x_2> 22 </x_2>
40-
<y_2> 22 </y_2>
41-
</domain>
42-
<n_recruitment_per_step> 0 </n_recruitment_per_step>
4348
<filename> Benchmarks/ModuleBenchmarks/OutputModules/initial_population_2.csv </filename>
44-
</distribution>
49+
</initial_population>
50+
<production>
51+
<type> FixedRate </type>
52+
<per_model_area> 0 </per_model_area>
53+
</production>
54+
<dispersal>
55+
<type> Uniform </type>
56+
</dispersal>
4557
</group>
4658
</population>
4759
<time_loop>

‎Benchmarks/ModuleBenchmarks/OutputModules/OnePlantOneFile/OnePlantOneFile.xml‎

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,46 @@
1414
<species> Benchmarks/ModuleBenchmarks/OutputModules/species1.py </species>
1515
<vegetation_model_type> Bettina </vegetation_model_type>
1616
<mortality> NoGrowth </mortality>
17-
<distribution>
17+
<domain>
18+
<x_1> 0 </x_1>
19+
<y_1> 0 </y_1>
20+
<x_2> 22 </x_2>
21+
<y_2> 22 </y_2>
22+
</domain>
23+
<initial_population>
1824
<type> FromFile </type>
19-
<domain>
20-
<x_1> 0 </x_1>
21-
<y_1> 0 </y_1>
22-
<x_2> 22 </x_2>
23-
<y_2> 22 </y_2>
24-
</domain>
25-
<n_recruitment_per_step> 0 </n_recruitment_per_step>
2625
<filename> Benchmarks/ModuleBenchmarks/OutputModules/initial_population_1.csv </filename>
27-
</distribution>
26+
</initial_population>
27+
<production>
28+
<type> FixedRate </type>
29+
<per_model_area> 0 </per_model_area>
30+
</production>
31+
<dispersal>
32+
<type> Uniform </type>
33+
</dispersal>
2834
</group>
2935
<group>
3036
<name> Species_2 </name>
3137
<species> Benchmarks/ModuleBenchmarks/OutputModules/species2.py </species>
3238
<vegetation_model_type> Bettina </vegetation_model_type>
3339
<mortality> NoGrowth </mortality>
34-
<distribution>
40+
<domain>
41+
<x_1> 0 </x_1>
42+
<y_1> 0 </y_1>
43+
<x_2> 22 </x_2>
44+
<y_2> 22 </y_2>
45+
</domain>
46+
<initial_population>
3547
<type> FromFile </type>
36-
<domain>
37-
<x_1> 0 </x_1>
38-
<y_1> 0 </y_1>
39-
<x_2> 22 </x_2>
40-
<y_2> 22 </y_2>
41-
</domain>
42-
<n_recruitment_per_step> 0 </n_recruitment_per_step>
4348
<filename> Benchmarks/ModuleBenchmarks/OutputModules/initial_population_2.csv </filename>
44-
</distribution>
49+
</initial_population>
50+
<production>
51+
<type> FixedRate </type>
52+
<per_model_area> 0 </per_model_area>
53+
</production>
54+
<dispersal>
55+
<type> Uniform </type>
56+
</dispersal>
4557
</group>
4658
</population>
4759
<time_loop>

‎Benchmarks/ModuleBenchmarks/OutputModules/OnePlantOneFile/OnePlantOneFile_CI.xml‎

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,46 @@
1414
<species> Benchmarks/ModuleBenchmarks/OutputModules/species1.py </species>
1515
<vegetation_model_type> Bettina </vegetation_model_type>
1616
<mortality> NoGrowth </mortality>
17-
<distribution>
17+
<domain>
18+
<x_1> 0 </x_1>
19+
<y_1> 0 </y_1>
20+
<x_2> 22 </x_2>
21+
<y_2> 22 </y_2>
22+
</domain>
23+
<initial_population>
1824
<type> FromFile </type>
19-
<domain>
20-
<x_1> 0 </x_1>
21-
<y_1> 0 </y_1>
22-
<x_2> 22 </x_2>
23-
<y_2> 22 </y_2>
24-
</domain>
25-
<n_recruitment_per_step> 0 </n_recruitment_per_step>
2625
<filename> Benchmarks/ModuleBenchmarks/OutputModules/initial_population_1.csv </filename>
27-
</distribution>
26+
</initial_population>
27+
<production>
28+
<type> FixedRate </type>
29+
<per_model_area> 0 </per_model_area>
30+
</production>
31+
<dispersal>
32+
<type> Uniform </type>
33+
</dispersal>
2834
</group>
2935
<group>
3036
<name> Species_2 </name>
3137
<species> Benchmarks/ModuleBenchmarks/OutputModules/species2.py </species>
3238
<vegetation_model_type> Bettina </vegetation_model_type>
3339
<mortality> NoGrowth </mortality>
34-
<distribution>
40+
<domain>
41+
<x_1> 0 </x_1>
42+
<y_1> 0 </y_1>
43+
<x_2> 22 </x_2>
44+
<y_2> 22 </y_2>
45+
</domain>
46+
<initial_population>
3547
<type> FromFile </type>
36-
<domain>
37-
<x_1> 0 </x_1>
38-
<y_1> 0 </y_1>
39-
<x_2> 22 </x_2>
40-
<y_2> 22 </y_2>
41-
</domain>
42-
<n_recruitment_per_step> 0 </n_recruitment_per_step>
4348
<filename> Benchmarks/ModuleBenchmarks/OutputModules/initial_population_2.csv </filename>
44-
</distribution>
49+
</initial_population>
50+
<production>
51+
<type> FixedRate </type>
52+
<per_model_area> 0 </per_model_area>
53+
</production>
54+
<dispersal>
55+
<type> Uniform </type>
56+
</dispersal>
4557
</group>
4658
</population>
4759
<time_loop>

0 commit comments

Comments
 (0)