Skip to content

Commit

Permalink
Merge commit '599b8559f62c8ab0237a2cdc9688bdcea08ea6c7' into fix_bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
@gbarter
gbarter committed Jan 24, 2023
2 parents d412e8f + 599b855 commit 82ed80f
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 20 deletions.
19 changes: 10 additions & 9 deletions WISDEM/wisdem/glue_code/gc_WT_InitModel.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1047,15 +1047,16 @@ def assign_floating_values(wt_opt, modeling_options, floating, opt_options):
memname = kgrp["names"][0]
idx2 = floating_init_options["members"]["name2idx"][memname]
if idx == idx2:
if float_opt["members"]["groups"][j]["diameter"]["constant"]:
wt_opt[f"floating.memgrp{idx}.outer_diameter_in"] = floating["members"][i]["outer_shape"][
"outer_diameter"
]["values"][0]
else:
wt_opt[f"floating.memgrp{idx}.outer_diameter_in"][:] = floating["members"][i]["outer_shape"][
"outer_diameter"
]["values"]
diameter_assigned = True
if "diameter" in float_opt["members"]["groups"][j]:
if float_opt["members"]["groups"][j]["diameter"]["constant"]:
wt_opt[f"floating.memgrp{idx}.outer_diameter_in"] = floating["members"][i]["outer_shape"][
"outer_diameter"
]["values"][0]
else:
wt_opt[f"floating.memgrp{idx}.outer_diameter_in"][:] = floating["members"][i]["outer_shape"][
"outer_diameter"
]["values"]
diameter_assigned = True

if not diameter_assigned:
wt_opt[f"floating.memgrp{idx}.outer_diameter_in"] = np.interp(
Expand Down
24 changes: 13 additions & 11 deletions WISDEM/wisdem/inputs/analysis_schema.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ properties:
names: *floatname
diameter:
type: object
default: {}
#default: {}
description: Diameter optimization of member group
properties:
lower_bound: *dbound
Expand All @@ -746,14 +746,14 @@ properties:
default: False
thickness:
type: object
default: {}
#default: {}
description: Thickness optimization of member group
properties:
lower_bound: *tbound
upper_bound: *tbound
ballast:
type: object
default: {}
#default: {}
description: Ballast volume optimization of member group
properties:
lower_bound:
Expand All @@ -771,7 +771,7 @@ properties:
axial_joints:
type: array
description: List of axial joint sets in this member group that are optimized as one
default: []
#default: []
items:
type: object
default: {}
Expand All @@ -791,17 +791,17 @@ properties:
default: 1.0
stiffeners:
type: object
default: {}
#default: {}
description: Stiffener optimization of member group
properties:
ring:
type: object
default: {}
#default: {}
description: Ring stiffener optimization of member group
properties:
size: # currently not implemented as a DV in gc_PoseOptimization.py
type: object
default: {}
#default: {}
description: Ring stiffener sizing multiplier on T-shape
properties:
min_gain: &mingain
Expand All @@ -816,7 +816,7 @@ properties:
spacing:
type: object
description: Ring stiffener spacing along member axis
default: {}
#default: {}
properties:
lower_bound:
type: number
Expand All @@ -828,22 +828,23 @@ properties:
type: number
unit: none
description: Design variable bound
default: 0.1
minimum: 0.0
longitudinal:
type: object
default: {}
#default: {}
description: Longitudinal stiffener optimization of member group
properties:
size: # currently not implemented as a DV in gc_PoseOptimization.py
type: object
default: {}
#default: {}
description: Longitudinal stiffener sizing multiplier on T-shape
properties:
min_gain: *mingain
max_gain: *maxgain
spacing:
type: object
default: {}
#default: {}
description: Longitudinal stiffener spacing around member annulus
properties:
lower_bound:
Expand All @@ -857,6 +858,7 @@ properties:
type: number
unit: rad
description: Design variable bound
default: 0.1
minimum: 0.0
maximum: 3.141592653589793 #180 deg
mooring:
Expand Down

0 comments on commit 82ed80f

Please sign in to comment.