Skip to content

Commit

Permalink
delete obsolete control_methods folder
Browse files Browse the repository at this point in the history
  • Loading branch information
Zachary committed Dec 12, 2023
1 parent 18499b7 commit 33ede1c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 42 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,8 @@ Actuator.UniformCtDisk.num_points_r = 20
Actuator.UniformCtDisk.num_points_t = 5


Actuator.labels = T00 T01 T02 T03 T04 T05 T06 T07
Actuator.labels = T00 T01
# T02 T03 T04 T05 T06 T07
Actuator.JoukowskyDisk.thrust_coeff = 8.1672e-01 7.9044e-01 7.8393e-01 7.8624e-01 7.8824e-01 7.8942e-01 7.8902e-01 7.8740e-01 7.8503e-01 7.8237e-01 7.7955e-01 7.7583e-01 7.7583e-01 7.7583e-01 7.7583e-01 7.7583e-01 7.7583e-01 7.7583e-01 7.7583e-01 7.7583e-01 7.7583e-01 7.7583e-01 7.7583e-01 7.7583e-01 7.7583e-01 7.7583e-01 7.7583e-01 7.7583e-01 7.6922e-01 7.4270e-01 5.5949e-01 4.6163e-01 3.8786e-01 3.2901e-01 2.8093e-01 2.4114e-01 2.0795e-01 1.8010e-01 1.5663e-01 1.3679e-01 1.1995e-01 1.0562e-01 9.3384e-02 8.2908e-02 7.3910e-02 6.6159e-02 5.9463e-02 5.3662e-02 4.8622e-02 4.4230e-02
Actuator.JoukowskyDisk.wind_speed = 3.0000e+00 3.5495e+00 4.0679e+00 4.5539e+00 5.0064e+00 5.4244e+00 5.8069e+00 6.1530e+00 6.4619e+00 6.7330e+00 6.9655e+00 7.1589e+00 7.3128e+00 7.4269e+00 7.5009e+00 7.5345e+00 7.5412e+00 7.5883e+00 7.6757e+00 7.8031e+00 7.9702e+00 8.1767e+00 8.4221e+00 8.7059e+00 9.0273e+00 9.3856e+00 9.7800e+00 1.0210e+01 1.0659e+01 1.0673e+01 1.1170e+01 1.1699e+01 1.2259e+01 1.2848e+01 1.3465e+01 1.4109e+01 1.4778e+01 1.5471e+01 1.6185e+01 1.6921e+01 1.7674e+01 1.8445e+01 1.9231e+01 2.0030e+01 2.0841e+01 2.1661e+01 2.2489e+01 2.3323e+01 2.4160e+01 2.5000e+01
Actuator.JoukowskyDisk.rpm = 5.0000e+00 5.0000e+00 5.0000e+00 5.0000e+00 5.0000e+00 5.0000e+00 5.0000e+00 5.0000e+00 5.0000e+00 5.0000e+00 5.0000e+00 5.0861e+00 5.1954e+00 5.2765e+00 5.3290e+00 5.3529e+00 5.3577e+00 5.3912e+00 5.4532e+00 5.5437e+00 5.6625e+00 5.8092e+00 5.9836e+00 6.1851e+00 6.4135e+00 6.6681e+00 6.9483e+00 7.2535e+00 7.4992e+00 7.4992e+00 7.4992e+00 7.4992e+00 7.4992e+00 7.4992e+00 7.4992e+00 7.4992e+00 7.4992e+00 7.4992e+00 7.4992e+00 7.4992e+00 7.4992e+00 7.4992e+00 7.4992e+00 7.4992e+00 7.4992e+00 7.4992e+00 7.4992e+00 7.4992e+00 7.4992e+00 7.4992e+00
Expand All @@ -174,13 +175,7 @@ Actuator.JoukowskyDisk.use_root_correction = true
Actuator.JoukowskyDisk.epsilon = 5.0
Actuator.JoukowskyDisk.vortex_core_size = 24.0

Actuator.JoukowskyDisk.yaw = 240.0
Actuator.UniformCtDisk.yaw = 240.0

Actuator.T00.base_position               = 2000    1000    0
Actuator.T01.base_position               = 1321.17749    1678.82251    0
Actuator.T02.base_position               = 642.35498    2357.64502    0
Actuator.T03.base_position               = 2509.116882    2187.939392    0
Actuator.T04.base_position               = 1830.294372    2866.761902    0
Actuator.T05.base_position               = 3697.056274    2697.056274    0
Actuator.T06.base_position               = 3018.233764    3375.878784    0
Actuator.T07.base_position               = 2339.411254    4054.701294    0
Actuator.T00.base_position = 2000.0 2000.0 0.0
Actuator.T01.base_position = 2500.0 2500.0 0.0
27 changes: 0 additions & 27 deletions hercules/control_methods/control_methods.py

This file was deleted.

6 changes: 1 addition & 5 deletions hercules/dummy_amr_wind.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,6 @@ def run(self):

# Advance simulation time and time step counter
sim_time_s += self.dt
time_step += 1
# Advance simulation time and time step counter
sim_time_s += self.dt
time_step += 1
self.sync_time_helics(self.absolute_helics_time + self.deltat)

# TODO cleanup code to move publish and subscribe here.
Expand Down Expand Up @@ -330,7 +326,7 @@ def launch_dummy_amr_wind(amr_input_file, amr_standin_data_file=None):
"Agent": "dummy_amr_wind",
}

if amr_standin_data_file != None:
if amr_standin_data_file is not None:
obj = DummyAMRWind(config, amr_input_file, amr_standin_data_file)
else:
obj = DummyAMRWind(config, amr_input_file)
Expand Down

0 comments on commit 33ede1c

Please sign in to comment.