Commit ab95ef3 1 parent 6c3cd8c commit ab95ef3 Copy full SHA for ab95ef3
File tree 10 files changed +20
-19
lines changed
gz-waves-models/world_models
10 files changed +20
-19
lines changed Original file line number Diff line number Diff line change 11
11
</author >
12
12
13
13
<description >
14
- Monochromatic surface waves T=15s, H=2m.
14
+ Regular surface waves T=15s, H=2m.
15
+
15
16
This model uses the materials from the `waves`
16
17
model to prevent duplicating the large mesh files.
17
18
</description >
Original file line number Diff line number Diff line change 11
11
</author >
12
12
13
13
<description >
14
- Monochromatic surface waves T=15s, H=4m.
14
+ Regular surface waves T=15s, H=4m.
15
+
15
16
This model uses the materials from the `waves`
16
17
model to prevent duplicating the large mesh files.
17
18
</description >
Original file line number Diff line number Diff line change 11
11
</author >
12
12
13
13
<description >
14
- Monochromatic surface waves T=15s, H=6m.
14
+ Regular surface waves T=15s, H=6m.
15
+
15
16
This model uses the materials from the `waves`
16
17
model to prevent duplicating the large mesh files.
17
18
</description >
Original file line number Diff line number Diff line change 11
11
</author >
12
12
13
13
<description >
14
- Monochromatic surface waves T=1s, H=0.5m.
14
+ Regular surface waves T=1s, H=0.5m.
15
+
15
16
This model uses the materials from the `waves`
16
17
model to prevent duplicating the large mesh files.
17
18
</description >
Original file line number Diff line number Diff line change 11
11
</author >
12
12
13
13
<description >
14
- Monochromatic surface waves T=20s, H=0m.
14
+ Regular surface waves T=20s, H=0m.
15
+
15
16
This model uses the materials from the `waves`
16
17
model to prevent duplicating the large mesh files.
17
18
</description >
Original file line number Diff line number Diff line change 11
11
</author >
12
12
13
13
<description >
14
- Monochromatic surface waves T=3s, H=1m.
14
+ Regular surface waves T=3s, H=1m.
15
+
15
16
This model uses the materials from the `waves`
16
17
model to prevent duplicating the large mesh files.
17
18
</description >
Original file line number Diff line number Diff line change 11
11
</author >
12
12
13
13
<description >
14
- Monochromatic surface waves T=6s, H=2m.
14
+ Regular surface waves T=6s, H=2m.
15
+
15
16
This model uses the materials from the `waves`
16
17
model to prevent duplicating the large mesh files.
17
18
</description >
Original file line number Diff line number Diff line change 1
1
2
2
<?xml version =' 1.0' ?>
3
3
<model >
4
- <<<<<<<< HEAD:gz-waves-models/world_models/regular_waves/model.config
5
- <name >Regular Waves</name >
6
- ========
7
4
<name >Regular Waves 6s 4m</name >
8
- >>>>>>>> a12b047 (Update example regular wave models (#73)):gz-waves-models/world_models/regular_waves_6s_4m/model.config
9
5
<version >1.0</version >
10
6
<sdf version =' 1.6' >model.sdf</sdf >
11
7
15
11
</author >
16
12
17
13
<description >
18
- <<<<<<<< HEAD:gz-waves-models/world_models/regular_waves/model.config
19
- Regular surface waves. i.e. plane progressive waves of a single frequency.
20
-
21
- ========
22
- Monochromatic surface waves T=6s, H=4m.
23
- >>>>>>>> a12b047 (Update example regular wave models (#73)):gz-waves-models/world_models/regular_waves_6s_4m/model.config
14
+ Regular surface waves T=6s, H=4m.
15
+
24
16
This model uses the materials from the `waves`
25
17
model to prevent duplicating the large mesh files.
26
18
</description >
Original file line number Diff line number Diff line change 11
11
</author >
12
12
13
13
<description >
14
- Monochromatic surface waves T=8s, H=2m.
14
+ Regular surface waves T=8s, H=2m.
15
+
15
16
This model uses the materials from the `waves`
16
17
model to prevent duplicating the large mesh files.
17
18
</description >
Original file line number Diff line number Diff line change 11
11
</author >
12
12
13
13
<description >
14
- Monochromatic surface waves T=8s, H=4m.
14
+ Regular surface waves T=8s, H=4m.
15
+
15
16
This model uses the materials from the `waves`
16
17
model to prevent duplicating the large mesh files.
17
18
</description >
You can’t perform that action at this time.
0 commit comments