Merge branch 'develop'

Conflicts:
	parallel_regression.py
	serial_regression.py

Author: Francisco Palacios

actuator_disk/ActDisk_Euler.cfg

@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                              %
 % SU2 configuration file                                                       %
-% Case description: Actuator Disk example (not validated)                      %
+% Case description: Actuator Disk example                                      %
 % Author: Francisco Palacios                                                   %
 % Institution: Stanford University                                             %
 % Date: 2014.06.01                                                             %
@@ -26,7 +26,7 @@ RESTART_SOL= NO
 % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
 %
 % Mach number (non-dimensional, based on the free-stream values)
-MACH_NUMBER= 0.1
+MACH_NUMBER= 0.5
 %
 % Angle of attack (degrees)
 AoA= 0.0
@@ -55,11 +55,26 @@ REF_AREA= 1.0
 % Actuator disk boundary marker(s) (NONE = no marker)
 % Format: ( inlet face marker, outlet face marker,
 % rotation_angle_x-axis, rotation_angle_y-axis, rotation_angle_z-axis, 
-% root radius, tip radius, thrust coefficient, rev/min, ... )
-MARKER_ACTDISK = ( disk_in, disk_out, 0.1104127, 9.743505, 14.09530, 0.30, 1.96, 0.3, 40 )
+% root radius, tip radius, pressure jump, temperature jump, rev/min, 
+% uniform(0)/linear(1) distribution, ... )
+MARKER_ACTDISK = ( disk_in, disk_out, 0.1104127, 9.743505, 14.09530, 0.0, 1.96, 1000, 10, 0.0, 0 )
 %
 % Marker of the far field (0 = no marker)
-MARKER_FAR= ( inlet, outlet, side )
+% MARKER_FAR= ( inlet, outlet, side )
+%
+% Inlet boundary type (TOTAL_CONDITIONS, MASS_FLOW)
+INLET_TYPE= TOTAL_CONDITIONS
+%
+% Inlet boundary marker(s) with the following formats (NONE = no marker) 
+% Total Conditions: (inlet marker, total temp, total pressure, flow_direction_x, 
+%           flow_direction_y, flow_direction_z, ... ) where flow_direction is
+%           a unit vector.
+MARKER_INLET= ( inlet, 288.15, 120193, 1.0, 0.0, 0.0 )
+%
+%
+% Outlet boundary marker(s) (NONE = no marker)
+% Format: ( outlet marker, back pressure (static), ... )
+MARKER_OUTLET= ( side, 101325.0, outlet, 101325.0 )
 %
 % Marker of the surface which is going to be plotted or designed
 MARKER_PLOTTING= ( disk_in )
@@ -69,10 +84,10 @@ MARKER_MONITORING= ( disk_in )
 
 % ------------- COMMON PARAMETERS TO DEFINE THE NUMERICAL METHOD --------------%
 % Numerical method for spatial gradients (GREEN_GAUSS, WEIGHTED_LEAST_SQUARES)
-NUM_METHOD_GRAD= WEIGHTED_LEAST_SQUARES
+NUM_METHOD_GRAD= GREEN_GAUSS
 %
 % Courant-Friedrichs-Lewy condition of the finest grid
-CFL_NUMBER= 5.0
+CFL_NUMBER= 10.0
 %
 % Adaptive CFL number (NO, YES)
 CFL_ADAPT= NO
@@ -94,17 +109,17 @@ LINEAR_SOLVER= FGMRES
 LINEAR_SOLVER_ERROR= 1E-6
 %
 % Max number of iterations of the linear solver for the implicit formulation
-LINEAR_SOLVER_ITER= 2
+LINEAR_SOLVER_ITER= 100
 
 % -------------------------- MULTIGRID PARAMETERS -----------------------------%
 % Multi-Grid Levels (0 = no multi-grid)
-MGLEVEL= 2
+MGLEVEL= 3
 %
 % Multi-grid cycle (V_CYCLE, W_CYCLE, FULLMG_CYCLE)
 MGCYCLE= V_CYCLE
 %
 % Multi-Grid PreSmoothing Level
-MG_PRE_SMOOTH= ( 1, 2, 3, 3 )
+MG_PRE_SMOOTH= ( 1, 2, 2, 2 )
 %
 % Multi-Grid PostSmoothing Level
 MG_POST_SMOOTH= ( 0, 0, 0, 0 )
@@ -118,17 +133,43 @@ MG_DAMP_RESTRICTION= 0.75
 % Damping factor for the correction prolongation
 MG_DAMP_PROLONGATION= 0.75
 
+% ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
+%
+% Reference element length for computing the slope and sharp edges 
+%                              limiters (0.1 m, 5.0 in by default)
+REF_ELEM_LENGTH= 0.1
+%
+% Coefficient for the limiter
+LIMITER_COEFF= 0.1
+%
+% Freeze the value of the limiter after a number of iterations
+LIMITER_ITER= 999999
+%
+% Coefficient for the sharp edges limiter
+SHARP_EDGES_COEFF= 3.0
+%
+% Reference coefficient (sensitivity) for detecting sharp edges.
+REF_SHARP_EDGES= 3.0
+%
+% Remove sharp edges from the sensitivity evaluation (NO, YES)
+SENS_REMOVE_SHARP= NO
+
 % --------------------- FLOW NUMERICAL METHOD DEFINITION ----------------------%
 % Convective numerical method (JST, CUSP, LAX-FRIEDRICH, ROE-1ST_ORDER, 
 %                              ROE-2ND_ORDER)
 CONV_NUM_METHOD_FLOW= ROE
 %
+% Spatial numerical order integration (1ST_ORDER, 2ND_ORDER, 2ND_ORDER_LIMITER)
+SPATIAL_ORDER_FLOW= 2ND_ORDER
 %
 % 1st, 2nd and 4th order artificial dissipation coefficients
 AD_COEFF_FLOW= ( 0.15, 0.5, 0.02 )
 %
 % Time discretization (RUNGE-KUTTA_EXPLICIT, EULER_IMPLICIT, EULER_EXPLICIT)
 TIME_DISCRE_FLOW= EULER_IMPLICIT
+%
+% Relaxation coefficient
+RELAXATION_FACTOR_FLOW= 1.0
 
 % ----------------------- GEOMETRY EVALUATION PARAMETERS ----------------------%
 %
@@ -147,7 +188,7 @@ NEW_ELEMS= 15
 %                          GRAD_ADJOINT, GRAD_FLOW_ADJ, ROBUST,
 %                          FULL_LINEAR, COMPUTABLE, COMPUTABLE_ROBUST,
 %                          REMAINING, WAKE, HORIZONTAL_PLANE)
-KIND_ADAPT= GRAD_FLOW
+KIND_ADAPT= FULL
 %
 % Scale factor for the dual volume
 DUALVOL_POWER= 0.5
@@ -247,7 +288,7 @@ CAUCHY_FUNC_FLOW= DRAG
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %
 % Mesh input file
-MESH_FILENAME= ActuatorDisk.su2
+MESH_FILENAME= ActuatorDisk_I.su2
 %
 % Mesh input file format (SU2, CGNS, NETCDF_ASCII)
 MESH_FORMAT= SU2