diff --git a/funtofem/interface/fun3d_interface.py b/funtofem/interface/fun3d_interface.py index 61dc0545..5cf21447 100644 --- a/funtofem/interface/fun3d_interface.py +++ b/funtofem/interface/fun3d_interface.py @@ -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 @@ -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, ) diff --git a/tests/fun3d_tests/fully_coupled_disc_deriv/laminar/meshes/laminar/Flow/fun3d.nml b/tests/fun3d_tests/fully_coupled_disc_deriv/laminar/meshes/laminar/Flow/fun3d.nml index 68ce4a94..304aaee6 100644 --- a/tests/fun3d_tests/fully_coupled_disc_deriv/laminar/meshes/laminar/Flow/fun3d.nml +++ b/tests/fun3d_tests/fully_coupled_disc_deriv/laminar/meshes/laminar/Flow/fun3d.nml @@ -24,7 +24,7 @@ freeze_limiter_iteration = 100 / &code_run_control - restart_write_freq = 1000 + restart_write_freq = 500 restart_read = 'off' steps = 500 / @@ -44,6 +44,7 @@ moving_grid = .true. boundary_animation_freq = 1000 volume_animation_freq = 1000 + recompute_turb_dist = .false. / &slice_data nslices = 1 diff --git a/tests/fun3d_tests/fully_coupled_disc_deriv/laminar/test_fun3d_tacs.py b/tests/fun3d_tests/fully_coupled_disc_deriv/laminar/test_fun3d_tacs.py index c80cc11f..73137084 100644 --- a/tests/fun3d_tests/fully_coupled_disc_deriv/laminar/test_fun3d_tacs.py +++ b/tests/fun3d_tests/fully_coupled_disc_deriv/laminar/test_fun3d_tacs.py @@ -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( @@ -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( @@ -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( @@ -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( @@ -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( @@ -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( diff --git a/tests/fun3d_tests/fully_coupled_disc_deriv/turb_AE/meshes/turbulent/Flow/fun3d.nml b/tests/fun3d_tests/fully_coupled_disc_deriv/turb_AE/meshes/turbulent/Flow/fun3d.nml index 9330f05f..7a562e81 100644 --- a/tests/fun3d_tests/fully_coupled_disc_deriv/turb_AE/meshes/turbulent/Flow/fun3d.nml +++ b/tests/fun3d_tests/fully_coupled_disc_deriv/turb_AE/meshes/turbulent/Flow/fun3d.nml @@ -24,7 +24,7 @@ freeze_limiter_iteration = 100 / &code_run_control - restart_write_freq = 1000 + restart_write_freq = 500 restart_read = 'off' steps = 500 / @@ -45,6 +45,7 @@ moving_grid = .true. boundary_animation_freq = 1000 volume_animation_freq = 1000 + recompute_turb_dist = .false. / &slice_data nslices = 1 diff --git a/tests/fun3d_tests/fully_coupled_disc_deriv/turb_AE/test_fun3d_tacs.py b/tests/fun3d_tests/fully_coupled_disc_deriv/turb_AE/test_fun3d_tacs.py index b23f13f6..2fa0aad3 100644 --- a/tests/fun3d_tests/fully_coupled_disc_deriv/turb_AE/test_fun3d_tacs.py +++ b/tests/fun3d_tests/fully_coupled_disc_deriv/turb_AE/test_fun3d_tacs.py @@ -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( @@ -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( diff --git a/tests/fun3d_tests/fully_coupled_disc_deriv/turb_AT/meshes/turbulent/Flow/fun3d.nml b/tests/fun3d_tests/fully_coupled_disc_deriv/turb_AT/meshes/turbulent/Flow/fun3d.nml index 69958042..4f81bca5 100644 --- a/tests/fun3d_tests/fully_coupled_disc_deriv/turb_AT/meshes/turbulent/Flow/fun3d.nml +++ b/tests/fun3d_tests/fully_coupled_disc_deriv/turb_AT/meshes/turbulent/Flow/fun3d.nml @@ -24,7 +24,7 @@ freeze_limiter_iteration = 100 / &code_run_control - restart_write_freq = 1000 + restart_write_freq = 500 restart_read = 'off' steps = 500 / @@ -44,6 +44,7 @@ moving_grid = .true. boundary_animation_freq = 1000 volume_animation_freq = 1000 + recompute_turb_dist = .false. / &slice_data nslices = 1 diff --git a/tests/fun3d_tests/fully_coupled_disc_deriv/turb_AT/test_fun3d_tacs.py b/tests/fun3d_tests/fully_coupled_disc_deriv/turb_AT/test_fun3d_tacs.py index 8c6f40f5..c9aa866f 100644 --- a/tests/fun3d_tests/fully_coupled_disc_deriv/turb_AT/test_fun3d_tacs.py +++ b/tests/fun3d_tests/fully_coupled_disc_deriv/turb_AT/test_fun3d_tacs.py @@ -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( @@ -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( diff --git a/tests/fun3d_tests/fully_coupled_disc_deriv/turb_ATE/meshes/turbulent/Flow/fun3d.nml b/tests/fun3d_tests/fully_coupled_disc_deriv/turb_ATE/meshes/turbulent/Flow/fun3d.nml index 69958042..4f81bca5 100644 --- a/tests/fun3d_tests/fully_coupled_disc_deriv/turb_ATE/meshes/turbulent/Flow/fun3d.nml +++ b/tests/fun3d_tests/fully_coupled_disc_deriv/turb_ATE/meshes/turbulent/Flow/fun3d.nml @@ -24,7 +24,7 @@ freeze_limiter_iteration = 100 / &code_run_control - restart_write_freq = 1000 + restart_write_freq = 500 restart_read = 'off' steps = 500 / @@ -44,6 +44,7 @@ moving_grid = .true. boundary_animation_freq = 1000 volume_animation_freq = 1000 + recompute_turb_dist = .false. / &slice_data nslices = 1 diff --git a/tests/fun3d_tests/fully_coupled_disc_deriv/turb_ATE/test_fun3d_tacs.py b/tests/fun3d_tests/fully_coupled_disc_deriv/turb_ATE/test_fun3d_tacs.py index 1589862f..289faeec 100644 --- a/tests/fun3d_tests/fully_coupled_disc_deriv/turb_ATE/test_fun3d_tacs.py +++ b/tests/fun3d_tests/fully_coupled_disc_deriv/turb_ATE/test_fun3d_tacs.py @@ -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( @@ -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( diff --git a/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/euler-AE/test_fun3d_tacs_unsteady.py b/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/euler-AE/test_fun3d_tacs_unsteady.py index 9292ce44..6b4c710f 100644 --- a/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/euler-AE/test_fun3d_tacs_unsteady.py +++ b/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/euler-AE/test_fun3d_tacs_unsteady.py @@ -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}, @@ -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}, diff --git a/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/laminar-AE/test_fun3d_tacs_unsteady.py b/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/laminar-AE/test_fun3d_tacs_unsteady.py index 1b97d123..03b60621 100644 --- a/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/laminar-AE/test_fun3d_tacs_unsteady.py +++ b/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/laminar-AE/test_fun3d_tacs_unsteady.py @@ -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}, @@ -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}, diff --git a/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/laminar-AT/test_fun3d_tacs_unsteady.py b/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/laminar-AT/test_fun3d_tacs_unsteady.py index a118e7ff..17ec9385 100644 --- a/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/laminar-AT/test_fun3d_tacs_unsteady.py +++ b/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/laminar-AT/test_fun3d_tacs_unsteady.py @@ -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}, @@ -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}, diff --git a/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/turbulent-AE/test_fun3d_tacs_unsteady.py b/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/turbulent-AE/test_fun3d_tacs_unsteady.py index 3423764f..284c371a 100644 --- a/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/turbulent-AE/test_fun3d_tacs_unsteady.py +++ b/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/turbulent-AE/test_fun3d_tacs_unsteady.py @@ -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}, @@ -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}, diff --git a/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/turbulent-AT/test_fun3d_tacs_unsteady.py b/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/turbulent-AT/test_fun3d_tacs_unsteady.py index dc3b540f..fed36c04 100644 --- a/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/turbulent-AT/test_fun3d_tacs_unsteady.py +++ b/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/turbulent-AT/test_fun3d_tacs_unsteady.py @@ -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}, @@ -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}, diff --git a/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/turbulent-ATE/test_fun3d_tacs_unsteady.py b/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/turbulent-ATE/test_fun3d_tacs_unsteady.py index 4816c399..b2ffe02c 100644 --- a/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/turbulent-ATE/test_fun3d_tacs_unsteady.py +++ b/tests/fun3d_tests/fully_coupled_disc_deriv_unsteady/turbulent-ATE/test_fun3d_tacs_unsteady.py @@ -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}, @@ -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},