Skip to content

Commit 18c8ffa

Browse files
committed
add verbosity messages, fix constructor
1 parent 060c630 commit 18c8ffa

File tree

1 file changed

+25
-6
lines changed

1 file changed

+25
-6
lines changed

lib/NonlinearSolveBase/src/verbosity.jl

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@ nonlinear_verbosity_defaults = Dict(
77
:colorvec_non_sparse => Verbosity.Warn(),
88
:colorvec_no_prototype => Verbosity.Warn(),
99
:sparsity_using_jac_prototype => Verbosity.Warn(),
10-
:sparse_matrixcolorings_not_loaded => Verbosity.Warn()
10+
:sparse_matrixcolorings_not_loaded => Verbosity.Warn(),
11+
:alias_u0_immutable => Verbosity.Warn(),
12+
:linsovle_failed_noncurrent => Verbosity.Warn(),
13+
:jacobian_free => Verbosity.Warn(),
14+
:termination_condition => Verbosity.Warn(),
15+
:threshold_state => Verbosity.Warn(),
16+
:pinv_undefined => Verbosity.Warn()
1117
)
1218

1319

@@ -17,13 +23,22 @@ struct NonlinearErrorControlVerbosity
1723
non_forward_mode::Verbosity.Type
1824
fd_ad_caution::Verbosity.Type
1925
ad_backend_incompatible::Verbosity.Type
26+
alias_u0_immutable::Verbosity.Type
27+
linsolve_failed_noncurrent::Verbosity.Type
28+
jacobian_free::Verbosity.Type
29+
termination_condition::Verbosity.Type
2030

2131
function NonlinearErrorControlVerbosity(immutable_u0 = nonlinear_verbosity_defaults[:immutable_u0],
2232
non_enclosing_interval = nonlinear_verbosity_defaults[:non_enclosing_interval],
2333
non_forward_mode = nonlinear_verbosity_defaults[:non_forward_mode],
2434
fd_ad_caution = nonlinear_verbosity_defaults[:fd_ad_caution],
25-
ad_backend_incompatible = nonlinear_verbosity_defaults[:ad_backend_incompatible])
26-
new(immutable_u0, non_enclosing_interval, non_forward_mode, fd_ad_caution, ad_backend_incompatible)
35+
ad_backend_incompatible = nonlinear_verbosity_defaults[:ad_backend_incompatible],
36+
alias_u0_immutable = nonlinear_verbosity_defaults[:alias_u0_immutable],
37+
linsolve_failed_noncurrent = nonlinear_verbosity_defaults[:linsolve_failed_noncurrent],
38+
jacobian_free = nonlinear_verbosity_defaults[:jacobian_free],
39+
termination_condition = nonlinear_verbosity_defaults[:termination_condition])
40+
new(immutable_u0, non_enclosing_interval, non_forward_mode, fd_ad_caution, ad_backend_incompatible,
41+
alias_u0_immutable, linsolve_failed_noncurrent, jacobian_free, termination_condition)
2742
end
2843
end
2944

@@ -38,7 +53,7 @@ function NonlinearErrorControlVerbosity(verbose::Verbosity.Type)
3853
Verbosity.Warn() => NonlinearErrorControlVerbosity(fill(
3954
Verbosity.Warn(), length(fieldnames(NonlinearErrorControlVerbosity)))...)
4055

41-
Verbosity.Error() => NonlinearNumericalVerbosity(fill(
56+
Verbosity.Error() => NonlinearErrorControlVerbosity(fill(
4257
Verbosity.Error(), length(fieldnames(NonlinearErrorControlVerbosity)))...)
4358

4459
Verbosity.Default() => NonlinearErrorControlVerbosity()
@@ -86,8 +101,12 @@ function NonlinearPerformanceVerbosity(verbose::Verbosity.Type)
86101
end
87102

88103
mutable struct NonlinearNumericalVerbosity
89-
function NonlinearNumericalVerbosity()
90-
new()
104+
threshold_state::Verbosity.Type
105+
pinv_undefined::Verbosity.Type
106+
function NonlinearNumericalVerbosity(;
107+
threshold_state = nonlinear_verbosity_defaults[:threshold_state],
108+
pinv_undefined = nonlinear_verbosity_defaults[:pinv_undefined])
109+
new(threshold_state, pinv_undefined)
91110
end
92111
end
93112

0 commit comments

Comments
 (0)