Skip to content

Commit

Permalink
Timeout and tol defaults for serial_regression_AD.py, updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jblueh
jblueh committed Sep 28, 2022
1 parent 627f045 commit a239b46
Showing 1 changed file with 14 additions and 35 deletions.
49 changes: 14 additions & 35 deletions TestCases/serial_regression_AD.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ def main():
discadj_naca0012.cfg_file = "inv_NACA0012_discadj.cfg"
discadj_naca0012.test_iter = 100
discadj_naca0012.test_vals = [-3.561506, -8.926634, -0.000000, 0.005587]
discadj_naca0012.timeout = 1600
discadj_naca0012.tol = 0.00001
test_list.append(discadj_naca0012)

# Inviscid Cylinder 3D (multiple markers)
Expand All @@ -58,8 +56,6 @@ def main():
discadj_cylinder3D.cfg_file = "inv_cylinder3D.cfg"
discadj_cylinder3D.test_iter = 5
discadj_cylinder3D.test_vals = [-3.737675, -3.842311, -0.000000, 0.000000]
discadj_cylinder3D.timeout = 1600
discadj_cylinder3D.tol = 0.00001
test_list.append(discadj_cylinder3D)

# Arina nozzle 2D
Expand All @@ -68,8 +64,6 @@ def main():
discadj_arina2k.cfg_file = "Arina2KRS.cfg"
discadj_arina2k.test_iter = 20
discadj_arina2k.test_vals = [-3.087863, -3.481496, 6.8879e-02, 0]
discadj_arina2k.timeout = 1600
discadj_arina2k.tol = 0.00001
test_list.append(discadj_arina2k)

#######################################################
Expand All @@ -82,8 +76,6 @@ def main():
discadj_rans_naca0012_sa.cfg_file = "turb_NACA0012_sa.cfg"
discadj_rans_naca0012_sa.test_iter = 10
discadj_rans_naca0012_sa.test_vals = [-2.230555, 0.645023, 0.180740, -0.000018, 5.000000, -4.275184, 5.000000, -8.892454] #last 8 columns
discadj_rans_naca0012_sa.timeout = 1600
discadj_rans_naca0012_sa.tol = 0.00001
test_list.append(discadj_rans_naca0012_sa)

# Adjoint turbulent NACA0012 SST
Expand All @@ -92,8 +84,6 @@ def main():
discadj_rans_naca0012_sst.cfg_file = "turb_NACA0012_sst.cfg"
discadj_rans_naca0012_sst.test_iter = 10
discadj_rans_naca0012_sst.test_vals = [-2.221792, -0.491367, 0.182010, -0.000018]
discadj_rans_naca0012_sst.timeout = 1600
discadj_rans_naca0012_sst.tol = 0.00001
test_list.append(discadj_rans_naca0012_sst)

#######################################
Expand All @@ -106,8 +96,6 @@ def main():
discadj_incomp_NACA0012.cfg_file = "incomp_NACA0012_disc.cfg"
discadj_incomp_NACA0012.test_iter = 20
discadj_incomp_NACA0012.test_vals = [20.000000, -4.092007, -2.652750, 0.000000]
discadj_incomp_NACA0012.timeout = 1600
discadj_incomp_NACA0012.tol = 0.00001
test_list.append(discadj_incomp_NACA0012)

#####################################
Expand All @@ -120,8 +108,6 @@ def main():
discadj_incomp_cylinder.cfg_file = "heated_cylinder.cfg"
discadj_incomp_cylinder.test_iter = 20
discadj_incomp_cylinder.test_vals = [20.000000, -2.373367, -2.368305, 0.000000] #last 4 columns
discadj_incomp_cylinder.timeout = 1600
discadj_incomp_cylinder.tol = 0.00001
test_list.append(discadj_incomp_cylinder)

######################################
Expand All @@ -134,8 +120,6 @@ def main():
discadj_incomp_turb_NACA0012_sa.cfg_file = "turb_naca0012_sa.cfg"
discadj_incomp_turb_NACA0012_sa.test_iter = 10
discadj_incomp_turb_NACA0012_sa.test_vals = [10.000000, -3.845979, -1.031095, 0.000000] #last 4 columns
discadj_incomp_turb_NACA0012_sa.timeout = 1600
discadj_incomp_turb_NACA0012_sa.tol = 0.00001
test_list.append(discadj_incomp_turb_NACA0012_sa)

# Adjoint Incompressible Turbulent NACA 0012 SST
Expand All @@ -144,8 +128,6 @@ def main():
discadj_incomp_turb_NACA0012_sst.cfg_file = "turb_naca0012_sst.cfg"
discadj_incomp_turb_NACA0012_sst.test_iter = 10
discadj_incomp_turb_NACA0012_sst.test_vals = [-3.845577, -2.414021, -8.420183, 0.000000] #last 4 columns
discadj_incomp_turb_NACA0012_sst.timeout = 1600
discadj_incomp_turb_NACA0012_sst.tol = 0.00001
test_list.append(discadj_incomp_turb_NACA0012_sst)

#######################################################
Expand All @@ -158,8 +140,6 @@ def main():
discadj_cylinder.cfg_file = "cylinder.cfg"
discadj_cylinder.test_iter = 9
discadj_cylinder.test_vals = [3.746909, -1.544883, -0.008321, 0.000014] #last 4 columns
discadj_cylinder.timeout = 1600
discadj_cylinder.tol = 0.00001
discadj_cylinder.unsteady = True
test_list.append(discadj_cylinder)

Expand All @@ -173,8 +153,6 @@ def main():
discadj_DT_1ST_cylinder.cfg_file = "cylinder.cfg"
discadj_DT_1ST_cylinder.test_iter = 9
discadj_DT_1ST_cylinder.test_vals = [3.698168, -1.607050, -0.002159, 0.000028] #last 4 columns
discadj_DT_1ST_cylinder.timeout = 1600
discadj_DT_1ST_cylinder.tol = 0.00001
discadj_DT_1ST_cylinder.unsteady = True
test_list.append(discadj_DT_1ST_cylinder)

Expand All @@ -188,8 +166,6 @@ def main():
discadj_pitchingNACA0012.cfg_file = "inv_NACA0012_pitching.cfg"
discadj_pitchingNACA0012.test_iter = 4
discadj_pitchingNACA0012.test_vals = [-1.218846, -1.645199, -0.007645, 0.000013]
discadj_pitchingNACA0012.timeout = 1600
discadj_pitchingNACA0012.tol = 0.00001
discadj_pitchingNACA0012.unsteady = True
test_list.append(discadj_pitchingNACA0012)

Expand All @@ -199,8 +175,6 @@ def main():
unst_deforming_naca0012.cfg_file = "inv_NACA0012_pitching_deform_ad.cfg"
unst_deforming_naca0012.test_iter = 4
unst_deforming_naca0012.test_vals = [-1.958006, -1.841808, 1081.700000, 0.000004]
unst_deforming_naca0012.timeout = 1600
unst_deforming_naca0012.tol = 0.00001
unst_deforming_naca0012.unsteady = True
test_list.append(unst_deforming_naca0012)

Expand All @@ -215,8 +189,6 @@ def main():
discadj_fea.test_iter = 4
discadj_fea.test_vals = [-2.849531, -3.238474, -3.6413e-04, -8.7087] #last 4 columns
discadj_fea.test_vals_aarch64 = [-2.849570, -3.238519, -3.6413e-04, -8.7087] #last 4 columns
discadj_fea.timeout = 1600
discadj_fea.tol = 0.00001
test_list.append(discadj_fea)

###################################
Expand All @@ -229,8 +201,6 @@ def main():
discadj_heat.cfg_file = "disc_adj_heat.cfg"
discadj_heat.test_iter = 10
discadj_heat.test_vals = [-2.271569, 0.671288, -3.172000, -8.231500] #last 4 columns
discadj_heat.timeout = 1600
discadj_heat.tol = 0.00001
test_list.append(discadj_heat)

###################################
Expand All @@ -243,8 +213,6 @@ def main():
discadj_fsi.cfg_file = "config.cfg"
discadj_fsi.test_iter = 6
discadj_fsi.test_vals = [6, -1.572702, -3.084381, 4.3990e-04, -1.0631] #last 5 columns
discadj_fsi.timeout = 1600
discadj_fsi.tol = 0.00001
test_list.append(discadj_fsi)

###################################
Expand All @@ -257,18 +225,23 @@ def main():
discadj_cht.cfg_file = "cht_2d_3cylinders.cfg"
discadj_cht.test_iter = 10
discadj_cht.test_vals = [-2.364405, -3.085551, -3.085518, -3.085513] #last 4 columns
discadj_cht.timeout = 1600
discadj_cht.tol = 0.00001
test_list.append(discadj_cht)

######################################
### RUN TESTS ###
######################################

# set default command "SU2_CFD_AD" unless something else has been specified
# set suitable defaults unless something else has been specified
# command: "SU2_CFD_AD"
# timeout: 1600
# tol: 0.00001
for test in test_list:
if test.command.empty():
test.command = TestCase.Command(exec = "SU2_CFD_AD")
if test.timeout == 0:
test.timeout = 1600
if test.tol == 0.0:
test.tol = 0.00001

pass_list = [ test.run_test() for test in test_list ]

Expand All @@ -283,6 +256,7 @@ def main():
discadj_rht.test_iter = 10
discadj_rht.command = TestCase.Command(exec = "discrete_adjoint.py", param = "-f")
discadj_rht.timeout = 1600
discadj_rht.tol = 0.001
discadj_rht.reference_file = "of_grad_cd.csv.ref"
discadj_rht.reference_file_aarch64 = "of_grad_cd_aarch64.csv.ref"
discadj_rht.test_file = "of_grad_cd.csv"
Expand All @@ -300,6 +274,7 @@ def main():
discadj_euler_py.test_iter = 10
discadj_euler_py.command = TestCase.Command(exec = "discrete_adjoint.py", param = "-f")
discadj_euler_py.timeout = 1600
discadj_euler_py.tol = 0.001
discadj_euler_py.reference_file = "of_grad_cd_disc.dat.ref"
discadj_euler_py.reference_file_aarch64 = "of_grad_cd_disc_aarch64.dat.ref"
discadj_euler_py.test_file = "of_grad_cd.dat"
Expand All @@ -313,6 +288,7 @@ def main():
discadj_multiple_ffd_py.test_iter = 9
discadj_multiple_ffd_py.command = TestCase.Command(exec = "discrete_adjoint.py", param = "-f")
discadj_multiple_ffd_py.timeout = 1600
discadj_multiple_ffd_py.tol = 0.001
discadj_multiple_ffd_py.reference_file = "of_grad_cd.dat.ref"
discadj_multiple_ffd_py.reference_file_aarch64 = "of_grad_cd_aarch64.dat.ref"
discadj_multiple_ffd_py.test_file = "of_grad_cd.dat"
Expand All @@ -326,6 +302,7 @@ def main():
directdiff_euler_py.test_iter = 10
directdiff_euler_py.command = TestCase.Command(exec = "direct_differentiation.py", param = "-f")
directdiff_euler_py.timeout = 1600
directdiff_euler_py.tol = 0.001
directdiff_euler_py.reference_file = "of_grad_directdiff.dat.ref"
directdiff_euler_py.reference_file_aarch64 = "of_grad_directdiff_aarch64.dat.ref"
directdiff_euler_py.test_file = "DIRECTDIFF/of_grad_directdiff.dat"
Expand All @@ -339,6 +316,7 @@ def main():
directdiff_multiple_ffd_py.test_iter = 9
directdiff_multiple_ffd_py.command = TestCase.Command(exec = "direct_differentiation.py", param = "-f")
directdiff_multiple_ffd_py.timeout = 1600
directdiff_multiple_ffd_py.tol = 0.001
directdiff_multiple_ffd_py.reference_file = "of_grad_directdiff.dat.ref"
directdiff_multiple_ffd_py.reference_file_aarch64 = "of_grad_directdiff_aarch64.dat.ref"
directdiff_multiple_ffd_py.test_file = "DIRECTDIFF/of_grad_directdiff.dat"
Expand All @@ -352,6 +330,7 @@ def main():
# discadj_multi_py.test_iter = 10
# discadj_multi_py.command = TestCase.Command(exec = "discrete_adjoint.py")
# discadj_multi_py.timeout = 1600
# discadj_multi_py.timeout = 0.001
# discadj_multi_py.reference_file = "of_grad_combo.dat.refdiscrete"
# discadj_multi_py.test_file = "of_grad_combo.dat"
# pass_list.append(discadj_multi_py.run_filediff())
Expand Down

0 comments on commit a239b46

Please sign in to comment.