Merge remote-tracking branch 'origin/feature_input_output' into feature_input_output

talbring · talbring · commit 320abbd7eb2f · 2019-07-10T17:56:08.000+02:00
diff --git a/Multi_Objective_Shape_Design/solution_adj_cd.dat b/Multi_Objective_Shape_Design/solution_adj_cd.dat
@@ -3749,7 +3749,7 @@
 3747	4.000000000000004e-02	0.000000000000000e+00	-1.382945087837384e-03	4.209087405852966e-06	7.076849877802902e-08	-2.712572555121020e-09	1.626303258728257e-18	1.576023516926985e-04	-7.880117584634921e-03	
 3748	2.000000000000002e-02	0.000000000000000e+00	-1.355386054353239e-03	4.123324031854837e-06	-5.871799918772276e-08	-2.700177965039960e-09	1.007630394053716e-17	-6.722071959046241e-04	3.361035979523117e-02	
 3749	0.000000000000000e+00	0.000000000000000e+00	-1.555495284528642e-03	4.561544769173810e-06	-5.924388224890563e-08	-2.978008042622753e-09	3.543985851311993e-18	-8.932467208965700e-04	8.932467208965690e-02	
-EXT_ITER= 634
+ITER= 634
 AOA= 0.000000000000000e+00
 SIDESLIP_ANGLE= 0.000000000000000e+00
 INITIAL_BCTHRUST= 4.000000000000000e+03
diff --git a/Multi_Objective_Shape_Design/solution_adj_combo.dat b/Multi_Objective_Shape_Design/solution_adj_combo.dat
@@ -3749,7 +3749,7 @@
 3747	4.000000000000004e-02	0.000000000000000e+00	1.170008845917032e+01	-3.605599425635458e-02	-5.866956206405254e-04	2.335191218291482e-05	-2.986499936241671e-14	-5.100535268130951e+00	2.550267634065474e+02	
 3748	2.000000000000002e-02	0.000000000000000e+00	1.128998139754059e+01	-3.497590207222737e-02	8.507629168350131e-04	2.290251412109289e-05	7.976952431931750e-14	4.447603341568136e+00	-2.223801670784065e+02	
 3749	0.000000000000000e+00	0.000000000000000e+00	1.323908805872447e+01	-3.895992167347566e-02	6.218359550883403e-04	2.562024014072503e-05	2.481348460037225e-14	4.444449470344431e+00	-4.444449470344427e+02	
-EXT_ITER= 25434
+ITER= 25434
 AOA= 0.000000000000000e+00
 SIDESLIP_ANGLE= 0.000000000000000e+00
 INITIAL_BCTHRUST= 4.000000000000000e+03
diff --git a/Multi_Objective_Shape_Design/solution_adj_pt.dat b/Multi_Objective_Shape_Design/solution_adj_pt.dat
@@ -3749,7 +3749,7 @@
 3747	4.000000000000004e-02	0.000000000000000e+00	-3.544825533795723e+04	1.035944053781001e+02	1.928526976773254e+00	-6.557557269511705e-02	-9.447376214666292e-11	-3.350362730956871e+04	1.675181365478435e+06	
 3748	2.000000000000002e-02	0.000000000000000e+00	-3.649942662500910e+04	1.049041184065464e+02	1.909393300782109e+00	-6.870240350044132e-02	-4.365574568510056e-11	-3.017281490268009e+04	1.508640745134003e+06	
 3749	0.000000000000000e+00	0.000000000000000e+00	-3.941364231144269e+04	1.142302249219858e+02	-3.415236920089749e-01	-7.275300269258987e-02	4.063167580170557e-10	-5.475057392980672e+04	5.475057392980666e+06	
-EXT_ITER= 876
+ITER= 876
 AOA= 0.000000000000000e+00
 SIDESLIP_ANGLE= 0.000000000000000e+00
 INITIAL_BCTHRUST= 4.000000000000000e+03
diff --git a/_tutorials/compressible_flow/Inviscid_Bump.md b/_tutorials/compressible_flow/Inviscid_Bump.md
@@ -122,7 +122,7 @@ RESIDUAL_MINVAL= -12
 STARTCONV_ITER= 10
 ```
 
-There are three different types of criteria for terminating a simulation in SU2: running a specified number of iterations (`EXT_ITER` option), reducing the residual of the density equation by a specified order of magnitude (or reaching a specified lower limit), or by converging an objective, such as drag, to a certain tolerance. The most common convergence criteria is the `RESIDUAL` option which is used in this tutorial by setting the `CONV_CRITERIA`. The `RESIDUAL_REDUCTION` option controls how many orders of magnitude reduction in the density residual are required for convergence, and `RESIDUAL_MINVAL` sets the minimum value that the residual is allowed to reach before automatically terminating. The user can set a specific iteration number to use for the initial value of the density residual using the `STARTCONV_ITER` option. For example, the simulation for the inviscid channel will terminate once the density residual reaches a value that is 6 orders of magnitude smaller than its value at iteration 10. Note, however, that SU2 will always use the maximum value of the density residual to compute the relative reduction, even if the maximum value occurs after the iteration specified in `STARTCONV_ITER`.
+There are three different types of criteria for terminating a simulation in SU2: running a specified number of iterations (`ITER` option), reducing the residual of the density equation by a specified order of magnitude (or reaching a specified lower limit), or by converging an objective, such as drag, to a certain tolerance. The most common convergence criteria is the `RESIDUAL` option which is used in this tutorial by setting the `CONV_CRITERIA`. The `RESIDUAL_REDUCTION` option controls how many orders of magnitude reduction in the density residual are required for convergence, and `RESIDUAL_MINVAL` sets the minimum value that the residual is allowed to reach before automatically terminating. The user can set a specific iteration number to use for the initial value of the density residual using the `STARTCONV_ITER` option. For example, the simulation for the inviscid channel will terminate once the density residual reaches a value that is 6 orders of magnitude smaller than its value at iteration 10. Note, however, that SU2 will always use the maximum value of the density residual to compute the relative reduction, even if the maximum value occurs after the iteration specified in `STARTCONV_ITER`.
 
 ### Running SU2
 
diff --git a/documents/WorkshopFeb2017/compute_Mpolar.py b/documents/WorkshopFeb2017/compute_Mpolar.py
@@ -60,7 +60,7 @@ def main():
     
     # prepare config
     config.NUMBER_PART = options.partitions
-    config.EXT_ITER    = options.iterations
+    config.ITER    = options.iterations
     
     # Initialize results arrays   
     nMach = 5
