Skip to content

Commit 0b617df

Browse files
jayantmukhojayantmukho
committed
merge with develop
2 parents eb9a70d + 54fed59 commit 0b617df

File tree

58 files changed

+16835
-15473
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+16835
-15473
lines changed

‎Inc_Inviscid_Hydrofoil/inv_naca0012.cfg‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
9696
RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
9797
%
9898
% Number of total iterations
99-
EXT_ITER= 9999
99+
ITER= 9999
100100

101101
% ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
102102
%
@@ -157,24 +157,19 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
157157
%
158158
CONV_CRITERIA= RESIDUAL
159159
%
160-
% Residual reduction (order of magnitude with respect to the initial value)
161-
RESIDUAL_REDUCTION= 10
162160
%
163161
% Min value of the residual (log10 of the residual)
164-
RESIDUAL_MINVAL= -18
162+
CONV_RESIDUAL_MINVAL= -18
165163
%
166164
% Start Cauchy criteria at iteration number
167-
STARTCONV_ITER= 10
165+
CONV_STARTITER= 10
168166
%
169167
% Number of elements to apply the criteria
170-
CAUCHY_ELEMS= 50
168+
CONV_CAUCHY_ELEMS= 50
171169
%
172170
% Epsilon to control the series convergence
173-
CAUCHY_EPS= 1E-6
171+
CONV_CAUCHY_EPS= 1E-6
174172
%
175-
% Function to apply the criteria (LIFT, DRAG, SENS_GEOMETRY, SENS_MACH,
176-
% DELTA_LIFT, DELTA_DRAG)
177-
CAUCHY_FUNC_FLOW= DRAG
178173

179174
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
180175
%
@@ -185,25 +180,28 @@ MESH_FILENAME= mesh_NACA0012_5deg_6814.su2
185180
MESH_FORMAT= SU2
186181
%
187182
% Restart flow input file
188-
SOLUTION_FLOW_FILENAME= solution_flow.dat
183+
SOLUTION_FILENAME= solution_flow.dat
189184
%
190-
% Output file format (PARAVIEW, TECPLOT)
191-
OUTPUT_FORMAT= PARAVIEW
185+
% Output tabular format (CSV, TECPLOT)
186+
TABULAR_FORMAT= CSV
192187
%
193188
% Output file convergence history (w/o extension)
194189
CONV_FILENAME= history
195190
%
196191
% Output file restart flow
197-
RESTART_FLOW_FILENAME= restart_flow.dat
192+
RESTART_FILENAME= restart_flow.dat
198193
%
199194
% Output file flow (w/o extension) variables
200-
VOLUME_FLOW_FILENAME= flow
195+
VOLUME_FILENAME= flow
201196
%
202197
% Output file surface flow coefficient (w/o extension)
203-
SURFACE_FLOW_FILENAME= surface_flow
198+
SURFACE_FILENAME= surface_flow
204199
%
205200
% Writing solution file frequency
206201
WRT_SOL_FREQ= 50
207202
%
208203
% Writing convergence history frequency
209204
WRT_CON_FREQ= 1
205+
%
206+
% Screen output
207+
SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_VELOCITY-X, LIFT, DRAG)

‎Inc_Laminar_Cavity/lam_buoyancy_cavity.cfg‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ MAX_DELTA_TIME= 1E6
136136
RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
137137
%
138138
% Number of total iterations
139-
EXT_ITER= 99999
139+
ITER= 99999
140140

141141
% ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
142142
%
@@ -201,24 +201,19 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
201201
% Convergence criteria (CAUCHY, RESIDUAL)
202202
CONV_CRITERIA= RESIDUAL
203203
%
204-
% Residual reduction (order of magnitude with respect to the initial value)
205-
RESIDUAL_REDUCTION= 8
206204
%
207205
% Min value of the residual (log10 of the residual)
208-
RESIDUAL_MINVAL= -12
206+
CONV_RESIDUAL_MINVAL= -12
209207
%
210208
% Start convergence criteria at iteration number
211-
STARTCONV_ITER= 10
209+
CONV_STARTITER= 10
212210
%
213211
% Number of elements to apply the criteria
214-
CAUCHY_ELEMS= 100
212+
CONV_CAUCHY_ELEMS= 100
215213
%
216214
% Epsilon to control the series convergence
217-
CAUCHY_EPS= 1E-6
215+
CONV_CAUCHY_EPS= 1E-6
218216
%
219-
% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY,
220-
% SENS_MACH, DELTA_LIFT, DELTA_DRAG)
221-
CAUCHY_FUNC_FLOW= DRAG
222217

223218
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
224219
%
@@ -232,25 +227,25 @@ MESH_FORMAT= SU2
232227
MESH_OUT_FILENAME= mesh_out.su2
233228
%
234229
% Restart flow input file
235-
SOLUTION_FLOW_FILENAME= solution_flow.dat
230+
SOLUTION_FILENAME= solution_flow.dat
236231
%
237232
% Restart adjoint input file
238233
SOLUTION_ADJ_FILENAME= solution_adj.dat
239234
%
240235
% Output file format (PARAVIEW, TECPLOT, STL)
241-
OUTPUT_FORMAT= PARAVIEW
236+
TABULAR_FORMAT= CSV
242237
%
243238
% Output file convergence history (w/o extension)
244239
CONV_FILENAME= history
245240
%
246241
% Output file restart flow
247-
RESTART_FLOW_FILENAME= restart_flow.dat
242+
RESTART_FILENAME= restart_flow.dat
248243
%
249244
% Output file restart adjoint
250245
RESTART_ADJ_FILENAME= restart_adj.dat
251246
%
252247
% Output file flow (w/o extension) variables
253-
VOLUME_FLOW_FILENAME= flow
248+
VOLUME_FILENAME= flow
254249
%
255250
% Output file adjoint (w/o extension) variables
256251
VOLUME_ADJ_FILENAME= adjoint
@@ -259,7 +254,7 @@ VOLUME_ADJ_FILENAME= adjoint
259254
GRAD_OBJFUNC_FILENAME= of_grad.dat
260255
%
261256
% Output file surface flow coefficient (w/o extension)
262-
SURFACE_FLOW_FILENAME= surface_flow
257+
SURFACE_FILENAME= surface_flow
263258
%
264259
% Output file surface adjoint coefficient (w/o extension)
265260
SURFACE_ADJ_FILENAME= surface_adjoint
@@ -269,7 +264,9 @@ WRT_SOL_FREQ= 100
269264
%
270265
% Writing convergence history frequency
271266
WRT_CON_FREQ= 1
272-
267+
%
268+
% Screen output
269+
SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_VELOCITY-X, LIFT, DRAG)
273270
% ----------------------- GEOMETRY EVALUATION PARAMETERS ----------------------%
274271
%
275272
% Extract a slice using GEO_BOUNDS (works with 2D cartesian grids only)

‎Inc_Laminar_Flat_Plate/lam_flatplate.cfg‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ CFL_ADAPT= NO
142142
CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
143143
%
144144
% Number of total iterations
145-
EXT_ITER= 99999
145+
ITER= 99999
146146

147147
% ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
148148
%
@@ -212,24 +212,19 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
212212
%
213213
CONV_CRITERIA= RESIDUAL
214214
%
215-
% Residual reduction (order of magnitude with respect to the initial value)
216-
RESIDUAL_REDUCTION= 10
217215
%
218216
% Min value of the residual (log10 of the residual)
219-
RESIDUAL_MINVAL= -14
217+
CONV_RESIDUAL_MINVAL= -14
220218
%
221219
% Start convergence criteria at iteration number
222-
STARTCONV_ITER= 10
220+
CONV_STARTITER= 10
223221
%
224222
% Number of elements to apply the criteria
225-
CAUCHY_ELEMS= 100
223+
CONV_CAUCHY_ELEMS= 100
226224
%
227225
% Epsilon to control the series convergence
228-
CAUCHY_EPS= 1E-6
226+
CONV_CAUCHY_EPS= 1E-6
229227
%
230-
% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY,
231-
% SENS_MACH, DELTA_LIFT, DELTA_DRAG)
232-
CAUCHY_FUNC_FLOW= DRAG
233228
234229
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
235230
%
@@ -243,25 +238,25 @@ MESH_FORMAT= SU2
243238
MESH_OUT_FILENAME= mesh_out.su2
244239
%
245240
% Restart flow input file
246-
SOLUTION_FLOW_FILENAME= solution_flow.dat
241+
SOLUTION_FILENAME= solution_flow.dat
247242
%
248243
% Restart adjoint input file
249244
SOLUTION_ADJ_FILENAME= solution_adj.dat
250245
%
251246
% Output file format (PARAVIEW, TECPLOT, STL)
252-
OUTPUT_FORMAT= PARAVIEW
247+
TABULAR_FORMAT= CSV
253248
%
254249
% Output file convergence history (w/o extension)
255250
CONV_FILENAME= history
256251
%
257252
% Output file restart flow
258-
RESTART_FLOW_FILENAME= restart_flow.dat
253+
RESTART_FILENAME= restart_flow.dat
259254
%
260255
% Output file restart adjoint
261256
RESTART_ADJ_FILENAME= restart_adj.dat
262257
%
263258
% Output file flow (w/o extension) variables
264-
VOLUME_FLOW_FILENAME= flow
259+
VOLUME_FILENAME= flow
265260
%
266261
% Output file adjoint (w/o extension) variables
267262
VOLUME_ADJ_FILENAME= adjoint
@@ -270,7 +265,7 @@ VOLUME_ADJ_FILENAME= adjoint
270265
GRAD_OBJFUNC_FILENAME= of_grad.dat
271266
%
272267
% Output file surface flow coefficient (w/o extension)
273-
SURFACE_FLOW_FILENAME= surface_flow
268+
SURFACE_FILENAME= surface_flow
274269
%
275270
% Output file surface adjoint coefficient (w/o extension)
276271
SURFACE_ADJ_FILENAME= surface_adjoint
@@ -280,6 +275,9 @@ WRT_SOL_FREQ= 250
280275
%
281276
% Writing convergence history frequency
282277
WRT_CON_FREQ= 1
278+
%
279+
% Screen output
280+
SCREEN_OUTPUT= (INNER_ITER, RMS_PRESSURE, RMS_VELOCITY-X, LIFT, DRAG)
283281
284282
% ----------------------- GEOMETRY EVALUATION PARAMETERS ----------------------%
285283
%

‎Inc_Laminar_Step/lam_backwardstep.cfg‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ MAX_DELTA_TIME= 1E30
116116
RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 )
117117
%
118118
% Number of total iterations
119-
EXT_ITER= 99999
119+
ITER= 99999
120120

121121
% ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
122122
%
@@ -197,24 +197,19 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
197197
%
198198
CONV_CRITERIA= RESIDUAL
199199
%
200-
% Residual reduction (order of magnitude with respect to the initial value)
201-
RESIDUAL_REDUCTION= 12
202200
%
203201
% Min value of the residual (log10 of the residual)
204-
RESIDUAL_MINVAL= -16
202+
CONV_RESIDUAL_MINVAL= -16
205203
%
206204
% Start convergence criteria at iteration number
207-
STARTCONV_ITER= 10
205+
CONV_STARTITER= 10
208206
%
209207
% Number of elements to apply the criteria
210-
CAUCHY_ELEMS= 100
208+
CONV_CAUCHY_ELEMS= 100
211209
%
212210
% Epsilon to control the series convergence
213-
CAUCHY_EPS= 1E-6
211+
CONV_CAUCHY_EPS= 1E-6
214212
%
215-
% Function to apply the criteria (LIFT, DRAG, NEARFIELD_PRESS, SENS_GEOMETRY,
216-
% SENS_MACH, DELTA_LIFT, DELTA_DRAG)
217-
CAUCHY_FUNC_FLOW= DRAG
218213

219214
% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
220215
%
@@ -228,25 +223,25 @@ MESH_FORMAT= SU2
228223
MESH_OUT_FILENAME= mesh_out.su2
229224
%
230225
% Restart flow input file
231-
SOLUTION_FLOW_FILENAME= solution_flow.dat
226+
SOLUTION_FILENAME= solution_flow.dat
232227
%
233228
% Restart adjoint input file
234229
SOLUTION_ADJ_FILENAME= solution_adj.dat
235230
%
236231
% Output file format (PARAVIEW, TECPLOT, STL)
237-
OUTPUT_FORMAT= PARAVIEW
232+
TABULAR_FORMAT= CSV
238233
%
239234
% Output file convergence history (w/o extension)
240235
CONV_FILENAME= history
241236
%
242237
% Output file restart flow
243-
RESTART_FLOW_FILENAME= restart_flow.dat
238+
RESTART_FILENAME= restart_flow.dat
244239
%
245240
% Output file restart adjoint
246241
RESTART_ADJ_FILENAME= restart_adj.dat
247242
%
248243
% Output file flow (w/o extension) variables
249-
VOLUME_FLOW_FILENAME= flow
244+
VOLUME_FILENAME= flow
250245
%
251246
% Output file adjoint (w/o extension) variables
252247
VOLUME_ADJ_FILENAME= adjoint
@@ -255,7 +250,7 @@ VOLUME_ADJ_FILENAME= adjoint
255250
GRAD_OBJFUNC_FILENAME= of_grad.dat
256251
%
257252
% Output file surface flow coefficient (w/o extension)
258-
SURFACE_FLOW_FILENAME= surface_flow
253+
SURFACE_FILENAME= surface_flow
259254
%
260255
% Output file surface adjoint coefficient (w/o extension)
261256
SURFACE_ADJ_FILENAME= surface_adjoint
@@ -265,6 +260,9 @@ WRT_SOL_FREQ= 250
265260
%
266261
% Writing convergence history frequency
267262
WRT_CON_FREQ= 1
263+
%
264+
% Screen output
265+
SCREEN_OUTPUT=(INNER_ITER, RMS_PRESSURE, RMS_VELOCITY-X, LIFT, DRAG)
268266

269267
% ----------------------- GEOMETRY EVALUATION PARAMETERS ----------------------%
270268
%

0 commit comments

Comments
 (0)