Skip to content

Commit c6adf29

Browse files
andrewdnolanandrewdnolan
committed
Apply Adiren's solver settings to the remaining experiments
1 parent a436234 commit c6adf29

File tree

4 files changed

+58
-50
lines changed

4 files changed

+58
-50
lines changed

‎expr/01_UQ/sensitivity.py‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,12 @@ def main(argv):
8383
parser.add_argument('-Dynamic_int','--Dynamic_exec_interval', type=int,
8484
help = "Interval to execute the dynamic solver, relative"\
8585
"to the thermodynamic solver",
86-
default = 1)
87-
88-
parser.add_argument('-it_diag','--diagnostic_SS_iterations', type=int,
89-
help = "Number of (S)teady (S)tate itterations for the\n"\
90-
"diagnostic simulation",
91-
default = 25)
86+
default = 10)
9287

9388
parser.add_argument('-it_prog','--prognostic_SS_iterations', type=int,
9489
help = "Number of (S)teady (S)tate itterations for the \n"\
9590
"prognostic simulation",
96-
default = 10)
91+
default = 1)
9792

9893
parser.add_argument('-C_firn', type=float,
9994
help = "firn densification constant",

‎expr/01_UQ/sifs/prognostic.sif‎

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -304,36 +304,43 @@ Solver 6
304304
Exported Variable 4 = -dofs 1 "runoff_frac" ! [-]
305305
End
306306

307-
! Navier-Stokes Equation (Stokes Flow)
307+
! Navier-Stokes Equation (vectorized & threaded)
308308
Solver 7
309309
Exec Interval = <Dynamic_int>
310310
Timestep Scale = <Dynamic_int>
311311

312-
Equation = "Navier-Stokes"
313-
Flow model = String "Stokes"
312+
Equation = "Stokes-Vec"
313+
Procedure = "IncompressibleNSVec" "IncompressibleNSSolver"
314+
Div-Curl Discretization = Logical False
314315
Optimize Bandwidth = Logical True
315-
! Stabilization Method = [Stabilized,P2/P1,Bubbles]
316-
Stabilization Method = String "Bubbles"
317316

318-
! Linear System Solver = Direct
319-
! Linear System Direct Method = "UMFPACK"
320-
Linear System Solver = "Iterative"
321-
Linear System Iterative Method = "BiCGStabl"
322-
BiCGStabl Polynomial Degree = 4
323-
Linear System Max Iterations = 1000
324-
Linear System Convergence Tolerance = 1.0E-08
325-
Linear System Abort Not Converged = Logical False
326-
Linear System Preconditioning = "ILU0"
317+
Stabilization Method = String "Stabilized"
318+
Flow model = String "Stokes"
319+
Block Preconditioner = logical True
327320

328-
Nonlinear System Convergence Tolerance = 1.0E-07
329-
Nonlinear System Max Iterations = 25
330-
Nonlinear System Newton After Iterations = 25
331-
Nonlinear System Newton After Tolerance = 1.0E-04
332-
Nonlinear System Reset Newton = Logical True
333-
! Nonlinear System Convergence Measure = String "solution"
321+
! Linear system settings:
322+
!------------------------
323+
Linear System Solver = Direct
324+
Linear System Direct Method = "UMFPACK"
325+
Mumps percentage increase working space = Integer 400
334326

327+
! Non-linear iteration settings:
328+
!-------------------------------
329+
Nonlinear System Max Iterations = 50
330+
Nonlinear System Convergence Tolerance = 1.0E-03
331+
Nonlinear System Newton After Iterations = 5
332+
Nonlinear System Newton After Tolerance = 1.0E-03
333+
Nonlinear System Reset Newton = Logical True
334+
335+
! Convergence on timelevel:
336+
!--------------------------
335337
Steady State Convergence Tolerance = 1.0E-03
336-
! Steady State Convergence Measure = String "solution"
338+
339+
Relative Integration Order = -1
340+
!Number of Integration Points = Integer 44 ! 21, 28, 44, 64, ...
341+
342+
! 1st iteration viscosity is constant
343+
Constant-Viscosity Start = Logical False
337344

338345
Exported Variable 1 = -dofs 2 "Mesh Velocity"
339346
Exported Variable 2 = -dofs 1 "Densi"

‎expr/02_surge2steady/sifs/pseudo_surge.sif‎

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -278,35 +278,41 @@ Solver 6
278278
Exec Interval = <Dynamic_int>
279279
Timestep Scale = <Dynamic_int>
280280

281-
Equation = "Navier-Stokes"
282-
Flow model = String "Stokes"
281+
Equation = "Stokes-Vec"
282+
Procedure = "IncompressibleNSVec" "IncompressibleNSSolver"
283+
Div-Curl Discretization = Logical False
283284
Optimize Bandwidth = Logical True
284-
! Stabilization Method = [Stabilized,P2/P1,Bubbles]
285-
Stabilization Method = String "Bubbles"
286285

287-
! Linear System Solver = Direct
288-
! Linear System Direct Method = "UMFPACK"
289-
Linear System Solver = "Iterative"
290-
Linear System Iterative Method = "BiCGStabl"
291-
BiCGStabl Polynomial Degree = 4
292-
Linear System Max Iterations = 1000
293-
Linear System Convergence Tolerance = 1.0E-08
294-
Linear System Abort Not Converged = Logical False
295-
Linear System Preconditioning = "ILU0"
286+
Stabilization Method = String "Stabilized"
287+
Flow model = String "Stokes"
288+
Block Preconditioner = logical True
296289

297-
Nonlinear System Convergence Tolerance = 1.0E-06
298-
Nonlinear System Max Iterations = 25
299-
Nonlinear System Newton After Iterations = 25
300-
Nonlinear System Newton After Tolerance = 1.0E-04
301-
Nonlinear System Reset Newton = Logical True
302-
! Nonlinear System Convergence Measure = String "solution"
290+
! Linear system settings:
291+
!------------------------
292+
Linear System Solver = Direct
293+
Linear System Direct Method = "UMFPACK"
294+
Mumps percentage increase working space = Integer 400
303295

296+
! Non-linear iteration settings:
297+
!-------------------------------
298+
Nonlinear System Max Iterations = 50
299+
Nonlinear System Convergence Tolerance = 1.0E-03
300+
Nonlinear System Newton After Iterations = 5
301+
Nonlinear System Newton After Tolerance = 1.0E-03
302+
Nonlinear System Reset Newton = Logical True
303+
304+
! Convergence on timelevel:
305+
!--------------------------
304306
Steady State Convergence Tolerance = 1.0E-03
305-
! Steady State Convergence Measure = String "solution"
307+
308+
Relative Integration Order = -1
309+
!Number of Integration Points = Integer 44 ! 21, 28, 44, 64, ...
310+
311+
! 1st iteration viscosity is constant
312+
Constant-Viscosity Start = Logical False
306313

307314
Exported Variable 1 = -dofs 2 "Mesh Velocity"
308315
Exported Variable 2 = -dofs 1 "Densi"
309-
! Exported Variable 4 = -dofs 1 "Melt"
310316
Exported Variable 3 = Flow Solution Loads[Fx:1 Fy:1 Fz:1 CEQ Residual:1 ]
311317
Calculate Loads = Logical True
312318
End

‎expr/02_surge2steady/surge2steady.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def main(argv):
106106

107107
parser.add_argument('-itters',f'--{vars["SS_itters"]["flag_var"]}', type=int,
108108
help = "Number of (S)teady (S)tate itterations",
109-
default = 10)
109+
default = 1)
110110

111111

112112
args, _ = parser.parse_known_args(argv)

0 commit comments

Comments
 (0)