Skip to content

Commit 856dce3

Browse files
committed
test(subdomain): use Julienne 2.3.0 idioms
1 parent fbf5dd8 commit 856dce3

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

fpm.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ name = "matcha"
22

33
[dependencies]
44
assert = {git = "https://github.com/berkeleylab/assert", tag = "2.1.0"}
5-
julienne = {git = "https://github.com/BerkeleyLab/julienne", tag = "2.3.0"}
5+
julienne = {git = "https://github.com/BerkeleyLab/julienne", tag = "2.4.0"}

test/subdomain_test_m.F90

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@ module subdomain_test_m
77
!! Define subdomain tests and procedures required for reporting results
88
use julienne_m, only : &
99
diagnosis_function_i &
10+
,operator(.all.) &
11+
,operator(.approximates.) &
12+
,operator(.and.) &
1013
,operator(.csv.) &
14+
,operator(.isAtLeast.) &
15+
,operator(.isAtMost.) &
16+
,operator(.within.) &
1117
,string_t &
1218
,test_t &
1319
,test_description_t &
@@ -191,10 +197,7 @@ function correct_steady_state() result(test_diagnosis)
191197
end associate
192198

193199
associate(residual => T%values() - T_steady)
194-
test_diagnosis = test_diagnosis_t( &
195-
test_passed = all(residual >= 0. .and. residual <= tolerance) &
196-
,diagnostics_string = "expected 0 <= " & ! // string_t(residual) // "<= "// string_t(tolerance) &
197-
)
200+
test_diagnosis = .all. ((residual .isAtLeast. 0.) .and. (residual .isAtMost. tolerance))
198201
end associate
199202
end function
200203

@@ -207,13 +210,10 @@ function functional_matches_procedural() result(test_diagnosis)
207210

208211
associate( T_f => T_functional(), T_p => T_procedural())
209212
associate(L_infinity_norm => maxval(abs(T_f - T_p)))
210-
test_diagnosis = test_diagnosis_t( &
211-
test_passed = L_infinity_norm < tolerance &
212-
,diagnostics_string = "expected " // string_t(L_infinity_norm) // " < " // string_t(tolerance) &
213-
)
213+
test_diagnosis = .all. (T_f .approximates. T_p .within. tolerance)
214214
end associate
215215
end associate
216-
&
216+
217217
contains
218218

219219
function T_functional()

0 commit comments

Comments
 (0)