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 <[email protected]> * Waves: rename monochromatic_waves model - Rename to regular waves. Signed-off-by: Rhys Mainwaring <[email protected]> * Waves: update regular wave model descriptions Signed-off-by: Rhys Mainwaring <[email protected]>
srmainwaring · Nov 25, 2022 · 0328008 · 0328008
1 parent 9895269
commit 0328008
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 19 deletions.
diff --git a/gz-waves-models/world_models/regular_waves_15s_2m/model.config b/gz-waves-models/world_models/regular_waves_15s_2m/model.config
@@ -11,7 +11,8 @@
   </author>
 
   <description>
-    Monochromatic surface waves T=15s, H=2m.
+    Regular surface waves T=15s, H=2m.
+
     This model uses the materials from the `waves`
     model to prevent duplicating the large mesh files.
   </description>

diff --git a/gz-waves-models/world_models/regular_waves_15s_4m/model.config b/gz-waves-models/world_models/regular_waves_15s_4m/model.config
@@ -11,7 +11,8 @@
   </author>
 
   <description>
-    Monochromatic surface waves T=15s, H=4m.
+    Regular surface waves T=15s, H=4m.
+
     This model uses the materials from the `waves`
     model to prevent duplicating the large mesh files.
   </description>

diff --git a/gz-waves-models/world_models/regular_waves_15s_6m/model.config b/gz-waves-models/world_models/regular_waves_15s_6m/model.config
@@ -11,7 +11,8 @@
   </author>
 
   <description>
-    Monochromatic surface waves T=15s, H=6m.
+    Regular surface waves T=15s, H=6m.
+
     This model uses the materials from the `waves`
     model to prevent duplicating the large mesh files.
   </description>

diff --git a/gz-waves-models/world_models/regular_waves_1s_0.5m/model.config b/gz-waves-models/world_models/regular_waves_1s_0.5m/model.config
@@ -11,7 +11,8 @@
   </author>
 
   <description>
-    Monochromatic surface waves T=1s, H=0.5m.
+    Regular surface waves T=1s, H=0.5m.
+
     This model uses the materials from the `waves`
     model to prevent duplicating the large mesh files.
   </description>

diff --git a/gz-waves-models/world_models/regular_waves_20s_0m/model.config b/gz-waves-models/world_models/regular_waves_20s_0m/model.config
@@ -11,7 +11,8 @@
   </author>
 
   <description>
-    Monochromatic surface waves T=20s, H=0m.
+    Regular surface waves T=20s, H=0m.
+
     This model uses the materials from the `waves`
     model to prevent duplicating the large mesh files.
   </description>

diff --git a/gz-waves-models/world_models/regular_waves_3s_1m/model.config b/gz-waves-models/world_models/regular_waves_3s_1m/model.config
@@ -11,7 +11,8 @@
   </author>
 
   <description>
-    Monochromatic surface waves T=3s, H=1m.
+    Regular surface waves T=3s, H=1m.
+
     This model uses the materials from the `waves`
     model to prevent duplicating the large mesh files.
   </description>

diff --git a/gz-waves-models/world_models/regular_waves_6s_2m/model.config b/gz-waves-models/world_models/regular_waves_6s_2m/model.config
@@ -11,7 +11,8 @@
   </author>
 
   <description>
-    Monochromatic surface waves T=6s, H=2m.
+    Regular surface waves T=6s, H=2m.
+
     This model uses the materials from the `waves`
     model to prevent duplicating the large mesh files.
   </description>

diff --git a/gz-waves-models/world_models/regular_waves_6s_4m/model.config b/gz-waves-models/world_models/regular_waves_6s_4m/model.config
@@ -1,11 +1,7 @@
 
 <?xml version='1.0'?>
 <model>
-<<<<<<<< HEAD:gz-waves-models/world_models/regular_waves/model.config
-  <name>Regular Waves</name>
-========
   <name>Regular Waves 6s 4m</name>
->>>>>>>> a12b047 (Update example regular wave models (#73)):gz-waves-models/world_models/regular_waves_6s_4m/model.config
   <version>1.0</version>
   <sdf version='1.6'>model.sdf</sdf>
 
@@ -15,12 +11,8 @@
   </author>
 
   <description>
-<<<<<<<< HEAD:gz-waves-models/world_models/regular_waves/model.config
-    Regular surface waves. i.e. plane progressive waves of a single frequency.
-
-========
-    Monochromatic surface waves T=6s, H=4m.
->>>>>>>> a12b047 (Update example regular wave models (#73)):gz-waves-models/world_models/regular_waves_6s_4m/model.config
+    Regular surface waves T=6s, H=4m.
+
     This model uses the materials from the `waves`
     model to prevent duplicating the large mesh files.
   </description>

diff --git a/gz-waves-models/world_models/regular_waves_8s_2m/model.config b/gz-waves-models/world_models/regular_waves_8s_2m/model.config
@@ -11,7 +11,8 @@
   </author>
 
   <description>
-    Monochromatic surface waves T=8s, H=2m.
+    Regular surface waves T=8s, H=2m.
+
     This model uses the materials from the `waves`
     model to prevent duplicating the large mesh files.
   </description>

diff --git a/gz-waves-models/world_models/regular_waves_8s_4m/model.config b/gz-waves-models/world_models/regular_waves_8s_4m/model.config
@@ -11,7 +11,8 @@
   </author>
 
   <description>
-    Monochromatic surface waves T=8s, H=4m.
+    Regular surface waves T=8s, H=4m.
+
     This model uses the materials from the `waves`
     model to prevent duplicating the large mesh files.
   </description>