Skip to content

Commit c995769

Browse files
pcarruscagpcarruscag
committed
change large filediffs to residuals
1 parent 94df327 commit c995769

File tree

4 files changed

+46
-61
lines changed

4 files changed

+46
-61
lines changed

‎TestCases/flamelet/03_laminar_premixed_ch4_flame_cht_cfd/lam_prem_ch4_cht_cfd_master.cfg‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,15 @@ SCREEN_WRT_FREQ_OUTER= 1
4343

4444
WRT_VOLUME_OVERWRITE= YES
4545

46-
WRT_ZONE_CONV= YES
46+
%WRT_ZONE_CONV= YES
4747
CONV_RESIDUAL_MINVAL= -20
4848

4949
VOLUME_FILENAME= fluid
5050

5151
CONV_FILENAME= history
5252

53+
SCREEN_OUTPUT= OUTER_ITER, RMS_RES[0], RMS_RES[1]
54+
5355
% --------------------------- Optimization Parameters --------------------------%
5456

5557
MESH_FILENAME= mesh_unstructured_cht.su2

‎TestCases/flamelet/04_laminar_premixed_ch4_flame_cht_ad/lam_prem_ch4_cht_ad_master.cfg‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,11 @@ OUTER_ITER = 1100
4444
OUTPUT_WRT_FREQ= 50
4545
SCREEN_WRT_FREQ_INNER= 1
4646
SCREEN_WRT_FREQ_OUTER= 1
47+
SCREEN_OUTPUT= OUTER_ITER, BGS_RES[0], BGS_RES[1]
4748

4849
WRT_VOLUME_OVERWRITE= YES
4950

50-
WRT_ZONE_CONV= YES
51+
%WRT_ZONE_CONV= YES
5152
CONV_RESIDUAL_MINVAL= -20
5253

5354
VOLUME_FILENAME= fluid

‎TestCases/parallel_regression.py‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1629,10 +1629,23 @@ def main():
16291629
cgns_writer.cfg_file = "config.cfg"
16301630
cgns_writer.test_iter = 1
16311631
cgns_writer.test_vals = [-2.974473, 0.640256, 5.371028, -6.732060]
1632-
cgns_writer.command = TestCase.Command("mpirun -n 2", "SU2_CFD")
16331632
cgns_writer.new_output = True
16341633
test_list.append(cgns_writer)
16351634

1635+
######################################
1636+
### RUN CHT TEST WITH FILEDIFF ###
1637+
######################################
1638+
1639+
# 2D planar laminar premixed methane flame on isothermal burner with conjugate heat transfer in cooling fin (restart)
1640+
cfd_flamelet_ch4_cht = TestCase('cfd_flamelet_ch4_cht')
1641+
cfd_flamelet_ch4_cht.cfg_dir = "flamelet/03_laminar_premixed_ch4_flame_cht_cfd"
1642+
cfd_flamelet_ch4_cht.cfg_file = "lam_prem_ch4_cht_cfd_master.cfg"
1643+
cfd_flamelet_ch4_cht.test_iter = 5
1644+
cfd_flamelet_ch4_cht.test_vals = [-10.166699, -9.300739, -9.991235, -11.925992, -3.447454, -12.298202, -13.718519, -6.864747]
1645+
cfd_flamelet_ch4_cht.timeout = 1600
1646+
cfd_flamelet_ch4_cht.multizone = True
1647+
test_list.append(cfd_flamelet_ch4_cht)
1648+
16361649
######################################
16371650
### RUN TESTS ###
16381651
######################################
@@ -1651,25 +1664,6 @@ def main():
16511664

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

1654-
######################################
1655-
### RUN CHT TEST WITH FILEDIFF ###
1656-
######################################
1657-
1658-
# 2D planar laminar premixed methane flame on isothermal burner with conjugate heat transfer in cooling fin (restart)
1659-
cfd_flamelet_ch4_cht = TestCase('cfd_flamelet_ch4_cht')
1660-
cfd_flamelet_ch4_cht.cfg_dir = "flamelet/03_laminar_premixed_ch4_flame_cht_cfd"
1661-
cfd_flamelet_ch4_cht.cfg_file = "lam_prem_ch4_cht_cfd_master.cfg"
1662-
cfd_flamelet_ch4_cht.test_iter = 5
1663-
cfd_flamelet_ch4_cht.command = TestCase.Command("mpirun -n 2", "SU2_CFD")
1664-
cfd_flamelet_ch4_cht.timeout = 1600
1665-
cfd_flamelet_ch4_cht.reference_file = "restart_0.csv.ref"
1666-
cfd_flamelet_ch4_cht.test_file = "restart_0.csv"
1667-
cfd_flamelet_ch4_cht.multizone = True
1668-
cfd_flamelet_ch4_cht.comp_threshold = 1e-6
1669-
cfd_flamelet_ch4_cht.tol_file_percent = 1.0
1670-
# pass_list.append(cfd_flamelet_ch4_cht.run_filediff())
1671-
# test_list.append(cfd_flamelet_ch4_cht)
1672-
16731667
######################################
16741668
### RUN SU2_SOL TESTS ###
16751669
######################################

‎TestCases/parallel_regression_AD.py‎

Lines changed: 27 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ def main():
277277
discadj_fsi2.cfg_dir = "disc_adj_fsi/Airfoil_2d"
278278
discadj_fsi2.cfg_file = "config.cfg"
279279
discadj_fsi2.test_iter = 8
280-
discadj_fsi2.test_vals = [-4.772783, 0.916930, -3.863369, 2.9545e-01, 3.8412]
280+
discadj_fsi2.test_vals = [-4.772585, 0.918091, -3.863369, 0.295450, 3.841200]
281281
discadj_fsi2.test_vals_aarch64 = [-4.349372, 0.190601, -1.303589, 0.754070, 2.324400]
282282
discadj_fsi2.tol = 0.00001
283283
test_list.append(discadj_fsi2)
@@ -323,6 +323,28 @@ def main():
323323
da_unsteadyCHT_cylinder.multizone = True
324324
test_list.append(da_unsteadyCHT_cylinder)
325325

326+
##################################
327+
### Disc. adj. flamelet solver ###
328+
##################################
329+
330+
# 2D planar laminar premixed flame on isothermal burner (restart)
331+
discadj_flamelet_ch4_hx = TestCase('discadj_flamelet_ch4_hx')
332+
discadj_flamelet_ch4_hx.cfg_dir = "flamelet/02_laminar_premixed_ch4_flame_hx_ad"
333+
discadj_flamelet_ch4_hx.cfg_file = "lam_prem_ch4_hx_ad.cfg"
334+
discadj_flamelet_ch4_hx.multizone = False
335+
discadj_flamelet_ch4_hx.test_iter = 10
336+
discadj_flamelet_ch4_hx.test_vals = [-8.590418, -8.455958, -8.752915, -6.591140, -14.611234, -3.200577, -18.860864]
337+
test_list.append(discadj_flamelet_ch4_hx)
338+
339+
# 2D planar laminar premixed flame on isothermal burner with conjugate heat transfer (restart)
340+
discadj_flamelet_ch4_cht = TestCase('discadj_flamelet_ch4_cht')
341+
discadj_flamelet_ch4_cht.cfg_dir = "flamelet/04_laminar_premixed_ch4_flame_cht_ad"
342+
discadj_flamelet_ch4_cht.cfg_file = "lam_prem_ch4_cht_ad_master.cfg"
343+
discadj_flamelet_ch4_cht.multizone = True
344+
discadj_flamelet_ch4_cht.test_iter = 10
345+
discadj_flamelet_ch4_cht.test_vals = [-2.709315, -1.959829, -1.979420, -0.095015, -7.230415, -18.606872, -18.578240, -4.804839]
346+
test_list.append(discadj_flamelet_ch4_cht)
347+
326348
######################################
327349
### RUN TESTS ###
328350
######################################
@@ -341,40 +363,6 @@ def main():
341363

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

344-
##################################
345-
### Disc. adj. flamelet solver ###
346-
##################################
347-
348-
# 2D planar laminar premixed flame on isothermal burner (restart)
349-
discadj_flamelet_ch4_hx = TestCase('discadj_flamelet_ch4_hx')
350-
discadj_flamelet_ch4_hx.command = TestCase.Command("mpirun -n 2", "SU2_CFD_AD")
351-
discadj_flamelet_ch4_hx.cfg_dir = "flamelet/02_laminar_premixed_ch4_flame_hx_ad"
352-
discadj_flamelet_ch4_hx.cfg_file = "lam_prem_ch4_hx_ad.cfg"
353-
discadj_flamelet_ch4_hx.multizone = False
354-
discadj_flamelet_ch4_hx.test_iter = 10
355-
discadj_flamelet_ch4_hx.timeout = 20000
356-
discadj_flamelet_ch4_hx.reference_file = "restart_adj_custom.csv.ref"
357-
discadj_flamelet_ch4_hx.test_file = "restart_adj_custom.csv"
358-
discadj_flamelet_ch4_hx.comp_threshold = 1e-6
359-
discadj_flamelet_ch4_hx.tol_file_percent = 0.1
360-
# pass_list.append(discadj_flamelet_ch4_hx.run_filediff())
361-
# test_list.append(discadj_flamelet_ch4_hx)
362-
363-
# 2D planar laminar premixed flame on isothermal burner with conjugate heat transfer (restart)
364-
discadj_flamelet_ch4_cht = TestCase('discadj_flamelet_ch4_cht')
365-
discadj_flamelet_ch4_cht.command = TestCase.Command("mpirun -n 2", "SU2_CFD_AD")
366-
discadj_flamelet_ch4_cht.cfg_dir = "flamelet/04_laminar_premixed_ch4_flame_cht_ad"
367-
discadj_flamelet_ch4_cht.cfg_file = "lam_prem_ch4_cht_ad_master.cfg"
368-
discadj_flamelet_ch4_cht.multizone = True
369-
discadj_flamelet_ch4_cht.test_iter = 5
370-
discadj_flamelet_ch4_cht.reference_file = "restart_adj_T_0.csv.ref"
371-
discadj_flamelet_ch4_cht.test_file = "restart_adj_T_0.csv"
372-
discadj_flamelet_ch4_cht.comp_threshold = 1e-6
373-
discadj_flamelet_ch4_cht.tol_file_percent = 0.1
374-
discadj_flamelet_ch4_cht.timeout = 20000
375-
# pass_list.append(discadj_flamelet_ch4_cht.run_filediff())
376-
# test_list.append(discadj_flamelet_ch4_cht)
377-
378366
################################################
379367
### Gradient check (dot) for flamelet solver ###
380368
################################################
@@ -392,8 +380,8 @@ def main():
392380
dot_flamelet_ch4_hx.test_file = "of_grad.csv"
393381
dot_flamelet_ch4_hx.comp_threshold = 1e-6
394382
dot_flamelet_ch4_hx.tol_file_percent = 0.1
395-
# pass_list.append(dot_flamelet_ch4_hx.run_filediff())
396-
# test_list.append(dot_flamelet_ch4_hx)
383+
pass_list.append(dot_flamelet_ch4_hx.run_filediff())
384+
test_list.append(dot_flamelet_ch4_hx)
397385

398386
# 2D planar laminar premixed flame on isothermal burner with conjugate heat transfer (restart)
399387
# This test restarts on the output of test discadj_flamelet_ch4_cht and
@@ -409,8 +397,8 @@ def main():
409397
dot_flamelet_ch4_cht.test_file = "of_grad.csv"
410398
dot_flamelet_ch4_cht.comp_threshold = 1e-6
411399
dot_flamelet_ch4_cht.tol_file_percent = 0.1
412-
# pass_list.append(dot_flamelet_ch4_cht.run_filediff())
413-
# test_list.append(dot_flamelet_ch4_cht)
400+
pass_list.append(dot_flamelet_ch4_cht.run_filediff())
401+
test_list.append(dot_flamelet_ch4_cht)
414402

415403
##################################################
416404
### Structural Adjoint - Topology Optimization ###

0 commit comments

Comments
 (0)