Skip to content

Commit

Permalink
all tests passing
Browse files Browse the repository at this point in the history
  • Loading branch information
@gbarter
gbarter committed Nov 4, 2020
1 parent 62fe91e commit 18ec4bd
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
16 changes: 8 additions & 8 deletions wisdem/glue_code/gc_WT_DataStruc.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1180,8 +1180,8 @@ def setup(self):
n_joints = floating_init_options['joints']['n_joints']
n_members = floating_init_options['members']['n_members']

ivc = self.add_subsystem('floating_joints', om.IndepVarComp())
ivc.add_output('location', val = np.zeros((n_joints, 3)), units='m')
jivc = self.add_subsystem('floating_joints', om.IndepVarComp())
jivc.add_output('location', val = np.zeros((n_joints, 3)), units='m')

for i in range(n_members):
name_member = floating_init_options['members']['name'][i]
Expand Down Expand Up @@ -1210,8 +1210,8 @@ def setup(self):
n_anchor_types = mooring_init_options['n_anchor_types']

ivc = self.add_subsystem('mooring', om.IndepVarComp(), promotes=['*'])
ivc.add_discrete_output('nodes_name', val = ['']*n_nodes)

ivc.add_discrete_output('node_names', val = ['']*n_nodes)
ivc.add_output('nodes_location', val = np.zeros((n_nodes, 3)), units='m')
ivc.add_discrete_output('line_id', val = ['']*n_lines)
ivc.add_output('unstretched_length', val = np.zeros(n_lines), units='m')
Expand Down Expand Up @@ -1249,10 +1249,10 @@ def setup(self):
self.add_input('line_mass_density', val = np.zeros(n_line_types), units='kg/m')
self.add_input('line_cost_rate', val = np.zeros(n_line_types), units='USD/m')

self.add_output('line_mass', val = np.zeros(n_line_types), units='kg/m')
self.add_output('mooring_mass', val = np.zeros(n_line_types), units='kg/m')
self.add_output('line_cost', val = np.zeros(n_line_types), units='USD/m')
self.add_output('mooring_cost', val = np.zeros(n_line_types), units='USD/m')
self.add_output('line_mass', val = np.zeros(n_lines), units='kg')
self.add_output('mooring_mass', val = 0.0, units='kg')
self.add_output('line_cost', val = np.zeros(n_lines), units='USD')
self.add_output('mooring_cost', val = 0.0, units='USD')

def compute(self, inputs, outputs, discrete_inputs, discrete_outputs):
mooring_init_options = self.options['mooring_init_options']
Expand Down
8 changes: 4 additions & 4 deletions wisdem/glue_code/gc_WT_InitModel.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -710,14 +710,15 @@ def assign_mooring_values(wt_opt, modeling_options, mooring):
n_line_types = mooring_init_options['n_line_types']
n_anchor_types = mooring_init_options['n_anchor_types']

wt_opt['mooring.node_names'] = [mooring['nodes'][i]['name'] for i in range(n_nodes)]
wt_opt['mooring.line_id'] = [mooring['lines'][i]['name'] for i in range(n_lines)]
wt_opt['mooring.line_names'] = [mooring['line_types'][i]['name'] for i in range(n_line_types)]
wt_opt['mooring.anchor_names'] = [mooring['anchor_types'][i]['name'] for i in range(n_anchor_types)]
for i in range(n_nodes):
wt_opt['mooring.nodes_location'][i,:] = mooring['nodes'][i]['location']
wt_opt['mooring.nodes_name'][i] = mooring['nodes'][i]['name']
for i in range(n_lines):
wt_opt['mooring.unstretched_length'][i] = mooring['lines'][i]['unstretched_length']
wt_opt['mooring.line_id'][i] = mooring['lines'][i]['name']
for i in range(n_line_types):
wt_opt['mooring.line_name'][i] = mooring['line_types'][i]['name']
wt_opt['mooring.line_diameter'][i] = mooring['line_types'][i]['diameter']
wt_opt['mooring.line_mass_density'][i] = mooring['line_types'][i]['mass_density']
wt_opt['mooring.line_stiffness'][i] = mooring['line_types'][i]['stiffness']
Expand All @@ -728,7 +729,6 @@ def assign_mooring_values(wt_opt, modeling_options, mooring):
wt_opt['mooring.line_transverse_drag'][i] = mooring['line_types'][i]['transverse_drag']
wt_opt['mooring.line_tangential_drag'][i] = mooring['line_types'][i]['tangential_drag']
for i in range(n_anchor_types):
wt_opt['mooring.anchor_name'][i] = mooring['anchor_types'][i]['name']
wt_opt['mooring.anchor_mass'][i] = mooring['anchor_types'][i]['mass']
wt_opt['mooring.anchor_cost'][i] = mooring['anchor_types'][i]['cost']
wt_opt['mooring.anchor_max_vertical_load'][i] = mooring['anchor_types'][i]['max_vertical_load']
Expand Down
2 changes: 1 addition & 1 deletion wisdem/glue_code/glue_code.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ def setup(self):
self.connect('mooring.n_lines', 'orbit.num_mooring_lines')
self.connect('mooring.line_mass', 'orbit.mooring_line_mass', src_indices=[0])
self.connect('mooring.line_diameter', 'orbit.mooring_line_diameter', src_indices=[0])
self.connect('mooring_unstretched_length', 'orbit.mooring_line_length', src_indices=[0])
self.connect('mooring.unstretched_length', 'orbit.mooring_line_length', src_indices=[0])
self.connect('mooring.anchor_mass', 'orbit.anchor_mass')
self.connect('elastic.precomp.blade_mass', 'orbit.blade_mass')
self.connect('tcc.turbine_cost_kW', 'orbit.turbine_capex')
Expand Down
2 changes: 1 addition & 1 deletion wisdem/test/test_gluecode/test_gluecode.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def test15MW(self):

self.assertAlmostEqual(wt_opt['elastic.precomp.blade_mass'][0], 73310.0985877902, 1)
self.assertAlmostEqual(wt_opt['sse.AEP'][0]*1.e-6, 78.0371305939, 1)
self.assertAlmostEqual(wt_opt['financese.lcoe'][0]*1.e3, 66.14272881152604, 1)
self.assertAlmostEqual(wt_opt['financese.lcoe'][0]*1.e3, 62.6572598382, 1)

def suite():
suite = unittest.TestSuite()
Expand Down

0 comments on commit 18ec4bd

Please sign in to comment.