Merge branch 'develop' of https://github.com/su2code/Tutorials into feature_multilayer_perceptron

EvertBunschoten · EvertBunschoten · commit 475b0d8c8e7e · 2023-03-30T17:16:52.000+02:00
diff --git a/compressible_flow/Turbulent_ONERAM6/turb_ONERAM6.cfg b/compressible_flow/Turbulent_ONERAM6/turb_ONERAM6.cfg
@@ -185,22 +185,9 @@ MG_DAMP_PROLONGATION= 0.7
 
 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------%
 %
-% Convective numerical method (JST, LAX-FRIEDRICH, CUSP, ROE, AUSM, HLLC,
-%                              TURKEL_PREC, MSW)
+% Convective numerical method
 CONV_NUM_METHOD_FLOW= JST
 %
-% Spatial numerical order integration (1ST_ORDER, 2ND_ORDER, 2ND_ORDER_LIMITER)
-MUSCL_FLOW= YES
-%
-% Slope limiter (NONE, VENKATAKRISHNAN, VENKATAKRISHNAN_WANG,
-%                BARTH_JESPERSEN, VAN_ALBADA_EDGE)
-SLOPE_LIMITER_FLOW= VENKATAKRISHNAN
-%
-% Coefficient for the Venkat's limiter (upwind scheme). A larger values decrease
-%             the extent of limiting, values approaching zero cause
-%             lower-order approximation to the solution (0.05 by default)
-VENKAT_LIMITER_COEFF= 0.05
-%
 % 2nd and 4th order artificial dissipation coefficients for
 %     the JST method ( 0.5, 0.02 by default )
 JST_SENSOR_COEFF= ( 0.5, 0.02 )
diff --git a/design/Inviscid_2D_Unconstrained_NACA0012/inv_NACA0012_basic.cfg b/design/Inviscid_2D_Unconstrained_NACA0012/inv_NACA0012_basic.cfg
@@ -133,9 +133,6 @@ MG_DAMP_PROLONGATION= 1.0
 %                              ROE-2ND_ORDER)
 CONV_NUM_METHOD_FLOW= JST
 %
-% Slope limiter (VENKATAKRISHNAN)
-SLOPE_LIMITER_FLOW= VENKATAKRISHNAN
-%
 % 2nd and 4th order artificial dissipation coefficients
 JST_SENSOR_COEFF= ( 0.5, 0.02 )
 %
@@ -154,9 +151,6 @@ OBJECTIVE_FUNCTION= DRAG
 %                              ROE-2ND_ORDER)
 CONV_NUM_METHOD_ADJFLOW= JST
 %
-% Slope limiter (VENKATAKRISHNAN, SHARP_EDGES)
-SLOPE_LIMITER_ADJFLOW= VENKATAKRISHNAN
-%
 % 2nd, and 4th order artificial dissipation coefficients
 ADJ_JST_SENSOR_COEFF= ( 0.0, 0.02 )
 %
@@ -278,7 +272,6 @@ SURFACE_FILENAME= surface_flow
 % Output file surface adjoint coefficient (w/o extension)
 SURFACE_ADJ_FILENAME= surface_adjoint
 %
-%
 % Screen output
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
 %
diff --git a/design/Turbulent_2D_Constrained_RAE2822/turb_SA_RAE2822.cfg b/design/Turbulent_2D_Constrained_RAE2822/turb_SA_RAE2822.cfg
@@ -109,7 +109,7 @@ OBJECTIVE_FUNCTION= DRAG
 %
 % Monotonic Upwind Scheme for Conservation Laws (TVD) in the flow equations.
 %           Required for 2nd order upwind schemes (NO, YES)
-MUSCL_FLOW= YES
+MUSCL_FLOW= NO
 %
 % Slope limiter (NONE, VENKATAKRISHNAN, VENKATAKRISHNAN_WANG,
 %                BARTH_JESPERSEN, VAN_ALBADA_EDGE)
@@ -125,7 +125,7 @@ SLOPE_LIMITER_TURB= VENKATAKRISHNAN
 %
 % Monotonic Upwind Scheme for Conservation Laws (TVD) in the adjoint flow equations.
 %           Required for 2nd order upwind schemes (NO, YES)
-MUSCL_ADJFLOW= YES
+MUSCL_ADJFLOW= NO
 %
 % Slope limiter (NONE, VENKATAKRISHNAN, BARTH_JESPERSEN, VAN_ALBADA_EDGE,
 %                SHARP_EDGES, WALL_DISTANCE)
diff --git a/design/Unsteady_Shape_Opt_NACA0012/unsteady_naca0012_opt.cfg b/design/Unsteady_Shape_Opt_NACA0012/unsteady_naca0012_opt.cfg
@@ -136,10 +136,6 @@ LINEAR_SOLVER_ITER= 5
 %                              TURKEL_PREC, MSW)
 CONV_NUM_METHOD_FLOW= JST
 %
-% Spatial numerical order integration (1ST_ORDER, 2ND_ORDER, 2ND_ORDER_LIMITER)
-%
-% MUSCL_FLOW= YES
-%
 % 1st, 2nd and 4th order artificial dissipation coefficients
 JST_SENSOR_COEFF= (  0.5, 0.01 )
 %
diff --git a/multiphysics/unsteady_fsi_python/Ma01/fluid.cfg b/multiphysics/unsteady_fsi_python/Ma01/fluid.cfg
@@ -121,18 +121,10 @@ LINEAR_SOLVER_ITER= 10
 %
 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------%
 %
-% Convective numerical method (JST, LAX-FRIEDRICH, CUSP, ROE, AUSM, HLLC,
+% Convective numerical method (JST, LAX-FRIEDRICH, ROE, AUSM, HLLC,
 %                              TURKEL_PREC, MSW)
 CONV_NUM_METHOD_FLOW= JST
 %
-% Spatial numerical order integration (1ST_ORDER, 2ND_ORDER, 2ND_ORDER_LIMITER)
-%
-% Monotonic Upwind Scheme for Conservation Laws (TVD) in the flow equations.
-%           Required for 2nd order upwind schemes (NO, YES)
-MUSCL_FLOW= YES
-% Slope limiter (VENKATAKRISHNAN, MINMOD)
-SLOPE_LIMITER_FLOW= VENKATAKRISHNAN
-%
 JST_SENSOR_COEFF= ( 0.5, 0.01 )
 % Time discretization (RUNGE-KUTTA_EXPLICIT, EULER_IMPLICIT, EULER_EXPLICIT)
 TIME_DISCRE_FLOW= EULER_IMPLICIT
diff --git a/multiphysics/unsteady_fsi_python/Ma02/fluid.cfg b/multiphysics/unsteady_fsi_python/Ma02/fluid.cfg
@@ -125,14 +125,6 @@ LINEAR_SOLVER_ITER= 10
 %                              TURKEL_PREC, MSW)
 CONV_NUM_METHOD_FLOW= JST
 %
-% Spatial numerical order integration (1ST_ORDER, 2ND_ORDER, 2ND_ORDER_LIMITER)
-%
-% Monotonic Upwind Scheme for Conservation Laws (TVD) in the flow equations.
-%           Required for 2nd order upwind schemes (NO, YES)
-MUSCL_FLOW= YES
-% Slope limiter (VENKATAKRISHNAN, MINMOD)
-SLOPE_LIMITER_FLOW= VENKATAKRISHNAN
-%
 JST_SENSOR_COEFF= ( 0.5, 0.01 )
 % Time discretization (RUNGE-KUTTA_EXPLICIT, EULER_IMPLICIT, EULER_EXPLICIT)
 TIME_DISCRE_FLOW= EULER_IMPLICIT
diff --git a/multiphysics/unsteady_fsi_python/Ma03/fluid.cfg b/multiphysics/unsteady_fsi_python/Ma03/fluid.cfg
@@ -125,14 +125,6 @@ LINEAR_SOLVER_ITER= 10
 %                              TURKEL_PREC, MSW)
 CONV_NUM_METHOD_FLOW= JST
 %
-% Spatial numerical order integration (1ST_ORDER, 2ND_ORDER, 2ND_ORDER_LIMITER)
-%
-% Monotonic Upwind Scheme for Conservation Laws (TVD) in the flow equations.
-%           Required for 2nd order upwind schemes (NO, YES)
-MUSCL_FLOW= YES
-% Slope limiter (VENKATAKRISHNAN, MINMOD)
-SLOPE_LIMITER_FLOW= VENKATAKRISHNAN
-%
 JST_SENSOR_COEFF= ( 0.5, 0.01 )
 % Time discretization (RUNGE-KUTTA_EXPLICIT, EULER_IMPLICIT, EULER_EXPLICIT)
 TIME_DISCRE_FLOW= EULER_IMPLICIT
diff --git a/multiphysics/unsteady_fsi_python/Ma0357/fluid.cfg b/multiphysics/unsteady_fsi_python/Ma0357/fluid.cfg
@@ -125,14 +125,6 @@ LINEAR_SOLVER_ITER= 10
 %                              TURKEL_PREC, MSW)
 CONV_NUM_METHOD_FLOW= JST
 %
-% Spatial numerical order integration (1ST_ORDER, 2ND_ORDER, 2ND_ORDER_LIMITER)
-%
-% Monotonic Upwind Scheme for Conservation Laws (TVD) in the flow equations.
-%           Required for 2nd order upwind schemes (NO, YES)
-MUSCL_FLOW= YES
-% Slope limiter (VENKATAKRISHNAN, MINMOD)
-SLOPE_LIMITER_FLOW= VENKATAKRISHNAN
-%
 JST_SENSOR_COEFF= ( 0.5, 0.01 )
 % Time discretization (RUNGE-KUTTA_EXPLICIT, EULER_IMPLICIT, EULER_EXPLICIT)
 TIME_DISCRE_FLOW= EULER_IMPLICIT
diff --git a/multiphysics/unsteady_fsi_python/Ma0364/fluid.cfg b/multiphysics/unsteady_fsi_python/Ma0364/fluid.cfg
@@ -125,14 +125,6 @@ LINEAR_SOLVER_ITER= 10
 %                              TURKEL_PREC, MSW)
 CONV_NUM_METHOD_FLOW= JST
 %
-% Spatial numerical order integration (1ST_ORDER, 2ND_ORDER, 2ND_ORDER_LIMITER)
-%
-% Monotonic Upwind Scheme for Conservation Laws (TVD) in the flow equations.
-%           Required for 2nd order upwind schemes (NO, YES)
-MUSCL_FLOW= YES
-% Slope limiter (VENKATAKRISHNAN, MINMOD)
-SLOPE_LIMITER_FLOW= VENKATAKRISHNAN
-%
 JST_SENSOR_COEFF= ( 0.5, 0.01 )
 % Time discretization (RUNGE-KUTTA_EXPLICIT, EULER_IMPLICIT, EULER_EXPLICIT)
 TIME_DISCRE_FLOW= EULER_IMPLICIT

Original file line number	Diff line number	Diff line change
`@@ -133,9 +133,6 @@ MG_DAMP_PROLONGATION= 1.0`
`133`	`133`	`% ROE-2ND_ORDER)`
`134`	`134`	`CONV_NUM_METHOD_FLOW= JST`
`135`	`135`	`%`
`136`		`-% Slope limiter (VENKATAKRISHNAN)`
`137`		`-SLOPE_LIMITER_FLOW= VENKATAKRISHNAN`
`138`		`-%`
`139`	`136`	`% 2nd and 4th order artificial dissipation coefficients`
`140`	`137`	`JST_SENSOR_COEFF= ( 0.5, 0.02 )`
`141`	`138`	`%`
`@@ -154,9 +151,6 @@ OBJECTIVE_FUNCTION= DRAG`
`154`	`151`	`% ROE-2ND_ORDER)`
`155`	`152`	`CONV_NUM_METHOD_ADJFLOW= JST`
`156`	`153`	`%`
`157`		`-% Slope limiter (VENKATAKRISHNAN, SHARP_EDGES)`
`158`		`-SLOPE_LIMITER_ADJFLOW= VENKATAKRISHNAN`
`159`		`-%`
`160`	`154`	`% 2nd, and 4th order artificial dissipation coefficients`
`161`	`155`	`ADJ_JST_SENSOR_COEFF= ( 0.0, 0.02 )`
`162`	`156`	`%`
`@@ -278,7 +272,6 @@ SURFACE_FILENAME= surface_flow`
`278`	`272`	`% Output file surface adjoint coefficient (w/o extension)`
`279`	`273`	`SURFACE_ADJ_FILENAME= surface_adjoint`
`280`	`274`	`%`
`281`		`-%`
`282`	`275`	`% Screen output`
`283`	`276`	`SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)`
`284`	`277`	`%`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ OBJECTIVE_FUNCTION= DRAG`
`109`	`109`	`%`
`110`	`110`	`% Monotonic Upwind Scheme for Conservation Laws (TVD) in the flow equations.`
`111`	`111`	`% Required for 2nd order upwind schemes (NO, YES)`
`112`		`-MUSCL_FLOW= YES`
	`112`	`+MUSCL_FLOW= NO`
`113`	`113`	`%`
`114`	`114`	`% Slope limiter (NONE, VENKATAKRISHNAN, VENKATAKRISHNAN_WANG,`
`115`	`115`	`% BARTH_JESPERSEN, VAN_ALBADA_EDGE)`
`@@ -125,7 +125,7 @@ SLOPE_LIMITER_TURB= VENKATAKRISHNAN`
`125`	`125`	`%`
`126`	`126`	`% Monotonic Upwind Scheme for Conservation Laws (TVD) in the adjoint flow equations.`
`127`	`127`	`% Required for 2nd order upwind schemes (NO, YES)`
`128`		`-MUSCL_ADJFLOW= YES`
	`128`	`+MUSCL_ADJFLOW= NO`
`129`	`129`	`%`
`130`	`130`	`% Slope limiter (NONE, VENKATAKRISHNAN, BARTH_JESPERSEN, VAN_ALBADA_EDGE,`
`131`	`131`	`% SHARP_EDGES, WALL_DISTANCE)`
Original file line number	Diff line number	Diff line change
`@@ -136,10 +136,6 @@ LINEAR_SOLVER_ITER= 5`
`136`	`136`	`% TURKEL_PREC, MSW)`
`137`	`137`	`CONV_NUM_METHOD_FLOW= JST`
`138`	`138`	`%`
`139`		`-% Spatial numerical order integration (1ST_ORDER, 2ND_ORDER, 2ND_ORDER_LIMITER)`
`140`		`-%`
`141`		`-% MUSCL_FLOW= YES`
`142`		`-%`
`143`	`139`	`% 1st, 2nd and 4th order artificial dissipation coefficients`
`144`	`140`	`JST_SENSOR_COEFF= ( 0.5, 0.01 )`
`145`	`141`	`%`