Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update some of the fun3d_tests to reflect changes in syntax #276

Merged
merged 4 commits into from
Feb 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions funtofem/interface/fun3d_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -1270,6 +1270,7 @@ def copy_real_interface(cls, fun3d_interface):
fun3d_dir=fun3d_interface.fun3d_dir,
auto_coords=fun3d_interface.auto_coords,
coord_test_override=fun3d_interface._coord_test_override,
fun3d_project_name=fun3d_interface.fun3d_project_name,
)

@classmethod
Expand All @@ -1289,4 +1290,5 @@ def copy_complex_interface(cls, fun3d_interface):
fun3d_dir=fun3d_interface.fun3d_dir,
auto_coords=fun3d_interface.auto_coords,
coord_test_override=fun3d_interface._coord_test_override,
fun3d_project_name=fun3d_interface.fun3d_project_name,
)
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
freeze_limiter_iteration = 100
/
&code_run_control
restart_write_freq = 1000
restart_write_freq = 500
restart_read = 'off'
steps = 500
/
Expand All @@ -44,6 +44,7 @@
moving_grid = .true.
boundary_animation_freq = 1000
volume_animation_freq = 1000
recompute_turb_dist = .false.
/
&slice_data
nslices = 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,12 @@ def test_thick_laminar_aerothermoelastic(self):

# build the solvers and coupled driver
solvers = SolverManager(comm)
solvers.flow = Fun3dInterface(comm, model, fun3d_dir="meshes")
solvers.flow = Fun3dInterface(
comm, model, fun3d_project_name="miniMesh", fun3d_dir="meshes"
)

solvers.structural = TacsSteadyInterface.create_from_bdf(
model, comm, nprocs=1, bdf_file=bdf_filename, output_dir=output_dir
model, comm, nprocs=1, bdf_file=bdf_filename, prefix=output_dir
)

transfer_settings = TransferSettings(
Expand Down Expand Up @@ -100,10 +102,12 @@ def test_alpha_laminar_aerothermoelastic(self):

# build the solvers and coupled driver
solvers = SolverManager(comm)
solvers.flow = Fun3dInterface(comm, model, fun3d_dir="meshes")
solvers.flow = Fun3dInterface(
comm, model, fun3d_project_name="miniMesh", fun3d_dir="meshes"
)

solvers.structural = TacsSteadyInterface.create_from_bdf(
model, comm, nprocs=1, bdf_file=bdf_filename, output_dir=output_dir
model, comm, nprocs=1, bdf_file=bdf_filename, prefix=output_dir
)

transfer_settings = TransferSettings(
Expand Down Expand Up @@ -145,10 +149,12 @@ def test_thick_laminar_aeroelastic(self):

# build the solvers and coupled driver
solvers = SolverManager(comm)
solvers.flow = Fun3dInterface(comm, model, fun3d_dir="meshes")
solvers.flow = Fun3dInterface(
comm, model, fun3d_project_name="miniMesh", fun3d_dir="meshes"
)

solvers.structural = TacsSteadyInterface.create_from_bdf(
model, comm, nprocs=1, bdf_file=bdf_filename, output_dir=output_dir
model, comm, nprocs=1, bdf_file=bdf_filename, prefix=output_dir
)

transfer_settings = TransferSettings(
Expand Down Expand Up @@ -189,10 +195,12 @@ def test_alpha_laminar_aeroelastic(self):

# build the solvers and coupled driver
solvers = SolverManager(comm)
solvers.flow = Fun3dInterface(comm, model, fun3d_dir="meshes")
solvers.flow = Fun3dInterface(
comm, model, fun3d_project_name="miniMesh", fun3d_dir="meshes"
)

solvers.structural = TacsSteadyInterface.create_from_bdf(
model, comm, nprocs=1, bdf_file=bdf_filename, output_dir=output_dir
model, comm, nprocs=1, bdf_file=bdf_filename, prefix=output_dir
)

transfer_settings = TransferSettings(
Expand Down Expand Up @@ -234,10 +242,12 @@ def test_thick_laminar_aerothermal(self):

# build the solvers and coupled driver
solvers = SolverManager(comm)
solvers.flow = Fun3dInterface(comm, model, fun3d_dir="meshes")
solvers.flow = Fun3dInterface(
comm, model, fun3d_project_name="miniMesh", fun3d_dir="meshes"
)

solvers.structural = TacsSteadyInterface.create_from_bdf(
model, comm, nprocs=1, bdf_file=bdf_filename, output_dir=output_dir
model, comm, nprocs=1, bdf_file=bdf_filename, prefix=output_dir
)

transfer_settings = TransferSettings(
Expand Down Expand Up @@ -278,10 +288,12 @@ def test_alpha_laminar_aerothermal(self):

# build the solvers and coupled driver
solvers = SolverManager(comm)
solvers.flow = Fun3dInterface(comm, model, fun3d_dir="meshes")
solvers.flow = Fun3dInterface(
comm, model, fun3d_project_name="miniMesh", fun3d_dir="meshes"
)

solvers.structural = TacsSteadyInterface.create_from_bdf(
model, comm, nprocs=1, bdf_file=bdf_filename, output_dir=output_dir
model, comm, nprocs=1, bdf_file=bdf_filename, prefix=output_dir
)

transfer_settings = TransferSettings(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
freeze_limiter_iteration = 100
/
&code_run_control
restart_write_freq = 1000
restart_write_freq = 500
restart_read = 'off'
steps = 500
/
Expand All @@ -45,6 +45,7 @@
moving_grid = .true.
boundary_animation_freq = 1000
volume_animation_freq = 1000
recompute_turb_dist = .false.
/
&slice_data
nslices = 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,12 @@ def test_alpha_turbulent_aeroelastic(self):

# build the solvers and coupled driver
solvers = SolverManager(comm)
solvers.flow = Fun3dInterface(comm, model, fun3d_dir="meshes")
solvers.flow = Fun3dInterface(
comm, model, fun3d_project_name="miniMesh", fun3d_dir="meshes"
)

solvers.structural = TacsSteadyInterface.create_from_bdf(
model, comm, nprocs=1, bdf_file=bdf_filename, output_dir=output_dir
model, comm, nprocs=1, bdf_file=bdf_filename, prefix=output_dir
)

transfer_settings = TransferSettings(
Expand Down Expand Up @@ -98,10 +100,12 @@ def test_thick_turbulent_aeroelastic(self):

# build the solvers and coupled driver
solvers = SolverManager(comm)
solvers.flow = Fun3dInterface(comm, model, fun3d_dir="meshes")
solvers.flow = Fun3dInterface(
comm, model, fun3d_project_name="miniMesh", fun3d_dir="meshes"
)

solvers.structural = TacsSteadyInterface.create_from_bdf(
model, comm, nprocs=1, bdf_file=bdf_filename, output_dir=output_dir
model, comm, nprocs=1, bdf_file=bdf_filename, prefix=output_dir
)

transfer_settings = TransferSettings(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
freeze_limiter_iteration = 100
/
&code_run_control
restart_write_freq = 1000
restart_write_freq = 500
restart_read = 'off'
steps = 500
/
Expand All @@ -44,6 +44,7 @@
moving_grid = .true.
boundary_animation_freq = 1000
volume_animation_freq = 1000
recompute_turb_dist = .false.
/
&slice_data
nslices = 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,12 @@ def test_alpha_turbulent_aerothermal(self):

# build the solvers and coupled driver
solvers = SolverManager(comm)
solvers.flow = Fun3dInterface(comm, model, fun3d_dir="meshes")
solvers.flow = Fun3dInterface(
comm, model, fun3d_project_name="miniMesh", fun3d_dir="meshes"
)

solvers.structural = TacsSteadyInterface.create_from_bdf(
model, comm, nprocs=1, bdf_file=bdf_filename, output_dir=output_dir
model, comm, nprocs=1, bdf_file=bdf_filename, prefix=output_dir
)

transfer_settings = TransferSettings(
Expand Down Expand Up @@ -100,10 +102,12 @@ def test_thick_turbulent_aerothermal(self):

# build the solvers and coupled driver
solvers = SolverManager(comm)
solvers.flow = Fun3dInterface(comm, model, fun3d_dir="meshes")
solvers.flow = Fun3dInterface(
comm, model, fun3d_project_name="miniMesh", fun3d_dir="meshes"
)

solvers.structural = TacsSteadyInterface.create_from_bdf(
model, comm, nprocs=1, bdf_file=bdf_filename, output_dir=output_dir
model, comm, nprocs=1, bdf_file=bdf_filename, prefix=output_dir
)

transfer_settings = TransferSettings(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
freeze_limiter_iteration = 100
/
&code_run_control
restart_write_freq = 1000
restart_write_freq = 500
restart_read = 'off'
steps = 500
/
Expand All @@ -44,6 +44,7 @@
moving_grid = .true.
boundary_animation_freq = 1000
volume_animation_freq = 1000
recompute_turb_dist = .false.
/
&slice_data
nslices = 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,12 @@ def test_thick_turbulent_aerothermoelastic(self):

# build the solvers and coupled driver
solvers = SolverManager(comm)
solvers.flow = Fun3dInterface(comm, model, fun3d_dir="meshes")
solvers.flow = Fun3dInterface(
comm, model, fun3d_project_name="miniMesh", fun3d_dir="meshes"
)

solvers.structural = TacsSteadyInterface.create_from_bdf(
model, comm, nprocs=1, bdf_file=bdf_filename, output_dir=output_dir
model, comm, nprocs=1, bdf_file=bdf_filename, prefix=output_dir
)

transfer_settings = TransferSettings(
Expand Down Expand Up @@ -100,10 +102,12 @@ def test_alpha_turbulent_aerothermoelastic(self):

# build the solvers and coupled driver
solvers = SolverManager(comm)
solvers.flow = Fun3dInterface(comm, model, fun3d_dir="meshes")
solvers.flow = Fun3dInterface(
comm, model, fun3d_project_name="miniMesh", fun3d_dir="meshes"
)

solvers.structural = TacsSteadyInterface.create_from_bdf(
model, comm, nprocs=1, bdf_file=bdf_filename, output_dir=output_dir
model, comm, nprocs=1, bdf_file=bdf_filename, prefix=output_dir
)

transfer_settings = TransferSettings(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ def test_inviscid_aeroelastic_thick(self):
solvers.flow = Fun3dInterface(
comm,
model,
fun3d_project_name="miniMesh",
fun3d_dir="meshes",
forward_options={"timedep_adj_frozen": True},
adjoint_options={"timedep_adj_frozen": True},
Expand Down Expand Up @@ -142,6 +143,7 @@ def test_inviscid_aeroelastic_alpha(self):
solvers.flow = Fun3dInterface(
comm,
model,
fun3d_project_name="miniMesh",
fun3d_dir="meshes",
forward_options={"timedep_adj_frozen": True},
adjoint_options={"timedep_adj_frozen": True},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ def test_laminar_aeroelastic_thick(self):
solvers.flow = Fun3dInterface(
comm,
model,
fun3d_project_name="miniMesh",
fun3d_dir="meshes",
forward_options={"timedep_adj_frozen": True},
adjoint_options={"timedep_adj_frozen": True},
Expand Down Expand Up @@ -142,6 +143,7 @@ def test_laminar_aeroelastic_alpha(self):
solvers.flow = Fun3dInterface(
comm,
model,
fun3d_project_name="miniMesh",
fun3d_dir="meshes",
forward_options={"timedep_adj_frozen": True},
adjoint_options={"timedep_adj_frozen": True},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ def test_laminar_aerothermal_thick(self):
solvers.flow = Fun3dInterface(
comm,
model,
fun3d_project_name="miniMesh",
fun3d_dir="meshes",
forward_options={"timedep_adj_frozen": True},
adjoint_options={"timedep_adj_frozen": True},
Expand Down Expand Up @@ -139,6 +140,7 @@ def test_laminar_aerothermal_alpha(self):
solvers.flow = Fun3dInterface(
comm,
model,
fun3d_project_name="miniMesh",
fun3d_dir="meshes",
forward_options={"timedep_adj_frozen": True},
adjoint_options={"timedep_adj_frozen": True},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ def test_turbulent_aeroelastic_thick(self):
solvers.flow = Fun3dInterface(
comm,
model,
fun3d_project_name="miniMesh",
fun3d_dir="meshes",
forward_options={"timedep_adj_frozen": True},
adjoint_options={"timedep_adj_frozen": True},
Expand Down Expand Up @@ -141,6 +142,7 @@ def test_turbulent_aeroelastic_alpha(self):
solvers.flow = Fun3dInterface(
comm,
model,
fun3d_project_name="miniMesh",
fun3d_dir="meshes",
forward_options={"timedep_adj_frozen": True},
adjoint_options={"timedep_adj_frozen": True},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ def test_turbulent_aerothermal_thick(self):
solvers.flow = Fun3dInterface(
comm,
model,
fun3d_project_name="miniMesh",
fun3d_dir="meshes",
forward_options={"timedep_adj_frozen": True},
adjoint_options={"timedep_adj_frozen": True},
Expand Down Expand Up @@ -141,6 +142,7 @@ def test_turbulent_aerothermal_alpha(self):
solvers.flow = Fun3dInterface(
comm,
model,
fun3d_project_name="miniMesh",
fun3d_dir="meshes",
forward_options={"timedep_adj_frozen": True},
adjoint_options={"timedep_adj_frozen": True},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ def test_turbulent_aerothermoelastic_thick(self):
solvers.flow = Fun3dInterface(
comm,
model,
fun3d_project_name="miniMesh",
fun3d_dir="meshes",
forward_options={"timedep_adj_frozen": True},
adjoint_options={"timedep_adj_frozen": True},
Expand Down Expand Up @@ -141,6 +142,7 @@ def test_turbulent_aerothermoelastic_alpha(self):
solvers.flow = Fun3dInterface(
comm,
model,
fun3d_project_name="miniMesh",
fun3d_dir="meshes",
forward_options={"timedep_adj_frozen": True},
adjoint_options={"timedep_adj_frozen": True},
Expand Down
Loading