layout bug fix and updates to layout demo files

-fixed grid_positions so that dummy points are added when there are less turbines than self.nt
-updates to layout demo files for matching wind rose, soil, and bathymetry for the gulf of maine

Author: erickaloz

famodel/design/layout.py

@@ -725,6 +725,8 @@ def pareGridPoints(self,points_ibe):
             # choose point outside bounds for leftovers
             leftover_loc = Point(min_x-1,min_y-1)
             furthest_points.extend([leftover_loc]*leftover)
+            # add dummy grid positions for points out of bounds
+            for i in range(leftover): self.grid_positions.append([0,0]) 
             if self.alternate_rows:
                 furthest_rotations.extend([0]*leftover)
 
@@ -2290,7 +2292,7 @@ def get_point_along_line(start, end, diste):
     direct = '../scripts'
     #wind_rose = WindRose.read_csv_long(
     #    os.path.join(direct,'humboldt_rose.csv'), wd_col="wd", ws_col="ws", freq_col="freq_val", ti_col_or_value=0.06)
-    wind_rose = WindRose.read_csv_long('layoutdemo/humboldt_rose.csv', 
+    wind_rose = WindRose.read_csv_long('layoutdemo/maine_rose.csv', 
         wd_col="wd", ws_col="ws", freq_col="freq_val", ti_col_or_value=0.06)
 
     # ----- LEASE AREA BOUNDARIES -----
@@ -2429,8 +2431,8 @@ def get_point_along_line(start, end, diste):
     settings['cable_mode'] = cable_mode
     settings['oss_coords'] = oss_coords
     settings['boundary_coords'] = boundary_coords
-    settings['bathymetry_file'] = 'layoutdemo/GulfOfMaine_bathymetry_100x100.txt'
-    settings['soil_file'] = 'layoutdemo/soil_sample.txt'
+    settings['bathymetry_file'] = 'layoutdemo/GulfOfMaine_bathy.txt'
+    settings['soil_file'] = 'layoutdemo/GulfofMaine_soil.txt'
     settings['floris_file']='layoutdemo/gch_floating.yaml'
     #settings['exclusion_coords'] = exclusion_coords
     settings['use_FLORIS'] = False

famodel/design/layoutdemo/GulfofMaine_bathy.txt

@@ -0,0 +1,27 @@
+--- MoorPy Bathymetry Input File ---
+nGridX 21
+nGridY 21
+	0	500	1000	1500	2000	2500	3000	3500	4000	4500	5000	5500	6000	6500	7000	7500	8000	8500	9000	9500	10000
+0	192.2	194.42	195.78	194.05	197.36	196.22	197.37	198.33	197.82	200.99	200.35	200.87	200.53	202.5	201.89	202.75	203.41	204.78	203.72	206.2	207.36
+500	194.98	194.55	196.14	196.04	196.9	197.67	198.88	198.48	199.04	200.02	200.99	201.23	199.83	200.36	202.83	203.24	206.34	203.47	206.42	207.33	208.68
+1000	194	195.4	195.35	195.69	197.49	198.33	198.3	200.51	199.52	200.34	201.58	203.46	203.02	203.51	203.18	204.87	206.26	204.95	204.04	205.46	206.74
+1500	194.16	196.03	196.04	197.33	196.74	199.13	198.77	200.43	200.95	202.41	201.22	202.73	202.77	203.57	204.57	206.03	204.7	208.39	207.71	208.79	209.46
+2000	194.35	195.06	197	198.19	198.85	199.02	200.39	200.36	201.83	202.93	202.61	204.13	203.2	203.89	204.93	206.44	205.36	206.2	207.47	208.36	209.82
+2500	194.84	198.21	197.96	198.65	199.05	201.06	199.84	201.71	202.14	203.02	203.73	204.07	205.27	204.91	205.67	206.32	207.32	208.35	210.21	208.82	208.29
+3000	196.56	200.27	198.75	199.36	201.81	200.09	203.31	201.98	202.48	203.44	205.18	203.92	203.1	206.1	205.52	207.54	208.3	207.84	209.44	207.01	210.27
+3500	196.34	199.06	200.3	200.57	199.74	201.84	203.44	202.91	202.51	205.53	206.42	206.8	204.45	206.54	206.18	206.71	210.69	209.42	209.37	209.53	210.86
+4000	200.21	199.63	199.84	200.3	201.47	202.5	202.87	204.4	203.02	202.95	206.49	206.53	207.11	207.28	209.22	207.75	209.29	209.51	209.65	212.16	211.32
+4500	198.75	198.21	203.21	202.11	202.16	200.01	202.27	204.78	204.76	205.09	205.84	204.82	209.3	206.85	206.62	209.83	208.37	209.36	211.37	210.83	212.87
+5000	198.9	201.12	200.9	201.9	200.37	204.32	204.91	203.86	206.9	206.38	206.2	207.1	207.08	208.57	209.8	209.98	211.03	211.3	212.49	212.42	211.64
+5500	200.7	200.61	201.06	203.15	203.78	205.13	204.48	205.82	206.26	205.47	206.91	207.45	206.78	209.31	211.52	209.54	211.03	212.35	211.79	212.54	213.55
+6000	202.12	201.62	201.21	202.69	204.4	204.62	205.63	203.96	208.46	206.8	209.43	209.47	208.8	209.64	209.44	211	211.47	212.35	213.94	213	213.18
+6500	200.88	201.71	202.87	203.26	203.82	205.35	204.79	206.34	207.04	206.08	206.74	209.28	209.79	211.41	211.77	211.48	212.43	212.62	214.73	212.51	216.3
+7000	201.86	203.5	205.48	202.83	205.17	206.92	205.65	207.11	206.25	207.7	209.84	208.32	210.05	210.78	211.28	212.49	213.62	213.31	214	213.72	216.6
+7500	203.31	204.93	203.04	206.21	206.58	207.03	205.39	208.15	208.48	208.5	209.75	209.71	210.43	211	212.54	213.66	214.67	214.94	216.49	216.71	215.06
+8000	202.63	207.41	206.07	205.8	204.06	206.11	207.58	209.16	208.2	210.6	209.47	210.3	212.38	211.26	213.76	214.56	213.71	214.96	214.68	215.53	217.59
+8500	203.57	205.56	206.15	205.94	206.73	207.6	206.98	209.73	208.07	210.64	210.15	210.94	212.99	212.88	212.92	215.43	213.84	214.76	217.16	215.75	216.18
+9000	205.83	206.57	206.17	207.73	206.31	209.36	211.25	210.42	211.35	210.77	211.63	211.18	211.96	212.96	214.4	214.61	215.86	215.47	216.98	216.4	218.99
+9500	207.15	204.9	207.67	205.55	207.54	211.33	207.91	210.61	211.37	211.49	212.43	214.55	212.24	214.03	215.97	215.85	215.96	217.28	216.94	219.44	218.32
+10000	207.17	210.63	208.28	208.94	208.47	210.76	209.89	210.01	211.2	210.91	212.2	213.47	214.43	215.94	215.21	214.32	218.94	217.45	217.44	219.35	218.86
+
+

famodel/design/layoutdemo/GulfofMaine_soil.txt

@@ -0,0 +1,36 @@
+--- MoorPy Soil Input File ---
+nGridX 21
+nGridY 21
+	0	500	1000	1500	2000	2500	3000	3500	4000	4500	5000	5500	6000	6500	7000	7500	8000	8500	9000	9500	10000
+0	hummock	hummock	hummock	hummock	hummock	complex	mud	sand	sand	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud
+500	hummock	hummock	hummock	hummock	hummock	complex	mud	sand	sand	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud
+1000	hummock	hummock	hummock	hummock	sand	hummock	hummock	sand	sand	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud
+1500	hummock	hummock	hummock	hummock	hummock	mud	hummock	sand	hummock	sand	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud
+2000	hummock	hummock	hummock	mud	sand	mud	hummock	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud
+2500	sand	sand	sand	mud	sand	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud
+3000	mud	mud	mud	sand	mud	sand	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud
+3500	hummock	hummock	hummock	mud	mud	sand	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud
+4000	hummock	hummock	hummock	mud	mud	mud	sand	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud
+4500	sand	sand	sand	sand	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud
+5000	sand	sand	sand	sand	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud
+5500	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud
+6000	sand	sand	sand	hummock	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud
+6500	sand	sand	sand	sand	sand	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud
+7000	mud	mud	mud	hummock	hummock	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud
+7500	mud	mud	mud	sand	sand	sand	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud
+8000	sand	sand	sand	mud	hummock	hummock	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud
+8500	sand	sand	sand	mud	sand	mud	sand	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud
+9000	hummock	hummock	hummock	sand	sand	sand	sand	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud
+9500	sand	sand	sand	sand	mud	sand	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud
+10000	sand	sand	sand	sand	sand	sand	sand	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud	mud
+--- SOIL TYPES ---
+Class 		Gamma 	 Su0 	k	alpha	phi	UCS	Em	
+(name) 	      (kN/m^3)  (kPa) 	(kPa/m) (-) 	(deg) 	(MPa) 	(MPa)
+mud	4.7	2.39	1.41	0.7	-	-	-
+mud_firm	4.7	23.94	2.67	0.7	-	-	-
+rock	-	-	-	-	-	7	50
+gravel	6	15	2	0.6	-	-	-
+sand	5.5	10	1.5	0.6	-	-	-
+complex	6.5	20	3	0.7	-	-	-
+hummock	5	5	1	0.5	-	-	-
+------------------