Skip to content

Commit ab95ef3

Browse files
committed
Merge (#80) into demo/linear-wave-body (#81)
* Waves: enable wave direction in the sinusoid wave model (#80) * Waves: enable wave direction in the sinusoid wave model - Allow wave direction to be set for regular waves. - Add test for a wave direction not parallel to the x-axis Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com> * Waves: rename monochromatic_waves model - Rename to regular waves. Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com> * Waves: update regular wave model descriptions Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com>
1 parent 6c3cd8c commit ab95ef3

File tree

10 files changed

+20
-19
lines changed

10 files changed

+20
-19
lines changed

gz-waves-models/world_models/regular_waves_15s_2m/model.config

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
</author>
1212

1313
<description>
14-
Monochromatic surface waves T=15s, H=2m.
14+
Regular surface waves T=15s, H=2m.
15+
1516
This model uses the materials from the `waves`
1617
model to prevent duplicating the large mesh files.
1718
</description>

gz-waves-models/world_models/regular_waves_15s_4m/model.config

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
</author>
1212

1313
<description>
14-
Monochromatic surface waves T=15s, H=4m.
14+
Regular surface waves T=15s, H=4m.
15+
1516
This model uses the materials from the `waves`
1617
model to prevent duplicating the large mesh files.
1718
</description>

gz-waves-models/world_models/regular_waves_15s_6m/model.config

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
</author>
1212

1313
<description>
14-
Monochromatic surface waves T=15s, H=6m.
14+
Regular surface waves T=15s, H=6m.
15+
1516
This model uses the materials from the `waves`
1617
model to prevent duplicating the large mesh files.
1718
</description>

gz-waves-models/world_models/regular_waves_1s_0.5m/model.config

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
</author>
1212

1313
<description>
14-
Monochromatic surface waves T=1s, H=0.5m.
14+
Regular surface waves T=1s, H=0.5m.
15+
1516
This model uses the materials from the `waves`
1617
model to prevent duplicating the large mesh files.
1718
</description>

gz-waves-models/world_models/regular_waves_20s_0m/model.config

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
</author>
1212

1313
<description>
14-
Monochromatic surface waves T=20s, H=0m.
14+
Regular surface waves T=20s, H=0m.
15+
1516
This model uses the materials from the `waves`
1617
model to prevent duplicating the large mesh files.
1718
</description>

gz-waves-models/world_models/regular_waves_3s_1m/model.config

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
</author>
1212

1313
<description>
14-
Monochromatic surface waves T=3s, H=1m.
14+
Regular surface waves T=3s, H=1m.
15+
1516
This model uses the materials from the `waves`
1617
model to prevent duplicating the large mesh files.
1718
</description>

gz-waves-models/world_models/regular_waves_6s_2m/model.config

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
</author>
1212

1313
<description>
14-
Monochromatic surface waves T=6s, H=2m.
14+
Regular surface waves T=6s, H=2m.
15+
1516
This model uses the materials from the `waves`
1617
model to prevent duplicating the large mesh files.
1718
</description>

gz-waves-models/world_models/regular_waves_6s_4m/model.config

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11

22
<?xml version='1.0'?>
33
<model>
4-
<<<<<<<< HEAD:gz-waves-models/world_models/regular_waves/model.config
5-
<name>Regular Waves</name>
6-
========
74
<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
95
<version>1.0</version>
106
<sdf version='1.6'>model.sdf</sdf>
117

@@ -15,12 +11,8 @@
1511
</author>
1612

1713
<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+
2416
This model uses the materials from the `waves`
2517
model to prevent duplicating the large mesh files.
2618
</description>

gz-waves-models/world_models/regular_waves_8s_2m/model.config

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
</author>
1212

1313
<description>
14-
Monochromatic surface waves T=8s, H=2m.
14+
Regular surface waves T=8s, H=2m.
15+
1516
This model uses the materials from the `waves`
1617
model to prevent duplicating the large mesh files.
1718
</description>

gz-waves-models/world_models/regular_waves_8s_4m/model.config

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
</author>
1212

1313
<description>
14-
Monochromatic surface waves T=8s, H=4m.
14+
Regular surface waves T=8s, H=4m.
15+
1516
This model uses the materials from the `waves`
1617
model to prevent duplicating the large mesh files.
1718
</description>

0 commit comments

Comments
 (0)